Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts

2014-12-28 11:20:15 +03:00

..

chem_grenade.dm

Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.

2014-12-24 01:50:19 +01:00

emgrenade.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

flashbang.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

ghettobomb.dm

On second thought, leave the result as just a path

2014-10-10 14:30:41 -07:00

grenade.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

smokebomb.dm

More qdel() changes.

2014-03-31 01:11:37 -07:00

spawnergrenade.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

syndieminibomb.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00