cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8097 from VOREStation/Arokha/solgov

Browse Source 
Fix solgov icons
This commit is contained in:
Aronai Sieyes
2020-05-28 16:57:54 -04:00
committed by GitHub
parent 4f6c4ff5c3 a313950f62
commit 39c7542b66
6 changed files with 409 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/outfits/outfit_vr.dm
View File

@@ -1,6 +1,6 @@
/decl/hierarchy/outfit/USDF/Marine
name = "USDF marine"
uniform = /obj/item/clothing/under/solgov/utility/marine/green
uniform = /obj/item/clothing/under/solgov/utility/army/urban
shoes = /obj/item/clothing/shoes/boots/jackboots
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/device/radio/headset/centcom
@@ -27,10 +27,10 @@
/decl/hierarchy/outfit/USDF/Officer
name = "USDF officer"
head = /obj/item/clothing/head/dress/marine/command/admiral
head = /obj/item/clothing/head/dress/army/command
shoes = /obj/item/clothing/shoes/boots/jackboots
l_ear = /obj/item/device/radio/headset/centcom
uniform = /obj/item/clothing/under/solgov/mildress/marine/command
uniform = /obj/item/clothing/under/solgov/mildress/army/command
back = /obj/item/weapon/storage/backpack/satchel
belt = /obj/item/weapon/gun/projectile/revolver/consul
l_pocket = /obj/item/ammo_magazine/s44

2
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
View File

@@ -75,7 +75,7 @@
character_name = list("Aronai Sieyes")
/datum/gear/fluff/aronai_ccmedjacket
path = /obj/item/clothing/suit/storage/service/sifguard/medical/command
path = /obj/item/clothing/suit/storage/solgov/service/sifguard/medical/command
display_name = "centcom medical jacket"
description = "A medical jacket straight from Central Command."
slot = slot_wear_suit

238
code/modules/clothing/head/solgov_vr.dm
View File

