Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

closets

…

effects

Revert #3316 from BEF due to compile errors and (assumed) missing files.

2013-07-20 18:38:00 +01:00

items

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

random

- removing yellow and black gloves from the randomized tech storage object

2013-06-11 00:52:32 -04:00

storage

Fixes #3118

2013-06-21 15:07:31 -07:00

structures

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

empulse.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-06-04 13:47:26 +04:00

explosion_recursive.dm

…

explosion.dm

Adds explosive implant admin messages, and jump button for explosions.

2013-08-12 12:34:13 +01:00

items.dm

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

objs.dm

Airlock and APC changes.

2013-05-23 16:43:29 +02:00

structures.dm

…

weapons.dm

…