mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 15:01:04 +01:00
Fixes some Sol uniforms having their uniforms being unable to be rolled (#14243)
This commit is contained in:
Wowzewow (Wezzy)
@@ -135,8 +135,8 @@ STOCK_ITEM_RARE(rare_clothing, 1)
|
||||
/obj/item/clothing/suit/storage/vysoka/f,
|
||||
/obj/item/clothing/suit/storage/vysoka,
|
||||
/obj/item/clothing/under/rank/iacjumpsuit,
|
||||
/obj/item/clothing/under/rank/fatigues/marine,
|
||||
/obj/item/clothing/under/rank/dress/subofficer,
|
||||
/obj/item/clothing/under/rank/sol/marine,
|
||||
/obj/item/clothing/under/rank/sol/dress/subofficer,
|
||||
/obj/item/clothing/under/dominia/lyodsuit/hoodie,
|
||||
/obj/item/clothing/shoes/sandal/clogs,
|
||||
/obj/item/clothing/under/lance,
|
||||
@@ -150,4 +150,4 @@ STOCK_ITEM_RARE(megacorp_goods, 0.25)
|
||||
var/obj/item/adv_item = pick(/obj/item/storage/backpack/service, /obj/item/device/advanced_healthanalyzer)
|
||||
new adv_item(L)
|
||||
|
||||
STOCK_ITEM_RARE(nothing, 0)
|
||||
STOCK_ITEM_RARE(nothing, 0)
|
||||
|
||||
@@ -567,68 +567,56 @@
|
||||
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
|
||||
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/head.dmi')
|
||||
|
||||
/obj/item/clothing/head/navy
|
||||
/obj/item/clothing/head/sol
|
||||
name = "sol navy utility cover"
|
||||
desc = "A military cover issued to Sol Alliance navy members as part of their field uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
|
||||
icon_state = "greyutility"
|
||||
item_state = "greyutility"
|
||||
contained_sprite = 1
|
||||
contained_sprite = TRUE
|
||||
armor = list(
|
||||
melee = ARMOR_MELEE_MINOR
|
||||
)
|
||||
/obj/item/clothing/head/navy/marine
|
||||
|
||||
/obj/item/clothing/head/sol/marine
|
||||
name = "sol marine utility cover"
|
||||
desc = "An eight pointed cover issued to Sol Alliance marines as part of their field uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "greenutility"
|
||||
item_state = "greenutility"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/navy/garrison
|
||||
/obj/item/clothing/head/sol/garrison
|
||||
name = "sol marine garrison cap"
|
||||
desc = "A green garrison cap issued to Sol Alliance marines."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "greengarrisoncap"
|
||||
item_state = "greengarrisoncap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress
|
||||
/obj/item/clothing/head/sol/dress
|
||||
name = "sol navy black peaked cap"
|
||||
desc = "A black cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by junior officers."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whitepeakcap"
|
||||
item_state = "whitepeakcap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress/marine
|
||||
/obj/item/clothing/head/sol/dress/marine
|
||||
name = "sol marine peaked cap"
|
||||
desc = "A green cap issued as part of the Sol Alliance marine service and dress uniforms."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whitepeakcap"
|
||||
item_state = "whitepeakcap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress/officer
|
||||
/obj/item/clothing/head/sol/dress/officer
|
||||
name = "sol navy officer peaked cap"
|
||||
desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by senior officers."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whitewheelcap"
|
||||
item_state = "whitewheelcap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress/admiral
|
||||
/obj/item/clothing/head/sol/dress/admiral
|
||||
name = "sol navy admiral peaked cap"
|
||||
desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by admirals."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "admiral_cap"
|
||||
item_state = "admiral_cap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/helmet/sol
|
||||
name = "sol combat helmet"
|
||||
desc = "A woodland colored helmet made from advanced ceramic."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
|
||||
icon_state = "helmet_tac_sol"
|
||||
item_state = "helmet_tac_sol"
|
||||
armor = list(
|
||||
@@ -638,7 +626,7 @@
|
||||
energy = ARMOR_ENERGY_SMALL,
|
||||
bomb = ARMOR_BOMB_PADDED
|
||||
)
|
||||
contained_sprite = 1
|
||||
contained_sprite = TRUE
|
||||
|
||||
/obj/item/clothing/head/nonla
|
||||
name = "non la"
|
||||
|
||||
@@ -565,7 +565,7 @@
|
||||
/obj/item/clothing/suit/storage/vest/sol
|
||||
name = "sol heavy armor vest"
|
||||
desc = "A high-quality armor vest in a deep green. It is surprisingly flexible and light, even with the added webbing and armor plating."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
|
||||
icon_state = "solwebvest"
|
||||
item_state = "solwebvest"
|
||||
armor = list(
|
||||
@@ -575,7 +575,7 @@
|
||||
energy = ARMOR_ENERGY_RESISTANT,
|
||||
bomb = ARMOR_BOMB_PADDED
|
||||
)
|
||||
contained_sprite = 1
|
||||
contained_sprite = TRUE
|
||||
|
||||
//All of the armor below is mostly unused
|
||||
|
||||
|
||||
@@ -1,77 +1,61 @@
|
||||
|
||||
/obj/item/clothing/under/rank/fatigues //regular sol navy uniform
|
||||
/obj/item/clothing/under/rank/sol //regular sol navy uniform
|
||||
name = "sol navy coveralls"
|
||||
desc = "Fire-retardant naval utility coveralls, worn by Solarian naval personnel serving aboard ships and in the field."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
|
||||
icon_state = "sol_uniform"
|
||||
item_state = "sol_uniform"
|
||||
contained_sprite = 1
|
||||
contained_sprite = TRUE
|
||||
armor = list(
|
||||
melee = ARMOR_MELEE_SMALL,
|
||||
bullet = ARMOR_BALLISTIC_MINOR,
|
||||
laser = ARMOR_LASER_MINOR
|
||||
)
|
||||
|
||||
/obj/item/clothing/under/rank/fatigues/marine //regular sol navy marine fatigues
|
||||
/obj/item/clothing/under/rank/sol/marine //regular sol navy marine fatigues
|
||||
name = "sol marine fatigues"
|
||||
desc = "A military uniform issued to Sol Alliance marines, to be used while in the field."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "marine_fatigue"
|
||||
item_state = "marine_fatigue"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/service //navy personnel service unniform
|
||||
/obj/item/clothing/under/rank/sol/service //navy personnel service uniform
|
||||
name = "sol navy service uniform"
|
||||
desc = "A military service uniform issued to Sol Alliance naval personnel, to be worn in environments where a utility uniform is unfitting."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whiteservice"
|
||||
item_state = "whiteservice"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/service/marine //sol marine service unniform
|
||||
/obj/item/clothing/under/rank/sol/service/marine //sol marine service uniform
|
||||
name = "sol marine service uniform"
|
||||
desc = "A military service uniform issued to Sol Alliance marines, to be worn in environments where a utility uniform is unfitting."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "tanutility"
|
||||
item_state = "tanutility"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress //navy personnel dress unniform
|
||||
/obj/item/clothing/under/rank/sol/dress //navy personnel dress uniform
|
||||
name = "sol navy dress uniform"
|
||||
desc = "A fancy military dress uniform issued to Sol Alliance naval personnel, to be worn in environments where a service uniform isn't formal enough."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "sailor"
|
||||
item_state = "sailor"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/marine //sol marine dress unniform
|
||||
/obj/item/clothing/under/rank/sol/dress/marine //sol marine dress uniform
|
||||
name = "sol marine dress uniform"
|
||||
desc = "A fancy military dress uniform issued to Sol Alliance marines, to be worn in environments where a service uniform isn't formal enough."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "mahreendress"
|
||||
item_state = "mahreendress"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/subofficer //sol marine officer dress unniform
|
||||
/obj/item/clothing/under/rank/sol/dress/subofficer //sol marine officer dress uniform
|
||||
name = "sol navy junior officer uniform"
|
||||
desc = "A fancy military uniform issued to lower ranking Sol Alliance navy officers. An officer in this uniform would be an Ensign, Sub-Lieutenant, or Lieutenant."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "subdress"
|
||||
item_state = "subdress"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/officer //sol marine officer dress unniform
|
||||
/obj/item/clothing/under/rank/sol/dress/officer //sol marine officer dress uniform
|
||||
name = "sol navy senior officer uniform"
|
||||
desc = "A fancy military uniform issued to high ranking Sol Alliance navy officers. An officer in this uniform would be a Lieutenant Commander, Commander, or Captain."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "dress"
|
||||
item_state = "dress"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/admiral //admiral uniform
|
||||
/obj/item/clothing/under/rank/sol/dress/admiral //admiral uniform
|
||||
name = "sol navy admiral uniform"
|
||||
desc = "A fancy military uniform issued to a higher member of the Sol Alliance navy. An officer in this uniform would be some form of Admiral."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "admiral_uniform"
|
||||
item_state = "admiral_uniform"
|
||||
contained_sprite = 1
|
||||
|
||||
@@ -285,7 +285,7 @@
|
||||
|
||||
/datum/outfit/admin/pod/fsf
|
||||
name = "RescuePod - FSF Crewman"
|
||||
uniform = /obj/item/clothing/under/rank/fatigues/
|
||||
uniform = /obj/item/clothing/under/rank/sol/
|
||||
shoes = /obj/item/clothing/shoes/jackboots
|
||||
belt = /obj/item/storage/belt/military
|
||||
back = /obj/item/storage/backpack/satchel_norm
|
||||
@@ -305,7 +305,7 @@
|
||||
)
|
||||
|
||||
backpack_contents = list(
|
||||
/obj/item/clothing/head/navy = 1
|
||||
/obj/item/clothing/head/sol = 1
|
||||
)
|
||||
|
||||
/datum/outfit/admin/pod/fsf/get_id_assignment()
|
||||
|
||||
@@ -530,9 +530,9 @@ var/list/worths = list(
|
||||
/obj/item/clothing/head/bomb_hood = 200,
|
||||
/obj/item/clothing/head/radiation = 250,
|
||||
/obj/item/clothing/head/bio_hood = 100,
|
||||
/obj/item/clothing/head/navy = 250,
|
||||
/obj/item/clothing/head/dress/admiral = 1000,
|
||||
/obj/item/clothing/head/dress = 350,
|
||||
/obj/item/clothing/head/sol = 250,
|
||||
/obj/item/clothing/head/sol/dress/admiral = 1000,
|
||||
/obj/item/clothing/head/sol/dress = 350,
|
||||
/obj/item/clothing/head/helmet/space/void/merc = 2000,
|
||||
/obj/item/clothing/head/helmet/space/void/security = 2000,
|
||||
/obj/item/clothing/head/helmet/space/void/captain = 3000,
|
||||
@@ -563,10 +563,10 @@ var/list/worths = list(
|
||||
/obj/item/clothing/under/rank/chief_medical_officer = 65,
|
||||
/obj/item/clothing/under/rank/warden = 5,
|
||||
/obj/item/clothing/under/rank/centcom = 200,
|
||||
/obj/item/clothing/under/rank/fatigues = 250,
|
||||
/obj/item/clothing/under/rank/service = 350,
|
||||
/obj/item/clothing/under/rank/dress/admiral = 1000,
|
||||
/obj/item/clothing/under/rank/dress = 450,
|
||||
/obj/item/clothing/under/rank/sol = 250,
|
||||
/obj/item/clothing/under/rank/sol/service = 350,
|
||||
/obj/item/clothing/under/rank/sol/dress/admiral = 1000,
|
||||
/obj/item/clothing/under/rank/sol/dress = 450,
|
||||
/obj/item/clothing/under/rank/centcom_commander = 300,
|
||||
/obj/item/clothing/under/syndicate/tacticool = 60,
|
||||
/obj/item/clothing/under/syndicate = 150,
|
||||
|
||||
Reference in New Issue
Block a user