From 56d88efca4eb00490a2e4ccf48ab7cf56fab6e13 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 1 May 2023 22:21:26 +0100 Subject: [PATCH] [MIRROR] Very late arrivals can arrive with toast [MDB IGNORE] (#20875) * Very late arrivals can arrive with toast * conflicts * rootbread --------- Co-authored-by: Thunder12345 Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/controllers/subsystem/job.dm | 12 ++++++++++++ config/spaceruinblacklist.txt | 3 --- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index dc543c5ccd9..3323db10697 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -1,3 +1,5 @@ +#define VERY_LATE_ARRIVAL_TOAST_PROB 20 + SUBSYSTEM_DEF(job) name = "Jobs" init_order = INIT_ORDER_JOBS @@ -579,6 +581,14 @@ SUBSYSTEM_DEF(job) setup_alt_job_items(wageslave, job, player_client) // SKYRAT EDIT ADDITION - ALTERNATIVE_JOB_TITLES + if(EMERGENCY_PAST_POINT_OF_NO_RETURN && prob(VERY_LATE_ARRIVAL_TOAST_PROB)) + // SKYRAT EDIT CHANGE START - Lizards + if(islizard(equipping)) + equipping.equip_to_slot_or_del(new /obj/item/food/breadslice/root(equipping), ITEM_SLOT_MASK) + else + equipping.equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK) + // SKYRAT EDIT CHANGE END - Lizards + job.after_spawn(equipping, player_client) /datum/controller/subsystem/job/proc/handle_auto_deadmin_roles(client/C, rank) @@ -1144,3 +1154,5 @@ SUBSYSTEM_DEF(job) return JOB_UNAVAILABLE_GENERIC return JOB_AVAILABLE + +#undef VERY_LATE_ARRIVAL_TOAST_PROB diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index 2a7cf70356c..3406bdc7e0e 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -82,10 +82,7 @@ #_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm #_maps/RandomRuins/SpaceRuins/phonebooth.dmm #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm -<<<<<<< HEAD #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/forgottenship_skyrat.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/shuttle8532.dmm #modular_skyrat/modules/ruins/maps/space/dangerous_research.dmm -======= #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm ->>>>>>> 77f4655efbe (Adds a phonebooth ruin to icebox, space, and lavaland (#74174))