Commit Graph

8 Commits

Author SHA1 Message Date
Mark van Alphen
5aa20721ba Prevent ruins from spawning on the Labor Camp and *very* close to the station 2019-06-05 03:16:55 +02:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +02:00
Fox McCloud
5bdbb64da2 returning parent value 2019-04-24 01:11:42 -04:00
Mark van Alphen
e7e6752c54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/master_controller.dm
#	paradise.dme
2019-04-14 19:17:06 +02:00
AffectedArc07
15e549fd7e Supers seem super useful 2019-04-14 16:57:15 +01:00
AffectedArc07
57fb39016c Stick it on my tab, barkeep 2019-04-14 16:57:15 +01:00
AffectedArc07
ae28500156 Init order changes 2019-04-14 16:56:06 +01:00
AffectedArc07
2304cf0f6f SSMapping 2019-04-14 16:56:06 +01:00