Merge pull request #15206 from zeroisthebiggay/metaprison

meta station prison remapping
This commit is contained in:
silicons
2021-09-28 00:13:13 -07:00
committed by GitHub
6 changed files with 5773 additions and 3748 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -2750,7 +2750,6 @@
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4 dir = 4
}, },
/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/freezer, /turf/open/floor/plasteel/freezer,
/area/security/prison) /area/security/prison)
"agP" = ( "agP" = (
@@ -61341,10 +61340,6 @@
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/security/courtroom) /area/security/courtroom)
"tVZ" = (
/obj/effect/landmark/start/prisoner,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"tXn" = ( "tXn" = (
/obj/structure/sink{ /obj/structure/sink{
dir = 4; dir = 4;
@@ -83604,7 +83599,7 @@ aaa
aem aem
aeq aeq
aeE aeE
tVZ aeU
afo afo
afD afD
aga aga

View File

@@ -0,0 +1,25 @@
#define JOB_MODIFICATION_MAP_NAME "PubbyStation"
/datum/job/hos/New()
..()
MAP_JOB_CHECK
access += ACCESS_CREMATORIUM
minimal_access += ACCESS_CREMATORIUM
/datum/job/warden/New()
..()
MAP_JOB_CHECK
access += ACCESS_CREMATORIUM
minimal_access += ACCESS_CREMATORIUM
/datum/job/officer/New()
..()
MAP_JOB_CHECK
access += ACCESS_CREMATORIUM
minimal_access += ACCESS_CREMATORIUM
/datum/job/prisoner/New()
..()
MAP_JOB_CHECK
total_positions = 0
spawn_positions = 2

View File

@@ -5,7 +5,7 @@
department_flag = CIVILIAN department_flag = CIVILIAN
faction = "Station" faction = "Station"
total_positions = 0 total_positions = 0
spawn_positions = 2 spawn_positions = 4
supervisors = "the security team" supervisors = "the security team"
outfit = /datum/outfit/job/prisoner outfit = /datum/outfit/job/prisoner

View File

@@ -1759,8 +1759,8 @@
#include "code\modules\antagonists\slaughter\slaughter.dm" #include "code\modules\antagonists\slaughter\slaughter.dm"
#include "code\modules\antagonists\slaughter\slaughter_antag.dm" #include "code\modules\antagonists\slaughter\slaughter_antag.dm"
#include "code\modules\antagonists\slaughter\slaughterevent.dm" #include "code\modules\antagonists\slaughter\slaughterevent.dm"
#include "code\modules\antagonists\space_ninja\space_ninja.dm"
#include "code\modules\antagonists\space_dragon\space_dragon.dm" #include "code\modules\antagonists\space_dragon\space_dragon.dm"
#include "code\modules\antagonists\space_ninja\space_ninja.dm"
#include "code\modules\antagonists\survivalist\survivalist.dm" #include "code\modules\antagonists\survivalist\survivalist.dm"
#include "code\modules\antagonists\swarmer\swarmer.dm" #include "code\modules\antagonists\swarmer\swarmer.dm"
#include "code\modules\antagonists\swarmer\swarmer_event.dm" #include "code\modules\antagonists\swarmer\swarmer_event.dm"
@@ -2132,8 +2132,8 @@
#include "code\modules\events\radiation_storm.dm" #include "code\modules\events\radiation_storm.dm"
#include "code\modules\events\sentience.dm" #include "code\modules\events\sentience.dm"
#include "code\modules\events\shuttle_loan.dm" #include "code\modules\events\shuttle_loan.dm"
#include "code\modules\events\space_ninja.dm"
#include "code\modules\events\space_dragon.dm" #include "code\modules\events\space_dragon.dm"
#include "code\modules\events\space_ninja.dm"
#include "code\modules\events\spacevine.dm" #include "code\modules\events\spacevine.dm"
#include "code\modules\events\spider_infestation.dm" #include "code\modules\events\spider_infestation.dm"
#include "code\modules\events\spontaneous_appendicitis.dm" #include "code\modules\events\spontaneous_appendicitis.dm"