Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

assembly.dm

Bug fixes, update quick create object

2015-03-02 21:20:12 +01:00

bomb.dm

More Linda Fixes

2015-05-21 19:33:54 -04:00

helpers.dm

…

holder.dm

tweaks and optimization

2015-06-21 02:16:18 -04:00

igniter.dm

Various Fixes

2015-04-29 18:12:24 -04:00

infrared.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

mousetrap.dm

assembly fixes

2015-04-25 22:43:40 -04:00

proximity.dm

…

shock_kit.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

signaler.dm

Fixes Signaler sleeping and frequencies

2015-05-18 04:52:49 -04:00

timer.dm

…

voice.dm

…