LetterJay 3973b368de Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -06:00

..

decals

Update cleanable.dm

2017-12-19 17:46:15 -06:00

effect_system

Merge pull request #33622 from duncathan/assert_gas

2017-12-20 00:14:13 -06:00

spawners

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

temporary_visuals

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

alien_acid.dm

…

anomalies.dm

Update anomalies.dm

2017-12-17 15:57:02 -06:00

bump_teleporter.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

contraband.dm

Prevent placing posters on diagonally-smoothed walls (#32558)

2017-11-13 02:33:30 -06:00

countdown.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

effects.dm

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -06:00

forcefields.dm

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -06:00

glowshroom.dm

Merge pull request #32876 from vuonojenmustaturska/glowshrooms

2017-11-19 21:24:51 -06:00

landmarks.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

manifest.dm

Update manifest.dm

2017-11-17 23:20:44 -05:00

mines.dm

…

misc.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

overlays.dm

…

portals.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

proximity.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

spiders.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

step_triggers.dm

Clean up some loc assignments (#33157)

2017-12-02 09:44:20 -06:00

wanted_poster.dm

…