From 2aedde06fc0408639f814dd4958ff5047875d716 Mon Sep 17 00:00:00 2001 From: TobyThorne <45202681+TobyThorne@users.noreply.github.com> Date: Sat, 3 Feb 2024 05:00:30 +0600 Subject: [PATCH] heights --- code/datums/events/gatecrasher.dm | 66 ++++++++++--------- .../mob/living/carbon/human/human_species.dm | 30 ++++----- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/code/datums/events/gatecrasher.dm b/code/datums/events/gatecrasher.dm index 259ad8d719d..b65a827b0dd 100644 --- a/code/datums/events/gatecrasher.dm +++ b/code/datums/events/gatecrasher.dm @@ -56,6 +56,7 @@ /obj/structure/closet/syndicate, /obj/structure/closet = 5 ) + var/species = list( // List of species to pick from. Uses util_pick_weight() SPECIES_HUMAN = 50, SPECIES_SWINE = 10, @@ -76,36 +77,38 @@ SPECIES_XENO_QUEEN = 1, SPECIES_XENO_HUNTER_FERAL = 1 ) - var/outfits = list( // List of outfits to pick from. Uses util_pick_weight() + + var/outfits_to_spawn = list( // List of outfits to pick from. Uses util_pick_weight() /decl/hierarchy/outfit = 10, - /decl/hierarchy/outfit/job/assistant = 10, - /decl/hierarchy/outfit/job/service/janitor = 1, - /decl/hierarchy/outfit/job/internal_affairs_agent = 1, - /decl/hierarchy/outfit/job/chaplain = 1, - /decl/hierarchy/outfit/job/merchant = 5, - /decl/hierarchy/outfit/job/clown = 3, - /decl/hierarchy/outfit/job/mime = 3, - /decl/hierarchy/outfit/job/cargo/cargo_tech = 2, - /decl/hierarchy/outfit/job/cargo/mining = 5, - /decl/hierarchy/outfit/job/cargo/mining/void = 3, - /decl/hierarchy/outfit/job/medical/virologist = 1, - /decl/hierarchy/outfit/job/science/scientist = 3, - /decl/hierarchy/outfit/job/silicon = 1, - /decl/hierarchy/outfit/nanotrasen/representative = 3, + /decl/hierarchy/outfit/job/assistant = 20, + /decl/hierarchy/outfit/job/service/janitor = 2, + /decl/hierarchy/outfit/job/internal_affairs_agent = 2, + /decl/hierarchy/outfit/job/chaplain = 2, + /decl/hierarchy/outfit/job/merchant = 10, + /decl/hierarchy/outfit/job/clown = 6, + /decl/hierarchy/outfit/job/mime = 6, + /decl/hierarchy/outfit/job/cargo/cargo_tech = 4, + /decl/hierarchy/outfit/job/cargo/mining = 10, + /decl/hierarchy/outfit/job/cargo/mining/void = 6, + /decl/hierarchy/outfit/job/medical/virologist = 2, + /decl/hierarchy/outfit/job/science/scientist = 6, + /decl/hierarchy/outfit/job/silicon = 2, + /decl/hierarchy/outfit/nanotrasen/representative = 4, /decl/hierarchy/outfit/nanotrasen/officer = 2, - /decl/hierarchy/outfit/pirate = 7, - /decl/hierarchy/outfit/pirate/space = 3, - /decl/hierarchy/outfit/wizard/blue = 1, - /decl/hierarchy/outfit/spec_op_officer = 1, - /decl/hierarchy/outfit/death_command = 1, - /decl/hierarchy/outfit/syndicate = 1, - /decl/hierarchy/outfit/syndicate/armored/commando = 1, - /decl/hierarchy/outfit/tunnel_clown = 1, - /decl/hierarchy/outfit/masked_killer = 1, - /decl/hierarchy/outfit/reaper = 1, - /decl/hierarchy/outfit/standard_space_gear = 5, - /decl/hierarchy/outfit/soviet_soldier = 1 + /decl/hierarchy/outfit/pirate = 14, + /decl/hierarchy/outfit/pirate/space = 6, + /decl/hierarchy/outfit/wizard/blue = 2, + /decl/hierarchy/outfit/spec_op_officer = 2, + /decl/hierarchy/outfit/death_command = 2, + /decl/hierarchy/outfit/syndicate = 2, + /decl/hierarchy/outfit/syndicate/armored/commando = 2, + /decl/hierarchy/outfit/tunnel_clown = 2, + /decl/hierarchy/outfit/masked_killer = 2, + /decl/hierarchy/outfit/reaper = 2, + /decl/hierarchy/outfit/standard_space_gear = 10, + /decl/hierarchy/outfit/soviet_soldier = 2 ) + var/items_to_spawn = list( /obj/item/reagent_containers/syringe/drugs, /obj/item/storage/pill_bottle/happy, @@ -309,6 +312,9 @@ if(new_body_build) M.change_body_build(new_body_build) + if(prob(70)) // 44% to be normal, 14% for each of four other heights + M.body_height = pick(body_heights) + M.SetName(M.species.get_random_name(M.gender)) M.real_name = M.name @@ -318,11 +324,11 @@ /obj/gatecrasher_spawn/proc/equip_outfit(mob/living/carbon/human/M) var/adjustments = 0 - adjustments = prob(50) ? (adjustments|OUTFIT_ADJUSTMENT_SKIP_SURVIVAL_GEAR) : adjustments - adjustments = prob(90) ? (adjustments|OUTFIT_ADJUSTMENT_SKIP_ID_PDA) : adjustments + adjustments = prob(30) ? (adjustments|OUTFIT_ADJUSTMENT_SKIP_SURVIVAL_GEAR) : adjustments + adjustments = prob(70) ? (adjustments|OUTFIT_ADJUSTMENT_SKIP_ID_PDA) : adjustments adjustments = prob(50) ? (adjustments|OUTFIT_ADJUSTMENT_PLAIN_HEADSET) : adjustments - var/decl/hierarchy/outfit/O = outfit_by_type(util_pick_weight(outfits)) + var/decl/hierarchy/outfit/O = outfit_by_type(util_pick_weight(outfits_to_spawn)) O.equip(M, equip_adjustments = adjustments) #undef OUTFIT_ADJUSTMENT_SKIP_SURVIVAL_GEAR diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 13485dfc915..017e70f7d42 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -49,24 +49,18 @@ /mob/living/carbon/human/gatecrasher/on_ghost_possess() . = ..() - var/datum/mind/M = mind - var/antag_roll = rand(1, 100) - switch(antag_roll) - if(1 to 5) - var/datum/antagonist/changeling/CH = GLOB.all_antag_types_[MODE_CHANGELING] - CH.add_antagonist(M, ignore_role = TRUE, do_not_equip = TRUE, max_stat = UNCONSCIOUS) - if(6 to 15) - var/datum/antagonist/traitor/TR = GLOB.all_antag_types_[MODE_TRAITOR] - TR.add_antagonist(M, ignore_role = TRUE, max_stat = UNCONSCIOUS) - if(16 to 18) - var/datum/antagonist/vampire/VA = GLOB.all_antag_types_[MODE_VAMPIRE] - VA.add_antagonist(M, ignore_role = TRUE, do_not_equip = TRUE, max_stat = UNCONSCIOUS) - if(19 to 21) - var/datum/antagonist/cultist/CU = GLOB.all_antag_types_[MODE_CULTIST] - CU.add_antagonist(M, ignore_role = TRUE, max_stat = UNCONSCIOUS) - if(22 to 25) - var/datum/antagonist/revolutionary/RE = GLOB.all_antag_types_[MODE_REVOLUTIONARY] - RE.add_antagonist(M, ignore_role = TRUE, max_stat = UNCONSCIOUS) + if(prob(65)) + return // Sorry no antagonizing today + + var/antag_poll = list( + MODE_CHANGELING = 3, + MODE_TRAITOR = 15, + MODE_VAMPIRE = 3, + MODE_CULTIST = 5, + MODE_REVOLUTIONARY = 5 + ) + var/datum/antagonist/selected_antag = GLOB.all_antag_types_[util_pick_weight(antag_poll)] + selected_antag?.add_antagonist(mind, TRUE, max_stat = UNCONSCIOUS) /mob/living/carbon/human/skrell/New(new_loc) h_style = "Skrell Male Tentacles"