ikarrus a89054dfaa Resolving Conflicts: ...

_maps/map_files/tgstation.2.1.3.dmm
	code/controllers/configuration.dm
	config/game_options.txt

2014-07-01 13:31:08 -06:00

..

decals

Meteor code uses OOP principles a little better now

2014-04-23 01:37:44 -05:00

spawners

Initial pass to convert LF to CRLF

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

aliens.dm

Reisin walls and doors will now block superconductivity (heat)

2014-04-30 07:40:41 -03: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

Nar-Sie update

2014-06-11 14:19:58 -05:00

forcefields.dm

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

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

gibs.dm

MONKEY MODE REDUX

2014-06-14 21:30:25 -05:00

glowshroom.dm

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

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

landmarks.dm

[Config] Security Officer Scaling

2014-06-15 21:24:07 -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

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

2014-02-23 14:55:12 -08: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

Fix for #3151

2014-04-21 19:36:33 +02:00

step_triggers.dm

Replaces atom/HasEntered() with the builtin atom/movable/Crossed()

2013-10-23 16:20:20 -04:00