Jordie0608 208b136996 Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying ...

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm

2014-10-07 21:56:06 +11:00

..

decals

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

spawners

Warning cones can be worn on your head, with original codersprites.

2014-09-19 22:44:59 +03:00

aliens.dm

Fixes resin walls icon on map maker + abandoned mining station

2014-10-01 13:41:48 +10:00

anomalies.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00: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

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

forcefields.dm

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

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

gibs.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

glowshroom.dm

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

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

landmarks.dm

Adds Deathsquad to Quick-Create Antagonist Menu

2014-08-16 00:40:37 -06: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

Adds asbolute paths to some effect files.

2014-08-07 18:59:06 +02:00

portals.dm

If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.

2014-04-02 08:36:33 -03:00

spiders.dm

Updates spiders to have full player functionality

2014-10-01 18:58:07 -04:00

step_triggers.dm

Adds asbolute paths to some effect files.

2014-08-07 18:59:06 +02:00