deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

..

assembly.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

bomb.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

doorcontrol.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

flash.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

health.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

helpers.dm

…

holder.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

igniter.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

infrared.dm

Merge pull request #37625 from ShizCalev/infrared

2018-05-03 08:44:01 -05:00

mousetrap.dm

Fixes mousetraps not going off from being dumped out (#37447)

2018-05-04 04:43:12 -05:00

proximity.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

shock_kit.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

signaler.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

timer.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

voice.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00