cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 01:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8002 from VOREStation/upstream-merge-7138

Browse Source 
[MIRROR] Updates Solgov/Sifguard uniforms
This commit is contained in:
Aronai Sieyes
2020-05-21 16:03:58 -04:00
committed by GitHub
parent 6319769ddd 3c4f6563a1
commit 22fe3bd4e4
23 changed files with 903 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+8 -16
View File
@@ -125,17 +125,9 @@
display_name = "cap, bill"
path = /obj/item/clothing/head/soft/mbill
/*/datum/gear/head/cap/sol
/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/sol
/datum/gear/head/cap/expdition
display_name = "cap, expedition"
path = /obj/item/clothing/head/soft/sol/expedition
/datum/gear/head/cap/fleet
display_name = "cap, fleet"
path = /obj/item/clothing/head/soft/sol/fleet*/ // Vorestation removal
path = /obj/item/clothing/head/soft/solgov
/datum/gear/head/cowboy
display_name = "cowboy, rodeo"
@@ -337,17 +329,17 @@
display_name = "welding, engie (engineering/robotics)"
path = /obj/item/clothing/head/welding/engie
/*/datum/gear/head/beret/sol
/datum/gear/head/beret/solgov
display_name = "beret sol, selection"
path = /obj/item/clothing/head/beret/sol
path = /obj/item/clothing/head/beret/solgov
/datum/gear/head/beret/sol/New()
/datum/gear/head/beret/solgov/New()
..()
var/list/sols = list()
for(var/sol_style in typesof(/obj/item/clothing/head/beret/sol))
var/obj/item/clothing/head/beret/sol/sol = sol_style
for(var/sol_style in typesof(/obj/item/clothing/head/beret/solgov))
var/obj/item/clothing/head/beret/solgov/sol = sol_style
sols[initial(sol.name)] = sol
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal.
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))
/datum/gear/head/surgery
display_name = "surgical cap selection"
code/modules/clothing/clothing.dm
+4
View File
@@ -776,12 +776,16 @@
|ACCESSORY_SLOT_MEDAL\
|ACCESSORY_SLOT_INSIGNIA\
|ACCESSORY_SLOT_TIE\
|ACCESSORY_SLOT_RANK\
|ACCESSORY_SLOT_DEPT\
|ACCESSORY_SLOT_OVER)
restricted_accessory_slots = (\
ACCESSORY_SLOT_UTILITY\
|ACCESSORY_SLOT_WEAPON\
|ACCESSORY_SLOT_ARMBAND\
|ACCESSORY_SLOT_TIE\
|ACCESSORY_SLOT_RANK\
|ACCESSORY_SLOT_DEPT\
|ACCESSORY_SLOT_OVER)
var/icon/rolled_down_icon = 'icons/mob/uniform_rolled_down.dmi'
code/modules/clothing/head/solgov.dm
+208 -54
View File
@@ -1,7 +1,7 @@
//SolGov uniform hats
//Utility
/obj/item/clothing/head/soft/sol
/obj/item/clothing/head/soft/solgov
name = "\improper SolGov cap"
desc = "It's a blue ballcap in Solar Confederate Government colors."
icon_state = "solsoft"
@@ -10,7 +10,12 @@
slot_r_hand_str = "lightbluesoft",
)
/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."
icon_state = "cap_veteran"
/obj/item/clothing/head/soft/solgov/sifguard
name = "\improper SifGuard cap"
desc = "It's a black ballcap bearing a Sif Defense Force crest."
icon_state = "expeditionsoft"
@@ -19,7 +24,12 @@
slot_r_hand_str = "blacksoft",
)
/obj/item/clothing/head/soft/sol/fleet
/obj/item/clothing/head/soft/solgov/sifguard/co
name = "\improper SifGuard captain's cap"
desc = "It's a black ballcap bearing the Sif Defense Force crest. The brim has gold trim."
icon_state = "expeditioncomsoft"
/obj/item/clothing/head/soft/solgov/fleet
name = "fleet cap"
desc = "It's a navy blue ballcap with a SCG Fleet crest."
icon_state = "fleetsoft"
@@ -46,21 +56,21 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/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 SCG Marine Corps."
icon_state = "greyutility"
desc = "A green utility cover bearing the crest of the SCG Marines."
icon_state = "greenutility"
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
/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 SCG Marine Corps."
desc = "A tan utility cover bearing the crest of the SCG Marines."
icon_state = "tanutility"
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
desc = "A green utility cover bearing the crest of the SCG Marine Corps."
icon_state = "greenutility"
/obj/item/clothing/head/utility/army/urban
name = "urban utility cover"
desc = "A grey utility cover bearing the crest of the SCG Marines."
icon_state = "greyutility"
//Service
@@ -75,29 +85,49 @@
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/service/marine
/obj/item/clothing/head/service/sifguard
name = "\improper SifGuard peaked cap"
desc = "A peaked black uniform cap belonging to the Sif Defense Force Corps."
icon_state = "ecdresscap"
/obj/item/clothing/head/service/sifguard/command
name = "\improper SifGuard officer's peaked cap"
desc = "A peaked black uniform cap belonging to the Sif Defense Force. This one is trimmed in gold."
icon_state = "ecdresscap_ofcr"
/obj/item/clothing/head/service/sifguard/captain
name = "\improper SifGuard captain's peaked cap"
desc = "A gold-trimmed peaked black uniform cap belonging to a Captain of the Sif Defense Force."
icon_state = "ecdresscap_capt"
/obj/item/clothing/head/service/sifguard/senior_command
name = "senior SifGuard officer's peaked cap"
desc = "A peaked grey uniform cap belonging to the Sif Defense Force. This one is trimmed in gold and blue."
icon_state = "greydresscap_senior"
/obj/item/clothing/head/service/army
name = "marine wheel cover"
desc = "A green service uniform cover with an SCG Marine Corps crest."
desc = "A green service uniform cover with an SCG Marine crest."
icon_state = "greenwheelcap"
/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 SCG Marine Corps crest and gold stripe."
desc = "A green service uniform cover with an SCG Marine crest and gold stripe."
icon_state = "greenwheelcap_com"
/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 SCG Marine Corps."
desc = "A green garrison cap belonging to the SCG Marine."
icon_state = "greengarrisoncap"
/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 SCG Marine Corps. This one has a gold pin."
desc = "A green garrison cap belonging to the SCG Marine. This one has a gold pin."
icon_state = "greengarrisoncap_com"
/obj/item/clothing/head/service/marine/campaign
/obj/item/clothing/head/service/army/campaign
name = "campaign cover"
desc = "A green campaign cover with an SCG Marine Corps crest. Only found on the heads of Drill Instructors."
desc = "A green campaign cover with an SCG Marine crest. Only found on the heads of Drill Sergeants."
icon_state = "greendrill"
//Dress
@@ -113,15 +143,10 @@
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/dress/expedition
name = "\improper SifGuard dress cap"
desc = "A peaked grey dress uniform cap belonging to the Sif Defense Force."
icon_state = "greydresscap"
/obj/item/clothing/head/dress/expedition/command
name = "\improper SifGuard command dress cap"
desc = "A peaked grey dress uniform cap belonging to the Sif Defense Force. This one is trimmed in gold."
icon_state = "greydresscap_com"
/obj/item/clothing/head/dress/fleet/garrison
name = "fleet garrison cap"
desc = "A white dress uniform cap. The classic sailor's choice."
icon_state = "whitegarrisoncap"
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
@@ -129,108 +154,237 @@
icon_state = "whitepeakcap"
/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 SCG Fleet crest."
icon_state = "whitepeakcap_com"
/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 SCG Marine Corps crest."
desc = "A white dress uniform cover with an SCG Marine crest."
icon_state = "whitewheelcap"
/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 SCG Marine Corps crest and gold stripe."
desc = "A white dress uniform cover with an SCG Marine crest and gold stripe."
icon_state = "whitewheelcap_com"
//Berets
/obj/item/clothing/head/beret/sol
/obj/item/clothing/head/beret/solgov
name = "peacekeeper beret"
desc = "A beret in Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety."
icon_state = "beret_lightblue"
/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."
icon_state = "beret_red"
/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."
icon_state = "beret_orange"
/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."
icon_state = "beret_purpleyellow"
/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."
icon_state = "beret_blue"
/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."
icon_state = "beret_green"
/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."
icon_state = "beret_white"
/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 SCGDF Mars Central Command. For brass who are more inclined towards style than safety."
icon_state = "beret_redgold"
/obj/item/clothing/head/beret/solgov/stratcom
name = "\improper STRATCOM beret"
desc = "A grey beret with a silver insignia, denoting service in the SCGDF Strategic Command. For intelligence personnel who are more inclined towards style than safety."
icon_state = "beret_graysilver"
/obj/item/clothing/head/beret/solgov/diplomatic
name = "diplomatic security beret"
desc = "A tan beret denoting service in the SCG Marines Diplomatic Security Group. For security personnel who are more inclined towards style than safety."
icon_state = "beret_tan"
/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."
icon_state = "beret_greensilver"
/obj/item/clothing/head/beret/solgov/sifguard
name = "\improper SifGuard beret"
desc = "A black beret belonging to the Sif Defense Force. For personnel that are more inclined towards style than safety."
icon_state = "beret_black"
/obj/item/clothing/head/beret/sol/expedition/security
/obj/item/clothing/head/beret/solgov/sifguard/security
name = "\improper SifGuard security beret"
desc = "A Sif Defense Force beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_security"
/obj/item/clothing/head/beret/sol/expedition/medical
/obj/item/clothing/head/beret/solgov/sifguard/medical
name = "\improper SifGuard medical beret"
desc = "A Sif Defense Force beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_medical"
/obj/item/clothing/head/beret/sol/expedition/engineering
/obj/item/clothing/head/beret/solgov/sifguard/engineering
name = "\improper SifGuard engineering beret"
desc = "A Sif Defense Force beret with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_engineering"
/obj/item/clothing/head/beret/sol/expedition/supply
/obj/item/clothing/head/beret/solgov/sifguard/supply
name = "\improper SifGuard supply beret"
desc = "A Sif Defense Force beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_supply"
/obj/item/clothing/head/beret/sol/expedition/command
/obj/item/clothing/head/beret/solgov/sifguard/service
name = "\improper SifGuard service beret"
desc = "An Sif Defense Force beret with a service crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_service"
/obj/item/clothing/head/beret/solgov/sifguard/command
name = "\improper SifGuard command beret"
desc = "A Sif Defense Force beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_command"
/obj/item/clothing/head/beret/sol/fleet
/obj/item/clothing/head/beret/solgov/sifguard/branch
name = "\improper Field Operations beret"
desc = "An Sif Defense Force beret carrying insignia of the Field Operations section of the Sif Defense Force. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_fieldOps"
/obj/item/clothing/head/beret/solgov/sifguard/branch/observatory
name = "\improper Observatory beret"
desc = "An Sif Defense Force beret carrying insignia of the Observatory section of the Sif Defense Force. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_observatory"
/obj/item/clothing/head/beret/solgov/fleet
name = "fleet beret"
desc = "A navy blue beret belonging to the SCG Fleet. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy"
/obj/item/clothing/head/beret/sol/fleet/security
/obj/item/clothing/head/beret/solgov/fleet/security
name = "fleet security beret"
desc = "An SCG Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_security"
/obj/item/clothing/head/beret/sol/fleet/medical
/obj/item/clothing/head/beret/solgov/fleet/medical
name = "fleet medical beret"
desc = "An SCG Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_medical"
/obj/item/clothing/head/beret/sol/fleet/engineering
/obj/item/clothing/head/beret/solgov/fleet/engineering
name = "fleet engineering beret"
desc = "An SCG Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_engineering"
/obj/item/clothing/head/beret/sol/fleet/supply
/obj/item/clothing/head/beret/solgov/fleet/supply
name = "fleet supply beret"
desc = "An SCG Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_supply"
/obj/item/clothing/head/beret/sol/fleet/command
/obj/item/clothing/head/beret/solgov/fleet/service
name = "fleet service beret"
desc = "An SCG Fleet beret with a service crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_service"
/obj/item/clothing/head/beret/solgov/fleet/exploration
name = "fleet exploration beret"
desc = "An SCG Fleet beret with an exploration crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_exploration"
/obj/item/clothing/head/beret/solgov/fleet/command
name = "fleet command beret"
desc = "An SCG Fleet beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_command"
/obj/item/clothing/head/beret/solgov/fleet/dress
name = "fleet dress beret"
desc = "A white SCG Fleet beret. For personnel that are more inclined towards style than safety."
icon_state = "beret_whiterim"
/obj/item/clothing/head/beret/solgov/fleet/dress/command
name = "fleet officer's dress beret"
desc = "A white SCG Fleet beret with a golden crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_whiterim_com"
/obj/item/clothing/head/beret/solgov/fleet/branch
name = "first fleet beret"
desc = "An SCG 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 SCG 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."
icon_state = "beret_navy_second"
/obj/item/clothing/head/beret/solgov/fleet/branch/third
name = "third fleet beret"
desc = "An SCG 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."
icon_state = "beret_navy_third"
/obj/item/clothing/head/beret/solgov/fleet/branch/fourth
name = "fourth fleet beret"
desc = "An SCG Fleet beret carrying insignia of Fourth Fleet, stationed on Skrell border. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_fourth"
/obj/item/clothing/head/beret/solgov/fleet/branch/fifth
name = "fifth fleet beret"
desc = "An SCG 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."
icon_state = "beret_navy_fifth"
//ushanka
/obj/item/clothing/head/ushanka/solgov
name = "\improper SifGuard fur hat"
desc = "An Sif Defense Force synthfur-lined hat for operating in cold environments."
icon_state = "ecushankadown"
//icon_state_up = "ecushankaup"
/obj/item/clothing/head/ushanka/solgov/fleet
name = "fleet fur hat"
desc = "An SCG Fleet synthfur-lined hat for operating in cold environments."
icon_state = "flushankadown"
//icon_state_up = "flushankaup"
/obj/item/clothing/head/ushanka/solgov/army
name = "marine fur hat"
desc = "An SCG Marine synthfur-lined hat for operating in cold environments."
icon_state = "barushankadown"
//icon_state_up = "barushankaup"
/obj/item/clothing/head/ushanka/solgov/army/green
name = "green marine fur hat"
desc = "An SCG Marine synthfur-lined hat for operating in cold environments."
icon_state = "arushankadown"
//icon_state_up = "mcushankaup"
//Terran
/obj/item/clothing/head/terran/navy/service
name = "ICCGN service cover"
desc = "A service uniform cover, worn by low-ranking crew within the Independent Navy."
icon_state = "terranservice"
item_state = "terranservice"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet")
body_parts_covered = 0
/obj/item/clothing/head/terran/navy/service/command
name = "ICCGN command service cover"
desc = "A service uniform cover, worn by high-ranking crew within the Independent Navy."
icon_state = "terranservice_comm"
item_state = "terranservice_comm"
code/modules/clothing/suits/solgov.dm
+302 -78
View File
@@ -1,129 +1,314 @@
//SolGov Uniform Suits
/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')
//Service
/obj/item/clothing/suit/storage/service
/obj/item/clothing/suit/storage/solgov/service
name = "service jacket"
desc = "A uniform service jacket, plain and undecorated."
icon_state = "blackservice"
item_state = "blackservice"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
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
flags_inv = HIDEHOLSTER //VOREStation Add - These obviously do.
allowed = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/flashlight,/obj/item/weapon/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/analyzer,/obj/item/device/radio,/obj/item/taperoll)
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND,ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_INSIGNIA,ACCESSORY_SLOT_RANK,ACCESSORY_SLOT_DEPT)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
/obj/item/clothing/suit/storage/service/sifguard
/obj/item/clothing/suit/storage/solgov/service/sifguard
name = "\improper SifGuard jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons."
icon_state = "blackservice_crew"
desc = "A uniform service jacket belonging to the Sif Defense Force."
icon_state = "ecservice_crew"
/obj/item/clothing/suit/storage/service/sifguard/medical
name = "\improper SifGuard medical jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and blue trim."
icon_state = "blackservice_med"
/obj/item/clothing/suit/storage/solgov/service/sifguard/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
/obj/item/clothing/suit/storage/service/sifguard/medical/command
name = "\improper SifGuard medical command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and blue trim."
icon_state = "blackservice_medcom"
/obj/item/clothing/suit/storage/solgov/service/sifguard/medical/command
icon_state = "ecservice_officer"
/obj/item/clothing/suit/storage/service/sifguard/engineering
name = "\improper SifGuard engineering jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and orange trim."
icon_state = "blackservice_eng"
/obj/item/clothing/suit/storage/solgov/service/sifguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
/obj/item/clothing/suit/storage/service/sifguard/engineering/command
name = "\improper SifGuard engineering command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and orange trim."
icon_state = "blackservice_engcom"
/obj/item/clothing/suit/storage/solgov/service/sifguard/engineering/command
icon_state = "ecservice_officer"
/obj/item/clothing/suit/storage/service/sifguard/supply
name = "\improper SifGuard supply jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and brown trim."
icon_state = "blackservice_sup"
/obj/item/clothing/suit/storage/solgov/service/sifguard/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
/obj/item/clothing/suit/storage/service/sifguard/security
name = "\improper SifGuard security jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and red trim."
icon_state = "blackservice_sec"
/obj/item/clothing/suit/storage/solgov/service/sifguard/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
/obj/item/clothing/suit/storage/service/sifguard/security/command
name = "\improper SifGuard security command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and red trim."
icon_state = "blackservice_seccom"
/obj/item/clothing/suit/storage/solgov/service/sifguard/security/command
icon_state = "ecservice_officer"
/obj/item/clothing/suit/storage/service/sifguard/command
name = "\improper SifGuard command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and gold trim."
icon_state = "blackservice_com"
/obj/item/clothing/suit/storage/solgov/service/sifguard/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
/obj/item/clothing/suit/storage/service/marine
/obj/item/clothing/suit/storage/solgov/service/sifguard/service/command
icon_state = "ecservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/exploration/command
icon_state = "ecservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
/obj/item/clothing/suit/storage/solgov/service/sifguard/research/command
icon_state = "ecservice_officer"
/obj/item/clothing/suit/storage/solgov/service/sifguard/command
icon_state = "ecservice_officer"
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
/obj/item/clothing/suit/storage/solgov/service/fleet
name = "fleet service jacket"
desc = "A navy blue SCG Fleet service jacket."
icon_state = "blueservice"
item_state = "blueservice"
/obj/item/clothing/suit/storage/solgov/service/fleet/snco
name = "fleet SNCO service jacket"
desc = "A navy blue SCG Fleet service jacket with silver cuffs."
icon_state = "blueservice_snco"
item_state = "blueservice_snco"
/obj/item/clothing/suit/storage/solgov/service/fleet/officer
name = "fleet officer's service jacket"
desc = "A navy blue SCG Fleet dress jacket with silver accents."
icon_state = "blueservice_off"
item_state = "blueservice_off"
/obj/item/clothing/suit/storage/solgov/service/fleet/command
name = "fleet senior officer's service jacket"
desc = "A navy blue SCG Fleet dress jacket with gold accents."
icon_state = "blueservice_comm"
item_state = "blueservice_comm"
/obj/item/clothing/suit/storage/solgov/service/fleet/flag
name = "fleet flag officer's service jacket"
desc = "A navy blue SCG Fleet dress jacket with red accents."
icon_state = "blueservice_flag"
item_state = "blueservice_flag"
/obj/item/clothing/suit/storage/solgov/service/army
name = "marine coat"
desc = "An SCG Marine Corps service coat. Green and undecorated."
desc = "An SCG Marine service coat. Green and undecorated."
icon_state = "greenservice"
item_state_slots = list(slot_r_hand_str = "suit_olive", slot_l_hand_str = "suit_olive")
item_state = "greenservice"
/obj/item/clothing/suit/storage/service/marine/medical
/obj/item/clothing/suit/storage/solgov/service/army/medical
name = "marine medical jacket"
desc = "An SCG Marine Corps service coat. This one has blue markings."
desc = "An SCG Marine service coat. This one has blue markings."
icon_state = "greenservice_med"
item_state = "greenservice_med"
/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 SCG Marine Corps service coat. This one has blue and gold markings."
desc = "An SCG Marine service coat. This one has blue and gold markings."
icon_state = "greenservice_medcom"
item_state = "greenservice_medcom"
/obj/item/clothing/suit/storage/service/marine/engineering
/obj/item/clothing/suit/storage/solgov/service/army/engineering
name = "marine engineering jacket"
desc = "An SCG Marine Corps service coat. This one has orange markings."
desc = "An SCG Marine service coat. This one has orange markings."
icon_state = "greenservice_eng"
item_state = "greenservice_eng"
/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 SCG Marine Corps service coat. This one has orange and gold markings."
desc = "An SCG Marine service coat. This one has orange and gold markings."
icon_state = "greenservice_engcom"
item_state = "greenservice_engcom"
/obj/item/clothing/suit/storage/service/marine/supply
/obj/item/clothing/suit/storage/solgov/service/army/supply
name = "marine supply jacket"
desc = "An SCG Marine Corps service coat. This one has brown markings."
desc = "An SCG Marine service coat. This one has brown markings."
icon_state = "greenservice_sup"
item_state = "greenservice_sup"
/obj/item/clothing/suit/storage/service/marine/security
/obj/item/clothing/suit/storage/solgov/service/army/security
name = "marine security jacket"
desc = "An SCG Marine Corps service coat. This one has red markings."
desc = "An SCG Marine service coat. This one has red markings."
icon_state = "greenservice_sec"
item_state = "greenservice_sec"
/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 SCG Marine Corps service coat. This one has red and gold markings."
desc = "An SCG Marine service coat. This one has red and gold markings."
icon_state = "greenservice_seccom"
item_state = "greenservice_seccom"
/obj/item/clothing/suit/storage/service/marine/command
/obj/item/clothing/suit/storage/solgov/service/army/service
name = "marine service jacket"
desc = "An SCG Marine service coat. This one has green markings."
icon_state = "greenservice_srv"
item_state = "greenservice_srv"
/obj/item/clothing/suit/storage/solgov/service/army/service/command
name = "marine service command jacket"
desc = "An SCG Marine service coat. This one has green and gold markings."
icon_state = "greenservice_srvcom"
item_state = "greenservice_srvcom"
/obj/item/clothing/suit/storage/solgov/service/army/exploration
name = "marine exploration jacket"
desc = "An SCG Marine service coat. This one has purple markings."
icon_state = "greenservice_exp"
item_state = "greenservice_exp"
/obj/item/clothing/suit/storage/solgov/service/army/exploration/command
name = "marine exploration command jacket"
desc = "An SCG Marine service coat. This one has purple and gold markings."
icon_state = "greenservice_expcom"
item_state = "greenservice_expcom"
/obj/item/clothing/suit/storage/solgov/service/army/command
name = "marine command jacket"
desc = "An SCG Marine Corps service coat. This one has gold markings."
icon_state = "greenservice_com"
item_state = "greenservice_com"
//Dress
//Dress - murder me with a gun why are these 3 different types
/obj/item/clothing/suit/dress
/obj/item/clothing/suit/storage/solgov/dress
name = "dress jacket"
desc = "A uniform dress jacket, fancy."
icon_state = "greydress"
icon_state = "ecdress_xpl"
item_state = "ecdress_xpl"
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
allowed = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_RANK)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
/obj/item/clothing/suit/dress/expedition
name = "SifGuard dress jacket"
/obj/item/clothing/suit/storage/solgov/dress/sifguard
name = "\improper SifGuard dress jacket"
desc = "A silver and grey dress jacket belonging to the Sif Defense Force. Fashionable, for the 25th century at least."
icon_state = "greydress"
icon_state = "ecdress_xpl"
item_state = "ecdress_xpl"
/obj/item/clothing/suit/dress/expedition/command
name = "SifGuard command dress jacket"
desc = "A gold and grey dress jacket belonging to the Sif Defense Force. The height of fashion."
icon_state = "greydress_com"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/senior
name = "\improper SifGuard senior's dress coat"
icon_state = "ecdress_sxpl"
item_state = "ecdress_sxpl"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/chief
name = "\improper SifGuard chief's dress coat"
icon_state = "ecdress_cxpl"
item_state = "ecdress_cxpl"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command
name = "\improper SifGuard officer's dress coat"
desc = "A gold and black dress peacoat belonging to the Sif Defense Force. The height of fashion."
icon_state = "ecdress_ofcr"
item_state = "ecdress_ofcr"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/cdr
name = "\improper SifGuard commander's dress coat"
icon_state = "ecdress_cdr"
item_state = "ecdress_cdr"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/capt
name = "\improper SifGuard captain's dress coat"
icon_state = "ecdress_capt"
item_state = "ecdress_capt"
/obj/item/clothing/suit/storage/solgov/dress/sifguard/command/adm
name = "\improper SifGuard admiral's dress coat"
icon_state = "ecdress_adm"
item_state = "ecdress_adm"
/obj/item/clothing/suit/storage/solgov/dress/fleet
name = "fleet dress jacket"
desc = "A navy blue SCG Fleet dress jacket. Don't get near pasta sauce or vox."
icon_state = "whitedress"
item_state = "whitedress"
/obj/item/clothing/suit/storage/solgov/dress/fleet/snco
name = "fleet dress SNCO jacket"
desc = "A navy blue SCG Fleet dress jacket with silver cuffs. Don't get near pasta sauce or vox."
icon_state = "whitedress_snco"
item_state = "whitedress_snco"
/obj/item/clothing/suit/storage/solgov/dress/fleet/officer
name = "fleet officer's dress jacket"
desc = "A navy blue SCG Fleet dress jacket with silver accents. Don't get near pasta sauce or vox."
icon_state = "whitedress_off"
item_state = "whitedress_off"
/obj/item/clothing/suit/storage/solgov/dress/fleet/command
name = "fleet senior officer's dress jacket"
desc = "A navy blue SCG Fleet dress jacket with gold accents. Don't get near pasta sauce or vox."
icon_state = "whitedress_comm"
item_state = "whitedress_comm"
/obj/item/clothing/suit/storage/solgov/dress/fleet/flag
name = "fleet flag officer's dress jacket"
desc = "A navy blue SCG Fleet dress jacket with red accents. Don't get near pasta sauce or vox."
icon_state = "whitedress_flag"
item_state = "whitedress_flag"
/obj/item/clothing/suit/dress/solgov
name = "dress jacket"
desc = "A uniform dress jacket, fancy."
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')
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
allowed = list(/obj/item/weapon/tank/emergency,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_RANK)
/obj/item/clothing/suit/dress/solgov/fleet/sailor
name = "fleet dress overwear"
desc = "A navy blue SCG Fleet dress suit. Almost looks like a school-girl outfit."
icon_state = "sailordress"
item_state = "whitedress"
/obj/item/clothing/suit/dress/solgov/army
name = "marine dress jacket"
desc = "A tailored black SCG Marines dress jacket with red trim. So sexy it hurts."
icon_state = "blackdress"
item_state = "blackdress"
/obj/item/clothing/suit/dress/solgov/army/command
name = "marine officer's dress jacket"
desc = "A tailored black SCG Marines dress jacket with gold trim. Smells like ceremony."
icon_state = "blackdress_com"
item_state = "blackdress_com"
//Misc
/obj/item/clothing/suit/storage/hooded/wintercoat/solgov
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')
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)
/obj/item/clothing/suit/storage/hooded/wintercoat/solgov/army
name = "marine winter coat"
icon_state = "coatar"
armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA,ACCESSORY_SLOT_RANK)
/obj/item/clothing/suit/storage/hooded/wintercoat/solgov/fleet
name = "fleet winter coat"
icon_state = "coatfl"
armor = list(melee = 20, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 0, rad = 10)
valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA)
/obj/item/clothing/suit/storage/toggle/dress
name = "clasped dress jacket"
@@ -143,21 +328,60 @@
item_state = "labcoat"
blood_overlay_type = "coat"
/obj/item/clothing/suit/dress/marine
name = "marine dress jacket"
desc = "A tailored black SCG Marine Corps dress jacket with red trim. So sexy it hurts."
icon_state = "blackdress"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
/obj/item/clothing/suit/dress/marine/command
name = "marine command dress jacket"
desc = "A tailored black SCG Marine Corps dress jacket with gold trim. Smells like ceremony."
icon_state = "blackdress_com"
//Misc
/obj/item/clothing/suit/storage/toggle/marshal_jacket
/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."
icon_state = "marshal_jacket"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
body_parts_covered = UPPER_TORSO|ARMS
body_parts_covered = UPPER_TORSO|ARMS
//Terrans
//Service
/obj/item/clothing/suit/storage/terran/service/navy
name = "ICCGN coat"
desc = "A ICCG Navy service coat. Black and undecorated."
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')
/obj/item/clothing/suit/storage/terran/service/navy/command
name = "indie command coat"
desc = "An ICCG Navy service command coat. White and undecorated."
icon_state = "terranservice_comm"
item_state = "terranservice_comm"
//Dress
/obj/item/clothing/suit/dress/terran
name = "dress jacket"
desc = "A uniform dress jacket, fancy."
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')
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
allowed = list(/obj/item/weapon/tank/emergency,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_RANK)
/obj/item/clothing/suit/dress/terran/navy
name = "ICCGN dress cloak"
desc = "A black ICCG Navy dress cloak with red detailing. So sexy it hurts."
icon_state = "terrandress"
item_state = "terrandress"
/obj/item/clothing/suit/dress/terran/navy/officer
name = "ICCGN officer's dress cloak"
desc = "A black ICCG Navy dress cloak with gold detailing. Smells like ceremony."
icon_state = "terrandress_off"
item_state = "terrandress_off"
/obj/item/clothing/suit/dress/terran/navy/command
name = "ICCGN command dress cloak"
desc = "A black ICCG Navy dress cloak with royal detailing. Smells like ceremony."
icon_state = "terrandress_comm"
item_state = "terrandress_comm"
code/modules/clothing/under/accessories/torch.dm
+59 -27
View File
@@ -117,6 +117,7 @@ ribbons
icon_state = "ribbon_marksman"
on_rolled = list("down" = "none")
slot = ACCESSORY_SLOT_MEDAL
w_class = ITEMSIZE_TINY
/obj/item/clothing/accessory/ribbon/solgov/marksman
name = "marksmanship ribbon"
@@ -294,7 +295,7 @@ department tags
desc = "Insignia denoting assignment to a department. These appear blank."
icon_state = "dept_exped"
on_rolled = list("down" = "none", "rolled" = "dept_exped_sleeves")
slot = ACCESSORY_SLOT_DECOR
slot = ACCESSORY_SLOT_DEPT
//removable = FALSE
/obj/item/clothing/accessory/solgov/department/command
@@ -305,14 +306,18 @@ department tags
/obj/item/clothing/accessory/solgov/department/command/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/command/jumper
icon_state = "dept_exped_jumper"
color = "#d6bb64"
/obj/item/clothing/accessory/solgov/department/command/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the command department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/command/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the command department. These fit marine uniforms."
/obj/item/clothing/accessory/solgov/department/command/army
icon_state = "dept_army"
desc = "Insignia denoting assignment to the command department. These fit Marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/engineering
@@ -323,14 +328,17 @@ department tags
/obj/item/clothing/accessory/solgov/department/engineering/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/engineering/jumper
icon_state = "dept_exped_jumper"
/obj/item/clothing/accessory/solgov/department/engineering/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the engineering department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/engineering/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the engineering department. These fit marine uniforms."
/obj/item/clothing/accessory/solgov/department/engineering/army
icon_state = "dept_army"
desc = "Insignia denoting assignment to the engineering department. These fit Marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/security
@@ -341,14 +349,18 @@ department tags
/obj/item/clothing/accessory/solgov/department/security/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/security/jumper
icon_state = "dept_exped_jumper"
color = "#721b1b"
/obj/item/clothing/accessory/solgov/department/security/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the security department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/security/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the security department. These fit marine uniforms."
/obj/item/clothing/accessory/solgov/department/security/army
icon_state = "dept_army"
desc = "Insignia denoting assignment to the security department. These fit Marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/medical
@@ -358,15 +370,20 @@ department tags
/obj/item/clothing/accessory/solgov/department/medical/service
icon_state = "dept_exped_service"
color = "#7faad1"
/obj/item/clothing/accessory/solgov/department/medical/jumper
icon_state = "dept_exped_jumper"
color = "#7faad1"
/obj/item/clothing/accessory/solgov/department/medical/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the medical department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/medical/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the medical department. These fit marine uniforms."
/obj/item/clothing/accessory/solgov/department/medical/army
icon_state = "dept_army"
desc = "Insignia denoting assignment to the medical department. These fit Marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/supply
@@ -377,14 +394,18 @@ department tags
/obj/item/clothing/accessory/solgov/department/supply/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/supply/jumper
icon_state = "dept_exped_jumper"
color = "#7faad1"
/obj/item/clothing/accessory/solgov/department/supply/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the supply department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/supply/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the supply department. These fit marine uniforms."
/obj/item/clothing/accessory/solgov/department/supply/army
icon_state = "dept_army"
desc = "Insignia denoting assignment to the supply department. These fit Marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/service
@@ -395,14 +416,18 @@ department tags
/obj/item/clothing/accessory/solgov/department/service/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/service/jumper
icon_state = "dept_exped_jumper"
color = "#7b965d"
/obj/item/clothing/accessory/solgov/department/service/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the service department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/service/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the service department. These fit marine uniforms."
/obj/item/clothing/accessory/solgov/department/service/army
icon_state = "dept_army"
desc = "Insignia denoting assignment to the service department. These fit Marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/exploration
@@ -413,14 +438,17 @@ department tags
/obj/item/clothing/accessory/solgov/department/exploration/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/exploration/jumper
icon_state = "dept_exped_jumper"
/obj/item/clothing/accessory/solgov/department/exploration/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the exploration department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/exploration/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the exploration department. These fit marine uniforms."
/obj/item/clothing/accessory/solgov/department/exploration/army
icon_state = "dept_army"
desc = "Insignia denoting assignment to the exploration department. These fit Marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/research
@@ -431,6 +459,10 @@ department tags
/obj/item/clothing/accessory/solgov/department/research/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/research/jumper
icon_state = "dept_exped_jumper"
color = "#916f8d"
/*********
ranks - ec
*********/
@@ -440,7 +472,7 @@ ranks - ec
desc = "Insignia denoting rank of some kind. These appear blank."
icon_state = "fleetrank"
on_rolled = list("down" = "none")
slot = ACCESSORY_SLOT_DECOR
slot = ACCESSORY_SLOT_RANK
gender = PLURAL
//high_visibility = 1
@@ -614,13 +646,13 @@ ranks - marines
/obj/item/clothing/accessory/solgov/rank/marine
name = "marine ranks"
desc = "Insignia denoting marine rank of some kind. These appear blank."
icon_state = "marinerank_enlisted"
icon_state = "armyrank_enlisted"
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/rank/marine/enlisted
name = "ranks (E-1 private)"
desc = "Insignia denoting the rank of Private."
icon_state = "marinerank_enlisted"
icon_state = "armyrank_enlisted"
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e2
name = "ranks (E-2 private second class)"
@@ -669,7 +701,7 @@ ranks - marines
/obj/item/clothing/accessory/solgov/rank/marine/officer
name = "ranks (O-1 second lieutenant)"
desc = "Insignia denoting the rank of Second Lieutenant."
icon_state = "marinerank_officer"
icon_state = "armyrank_officer"
/obj/item/clothing/accessory/solgov/rank/marine/officer/o2
name = "ranks (O-2 first lieutenant)"
@@ -694,7 +726,7 @@ ranks - marines
/obj/item/clothing/accessory/solgov/rank/marine/flag
name = "ranks (O-7 brigadier general)"
desc = "Insignia denoting the rank of Brigadier General."
icon_state = "marinerank_command"
icon_state = "armyrank_command"
/obj/item/clothing/accessory/solgov/rank/marine/flag/o8
name = "ranks (O-8 major general)"
code/modules/clothing/under/solgov.dm
+290 -105
View File
@@ -5,9 +5,9 @@
name = "master solgov uniform"
desc = "You shouldn't be seeing this."
icon = 'icons/obj/clothing/uniforms_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
rolled_down = 0
rolled_sleeves = 0
item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
siemens_coefficient = 0.8
@@ -33,11 +33,11 @@
icon_state = "fleetpt"
worn_state = "fleetpt"
/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."
icon_state = "marinept"
worn_state = "marinept"
icon_state = "armypt"
worn_state = "armypt"
//Utility
@@ -71,6 +71,18 @@
worn_state = "blackutility_crew"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
/obj/item/clothing/under/solgov/utility/sifguard_skirt
name = "\improper SifGuard skirt"
desc = "A black turtleneck and skirt, the elusive ladies' uniform of the Sif Defense Force."
icon_state = "blackservicefem"
worn_state = "blackservicefem"
/obj/item/clothing/under/solgov/utility/sifguard_skirt/officer
name = "\improper SifGuard officer skirt"
desc = "A black turtleneck and skirt, the elusive ladies' uniform of the Sif Defense Force. This one has gold trim."
icon_state = "blackservicefem_com"
worn_state = "blackservicefem_com"
/obj/item/clothing/under/solgov/utility/sifguard/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command)
@@ -86,6 +98,9 @@
/obj/item/clothing/under/solgov/utility/sifguard/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply)
/obj/item/clothing/under/solgov/utility/sifguard/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service)
/obj/item/clothing/under/solgov/utility/sifguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration)
@@ -93,7 +108,7 @@
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research)
/obj/item/clothing/under/solgov/utility/sifguard/officer
name = "\improper Sifuard officer's uniform"
name = "\improper Sifguard officer's uniform"
desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has gold trim."
icon_state = "blackutility_com"
worn_state = "blackutility_com"
@@ -113,6 +128,9 @@
/obj/item/clothing/under/solgov/utility/sifguard/officer/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply)
/obj/item/clothing/under/solgov/utility/sifguard/officer/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service)
/obj/item/clothing/under/solgov/utility/sifguard/officer/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration)
@@ -145,44 +163,87 @@
/obj/item/clothing/under/solgov/utility/fleet/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/fleet)
/obj/item/clothing/under/solgov/utility/fleet/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/fleet)
/obj/item/clothing/under/solgov/utility/fleet/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/fleet)
/obj/item/clothing/under/solgov/utility/fleet/combat
name = "fleet fatigues"
desc = "Alternative utility uniform of the SCG Fleet, for when coveralls are impractical."
icon_state = "navycombat"
worn_state = "navycombat"
/obj/item/clothing/under/solgov/utility/marine
/obj/item/clothing/under/solgov/utility/fleet/combat/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/fleet)
/obj/item/clothing/under/solgov/utility/fleet/combat/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet, /obj/item/clothing/accessory/armband/medblue)
/obj/item/clothing/under/solgov/utility/fleet/combat/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet)
/obj/item/clothing/under/solgov/utility/fleet/combat/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/fleet)
/obj/item/clothing/under/solgov/utility/fleet/officer
name = "fleet officer's coveralls"
desc = "Alternative utility uniform of the SCG Fleet, for officers."
icon_state = "navyutilityoff"
worn_state = "navyutilityoff"
/obj/item/clothing/under/solgov/utility/fleet/officer/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet)
/obj/item/clothing/under/solgov/utility/fleet/officer/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/fleet)
/obj/item/clothing/under/solgov/utility/fleet/officer/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/fleet)
/obj/item/clothing/under/solgov/utility/fleet/officer/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet)
/obj/item/clothing/under/solgov/utility/army
name = "marine fatigues"
desc = "The utility uniform of the SCG Marine Corps, made from durable material."
icon_state = "greyutility"
worn_state = "greyutility"
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/solgov/utility/marine/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/marine)
/obj/item/clothing/under/solgov/utility/marine/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/marine)
/obj/item/clothing/under/solgov/utility/marine/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/marine)
/obj/item/clothing/under/solgov/utility/marine/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/marine)
/obj/item/clothing/under/solgov/utility/marine/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/marine)
/obj/item/clothing/under/solgov/utility/marine/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/marine)
/obj/item/clothing/under/solgov/utility/marine/green
name = "green fatigues"
desc = "A green version of the SCG marine utility uniform, made from durable material."
desc = "The utility uniform of the SCG Marines, made from durable material."
icon_state = "greenutility"
worn_state = "greenutility"
/obj/item/clothing/under/solgov/utility/marine/tan
//obj/item/clothing/under/solgov/utility/army/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/army)
/obj/item/clothing/under/solgov/utility/army/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/army)
/obj/item/clothing/under/solgov/utility/army/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/army)
/obj/item/clothing/under/solgov/utility/army/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/army)
/obj/item/clothing/under/solgov/utility/army/medical/banded
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/army, /obj/item/clothing/accessory/armband/medblue)
/obj/item/clothing/under/solgov/utility/army/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/army)
/obj/item/clothing/under/solgov/utility/army/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/army)
/obj/item/clothing/under/solgov/utility/army/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/army)
/obj/item/clothing/under/solgov/utility/army/urban
name = "urban fatigues"
desc = "An urban version of the SCG Marines utility uniform, made from durable material."
icon_state = "greyutility"
worn_state = "greyutility"
/obj/item/clothing/under/solgov/utility/army/tan
name = "tan fatigues"
desc = "A tan version of the SCG marine utility uniform, made from durable material."
desc = "A tan version of the SCG Marines utility uniform, made from durable material."
icon_state = "tanutility"
worn_state = "tanutility"
@@ -195,24 +256,166 @@
worn_state = "whiteservice"
armor = list(melee = 5, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 5, rad = 0)
siemens_coefficient = 0.9
siemens_coefficient = 0.9
/obj/item/clothing/under/solgov/service/sifguard
name = "\improper SifGuard service uniform"
desc = "The service uniform of the Sif Defense Force in silver trim."
icon_state = "greydress"
worn_state = "greydress"
/obj/item/clothing/under/solgov/service/sifguard/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/jumper)
/obj/item/clothing/under/solgov/service/sifguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/jumper)
/obj/item/clothing/under/solgov/service/sifguard/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/jumper)
/obj/item/clothing/under/solgov/service/sifguard/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/jumper)
/obj/item/clothing/under/solgov/service/sifguard/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/jumper)
/obj/item/clothing/under/solgov/service/sifguard/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/jumper)
/obj/item/clothing/under/solgov/service/sifguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/jumper)
/obj/item/clothing/under/solgov/service/sifguard/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt
name = "\improper SifGuard service skirt"
desc = "A feminine version of the Sif Defense Force service uniform in silver trim."
icon_state = "greydressfem"
worn_state = "greydressfem"
/obj/item/clothing/under/solgov/service/sifguard/skirt/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/jumper)
/obj/item/clothing/under/solgov/service/sifguard/skirt/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command
name = "\improper SifGuard officer's service uniform"
desc = "The service uniform of the Sif Defense Force in gold trim."
icon_state = "greydress_com"
worn_state = "greydress_com"
/obj/item/clothing/under/solgov/service/sifguard/command/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt
name = "\improper SifGuard officer's service skirt"
desc = "A feminine version of the Sif Defense Force service uniform in gold trim."
icon_state = "greydressfem_com"
worn_state = "greydressfem_com"
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/jumper)
/obj/item/clothing/under/solgov/service/sifguard/command/skirt/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/jumper)
/obj/item/clothing/under/solgov/service/fleet
name = "fleet service uniform"
desc = "The service uniform of the SCG Fleet, made from immaculate white fabric."
icon_state = "whiteservice"
worn_state = "whiteservice"
starting_accessories = list(/obj/item/clothing/accessory/tie/navy)
/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 SCG Fleet, made from immaculate white fabric."
icon_state = "whiteservicefem"
worn_state = "whiteservicefem"
/obj/item/clothing/under/solgov/service/army
name = "marine service uniform"
desc = "The service uniform of the SCG Marine Corps. Slimming."
desc = "The service uniform of the SCG Marines. Slimming."
icon_state = "greenservice"
worn_state = "greenservice"
starting_accessories = list(/obj/item/clothing/accessory/tie/darkgreen)
/obj/item/clothing/under/solgov/service/marine/command
name = "marine command service uniform"
desc = "The service uniform of the SCG Marine Corps. Slimming and stylish."
/obj/item/clothing/under/solgov/service/army/skirt
name = "marine service skirt"
desc = "The service uniform skirt of the SCG Marines. Slimming."
icon_state = "greenservicefem"
worn_state = "greenservicefem"
/obj/item/clothing/under/solgov/service/army/command
name = "marine officer's service uniform"
desc = "The service uniform of the SCG Marines. Slimming and stylish."
icon_state = "greenservice_com"
worn_state = "greenservice_com"
starting_accessories = list(/obj/item/clothing/accessory/tie/darkgreen)
/obj/item/clothing/under/solgov/service/army/command/skirt
name = "marine officer's service skirt"
desc = "The service uniform skirt of the SCG Marines. Slimming and stylish."
icon_state = "greenservicefem_com"
worn_state = "greenservicefem_com"
//Dress
@@ -221,79 +424,31 @@
desc = "A dress uniform of some kind."
icon_state = "greydress"
worn_state = "greydress"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/solgov/mildress/sifguard
name = "\improper SifGuard dress uniform"
desc = "The dress uniform of the Sif Defense Force in silver trim."
/obj/item/clothing/under/solgov/mildress/sifguard/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
/obj/item/clothing/under/solgov/mildress/sifguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
/obj/item/clothing/under/solgov/mildress/sifguard/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
/obj/item/clothing/under/solgov/mildress/sifguard/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
/obj/item/clothing/under/solgov/mildress/sifguard/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
/obj/item/clothing/under/solgov/mildress/sifguard/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
/obj/item/clothing/under/solgov/mildress/sifguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
/obj/item/clothing/under/solgov/mildress/sifguard/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer
name = "\improper SifGuard command dress uniform"
desc = "The dress uniform of the Sif Defense Force in gold trim."
icon_state = "greydress_com"
worn_state = "greydress_com"
/obj/item/clothing/under/solgov/mildress/sifguard/officer/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
/obj/item/clothing/under/solgov/mildress/marine
/obj/item/clothing/under/solgov/mildress/army
name = "marine dress uniform"
desc = "The dress uniform of the SCG Marine Corps, class given form."
desc = "The dress uniform of the SCG Marines, class given form."
icon_state = "blackdress"
worn_state = "blackdress"
/obj/item/clothing/under/solgov/mildress/marine/command
name = "marine command dress uniform"
desc = "The dress uniform of the SCG Marine Corps, even classier in gold."
icon_state = "blackdress_com"
/obj/item/clothing/under/solgov/mildress/army/skirt
name = "marine dress skirt"
desc = "A feminine version of the SCG Marines dress uniform, class given form."
icon_state = "blackdressfem"
worn_state = "blackdressfem"
/obj/item/clothing/under/solgov/mildress/army/command
name = "marine officer's dress uniform"
desc = "The dress uniform of the SCG Marines, even classier in gold."
icon_state = "blackdress"
worn_state = "blackdress_com"
/obj/item/clothing/under/solgov/mildress/army/command/skirt
name = "marine officer's dress skirt"
desc = "A feminine version of the SCG Marines dress uniform, even classier in gold."
icon_state = "blackdressfem"
worn_state = "blackdressfem_com"
//Misc
@@ -313,3 +468,33 @@
worn_state = "sterile"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 0)
//Terrans
/obj/item/clothing/under/terran
name = "master ICCGN uniform"
desc = "You shouldn't be seeing this."
icon = 'icons/obj/clothing/uniforms_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
siemens_coefficient = 0.8
/obj/item/clothing/under/terran/navy/utility
name = "ICCGN utility uniform"
desc = "A comfortable black utility jumpsuit. Worn by the ICCG Navy."
icon_state = "terranutility"
worn_state = "terranutility"
/obj/item/clothing/under/terran/navy/service
name = "ICCGN service uniform"
desc = "The service uniform of the ICCG Navy, for low-ranking crew."
icon_state = "terranservice"
worn_state = "terranservice"
armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 5, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/terran/navy/service/command
name = "ICCGN command service uniform"
desc = "The service uniform of the ICCG Navy, for high-ranking crew."
icon_state = "terranservice_comm"
worn_state = "terranservice_comm"