@@ -1,172 +1,268 @@
//SolGov uniform hats
//Utility
/obj/item/clothing/head/soft/sol
/obj/item/clothing/head/soft/solgov
name = "\improper SolCom cap"
desc = "It's a blue ballcap in Terran Commonwealth Government colors."
/obj/item/clothing/head/soft/sol/expedition
/obj/item/clothing/head/soft/solgov/veteranhat
name = "veteran hat"
desc = "It's a tacky black ballcap bearing the yellow service ribbon of the Gaia Conflict."
/obj/item/clothing/head/soft/solgov/sifguard
name = "\improper NDF cap"
desc = "It's a black ballcap bearing a Nanotrasen Defense Force crest."
/obj/item/clothing/head/soft/sol/fleet
/obj/item/clothing/head/soft/solgov/sifguard/co
name = "\improper NDF captain's cap"
desc = "It's a black ballcap bearing the Nanotrasen Defense Force crest. The brim has gold trim."
/obj/item/clothing/head/soft/solgov/fleet
name = "fleet cap"
desc = "It's a navy blue ballcap with a TCG Fleet crest."
/obj/item/clothing/head/utility
name = "utility cover"
desc = "An eight-point utility cover."
/obj/item/clothing/head/utility/fleet
name = "fleet utility cover"
desc = "A navy blue utility cover bearing the crest of a TCG Fleet."
/obj/item/clothing/head/utility/marine
/obj/item/clothing/head/utility/army
name = "marine utility cover"
desc = "A grey utility cover bearing the crest of the TCG Marine Corps."
desc = "A green utility cover bearing the crest of the TCG Marines."
/obj/item/clothing/head/utility/marine/tan
/obj/item/clothing/head/utility/army/tan
name = "tan utility cover"
desc = "A tan utility cover bearing the crest of the TCG Marine Corps."
desc = "A tan utility cover bearing the crest of the TCG Marines."
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
desc = "A green utility cover bearing the crest of the TCG Marine Corps."
/obj/item/clothing/head/utility/marine/green/officer // "And YOU told me you were gonna wear something nice!"
name = "\improper officer's cap"
desc = "A green utility cover bearing the crest of the TCG Marine Corps. This one has an officer's emblem."
icon_state = "UNSCsoft"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
/obj/item/clothing/head/utility/army/urban
name = "urban utility cover"
desc = "A grey utility cover bearing the crest of the TCG Marines."
//Service
/obj/item/clothing/head/service/sifguard
name = "\improper NDF peaked cap"
desc = "A peaked black uniform cap belonging to the Nanotrasen Defense Force Corps."
/obj/item/clothing/head/service
name = "service cover"
desc = "A service uniform cover."
/obj/item/clothing/head/service/sifguard/command
name = "\improper NDF officer's peaked cap"
desc = "A peaked black uniform cap belonging to the Nanotrasen Defense Force. This one is trimmed in gold."
/obj/item/clothing/head/service/marine
/obj/item/clothing/head/service/sifguard/captain
name = "\improper NDF captain's peaked cap"
desc = "A gold-trimmed peaked black uniform cap belonging to a Captain of the Nanotrasen Defense Force."
/obj/item/clothing/head/service/sifguard/senior_command
name = "senior NDF officer's peaked cap"
desc = "A peaked grey uniform cap belonging to the Nanotrasen Defense Force. This one is trimmed in gold and blue."
/obj/item/clothing/head/service/army
name = "marine wheel cover"
desc = "A green service uniform cover with an TCG Marine Corps crest."
desc = "A green service uniform cover with an TCG Marine crest."
/obj/item/clothing/head/service/marine/command
/obj/item/clothing/head/service/army/command
name = "marine officer's wheel cover"
desc = "A green service uniform cover with an TCG Marine Corps crest and gold stripe."
desc = "A green service uniform cover with an TCG Marine crest and gold stripe."
/obj/item/clothing/head/service/marine/garrison
/obj/item/clothing/head/service/army/garrison
name = "marine garrison cap"
desc = "A green garrison cap belonging to the TCG Marine Corps."
desc = "A green garrison cap belonging to the TCG Marine."
/obj/item/clothing/head/service/marine/garrison/command
/obj/item/clothing/head/service/army/garrison/command
name = "marine officer's garrison cap"
desc = "A green garrison cap belonging to the TCG Marine Corps. This one has a gold pin."
desc = "A green garrison cap belonging to the TCG Marine. This one has a gold pin."
/obj/item/clothing/head/service/marine/campaign
/obj/item/clothing/head/service/army/campaign
name = "campaign cover"
desc = "A green campaign cover with an TCG Marine Corps crest. Only found on the heads of Drill Instructors."
icon_state = "greendrill"
desc = "A green campaign cover with an TCG Marine crest. Only found on the heads of Drill Sergeants."
//Dress
/obj/item/clothing/head/dress/expedition
name = "\improper NDF dress cap"
desc = "A peaked grey dress uniform cap belonging to the Nanotrasen Defense Force."
/obj/item/clothing/head/dress/expedition/command
name = "\improper NDF command dress cap"
desc = "A peaked grey dress uniform cap belonging to the Nanotrasen Defense Force. This one is trimmed in gold."
/obj/item/clothing/head/dress/fleet/garrison
name = "fleet garrison cap"
desc = "A white dress uniform cap. The classic sailor's choice."
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
desc = "A white dress uniform cover. This one has an TCG Fleet crest."
/obj/item/clothing/head/dress/fleet/command
name = "fleet command dress wheel cover"
name = "fleet officer's dress wheel cover"
desc = "A white dress uniform cover. This one has a gold stripe and an TCG Fleet crest."
/obj/item/clothing/head/dress/marine
/obj/item/clothing/head/dress/army
name = "marine dress wheel cover"
desc = "A white dress uniform cover with an TCG Marine Corps crest."
desc = "A white dress uniform cover with an TCG Marine crest."
/obj/item/clothing/head/dress/marine/command
/obj/item/clothing/head/dress/army/command
name = "marine officer's dress wheel cover"
desc = "A white dress uniform cover with an TCG Marine Corps crest and gold stripe."
/obj/item/clothing/head/dress/marine/command/admiral
name = "admiral's dress wheel cover"
desc = "A white dress uniform cover with an TCG Navy crest and gold stripe."
desc = "A white dress uniform cover with an TCG Marine crest and gold stripe."
//Berets
/obj/item/clothing/head/beret/sol
/obj/item/clothing/head/beret/solgov
name = "peacekeeper beret"
desc = "A beret in Terran Commonwealth colors. For peacekeepers that are more inclined towards style than safety."
desc = "A beret in Terran Commonwealth Government colors. For peacekeepers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/gateway
/obj/item/clothing/head/beret/solgov/homeguard
name = "home guard beret"
desc = "A red beret denoting service in the Sol Home Guard. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/gateway
name = "gateway administration beret"
desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/customs
/obj/item/clothing/head/beret/solgov/customs
name = "customs and trade beret"
desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/orbital
/obj/item/clothing/head/beret/solgov/orbital
name = "orbital assault beret"
desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/research
/obj/item/clothing/head/beret/solgov/research
name = "government research beret"
desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/health
/obj/item/clothing/head/beret/solgov/health
name = "health service beret"
desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition
/obj/item/clothing/head/beret/solgov/marcom
name = "\improper MARSCOM beret"
desc = "A red beret with a gold insignia, denoting service in the TCGDF Mars Central Command. For brass who are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/stratcom
name = "\improper STRATCOM beret"
desc = "A grey beret with a silver insignia, denoting service in the TCGDF Strategic Command. For intelligence personnel who are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/diplomatic
name = "diplomatic security beret"
desc = "A tan beret denoting service in the TCG Marines Diplomatic Security Group. For security personnel who are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/borderguard
name = "border security beret"
desc = "A green beret with a silver emblem, denoting service in the Bureau of Border Security. For border guards who are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/sifguard
name = "\improper NDF beret"
desc = "A black beret belonging to the Nanotrasen Defense Force. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/security
/obj/item/clothing/head/beret/solgov/sifguard/security
name = "\improper NDF security beret"
desc = "A Nanotrasen Defense Force beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/medical
/obj/item/clothing/head/beret/solgov/sifguard/medical
name = "\improper NDF medical beret"
desc = "A Nanotrasen Defense Force beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/engineering
/obj/item/clothing/head/beret/solgov/sifguard/engineering
name = "\improper NDF engineering beret"
desc = "A Nanotrasen Defense Force beret with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/supply
/obj/item/clothing/head/beret/solgov/sifguard/supply
name = "\improper NDF supply beret"
desc = "A Nanotrasen Defense Force beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/command
/obj/item/clothing/head/beret/solgov/sifguard/service
name = "\improper NDF service beret"
desc = "An Nanotrasen Defense Force beret with a service crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/sifguard/command
name = "\improper NDF command beret"
desc = "A Nanotrasen Defense Force beret with a command crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet
/obj/item/clothing/head/beret/solgov/sifguard/branch
name = "\improper Field Operations beret"
desc = "An Nanotrasen Defense Force beret carrying insignia of the Field Operations section of the Nanotrasen Defense Force. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/sifguard/branch/observatory
name = "\improper Observatory beret"
desc = "An Nanotrasen Defense Force beret carrying insignia of the Observatory section of the Nanotrasen Defense Force. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet
name = "fleet beret"
desc = "A navy blue beret belonging to the TCG Fleet. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/security
/obj/item/clothing/head/beret/solgov/fleet/security
name = "fleet security beret"
desc = "An TCG Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/medical
/obj/item/clothing/head/beret/solgov/fleet/medical
name = "fleet medical beret"
desc = "An TCG Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/engineering
/obj/item/clothing/head/beret/solgov/fleet/engineering
name = "fleet engineering beret"
desc = "An TCG Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/supply
/obj/item/clothing/head/beret/solgov/fleet/supply
name = "fleet supply beret"
desc = "An TCG Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/command
/obj/item/clothing/head/beret/solgov/fleet/service
name = "fleet service beret"
desc = "An TCG Fleet beret with a service crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/exploration
name = "fleet exploration beret"
desc = "An TCG Fleet beret with an exploration crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/command
name = "fleet command beret"
desc = "An TCG Fleet beret with a command crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/dress
name = "fleet dress beret"
desc = "A white TCG Fleet beret. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/dress/command
name = "fleet officer's dress beret"
desc = "A white TCG Fleet beret with a golden crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/branch
name = "first fleet beret"
desc = "An TCG Fleet beret carrying insignia of First Fleet, the Sol Guard, stationed in Sol. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_first"
/obj/item/clothing/head/beret/solgov/fleet/branch/second
name = "second fleet beret"
desc = "An TCG Fleet beret carrying insignia of Second Fleet, the Home Guard, tasked with defense of Sol territories. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/branch/third
name = "third fleet beret"
desc = "An TCG Fleet beret carrying insignia of Third Fleet, the Border Guard, guarding borders of Sol territory against Vox and pirates. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/branch/fourth
name = "fourth fleet beret"
desc = "An TCG Fleet beret carrying insignia of Fourth Fleet, stationed on Skrell border. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/solgov/fleet/branch/fifth
name = "fifth fleet beret"
desc = "An TCG Fleet beret carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech. For personnel that are more inclined towards style than safety."
//ushanka
/obj/item/clothing/head/ushanka/solgov
name = "\improper NDF fur hat"
desc = "An Nanotrasen Defense Force synthfur-lined hat for operating in cold environments."
/obj/item/clothing/head/ushanka/solgov/fleet
name = "fleet fur hat"
desc = "An TCG Fleet synthfur-lined hat for operating in cold environments."
/obj/item/clothing/head/ushanka/solgov/army
name = "marine fur hat"
desc = "An TCG Marine synthfur-lined hat for operating in cold environments."
/obj/item/clothing/head/ushanka/solgov/army/green
name = "green marine fur hat"
desc = "An TCG Marine synthfur-lined hat for operating in cold environments."
//Terran
/obj/item/clothing/head/terran/navy/service
name = "Ares service cover"
desc = "A service uniform cover, worn by low-ranking crew within the Ares Confederation Navy."
/obj/item/clothing/head/terran/navy/service/command
name = "Ares command service cover"
desc = "A service uniform cover, worn by high-ranking crew within the Ares Confederation Navy."

