From cad0fc0da1a55c7dda36fd54fd58b8048f4a9132 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Thu, 15 Jul 2021 19:04:39 +0000 Subject: [PATCH 1/2] Return cloaks to 1 pt cost --- .../preference_setup/loadout/loadout_suit.dm | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 738ee9bce2..b41e350209 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -207,9 +207,44 @@ path = /obj/item/clothing/accessory/poncho/roles/cargo cost = 1 +<<<<<<< HEAD /datum/gear/suit/roles/poncho/security display_name = "poncho, security" path = /obj/item/clothing/accessory/poncho/roles/security +||||||| parent of cbed72f7ee... Merge pull request #11090 from VOREStation/Arokha/cloaks1pt +/datum/gear/suit/roles/poncho/New() + ..() + var/list/ponchos = list( + "Cargo poncho" = /obj/item/clothing/accessory/poncho/roles/cargo, + "Security poncho" = /obj/item/clothing/accessory/poncho/roles/security, + "Medical poncho" = /obj/item/clothing/accessory/poncho/roles/medical, + "Engineering poncho" = /obj/item/clothing/accessory/poncho/roles/engineering, + "Science poncho" = /obj/item/clothing/accessory/poncho/roles/science + ) + gear_tweaks += new/datum/gear_tweak/path(ponchos) + + +/datum/gear/suit/roles/cloak + display_name = "cloak selection, departments" + path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo +======= +/datum/gear/suit/roles/poncho/New() + ..() + var/list/ponchos = list( + "Cargo poncho" = /obj/item/clothing/accessory/poncho/roles/cargo, + "Security poncho" = /obj/item/clothing/accessory/poncho/roles/security, + "Medical poncho" = /obj/item/clothing/accessory/poncho/roles/medical, + "Engineering poncho" = /obj/item/clothing/accessory/poncho/roles/engineering, + "Science poncho" = /obj/item/clothing/accessory/poncho/roles/science + ) + gear_tweaks += new/datum/gear_tweak/path(ponchos) + + +/datum/gear/suit/roles/cloak + display_name = "cloak selection, departments" + path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo + cost = 1 +>>>>>>> cbed72f7ee... Merge pull request #11090 from VOREStation/Arokha/cloaks1pt /datum/gear/suit/roles/poncho/medical display_name = "poncho, medical" From b16aed91599d6b5803448cdf8630fd97fe33fdf6 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Thu, 15 Jul 2021 20:24:02 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/client/preference_setup/loadout/loadout_suit.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 3b10b1c637..987811608b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -222,8 +222,8 @@ /datum/gear/suit/roles/cloak display_name = "cloak selection, departments" - path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo - cost = 1 + path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo + cost = 1 /datum/gear/suit/roles/cloak/New() ..()