f39b26000e
Update flash.dm
2014-08-18 22:16:52 -06:00
1cf1a193ca
Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
...
They are instead force ghosted, so it's not taken as free immunity from conversion.
2014-08-14 21:49:19 -06:00
ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
53d9aca271
Merge pull request #4371 from paprka/bowmanheadsets
...
Bowman radio headsets
2014-08-11 14:13:26 +01:00
55a11982da
Merge pull request #4361 from paprka/swatremoval
...
Replaces swat helmet for syndicates
2014-08-11 12:15:56 +02:00
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
8a5d1325d1
Update boxes.dm
2014-08-09 14:23:37 -06:00
22e0081cf3
Resolved Conflicts:
...
code/game/objects/items/weapons/storage/boxes.dm
2014-08-09 14:19:43 -06:00
3c96428603
[MAP] Boxstation Update and Deputy Armbands
...
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
0a7bd48a7b
Merge pull request #4368 from Firecage/Effectabsoluting
...
Adds absolute paths to some effect files.
2014-08-09 16:33:19 -03:00
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
24b18fad93
Absolute paths for item files.
2014-08-07 23:02:43 +02:00
e901f9b6c1
bowmans
2014-08-07 12:30:14 -07:00
22743b77f4
Adds asbolute paths to some effect files.
2014-08-07 18:59:06 +02:00
10f6ca8c7e
removes swat helmet
2014-08-07 04:47:55 -07:00
d41a469ff4
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
...
Conflicts:
code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
ccae5781c5
added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
...
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
0ad9b394d5
Merge pull request #4296 from AndroidSFV/alienwallbuff
...
Resin walls and weeds cannot be mash-attacked.
2014-08-03 21:46:22 -03:00
5b0aba0e67
Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014
...
Another lowercasing pass on a bunch of items and furnitures.
2014-08-02 18:02:50 -07:00
c74601646a
Merge pull request #4287 from AndroidSFV/taperecorderfix
...
Fixes a minor span class in tape recorder
2014-07-31 22:28:27 -05:00
1b2c95a81c
Merge branch 'master' into ItemNameFixing07-2014
2014-07-31 18:54:38 +02:00
817278e5ad
Resin walls and weeds cannot be mash-attacked.
2014-07-30 21:04:34 -05:00
589d38660a
Merge pull request #3967 from CollenN/radscanner
...
Adds Radioactive Microlaser to Traitor Arsenal
2014-07-30 10:13:10 +01:00
eea9ae50ad
merging
2014-07-29 16:50:21 -07:00
99e7957db0
Fixes a minor span class in tape recorder
2014-07-29 14:59:51 -05:00
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
056289a273
fixed moving between adjacent tables
2014-07-29 09:12:01 -07:00
fcb2fb9de3
Another lowercasing pass on a bunch of items and furnitures.
...
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
2df25335e2
You cannot instant wrench dislodged girders.
2014-07-26 23:25:01 +02:00
e4de28b13e
Merge pull request #4170 from RemieRichards/FixDoorLockerWeld
...
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-22 15:18:32 +01:00
172322c0ad
Merge pull request #4192 from paprka/sleepyfix
...
Fixes miauw's parapen laziness
2014-07-22 15:16:46 +01:00
07267b4220
Merge pull request #4208 from paprka/tfwnogrille
...
Grille hitting text fix.
2014-07-22 08:02:55 +01:00
9747d26081
you no longer kick grilles
2014-07-20 22:58:48 -07:00
7779a2f7e8
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-20 21:10:53 +02:00
3bf4ecfba5
fixes laziness
2014-07-18 18:30:23 -07:00
fc4c299252
Lighting cigarettes with flares/torches
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-16 16:34:42 +02:00
fdadd6ad86
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-16 00:45:38 +01:00
cf7c466779
Merge pull request #4144 from Rockdtben/securityPDA
...
PDA - Security Records were missing tables.
2014-07-14 14:17:11 +01:00
72423a7bd0
Merge pull request #4059 from Miauw62/goodbyeparapen
...
Replaces the parapen
2014-07-14 12:47:14 +01:00
9173a46bfd
Makes C4 unable to be planted on mobs and reduces C4 cost to 1 TC
2014-07-14 13:28:42 +02:00
eddcde41a8
Merge pull request #4135 from Rolan7/Issue_1919
...
Fixes tray layer issue
2014-07-14 09:26:05 +01:00
0e26850893
PDA - Security Records were missing tables.
...
Fixed a bug where printing would stop working if a record was deleted.
2014-07-12 20:54:47 -05:00
d567d23be8
Changes the layer for items on trays to -1. This makes them display on top of the tray, but not above other things.
2014-07-11 22:17:03 -04:00
7a853c5f86
round 2
2014-07-10 20:24:49 -07:00
b92397a2e3
paprikkas gay
2014-07-10 20:12:24 -07:00
0aae810b87
fixes merge issue with killer tomatoes
...
fixes soap
2014-07-07 13:59:59 -05:00
065028cf1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
...
i am going to murder you miauw
2014-07-07 12:51:56 -05:00
7b90557dea
..()
2014-07-07 13:46:59 -04:00
8e883deff7
Merge pull request #4057 from Aranclanos/OfficeChairs
...
Rolling chairs fixes.
2014-07-07 10:27:03 +01:00
Ikarrus
Alex
Swag McYolosteinen
paprka
Aranclanos
Firecage
MrPerson
Cheridan
KyrahAbattoir
AndroidSFV
Robson Richards
Rockdtben
Rolan7
CollenN