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

Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm

2015-01-06 12:17:29 +08:00

..

decals

…

spawners

Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.

2014-12-26 17:04:09 +01:00

aliens.dm

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

2014-12-16 02:52:08 +03:00

anomalies.dm

…

bump_teleporter.dm

…

effect_system.dm

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

2015-01-04 01:52:14 +00:00

explosion_particles.dm

…

forcefields.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

gibs.dm

…

glowshroom.dm

…

landmarks.dm

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

2015-01-06 12:17:29 +08:00

manifest.dm

…

mines.dm

…

misc.dm

…

overlays.dm

…

portals.dm

…

spiders.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

step_triggers.dm

…