10
code/modules/clothing/suits/solgov.dm
View File

@@ -2,7 +2,7 @@
/obj/item/clothing/suit/storage/solgov
name = "master solgov jacket"
icon = 'icons/obj/clothing/suits_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi')
icon_override = 'icons/mob/suit_solgov.dmi'
//Service
@@ -263,7 +263,7 @@
icon_state = "blackdress"
item_state = "blackdress"
icon = 'icons/obj/clothing/suits_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi')
icon_override = 'icons/mob/suit_solgov.dmi'
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
@@ -294,7 +294,7 @@
name = "\improper SifGuard winter coat"
icon_state = "coatec"
icon = 'icons/obj/clothing/suits_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi')
icon_override = 'icons/mob/suit_solgov.dmi'
armor = list(melee = 25, bullet = 10, laser = 5, energy = 10, bomb = 20, bio = 0, rad = 10)
valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA,ACCESSORY_SLOT_RANK)
@@ -345,7 +345,7 @@
icon_state = "terranservice"
item_state = "terranservice"
icon = 'icons/obj/clothing/suits_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi')
icon_override = 'icons/mob/suit_solgov.dmi'
/obj/item/clothing/suit/storage/terran/service/navy/command
name = "indie command coat"
@@ -361,7 +361,7 @@
icon_state = "terrandress"
item_state = "terrandress"
icon = 'icons/obj/clothing/suits_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi')
icon_override = 'icons/mob/suit_solgov.dmi'
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9

