Qustinnus 2312ff09be Fixing conflicts

2017-07-19 11:19:52 +02:00

..

decals

Disease Refactor (#29130)

2017-07-15 11:08:40 -04:00

effect_system

Rename Bump to Collide (#29207)

2017-07-14 13:47:22 +02:00

spawners

Fixing conflicts

2017-07-19 11:19:52 +02:00

temporary_visuals

Merge pull request #29162 from ChangelingRain/directionliststweak

2017-07-10 18:45:52 -04:00

alien_acid.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

anomalies.dm

Rename Bumped to CollidedWith

2017-07-15 00:25:22 +00:00

bump_teleporter.dm

Rename Bumped to CollidedWith

2017-07-15 00:25:22 +00:00

contraband.dm

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

countdown.dm

Revert "Removes the gang gamemode" (#26915)

2017-05-04 21:19:02 -05:00

effects.dm

Conveyor movement refactor/fix (#26408)

2017-04-21 19:27:37 -03:00

forcefields.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

glowshroom.dm

Merge pull request #29162 from ChangelingRain/directionliststweak

2017-07-10 18:45:52 -04:00

landmarks.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

manifest.dm

…

mines.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

misc.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

overlays.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

portals.dm

Fixes portals not autosetting their overridden target turf on Initialize - "It actually was my fault" (#28999)

2017-07-05 10:36:02 -04:00

proximity.dm

Removes HasProx testing message

2017-05-21 18:33:55 -04:00

spiders.dm

Rename Bump to Collide (#29207)

2017-07-14 13:47:22 +02:00

step_triggers.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

wanted_poster.dm

Fixes posters

2017-05-30 16:20:53 -04:00