Tigercat2000 dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat ...

Conflicts:
	code/game/machinery/door_control.dm

2016-04-05 21:10:36 -07:00

..

assembly.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

bomb.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

health.dm

Health Assembly

2015-09-06 02:19:44 -04:00

helpers.dm

…

holder.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

igniter.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

infrared.dm

Also stops ghosts from triggering infra

2016-02-26 22:03:37 -05:00

mousetrap.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

proximity.dm

Pass I

2015-09-04 05:18:48 -04:00

shock_kit.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

signaler.dm

Fixes "Adjust Signaler Settings" option not working

2016-03-30 15:42:35 -04:00

timer.dm

Pass I

2015-09-04 05:18:48 -04:00

voice.dm

added hear_message, like hear_talk but for audible emotes, voice analyzer & newscaster support

2015-12-13 04:36:41 -05:00