207
code/modules/clothing/suits/solgov_vr.dm
View File

@@ -1,87 +1,149 @@
//SolGov Uniform Suits
//Service
/obj/item/clothing/suit/storage/service/sifguard
/obj/item/clothing/suit/storage/solgov/service/sifguard
name = "\improper NDF jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has silver buttons."
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force."
/obj/item/clothing/suit/storage/service/sifguard/medical
name = "\improper NDF medical jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has silver buttons and blue trim."
/obj/item/clothing/suit/storage/solgov/service/fleet
name = "fleet service jacket"
desc = "A navy blue TCG Fleet service jacket."
/obj/item/clothing/suit/storage/service/sifguard/medical/command
name = "\improper NDF medical command jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has gold buttons and blue trim."
/obj/item/clothing/suit/storage/solgov/service/fleet/snco
name = "fleet SNCO service jacket"
desc = "A navy blue TCG Fleet service jacket with silver cuffs."
/obj/item/clothing/suit/storage/service/sifguard/engineering
name = "\improper NDF engineering jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has silver buttons and orange trim."
/obj/item/clothing/suit/storage/solgov/service/fleet/officer
name = "fleet officer's service jacket"
desc = "A navy blue TCG Fleet dress jacket with silver accents."
/obj/item/clothing/suit/storage/service/sifguard/engineering/command
name = "\improper NDF engineering command jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has gold buttons and orange trim."
/obj/item/clothing/suit/storage/solgov/service/fleet/command
name = "fleet senior officer's service jacket"
desc = "A navy blue TCG Fleet dress jacket with gold accents."
/obj/item/clothing/suit/storage/service/sifguard/supply
name = "\improper NDF supply jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has silver buttons and brown trim."
/obj/item/clothing/suit/storage/solgov/service/fleet/flag
name = "fleet flag officer's service jacket"
desc = "A navy blue TCG Fleet dress jacket with red accents."
/obj/item/clothing/suit/storage/service/sifguard/security
name = "\improper NDF security jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has silver buttons and red trim."
/obj/item/clothing/suit/storage/service/sifguard/security/command
name = "\improper NDF security command jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has gold buttons and red trim."
/obj/item/clothing/suit/storage/service/sifguard/command
name = "\improper NDF command jacket"
desc = "A uniform service jacket belonging to the Nanotrasen Defense Force. It has gold buttons and gold trim."
/obj/item/clothing/suit/storage/service/marine
/obj/item/clothing/suit/storage/solgov/service/army
name = "marine coat"
desc = "An TCG Marine Corps service coat. Green and undecorated."
desc = "An TCG Marine service coat. Green and undecorated."
/obj/item/clothing/suit/storage/service/marine/medical
/obj/item/clothing/suit/storage/solgov/service/army/medical
name = "marine medical jacket"
desc = "An TCG Marine Corps service coat. This one has blue markings."
desc = "An TCG Marine service coat. This one has blue markings."
/obj/item/clothing/suit/storage/service/marine/medical/command
/obj/item/clothing/suit/storage/solgov/service/army/medical/command
name = "marine medical command jacket"
desc = "An TCG Marine Corps service coat. This one has blue and gold markings."
desc = "An TCG Marine service coat. This one has blue and gold markings."
/obj/item/clothing/suit/storage/service/marine/engineering
/obj/item/clothing/suit/storage/solgov/service/army/engineering
name = "marine engineering jacket"
desc = "An TCG Marine Corps service coat. This one has orange markings."
desc = "An TCG Marine service coat. This one has orange markings."
/obj/item/clothing/suit/storage/service/marine/engineering/command
/obj/item/clothing/suit/storage/solgov/service/army/engineering/command
name = "marine engineering command jacket"
desc = "An TCG Marine Corps service coat. This one has orange and gold markings."
desc = "An TCG Marine service coat. This one has orange and gold markings."
/obj/item/clothing/suit/storage/service/marine/supply
/obj/item/clothing/suit/storage/solgov/service/army/supply
name = "marine supply jacket"
desc = "An TCG Marine Corps service coat. This one has brown markings."
desc = "An TCG Marine service coat. This one has brown markings."
/obj/item/clothing/suit/storage/service/marine/security
/obj/item/clothing/suit/storage/solgov/service/army/security
name = "marine security jacket"
desc = "An TCG Marine Corps service coat. This one has red markings."
desc = "An TCG Marine service coat. This one has red markings."
/obj/item/clothing/suit/storage/service/marine/security/command
/obj/item/clothing/suit/storage/solgov/service/army/security/command
name = "marine security command jacket"
desc = "An TCG Marine Corps service coat. This one has red and gold markings."
desc = "An TCG Marine service coat. This one has red and gold markings."
/obj/item/clothing/suit/storage/service/marine/command
/obj/item/clothing/suit/storage/solgov/service/army/service
name = "marine service jacket"
desc = "An TCG Marine service coat. This one has green markings."
/obj/item/clothing/suit/storage/solgov/service/army/service/command
name = "marine service command jacket"
desc = "An TCG Marine service coat. This one has green and gold markings."
/obj/item/clothing/suit/storage/solgov/service/army/exploration
name = "marine exploration jacket"
desc = "An TCG Marine service coat. This one has purple markings."
/obj/item/clothing/suit/storage/solgov/service/army/exploration/command
name = "marine exploration command jacket"
desc = "An TCG Marine service coat. This one has purple and gold markings."
/obj/item/clothing/suit/storage/solgov/service/army/command
name = "marine command jacket"
desc = "An TCG Marine Corps service coat. This one has gold markings."
//Dress
/obj/item/clothing/suit/dress/expedition
//Dress - murder me with a gun why are these 3 different types
/obj/item/clothing/suit/storage/solgov/dress/sifguard
name = "\improper NDF dress jacket"
desc = "A silver and grey dress jacket belonging to the Nanotrasen Defense Force. Fashionable, for the 24th century at least."
desc = "A silver and grey dress jacket belonging to the Nanotrasen Defense Force. Fashionable, for the 25th century at least."
/obj/item/clothing/suit/dress/expedition/command
name = "\improper NDF command dress jacket"
desc = "A gold and grey dress jacket belonging to the Nanotrasen Defense Force. The height of fashion."
/obj/item/clothing/suit/storage/solgov/dress/sifguard/senior
name = "\improper NDF senior's dress coat"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/chief
name = "\improper NDF chief's dress coat"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command
name = "\improper NDF officer's dress coat"
desc = "A gold and black dress peacoat belonging to the Nanotrasen Defense Force. The height of fashion."
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/cdr
name = "\improper NDF commander's dress coat"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/capt
name = "\improper NDF captain's dress coat"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/adm
name = "\improper NDF admiral's dress coat"
/obj/item/clothing/suit/storage/solgov/dress/fleet
name = "fleet dress jacket"
desc = "A navy blue TCG Fleet dress jacket. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/solgov/dress/fleet/snco
name = "fleet dress SNCO jacket"
desc = "A navy blue TCG Fleet dress jacket with silver cuffs. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/solgov/dress/fleet/officer
name = "fleet officer's dress jacket"
desc = "A navy blue TCG Fleet dress jacket with silver accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/solgov/dress/fleet/command
name = "fleet senior officer's dress jacket"
desc = "A navy blue TCG Fleet dress jacket with gold accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/solgov/dress/fleet/flag
name = "fleet flag officer's dress jacket"
desc = "A navy blue TCG Fleet dress jacket with red accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/dress/solgov/fleet/sailor
name = "fleet dress overwear"
desc = "A navy blue TCG Fleet dress suit. Almost looks like a school-girl outfit."
/obj/item/clothing/suit/dress/solgov/army
name = "marine dress jacket"
desc = "A tailored black TCG Marines dress jacket with red trim. So sexy it hurts."
/obj/item/clothing/suit/dress/solgov/army/command
name = "marine officer's dress jacket"
desc = "A tailored black TCG Marines dress jacket with gold trim. Smells like ceremony."
//Misc
/obj/item/clothing/suit/storage/hooded/wintercoat/solgov
name = "\improper NDF winter coat"
/obj/item/clothing/suit/storage/hooded/wintercoat/solgov/army
name = "marine winter coat"
/obj/item/clothing/suit/storage/hooded/wintercoat/solgov/fleet
name = "fleet winter coat"
/obj/item/clothing/suit/storage/toggle/dress
name = "clasped dress jacket"
desc = "A uniform dress jacket with gold toggles."
/obj/item/clothing/suit/storage/toggle/dress/fleet
name = "fleet dress jacket"
@@ -91,10 +153,31 @@
name = "fleet command dress jacket"
desc = "A crisp white TCG Fleet dress jacket dripping with gold accents. So bright it's blinding."
/obj/item/clothing/suit/dress/marine
name = "marine dress jacket"
desc = "A tailored black TCG Marine Corps dress jacket with red trim. So sexy it hurts."
/obj/item/clothing/suit/storage/marshal_jacket
name = "colonial marshal jacket"
desc = "A black synthleather jacket. The word 'MARSHAL' is stenciled onto the back in gold lettering."
/obj/item/clothing/suit/dress/marine/command
name = "marine command dress jacket"
desc = "A tailored black TCG Marine Corps dress jacket with gold trim. Smells like ceremony."
//Terrans
//Service
/obj/item/clothing/suit/storage/terran/service/navy
name = "Ares coat"
desc = "A Ares Navy service coat. Black and undecorated."
/obj/item/clothing/suit/storage/terran/service/navy/command
name = "Ares command coat"
desc = "An Ares Navy service command coat. White and undecorated."
//Dress
/obj/item/clothing/suit/dress/terran/navy
name = "Ares dress cloak"
desc = "A black Ares Navy dress cloak with red detailing. So sexy it hurts."
/obj/item/clothing/suit/dress/terran/navy/officer
name = "Ares officer's dress cloak"
desc = "A black Ares Navy dress cloak with gold detailing. Smells like ceremony."
/obj/item/clothing/suit/dress/terran/navy/command
name = "Ares command dress cloak"
desc = "A black Ares Navy dress cloak with royal detailing. Smells like ceremony."

