Joan Lung f10ac32b69 Merge branch 'master' of https://github.com/tgstation/tgstation into takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon ...

Conflicts:
	icons/mob/mob.dmi

2016-09-12 15:10:29 -04:00

..

assembly.dm

Origin tech changes and some fixes

2016-05-17 20:57:01 +03:00

bomb.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

doorcontrol.dm

* Admins can now bypass the vote creation cooldown.

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

flash.dm

Merge branch 'master' of https://github.com/tgstation/tgstation into takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon

2016-09-12 15:10:29 -04:00

health.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

helpers.dm

…

holder.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

igniter.dm

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

infrared.dm

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

mousetrap.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

proximity.dm

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

shock_kit.dm

…

signaler.dm

Origin tech changes and some fixes

2016-05-17 20:57:01 +03:00

timer.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

voice.dm

Origin tech changes and some fixes

2016-05-17 20:57:01 +03:00