phil235 95959a76ef Merge branch 'master' of https://github.com/tgstation/-tg-station into AdminRequests1 ...

Conflicts:
	code/modules/admin/verbs/randomverbs.dm

2016-05-07 12:33:06 +02:00

..

assembly.dm

New proximity code

2016-01-26 07:47:33 +03:00

bomb.dm

removes simulated turfs; adds space gas mixture for space

2016-03-10 17:27:01 -06:00

doorcontrol.dm

* Admins can now bypass the vote creation cooldown.

2016-04-29 18:21:53 +02:00

flash.dm

Fixes flashes and voice analyzers

2016-01-22 22:00:41 +03:00

health.dm

Merge conflict fix

2016-01-17 19:15:30 +02:00

helpers.dm

…

holder.dm

Merge conflict fix

2016-01-27 17:38:42 +02:00

igniter.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

infrared.dm

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

mousetrap.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

proximity.dm

Action buttons will now only update when needed instead of every Life().

2016-02-22 00:34:59 +01:00

shock_kit.dm

Splits beds and chairs

2016-02-18 17:55:38 +01:00

signaler.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

timer.dm

Merge conflict fix

2016-01-27 17:38:42 +02:00

voice.dm

Make it an else instead

2016-02-08 20:31:15 -02:00