Skip to content

Commit

Permalink
[MIRROR] repath /tc*/ to /commonwealth*/ & fix rolling utes
Browse files Browse the repository at this point in the history
  • Loading branch information
Spookerton authored and LordNest committed Feb 24, 2024
1 parent 19f29e9 commit b798ee8
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 51 deletions.
2 changes: 1 addition & 1 deletion maps/torch/torch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand All @@ -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, \
Expand All @@ -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
Expand All @@ -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. \
Expand All @@ -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"
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions packs/factions/commonwealth/misc.dm
Original file line number Diff line number Diff line change
@@ -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
)
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/item/storage/wallet/Initialize()
. = ..()
contents_allowed |= list(
/obj/item/clothing/accessory/tc_badge
/obj/item/clothing/accessory/commonwealth_badge
)
2 changes: 2 additions & 0 deletions packs/factions/fa/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@
sprite_sheets = list(
SPECIES_UNATHI = 'packs/factions/fa/clothing_unathi.dmi'
)
rolled_down = FALSE
rolled_sleeves = FALSE
11 changes: 0 additions & 11 deletions packs/factions/tc/misc.dm

This file was deleted.

0 comments on commit b798ee8

Please sign in to comment.