Remie Richards da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances ...

Conflicts:
	code/game/atoms.dm

2016-04-06 21:26:46 +01:00

..

effects

Made more sleeps use stoplag

2016-04-05 11:08:28 -07:00

items

Merge pull request #16616 from bgobandit/clownmegaphone

2016-04-05 15:35:36 -05:00

structures

Keep pixely layout when changing sign type

2016-04-06 14:02:47 +12:00

buckling.dm

Fixes pulling mob when trying to strip them.

2016-03-17 23:38:32 +01:00

empulse.dm

Pooling is good for the soul.

2015-11-17 11:27:26 -05:00

explosion.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-04-03 18:22:20 -06:00

items.dm

Adds a framework for alternate appearances (override images), the Cardborg costume now makes you look like a real Standard Cyborg

2016-04-02 20:52:00 +01:00

objs.dm

Replaced last occurences of gc_destroyed by qdeleted().

2016-03-05 01:58:56 +01:00

radiation.dm

Removes rad pulse admin notice

2015-12-10 04:26:56 -06:00

structures.dm

Adds sandbags

2016-04-02 23:52:12 -04:00

weapons.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00