Jordan Brown 44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix ...

Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction

2018-04-18 11:34:06 -05:00

..

simulated

Merge pull request #37268 from ShizCalev/scp-ruin-fix

2018-04-18 11:34:06 -05:00

space

Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00:00

ChangeTurf.dm

Merge pull request #34623 from ninjanomnom/template-placeontop

2018-01-24 18:18:31 -06:00

closed.dm

Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705

2017-12-30 13:19:00 -06:00

open.dm

Merge pull request #36888 from Robustin/initatmos

2018-04-02 08:33:48 -05:00

turf.dm

[READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344)

2018-02-18 11:34:29 -06:00