146af7607c
absolute paths for the structure folder files
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
2014-08-16 00:01:04 +02:00
74c22755be
Merge pull request #4365 from paprka/fingerlessgloves
...
Adds fingerless gloves, other glove related changes
2014-08-15 08:03:37 +01: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
148d16397b
Advanced Shotshells
...
adds 3 new types of shotgun ammo. make them by crafting the special shell in RND, and then using table-crafting to make the unique ammo.dmi
meteorshot, made with compressed matter cartridges
pulse slugs, shotgun rounds with the properties of a laser weapon.
dragonsbreath rounds, area-of-effect flame weapons.
renames ammunition/bullets.dm to ammunition/ammo_casings.dm, which is more accurate
splits RND designs up into their own files
2014-08-14 12:15:10 -05:00
54c8cc0f66
Some cleanup
2014-08-14 13:56:19 +04:00
04ce0616e7
Cannot place one-way glass by clicking on destroyed grille
2014-08-14 13:50:41 +04:00
6b628667ed
Accidentally left unnecessary comment
2014-08-14 13:36:00 +04:00
b76595d03e
Broken grilles won't summon new rods when hit
2014-08-14 13:33:10 +04:00
48976301c4
Welders won't weld if they're off. Welders won't finish welding if Toggle Open was used in the process.
2014-08-14 02:11:39 +04:00
bbf90b10d3
span fixes
2014-08-12 02:15:07 -07:00
ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
e97f21a24a
empty weapon click
2014-08-11 22:56:05 -07:00
5210419a87
undershirts
2014-08-11 22:41:07 -07: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
49dc1608d0
-Burglar alarm is now an area/proc
...
-Burglar alarm automatically clears after a minute
-Fixed runtime with cyborgs receiving burglar alarms
2014-08-09 17:09:35 -06: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
31ad2bc636
Burglar Alarm for Captain's Display Case
...
-Breaking the Captain's Display Case will now trigger an alarm, bolting all airlocks in the room as well as notifying the AI (after a 3 second delay)
Nowadays, I'm seeing far too many Captains breaking their display case with little repercussion. Keeping the gun in the case used to have value when the AI was able to watch over it (hear people breaking it), but since the AI was moved there's no value in keeping it in there besides to avoid being accused of powergaming.
This change is meant to add incentive for Captains to keep it in the case (Extra Security), humiliates them from taking it (bells and whistles will draw everyone's attention), and makes the steal objective a little more unique from the other ones.
Traitors would need to create their own escape route first, or be extremely predictable jump down the disposal outlet. An alternative to bolting the airlocks (should it be seen as being too extreme) would be to simply drop firedoors instead.
2014-08-09 12:51:11 -06:00
fa4d21980a
Makes the new code test-ready.
2014-08-08 18:19:11 +02: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
8602795aec
FUCKING RADIO CODE
2014-08-07 18:11:53 +02:00
3b00fa9cfa
cargonia strong!
2014-08-07 05:51:27 -07: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
c09d8981fe
makes ninja less stupidly broken
2014-08-06 15:13:06 -07:00
6b42d39228
does more shit
2014-08-05 19:17:21 +02:00
5ae8b76ab6
Converts whispers to the new system
...
Removes say_understand()
Removes .bak files that were just ancient duplicates.
2014-08-05 17:49:03 +02:00
891546aa56
More work on saycode.
2014-08-05 16:02:21 +02:00
0a4751a067
Starts work on say() improvement.
...
Removes silicon/decoy AIs because they are unused and in the way.
DOES NOT COMPILE, I MAY HAVE MISSED A PAREM SOMEWHERE BUT I HAVE NO IDEA WHERE
2014-08-04 22:30:26 +02: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
Firecage
Alex
ikarrus
Cheridan
Lo6a4evskiy
paprka
Swag McYolosteinen
Aranclanos
MrPerson
KyrahAbattoir
AndroidSFV