Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Adds TC and FPE outfits/accessories. #1912

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion code/datums/outfits/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@
id_slot = slot_wear_id
id_types = list(/obj/item/card/id/syndicate)
id_pda_assignment = "Scavenger"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_RESET_EQUIPMENT


flags = OUTFIT_HAS_BACKPACK|OUTFIT_RESET_EQUIPMENT
/singleton/hierarchy/outfit/earhart
name = "FPE Standard Equipment"
uniform = /obj/item/clothing/under/earhart
gloves = /obj/item/clothing/gloves/thick
shoes = /obj/item/clothing/shoes/jackboots/medievalboots
belt = /obj/item/storage/belt/holster
l_hand = /obj/item/clothing/accessory/patch/earhart


/singleton/hierarchy/outfit/commonwealth_sailor
name = "Terran Commonwealth Sailor"
uniform = /obj/item/clothing/under/commonwealth
head = /obj/item/clothing/head/commonwealthhat
gloves = /obj/item/clothing/gloves/thick
shoes = /obj/item/clothing/shoes/dutyboots
belt = /obj/item/storage/belt/holster
70 changes: 69 additions & 1 deletion code/modules/clothing/under/accessories/frontier.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/clothing/accessory/medal/fa
abstract_type = /obj/item/clothing/accessory/medal/fa
name = "base FFA medal"
name = "base FA medal"
desc = "You should not see this."
icon = 'icons/obj/clothing/obj_accessories_frontier.dmi'
accessory_icons = list(
Expand All @@ -14,24 +14,92 @@
SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_accessories_frontier_unathi.dmi'
)


/obj/item/clothing/accessory/medal/fa/get_fibers()
return null


/obj/item/clothing/accessory/medal/fa/guardsman
name = "guardsman medal"
desc = "A copper four-pointed star denoting that the wearer is a Guardsman of the Frontier Alliance. Not worth enough in the scrapyard to justify being reprimanded."
icon_state = "gam"
overlay_state = "gam_worn"


/obj/item/clothing/accessory/medal/fa/warden
name = "warden medal"
desc = "A silver four-pointed star denoting that the wearer is a Warden of the Frontier Alliance. Shinier than necessarily practical, and also clearly made of nickel silver if you bother to stare."
icon_state = "wam"
overlay_state = "wam_worn"


/obj/item/clothing/accessory/medal/fa/marshal
name = "star marshal medal"
desc = "A golden four-pointed star denoting that the wearer is a Star Marshal of the Frontier Alliance. If you take a real close look at it, you can see that the gold isn't real. It's plated tin."
icon_state = "sam"
overlay_state = "sam_worn"


/obj/item/clothing/accessory/patch/earhart
name = "mission patch, COL Earhart"
desc = "A reproduction of the symbology for the Terran Commonwealth colony ship COL Earhart, a sea-blue airplane over a red cross. This one has a three digit number on it."
icon = 'icons/obj/clothing/obj_accessories_frontier.dmi'
accessory_icons = list(
slot_w_uniform_str = 'icons/mob/onmob/onmob_accessories_frontier.dmi',
slot_wear_suit_str = 'icons/mob/onmob/onmob_accessories_frontier.dmi'
)
icon_state = "fpepatch"
overlay_state = "fpepatch"
on_rolled_down = ACCESSORY_ROLLED_NONE
w_class = ITEM_SIZE_TINY
slot = ACCESSORY_SLOT_INSIGNIA


/obj/item/clothing/accessory/medal/commonwealthshield
name = "commonwealth shield"
desc = "The pin worn by all agents of the Terran Commonwealth to symbolize their service to the blue marble."
icon = 'icons/obj/clothing/obj_accessories.dmi'
accessory_icons = list(
slot_w_uniform_str = 'icons/mob/onmob/onmob_accessories.dmi',
slot_wear_suit_str = 'icons/mob/onmob/onmob_accessories.dmi'
)
icon_state = "commonwealthshield"
overlay_state = "commonwealthshield"
on_rolled_down = ACCESSORY_ROLLED_NONE
w_class = ITEM_SIZE_TINY
slot = ACCESSORY_SLOT_MEDAL


