From ccc0a19e0422c705fa57df6560cdf067e0e1a4ce Mon Sep 17 00:00:00 2001 From: John Doe Date: Sat, 2 Sep 2023 11:40:18 -0700 Subject: [PATCH] joes no longer get an emergency kit --- code/game/jobs/job/civilians/support/working_joe.dm | 1 + code/game/jobs/job/job.dm | 2 ++ code/modules/cm_marines/equipment/kit_boxes.dm | 2 +- code/modules/mob/new_player/new_player.dm | 9 +++++---- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/jobs/job/civilians/support/working_joe.dm b/code/game/jobs/job/civilians/support/working_joe.dm index d4b575f324f2..ce1c8010c216 100644 --- a/code/game/jobs/job/civilians/support/working_joe.dm +++ b/code/game/jobs/job/civilians/support/working_joe.dm @@ -12,6 +12,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN flags_whitelist = WHITELIST_JOE gear_preset = /datum/equipment_preset/synth/working_joe + gets_emergency_kit = FALSE job_options = list(STANDARD_VARIANT = "JOE", HAZMAT_VARIANT = "HAZ") var/standard = TRUE diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 234902e11d22..0785fc5c337f 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -37,6 +37,8 @@ /// When set you will be able to choose between the different job options when selecting your role. /// Associated list. Main list elements - actual options, associated values - shorthands for job preferences menu (keep those short). var/job_options + /// If TRUE, this job will spawn w/ a cryo emergency kit during evac/red alert + var/gets_emergency_kit = TRUE /datum/job/New() . = ..() diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index a552b8eb0927..cc95465752a6 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -483,7 +483,7 @@ name = "\improper Cryo Self Defense Kit" desc = "A basic self-defense kit reserved for emergencies. As you might expect, not much care was put into keeping the stock fresh, who would be insane enough to attack a USCM ship directly?" icon_state = "cryo_defense_kit" - storage_slots = 2 + storage_slots = 3 /obj/item/storage/box/kit/cryo_self_defense/update_icon() if(LAZYLEN(contents)) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 9f88f0f9d611..5da499dabc52 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -228,6 +228,7 @@ new_player_panel() /mob/new_player/proc/AttemptLateSpawn(rank) + var/datum/job/player_rank = RoleAuthority.roles_for_mode[rank] if (src != usr) return if(SSticker.current_state != GAME_STATE_PLAYING) @@ -236,7 +237,7 @@ if(!enter_allowed) to_chat(usr, SPAN_WARNING("There is an administrative lock on entering the game! (The dropship likely crashed into the Almayer. This should take at most 20 minutes.)")) return - if(!RoleAuthority.assign_role(src, RoleAuthority.roles_for_mode[rank], 1)) + if(!RoleAuthority.assign_role(src, player_rank, 1)) to_chat(src, alert("[rank] is not available. Please try another.")) return @@ -244,16 +245,16 @@ close_spawn_windows() var/mob/living/carbon/human/character = create_character(TRUE) //creates the human and transfers vars and mind - RoleAuthority.equip_role(character, RoleAuthority.roles_for_mode[rank], late_join = TRUE) + RoleAuthority.equip_role(character, player_rank, late_join = TRUE) EquipCustomItems(character) - if(security_level > SEC_LEVEL_BLUE || EvacuationAuthority.evac_status) + if((security_level > SEC_LEVEL_BLUE || EvacuationAuthority.evac_status) && player_rank.gets_emergency_kit) to_chat(character, SPAN_HIGHDANGER("As you stagger out of hypersleep, the sleep bay blares: '[EvacuationAuthority.evac_status ? "VESSEL UNDERGOING EVACUATION PROCEDURES, SELF DEFENSE KIT PROVIDED" : "VESSEL IN HEIGHTENED ALERT STATUS, SELF DEFENSE KIT PROVIDED"]'.")) character.put_in_hands(new /obj/item/storage/box/kit/cryo_self_defense(character.loc)) GLOB.data_core.manifest_inject(character) SSticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc. //TODO!!!!! ~Carn - SSticker.mode.latejoin_tally += RoleAuthority.calculate_role_weight(RoleAuthority.roles_for_mode[rank]) + SSticker.mode.latejoin_tally += RoleAuthority.calculate_role_weight(player_rank) for(var/datum/squad/sq in RoleAuthority.squads) if(sq)