124
code/modules/clothing/under/solgov_vr.dm
View File

@@ -1,5 +1,4 @@
//SolGov Uniforms
//PT
/obj/item/clothing/under/solgov/pt/sifguard
name = "\improper NDF pt uniform"
@@ -9,43 +8,53 @@
name = "fleet pt uniform"
desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
/obj/item/clothing/under/solgov/pt/marine
/obj/item/clothing/under/solgov/pt/army
name = "marine pt uniform"
desc = "Does NOT leave much to the imagination."
//Utility
/obj/item/clothing/under/utility
name = "utility uniform"
desc = "A comfortable turtleneck and black utility trousers."
//Here's the real ones
/obj/item/clothing/under/solgov/utility/sifguard
name = "\improper NDF uniform"
desc = "The utility uniform of the Nanotrasen Defense Force, made from biohazard resistant material. This one has silver trim."
/obj/item/clothing/under/solgov/utility/sifguard/officer
name = "\improper NDF officer uniform"
desc = "The utility uniform of the Nanotrasen Defense Force, made from biohazard resistant material. This one has gold trim."
/obj/item/clothing/under/solgov/utility/sifguard_skirt
name = "\improper NDF skirt"
desc = "A black turtleneck and skirt, the elusive ladies' uniform of the Nanotrasen Defense Force."
/obj/item/clothing/under/solgov/utility/sifguard_skirt/officer
name = "\improper NDF officer skirt"
desc = "A black turtleneck and skirt, the elusive ladies' uniform of the Nanotrasen Defense Force. This one has gold trim."
/obj/item/clothing/under/solgov/utility/sifguard/officer
name = "\improper NDF officer's uniform"
desc = "The utility uniform of the Nanotrasen Defense Force, made from biohazard resistant material. This one has gold trim."
/obj/item/clothing/under/solgov/utility/fleet
name = "fleet coveralls"
desc = "The utility uniform of the TCG Fleet, made from an insulated material."
/obj/item/clothing/under/solgov/utility/marine
/obj/item/clothing/under/solgov/utility/fleet/combat
name = "fleet fatigues"
desc = "Alternative utility uniform of the TCG Fleet, for when coveralls are impractical."
/obj/item/clothing/under/solgov/utility/fleet/officer
name = "fleet officer's coveralls"
desc = "Alternative utility uniform of the TCG Fleet, for officers."
/obj/item/clothing/under/solgov/utility/army
name = "marine fatigues"
desc = "The utility uniform of the TCG Marine Corps, made from durable material."
desc = "The utility uniform of the TCG Marines, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/green
name = "green fatigues"
desc = "A green version of the TCG marine utility uniform, made from durable material."
/obj/item/clothing/under/solgov/utility/army/urban
name = "urban fatigues"
desc = "An urban version of the TCG Marines utility uniform, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/tan
/obj/item/clothing/under/solgov/utility/army/tan
name = "tan fatigues"
desc = "A tan version of the TCG marine utility uniform, made from durable material."
desc = "A tan version of the TCG Marines utility uniform, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/olive
/obj/item/clothing/under/solgov/utility/army/olive
name = "olive fatigues"
desc = "An olive version of the TCG marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
@@ -53,41 +62,82 @@
icon_state = "bdu_olive"
item_state = "bdu_olive"
/obj/item/clothing/under/solgov/utility/marine/desert
/obj/item/clothing/under/solgov/utility/army/desert
name = "desert fatigues"
desc = "A desert version of the TCG marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bdu_olive"
item_state = "bdu_olive"
desc = "A tan version of the TCG Marines utility uniform, made from durable material."
//Service
/obj/item/clothing/under/solgov/service/sifguard
name = "\improper NDF service uniform"
desc = "The service uniform of the Nanotrasen Defense Force in silver trim."
/obj/item/clothing/under/solgov/service/sifguard/skirt
name = "\improper NDF service skirt"
desc = "A feminine version of the Nanotrasen Defense Force service uniform in silver trim."
/obj/item/clothing/under/solgov/service/sifguard/command
name = "\improper NDF officer's service uniform"
desc = "The service uniform of the Nanotrasen Defense Force in gold trim."
/obj/item/clothing/under/solgov/service/sifguard/command/skirt
name = "\improper NDF officer's service skirt"
desc = "A feminine version of the Nanotrasen Defense Force service uniform in gold trim."
/obj/item/clothing/under/solgov/service/fleet
name = "fleet service uniform"
desc = "The service uniform of the TCG Fleet, made from immaculate white fabric."
/obj/item/clothing/under/solgov/service/marine
/obj/item/clothing/under/solgov/service/fleet/skirt
name = "fleet service skirt"
desc = "The service uniform skirt of the TCG Fleet, made from immaculate white fabric."
/obj/item/clothing/under/solgov/service/army
name = "marine service uniform"
desc = "The service uniform of the TCG Marine Corps. Slimming."
worn_state = "greenservice"
desc = "The service uniform of the TCG Marines. Slimming."
/obj/item/clothing/under/solgov/service/marine/command
name = "marine command service uniform"
desc = "The service uniform of the TCG Marine Corps. Slimming and stylish."
/obj/item/clothing/under/solgov/service/army/skirt
name = "marine service skirt"
desc = "The service uniform skirt of the TCG Marines. Slimming."
/obj/item/clothing/under/solgov/mildress/sifguard
name = "\improper NDF dress uniform"
desc = "The dress uniform of the Nanotrasen Defense Force in silver trim."
/obj/item/clothing/under/solgov/service/army/command
name = "marine officer's service uniform"
desc = "The service uniform of the TCG Marines. Slimming and stylish."
/obj/item/clothing/under/solgov/mildress/sifguard/officer
name = "\improper NDF command dress uniform"
desc = "The dress uniform of the Nanotrasen Defense Force in gold trim."
/obj/item/clothing/under/solgov/service/army/command/skirt
name = "marine officer's service skirt"
desc = "The service uniform skirt of the TCG Marines. Slimming and stylish."
/obj/item/clothing/under/solgov/mildress/marine
//Dress
/obj/item/clothing/under/solgov/mildress/army
name = "marine dress uniform"
desc = "The dress uniform of the TCG Marine Corps, class given form."
desc = "The dress uniform of the TCG Marines, class given form."
/obj/item/clothing/under/solgov/mildress/marine/command
name = "marine command dress uniform"
desc = "The dress uniform of the TCG Marine Corps, even classier in gold."
/obj/item/clothing/under/solgov/mildress/army/skirt
name = "marine dress skirt"
desc = "A feminine version of the TCG Marines dress uniform, class given form."
/obj/item/clothing/under/solgov/mildress/army/command
name = "marine officer's dress uniform"
desc = "The dress uniform of the TCG Marines, even classier in gold."
/obj/item/clothing/under/solgov/mildress/army/command/skirt
name = "marine officer's dress skirt"
desc = "A feminine version of the TCG Marines dress uniform, even classier in gold."
//Terrans
/obj/item/clothing/under/terran/navy/utility
name = "Ares utility uniform"
desc = "A comfortable black utility jumpsuit. Worn by the Ares Navy."
/obj/item/clothing/under/terran/navy/service
name = "Ares service uniform"
desc = "The service uniform of the Ares Navy, for low-ranking crew."
/obj/item/clothing/under/terran/navy/service/command
name = "Ares command service uniform"
desc = "The service uniform of the Ares Navy, for high-ranking crew."