From b798ee86f60b63f5278caa9db2d2877265b47597 Mon Sep 17 00:00:00 2001 From: Spookerton <918997+Spookerton@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:39:57 +0300 Subject: [PATCH] [MIRROR] repath /tc*/ to /commonwealth*/ & fix rolling utes --- maps/torch/torch.dm | 2 +- packs/factions/{tc => commonwealth}/_pack.dm | 0 packs/factions/{tc => commonwealth}/badges.dm | 22 ++++---- .../factions/{tc => commonwealth}/badges.dmi | Bin .../factions/{tc => commonwealth}/clothing.dm | 50 ++++++++++-------- .../{tc => commonwealth}/clothing.dmi | Bin packs/factions/commonwealth/misc.dm | 11 ++++ .../factions/{tc => commonwealth}/outfits.dm | 8 +-- packs/factions/{tc => commonwealth}/tweaks.dm | 2 +- packs/factions/fa/clothing.dm | 2 + packs/factions/tc/misc.dm | 11 ---- 11 files changed, 57 insertions(+), 51 deletions(-) rename packs/factions/{tc => commonwealth}/_pack.dm (100%) rename packs/factions/{tc => commonwealth}/badges.dm (69%) rename packs/factions/{tc => commonwealth}/badges.dmi (100%) rename packs/factions/{tc => commonwealth}/clothing.dm (57%) rename packs/factions/{tc => commonwealth}/clothing.dmi (100%) create mode 100644 packs/factions/commonwealth/misc.dm rename packs/factions/{tc => commonwealth}/outfits.dm (60%) rename packs/factions/{tc => commonwealth}/tweaks.dm (60%) delete mode 100644 packs/factions/tc/misc.dm diff --git a/maps/torch/torch.dm b/maps/torch/torch.dm index 854533ca071e0..31c972410aefd 100644 --- a/maps/torch/torch.dm +++ b/maps/torch/torch.dm @@ -3,11 +3,11 @@ #include "../../packs/deepmaint/_pack.dm" #include "../../packs/event_2022jul30/_pack.dm" + #include "../../packs/factions/commonwealth/_pack.dm" #include "../../packs/factions/fa/_pack.dm" #include "../../packs/factions/iccgn/_pack.dm" #include "../../packs/factions/scga/_pack.dm" #include "../../packs/factions/scgec/_pack.dm" - #include "../../packs/factions/tc/_pack.dm" #include "torch_announcements.dm" #include "torch_antagonism.dm" diff --git a/packs/factions/tc/_pack.dm b/packs/factions/commonwealth/_pack.dm similarity index 100% rename from packs/factions/tc/_pack.dm rename to packs/factions/commonwealth/_pack.dm diff --git a/packs/factions/tc/badges.dm b/packs/factions/commonwealth/badges.dm similarity index 69% rename from packs/factions/tc/badges.dm rename to packs/factions/commonwealth/badges.dm index 01397b2d63f35..99770b3e109e7 100644 --- a/packs/factions/tc/badges.dm +++ b/packs/factions/commonwealth/badges.dm @@ -1,9 +1,9 @@ -/obj/item/clothing/accessory/tc_badge - abstract_type = /obj/item/clothing/accessory/tc_badge - icon = 'packs/factions/tc/badges.dmi' +/obj/item/clothing/accessory/commonwealth_badge + abstract_type = /obj/item/clothing/accessory/commonwealth_badge + icon = 'packs/factions/commonwealth/badges.dmi' accessory_icons = list( - slot_w_uniform_str = 'packs/factions/tc/badges.dmi', - slot_wear_suit_str = 'packs/factions/tc/badges.dmi' + slot_w_uniform_str = 'packs/factions/commonwealth/badges.dmi', + slot_wear_suit_str = 'packs/factions/commonwealth/badges.dmi' ) icon_state = null on_rolled_down = ACCESSORY_ROLLED_NONE @@ -12,11 +12,11 @@ sprite_sheets = list() -/obj/item/clothing/accessory/tc_badge/get_fibers() +/obj/item/clothing/accessory/commonwealth_badge/get_fibers() return null -/obj/item/clothing/accessory/tc_badge/navy +/obj/item/clothing/accessory/commonwealth_badge/navy name = "commonwealth navy patch" desc = {"\ A shield shaped blue and green patch with a red star, signifying service in \ @@ -26,7 +26,7 @@ overlay_state = "navy_worn" -/obj/item/clothing/accessory/tc_badge/army +/obj/item/clothing/accessory/commonwealth_badge/army name = "commonwealth army patch" desc = {"\ A shield shaped blue and green patch with a golden sun, signifying service in \ @@ -36,7 +36,7 @@ overlay_state = "army_worn" -/obj/item/clothing/accessory/tc_badge/explorer +/obj/item/clothing/accessory/commonwealth_badge/explorer name = "ancient Expeditionary Corps patch" desc = {"\ A shield shaped blue and green patch with a purple chevron, signifying service \ @@ -46,7 +46,7 @@ overlay_state = "explorer_worn" -/obj/item/clothing/accessory/tc_badge/shield +/obj/item/clothing/accessory/commonwealth_badge/shield name = "commonwealth shield" desc = {"\ The pin worn by all agents of the Terran Commonwealth to symbolize their \ @@ -57,7 +57,7 @@ slot = ACCESSORY_SLOT_MEDAL -/obj/item/clothing/accessory/tc_badge/earhart +/obj/item/clothing/accessory/commonwealth_badge/earhart name = "mission patch, COL Earhart" desc = {"\ A reproduction of the symbology for the Terran Commonwealth colony ship COL \ diff --git a/packs/factions/tc/badges.dmi b/packs/factions/commonwealth/badges.dmi similarity index 100% rename from packs/factions/tc/badges.dmi rename to packs/factions/commonwealth/badges.dmi diff --git a/packs/factions/tc/clothing.dm b/packs/factions/commonwealth/clothing.dm similarity index 57% rename from packs/factions/tc/clothing.dm rename to packs/factions/commonwealth/clothing.dm index 5a437b7847c04..6936b1bb2b56e 100644 --- a/packs/factions/tc/clothing.dm +++ b/packs/factions/commonwealth/clothing.dm @@ -1,8 +1,8 @@ -/obj/item/clothing/under/tc - abstract_type = /obj/item/clothing/under/tc - icon = 'packs/factions/tc/clothing.dmi' +/obj/item/clothing/under/commonwealth + abstract_type = /obj/item/clothing/under/commonwealth + icon = 'packs/factions/commonwealth/clothing.dmi' item_icons = list( - slot_w_uniform_str = 'packs/factions/tc/clothing.dmi' + slot_w_uniform_str = 'packs/factions/commonwealth/clothing.dmi' ) sprite_sheets = list() body_parts_covered = FULL_TORSO | ARMS | FULL_LEGS @@ -13,7 +13,7 @@ ) -/obj/item/clothing/under/tc/utility +/obj/item/clothing/under/commonwealth/utility name = "commonwealth fatigues" desc = {"\ The classic chocolate-brown fatigues of the explorers and soldiers of the \ @@ -24,27 +24,29 @@ item_state_slots = list( slot_w_uniform_str = "utility" ) + rolled_down = FALSE + rolled_sleeves = FALSE -/obj/item/clothing/under/tc/utility/army +/obj/item/clothing/under/commonwealth/utility/army accessories = list( - /obj/item/clothing/accessory/tc_badge/army + /obj/item/clothing/accessory/commonwealth_badge/army ) -/obj/item/clothing/under/tc/utility/navy +/obj/item/clothing/under/commonwealth/utility/navy accessories = list( - /obj/item/clothing/accessory/tc_badge/navy + /obj/item/clothing/accessory/commonwealth_badge/navy ) -/obj/item/clothing/under/tc/utility/explorer +/obj/item/clothing/under/commonwealth/utility/explorer accessories = list( - /obj/item/clothing/accessory/tc_badge/explorer + /obj/item/clothing/accessory/commonwealth_badge/explorer ) -/obj/item/clothing/under/tc/earhart +/obj/item/clothing/under/commonwealth/earhart name = "earhart fatigues" desc = {"\ Faded and greying fatigues that resemble old Commonwealth designs, \ @@ -55,15 +57,17 @@ slot_w_uniform_str = "earhart" ) accessories = list( - /obj/item/clothing/accessory/tc_badge/earhart + /obj/item/clothing/accessory/commonwealth_badge/earhart ) + rolled_down = FALSE + rolled_sleeves = FALSE -/obj/item/clothing/suit/tc - abstract_type = /obj/item/clothing/suit/tc - icon = 'packs/factions/tc/clothing.dmi' +/obj/item/clothing/suit/commonwealth + abstract_type = /obj/item/clothing/suit/commonwealth + icon = 'packs/factions/commonwealth/clothing.dmi' item_icons = list( - slot_wear_suit_str = 'packs/factions/tc/clothing.dmi' + slot_wear_suit_str = 'packs/factions/commonwealth/clothing.dmi' ) sprite_sheets = list() body_parts_covered = FULL_TORSO | ARMS @@ -76,7 +80,7 @@ allowed = list() -/obj/item/clothing/suit/tc/pilot +/obj/item/clothing/suit/commonwealth/pilot name = "commonwealth pilot's jacket" desc = {"\ A stylish brown jacket with blue and green Terran Commonwealth insignia. \ @@ -91,16 +95,16 @@ ) -/obj/item/clothing/head/tc - abstract_type = /obj/item/clothing/head/tc - icon = 'packs/factions/tc/clothing.dmi' +/obj/item/clothing/head/commonwealth + abstract_type = /obj/item/clothing/head/commonwealth + icon = 'packs/factions/commonwealth/clothing.dmi' item_icons = list( - slot_head_str = 'packs/factions/tc/clothing.dmi' + slot_head_str = 'packs/factions/commonwealth/clothing.dmi' ) sprite_sheets = list() -/obj/item/clothing/head/tc/pilotka +/obj/item/clothing/head/commonwealth/pilotka name = "commonwealth pilotka" desc = "The folded service cap of the bygone Terran Commonwealth." icon_state = "pilotka" diff --git a/packs/factions/tc/clothing.dmi b/packs/factions/commonwealth/clothing.dmi similarity index 100% rename from packs/factions/tc/clothing.dmi rename to packs/factions/commonwealth/clothing.dmi diff --git a/packs/factions/commonwealth/misc.dm b/packs/factions/commonwealth/misc.dm new file mode 100644 index 0000000000000..859fffd908727 --- /dev/null +++ b/packs/factions/commonwealth/misc.dm @@ -0,0 +1,11 @@ +/obj/item/storage/backpack/dufflebag/kit_commonwealth + name = "dressup kit, Commonwealth" + startswith = list( + /obj/item/clothing/under/commonwealth/earhart, + /obj/item/clothing/suit/commonwealth/pilot, + /obj/item/clothing/head/commonwealth/pilotka, + /obj/item/clothing/accessory/commonwealth_badge/army, + /obj/item/clothing/accessory/commonwealth_badge/navy, + /obj/item/clothing/accessory/commonwealth_badge/explorer, + /obj/item/clothing/accessory/commonwealth_badge/earhart + ) diff --git a/packs/factions/tc/outfits.dm b/packs/factions/commonwealth/outfits.dm similarity index 60% rename from packs/factions/tc/outfits.dm rename to packs/factions/commonwealth/outfits.dm index 4642252c66b30..d4dee31ce1fc4 100644 --- a/packs/factions/tc/outfits.dm +++ b/packs/factions/commonwealth/outfits.dm @@ -1,16 +1,16 @@ /singleton/hierarchy/outfit/tc name = "TC - Kit" - uniform = /obj/item/clothing/under/tc/utility + uniform = /obj/item/clothing/under/commonwealth/utility gloves = /obj/item/clothing/gloves/thick shoes = /obj/item/clothing/shoes/dutyboots belt = /obj/item/storage/belt/holster - l_hand = /obj/item/storage/backpack/dufflebag/kit_tc + l_hand = /obj/item/storage/backpack/dufflebag/kit_commonwealth /singleton/hierarchy/outfit/earhart name = "TC - Earhart" - uniform = /obj/item/clothing/under/tc/earhart - head = /obj/item/clothing/head/tc/pilotka + uniform = /obj/item/clothing/under/commonwealth/earhart + head = /obj/item/clothing/head/commonwealth/pilotka gloves = /obj/item/clothing/gloves/thick shoes = /obj/item/clothing/shoes/dutyboots belt = /obj/item/storage/belt/holster diff --git a/packs/factions/tc/tweaks.dm b/packs/factions/commonwealth/tweaks.dm similarity index 60% rename from packs/factions/tc/tweaks.dm rename to packs/factions/commonwealth/tweaks.dm index 111c4b659574e..ad5c7f4a1cf97 100644 --- a/packs/factions/tc/tweaks.dm +++ b/packs/factions/commonwealth/tweaks.dm @@ -1,5 +1,5 @@ /obj/item/storage/wallet/Initialize() . = ..() contents_allowed |= list( - /obj/item/clothing/accessory/tc_badge + /obj/item/clothing/accessory/commonwealth_badge ) diff --git a/packs/factions/fa/clothing.dm b/packs/factions/fa/clothing.dm index 140cb56863a59..cd173784a7cb3 100644 --- a/packs/factions/fa/clothing.dm +++ b/packs/factions/fa/clothing.dm @@ -27,3 +27,5 @@ sprite_sheets = list( SPECIES_UNATHI = 'packs/factions/fa/clothing_unathi.dmi' ) + rolled_down = FALSE + rolled_sleeves = FALSE diff --git a/packs/factions/tc/misc.dm b/packs/factions/tc/misc.dm deleted file mode 100644 index 292f06cff187d..0000000000000 --- a/packs/factions/tc/misc.dm +++ /dev/null @@ -1,11 +0,0 @@ -/obj/item/storage/backpack/dufflebag/kit_tc - name = "dressup kit, TC" - startswith = list( - /obj/item/clothing/under/tc/earhart, - /obj/item/clothing/suit/tc/pilot, - /obj/item/clothing/head/tc/pilotka, - /obj/item/clothing/accessory/tc_badge/army, - /obj/item/clothing/accessory/tc_badge/navy, - /obj/item/clothing/accessory/tc_badge/explorer, - /obj/item/clothing/accessory/tc_badge/earhart - )