From 6d5f6b824d5337ee8588531e7a76f6b6fafcee05 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 31 Aug 2023 12:44:11 +0800 Subject: [PATCH 1/3] FixCommit --- code/modules/gear_presets/_select_equipment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 879cabefdf12..9d02cce8c5e9 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -997,7 +997,7 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) - if (4) + if (5) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) From d140e1d38c59a1b7381f990acd6a4ee37b4b9cd2 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 31 Aug 2023 12:51:50 +0800 Subject: [PATCH 2/3] ProperFIx --- code/modules/gear_presets/_select_equipment.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 9d02cce8c5e9..c4c4e329511a 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -986,7 +986,7 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka(new_human), WEAR_HEAD) /datum/equipment_preset/proc/spawn_random_upp_armor(mob/living/carbon/human/new_human) - var/random_gear = rand(1, 5) + var/random_gear = rand(1, 4) switch(random_gear) if (1, 2, 3) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) @@ -997,10 +997,6 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) - if (5) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) /datum/equipment_preset/proc/spawn_random_upp_belt(mob/living/carbon/human/new_human) var/random_gun = rand(1, 4) From 293326d3ca2b8758e685a15b41ea351c43954faa Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 31 Aug 2023 12:52:46 +0800 Subject: [PATCH 3/3] MisClick --- code/modules/gear_presets/_select_equipment.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index c4c4e329511a..9d02cce8c5e9 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -986,7 +986,7 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka(new_human), WEAR_HEAD) /datum/equipment_preset/proc/spawn_random_upp_armor(mob/living/carbon/human/new_human) - var/random_gear = rand(1, 4) + var/random_gear = rand(1, 5) switch(random_gear) if (1, 2, 3) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) @@ -997,6 +997,10 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) + if (5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) /datum/equipment_preset/proc/spawn_random_upp_belt(mob/living/carbon/human/new_human) var/random_gun = rand(1, 4)