[MIRROR] Very late arrivals can arrive with toast [MDB IGNORE] (#20875)

* Very late arrivals can arrive with toast

* conflicts

* rootbread

---------

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-05-01 14:21:26 -07:00
committed by GitHub
co-authored by Thunder12345 lessthanthree
parent 8e82f60486
commit 56d88efca4
2 changed files with 12 additions and 3 deletions
+12
View File
@@ -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
-3
View File
@@ -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))