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

Merge pull request #6263 from paprka/gunsthegunnening

2014-12-11 10:46:34 +03:00

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

Anomaly Event Changes

2014-10-19 17:07:07 -05:00

bump_teleporter.dm

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

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

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

Removes old/unused code from the tree. Use version control if you need it for some reason.

2014-11-16 16:53:18 -03:00

forcefields.dm

SubSystem rewrite

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

gibs.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

glowshroom.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

landmarks.dm

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

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

manifest.dm

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

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

mines.dm

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

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

misc.dm

…

overlays.dm

makes the singularity's pulling OOP with the magic of atom proc

2014-10-27 16:43:35 -07:00

portals.dm

Bluespace wormhole projector

2014-10-26 15:06:30 +02:00

spiders.dm

SubSystem rewrite

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

step_triggers.dm

Fixes some backwards logic

2014-12-12 16:48:06 +00:00