/obj/item/clothing/accessory/patch/commonwealth
abstract_type = /obj/item/clothing/accessory/patch/commonwealth
name = "base Terran Commonwealth Patch"
desc = "You should not see this."
icon = 'icons/obj/clothing/obj_accessories_frontier.dmi'
accessory_icons = list(
slot_w_uniform_str = 'icons/mob/onmob/onmob_accessories_frontier.dmi',
slot_wear_suit_str = 'icons/mob/onmob/onmob_accessories_frontier.dmi'
)
on_rolled_down = ACCESSORY_ROLLED_NONE
w_class = ITEM_SIZE_TINY
slot = ACCESSORY_SLOT_INSIGNIA


/obj/item/clothing/accessory/patch/commonwealth/navy
name = "commonwealth navy patch"
desc = "A shield shaped blue and green patch with a red star, signifying service in the now-defunct Terran Commonwealth Navy."
icon_state = "tc_navy"
overlay_state = "tc_navy"


/obj/item/clothing/accessory/patch/commonwealth/army
name = "commonwealth army patch"
desc = "A shield shaped blue and green patch with a golden sun, signifying service in the now-defunct Terran Commonwealth Army."
icon_state = "tc_army"
overlay_state = "tc_army"


/obj/item/clothing/accessory/patch/commonwealth/ec
name = "ancient Expeditionary Corps patch"
desc = "A shield shaped blue and green patch with a purple chevron, signifying service in the bygone Expeditionary Corps from before the foundation of the SCG."
icon_state = "tc_ec"
overlay_state = "tc_ec"
49 changes: 48 additions & 1 deletion code/modules/clothing/under/frontier.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

/obj/item/clothing/under/alliance
abstract_type = /obj/item/clothing/under/alliance
name = "parent Frontier Alliance suit"
desc = "You should not be seeing this."
item_icons = list(
Expand All @@ -13,6 +13,53 @@
SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_under_frontier_unathi.dmi'
)


/obj/item/clothing/under/alliance/vacsuit
name = "copernican VAC-suit"
desc = "A somewhat uncomfortable, utilitarian uniform meant to be worn under spacesuits by orbital shipyard workers. This one has Frontier Alliance crests on both shoulders."


/obj/item/clothing/under/earhart
name = "earhart fatigues"
desc = "Faded and greying fatigues that resemble old Commonwealth designs, commonly worn by the Free Peoples of Earhart."
item_icons = list(
slot_w_uniform_str = 'icons/mob/onmob/onmob_under_frontier.dmi'
)
icon = 'icons/obj/clothing/obj_under_frontier.dmi'
icon_state = "fpe"
worn_state = "fpe"
item_state = "fpe"


/obj/item/clothing/head/commonwealthhat
name = "commonwealth pilotka"
desc = "The folded service cap of the bygone Terran Commonwealth."
item_icons = list(
slot_w_uniform_str = 'icons/mob/onmob/onmob_head.dmi'
)
icon = 'icons/obj/clothing/obj_head.dmi'
icon_state = "commonwealthhat"
item_state = "commonwealthhat"


/obj/item/clothing/under/commonwealth
name = "terran commonwealth fatigues"
desc = "The classic chocolate-brown fatigues of the explorers and soldiers of the bygone Terran Commonwealth. They're in great condition despite probably being over a century old."
item_icons = list(
slot_w_uniform_str = 'icons/mob/onmob/onmob_under_frontier.dmi'
)
icon = 'icons/obj/clothing/obj_under_frontier.dmi'
icon_state = "commonwealth"
worn_state = "commonwealth"
item_state = "commonwealth"


/obj/item/clothing/suit/commonwealth
name = "terran commonwealth pilots jacket"
desc = "A stylish brown jacket with blue and green Terran Commonwealth insignia. Commonly worn by pilots of the prior century."
item_icons = list(
slot_w_uniform_str = 'icons/mob/onmob/onmob_suit.dmi'
)
icon = 'icons/obj/clothing/obj_suit.dmi'
icon_state = "commonwealthjacket"
item_state = "commonwealthjacket"
Binary file modified icons/mob/onmob/onmob_accessories.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_accessories_frontier.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_head.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_suit.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_under_frontier.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_accessories.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_accessories_frontier.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_head.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_suit.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_under_frontier.dmi
Binary file not shown.