mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-28 23:58:31 +01:00
Repathed ponchos to accessory/storage.
This commit is contained in:
MistakeNot4892
@@ -60,7 +60,7 @@ var/global/datum/antagonist/raider/raiders
|
||||
/obj/item/clothing/suit/storage/toggle/hoodie,
|
||||
/obj/item/clothing/suit/storage/toggle/hoodie/black,
|
||||
/obj/item/clothing/suit/unathi/mantle,
|
||||
/obj/item/clothing/accessory/poncho,
|
||||
/obj/item/clothing/accessory/storage/poncho,
|
||||
)
|
||||
|
||||
var/list/raider_guns = list(
|
||||
|
||||
@@ -185,32 +185,32 @@
|
||||
/datum/gear/suit/poncho
|
||||
display_name = "poncho selection"
|
||||
description = "A selection of ponchos in basic and departmental colours."
|
||||
path = /obj/item/clothing/accessory/poncho
|
||||
path = /obj/item/clothing/accessory/storage/poncho
|
||||
|
||||
/datum/gear/suit/poncho/New()
|
||||
..()
|
||||
var/list/ponchos = list()
|
||||
for(var/poncho_style in (typesof(/obj/item/clothing/accessory/poncho) - typesof(/obj/item/clothing/accessory/poncho/roles/cloak)))
|
||||
var/obj/item/clothing/accessory/poncho/poncho = poncho_style
|
||||
for(var/poncho_style in (typesof(/obj/item/clothing/accessory/storage/poncho) - typesof(/obj/item/clothing/accessory/storage/poncho/roles/cloak)))
|
||||
var/obj/item/clothing/accessory/storage/poncho/poncho = poncho_style
|
||||
ponchos[initial(poncho.name)] = poncho
|
||||
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos))
|
||||
|
||||
/datum/gear/suit/cloak_department
|
||||
display_name = "cloak, departmental selection"
|
||||
description = "A selection of cloaks in departmental colours."
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
|
||||
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/cargo
|
||||
|
||||
/datum/gear/suit/cloak_department/New()
|
||||
..()
|
||||
var/list/cloaks = list()
|
||||
for(var/cloak_style in (typesof(/obj/item/clothing/accessory/poncho/roles/cloak)))
|
||||
var/obj/item/clothing/accessory/poncho/roles/cloak/cloak = cloak_style
|
||||
for(var/cloak_style in (typesof(/obj/item/clothing/accessory/storage/poncho/roles/cloak)))
|
||||
var/obj/item/clothing/accessory/storage/poncho/roles/cloak/cloak = cloak_style
|
||||
cloaks[initial(cloak.name)] = cloak
|
||||
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
|
||||
|
||||
/datum/gear/suit/cloak_custom //A colorable cloak
|
||||
display_name = "cloak (colorable)"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/custom
|
||||
path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/custom
|
||||
|
||||
/datum/gear/suit/cloak_custom/New()
|
||||
..()
|
||||
|
||||
@@ -43,14 +43,13 @@
|
||||
/*
|
||||
* Poncho
|
||||
*/
|
||||
/obj/item/clothing/accessory/poncho
|
||||
/obj/item/clothing/accessory/storage/poncho
|
||||
name = "poncho"
|
||||
desc = "A simple, comfortable poncho."
|
||||
icon_state = "classicponcho"
|
||||
item_state = "classicponcho"
|
||||
icon_override = 'icons/mob/ties.dmi'
|
||||
var/icon_override_state /// Change this for mid-round and paintkit.
|
||||
var/fire_resist = T0C+100
|
||||
slots = 2
|
||||
allowed = list(/obj/item/tank/emergency/oxygen)
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
slot_flags = SLOT_OCLOTHING | SLOT_TIE
|
||||
@@ -61,8 +60,10 @@
|
||||
sprite_sheets = list(
|
||||
SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi'
|
||||
)
|
||||
var/icon_override_state /// Change this for mid-round and paintkit.
|
||||
var/fire_resist = T0C+100
|
||||
|
||||
/obj/item/clothing/accessory/poncho/equipped() /// Sets override, allows for mid-round changes && custom items. If you improve this code, please update paintkit.dm to accept it.
|
||||
/obj/item/clothing/accessory/storage/poncho/equipped() /// Sets override, allows for mid-round changes && custom items. If you improve this code, please update paintkit.dm to accept it.
|
||||
..()
|
||||
var/mob/living/carbon/human/H = loc
|
||||
if(istype(H) && H.wear_suit == src)
|
||||
@@ -74,13 +75,13 @@
|
||||
icon_override = 'icons/mob/ties.dmi'
|
||||
H.update_inv_wear_suit()
|
||||
|
||||
/obj/item/clothing/accessory/poncho/dropped() // Reset override
|
||||
/obj/item/clothing/accessory/storage/poncho/dropped() // Reset override
|
||||
if(icon_override_state)
|
||||
icon_override = icon_override_state
|
||||
else
|
||||
icon_override = 'icons/mob/ties.dmi'
|
||||
|
||||
/obj/item/clothing/accessory/poncho/on_attached(obj/item/clothing/S, mob/user) /// Otherwise gives teshari normal icon.
|
||||
/obj/item/clothing/accessory/storage/poncho/on_attached(obj/item/clothing/S, mob/user) /// Otherwise gives teshari normal icon.
|
||||
. = ..()
|
||||
if(icon_override_state)
|
||||
icon_override = icon_override_state
|
||||
@@ -91,55 +92,55 @@
|
||||
else
|
||||
icon_override = 'icons/mob/ties.dmi'
|
||||
|
||||
/obj/item/clothing/accessory/poncho/green
|
||||
/obj/item/clothing/accessory/storage/poncho/green
|
||||
name = "green poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is green."
|
||||
icon_state = "greenponcho"
|
||||
item_state = "greenponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/red
|
||||
/obj/item/clothing/accessory/storage/poncho/red
|
||||
name = "red poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is red."
|
||||
icon_state = "redponcho"
|
||||
item_state = "redponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/purple
|
||||
/obj/item/clothing/accessory/storage/poncho/purple
|
||||
name = "purple poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is purple."
|
||||
icon_state = "purpleponcho"
|
||||
item_state = "purpleponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/blue
|
||||
/obj/item/clothing/accessory/storage/poncho/blue
|
||||
name = "blue poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is blue."
|
||||
icon_state = "blueponcho"
|
||||
item_state = "blueponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/security
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/security
|
||||
name = "security poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is black and red, standard NanoTrasen Security colors."
|
||||
icon_state = "secponcho"
|
||||
item_state = "secponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/medical
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/medical
|
||||
name = "medical poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is white with green and blue tint, standard Medical colors."
|
||||
icon_state = "medponcho"
|
||||
item_state = "medponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/engineering
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/engineering
|
||||
name = "engineering poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is yellow and orange, standard Engineering colors."
|
||||
icon_state = "engiponcho"
|
||||
item_state = "engiponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/science
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/science
|
||||
name = "science poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is white with purple trim, standard NanoTrasen Science colors."
|
||||
icon_state = "sciponcho"
|
||||
item_state = "sciponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cargo
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cargo
|
||||
name = "cargo poncho"
|
||||
desc = "A simple, comfortable cloak without sleeves. This one is tan and grey, the colors of Cargo."
|
||||
icon_state = "cargoponcho"
|
||||
@@ -148,105 +149,105 @@
|
||||
/*
|
||||
* Cloak
|
||||
*/
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak
|
||||
name = "quartermaster's cloak"
|
||||
desc = "An elaborate brown and gold cloak."
|
||||
icon_state = "qmcloak"
|
||||
item_state = "qmcloak"
|
||||
body_parts_covered = null
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/ce
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/ce
|
||||
name = "chief engineer's cloak"
|
||||
desc = "An elaborate cloak worn by the chief engineer."
|
||||
icon_state = "cecloak"
|
||||
item_state = "cecloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/cmo
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/cmo
|
||||
name = "chief medical officer's cloak"
|
||||
desc = "An elaborate cloak meant to be worn by the chief medical officer."
|
||||
icon_state = "cmocloak"
|
||||
item_state = "cmocloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/hop
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/hop
|
||||
name = "head of personnel's cloak"
|
||||
desc = "An elaborate cloak meant to be worn by the head of personnel."
|
||||
icon_state = "hopcloak"
|
||||
item_state = "hopcloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/rd
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/rd
|
||||
name = "research director's cloak"
|
||||
desc = "An elaborate cloak meant to be worn by the research director."
|
||||
icon_state = "rdcloak"
|
||||
item_state = "rdcloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/qm
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/qm
|
||||
name = "quartermaster's cloak"
|
||||
desc = "An elaborate cloak meant to be worn by the quartermaster."
|
||||
icon_state = "qmcloak"
|
||||
item_state = "qmcloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/hos
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/hos
|
||||
name = "head of security's cloak"
|
||||
desc = "An elaborate cloak meant to be worn by the head of security."
|
||||
icon_state = "hoscloak"
|
||||
item_state = "hoscloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/captain
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/captain
|
||||
name = "site manager's cloak"
|
||||
desc = "An elaborate cloak meant to be worn by the site manager."
|
||||
icon_state = "capcloak"
|
||||
item_state = "capcloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/cargo
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/cargo
|
||||
name = "brown cloak"
|
||||
desc = "A simple brown and black cloak."
|
||||
icon_state = "cargocloak"
|
||||
item_state = "cargocloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/mining
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/mining
|
||||
name = "trimmed purple cloak"
|
||||
desc = "A trimmed purple and brown cloak."
|
||||
icon_state = "miningcloak"
|
||||
item_state = "miningcloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/security
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/security
|
||||
name = "red cloak"
|
||||
desc = "A simple red and black cloak."
|
||||
icon_state = "seccloak"
|
||||
item_state = "seccloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/service
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/service
|
||||
name = "green cloak"
|
||||
desc = "A simple green and blue cloak."
|
||||
icon_state = "servicecloak"
|
||||
item_state = "servicecloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/engineer
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/engineer
|
||||
name = "gold cloak"
|
||||
desc = "A simple gold and brown cloak."
|
||||
icon_state = "engicloak"
|
||||
item_state = "engicloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/atmos
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/atmos
|
||||
name = "yellow cloak"
|
||||
desc = "A trimmed yellow and blue cloak."
|
||||
icon_state = "atmoscloak"
|
||||
item_state = "atmoscloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/research
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/research
|
||||
name = "purple cloak"
|
||||
desc = "A simple purple and white cloak."
|
||||
icon_state = "scicloak"
|
||||
item_state = "scicloak"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/medical
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/medical
|
||||
name = "blue cloak"
|
||||
desc = "A simple blue and white cloak."
|
||||
icon_state = "medcloak"
|
||||
item_state = "medcloak"
|
||||
|
||||
|
||||
/obj/item/clothing/accessory/poncho/roles/cloak/custom //A colorable cloak
|
||||
/obj/item/clothing/accessory/storage/poncho/roles/cloak/custom //A colorable cloak
|
||||
name = "cloak"
|
||||
desc = "A simple, bland cloak."
|
||||
icon_state = "colorcloak"
|
||||
@@ -428,4 +429,4 @@
|
||||
/obj/item/clothing/accessory/asymovercoat
|
||||
name = "orange asymmetrical overcoat"
|
||||
desc = "An asymmetrical orange overcoat in a 2560's fashion."
|
||||
icon_state = "asymovercoat"
|
||||
icon_state = "asymovercoat"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal
|
||||
name = "thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer."
|
||||
slot_flags = SLOT_OCLOTHING | SLOT_TIE
|
||||
@@ -11,55 +11,55 @@
|
||||
min_cold_protection_temperature = T0C - 40
|
||||
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/green
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/green
|
||||
name = "green thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is green."
|
||||
icon_state = "greenponcho"
|
||||
item_state = "greenponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/red
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/red
|
||||
name = "red thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is red."
|
||||
icon_state = "redponcho"
|
||||
item_state = "redponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/purple
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/purple
|
||||
name = "purple thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is purple."
|
||||
icon_state = "purpleponcho"
|
||||
item_state = "purpleponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/blue
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/blue
|
||||
name = "blue thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is blue."
|
||||
icon_state = "blueponcho"
|
||||
item_state = "blueponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/security
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/security
|
||||
name = "security thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is black and red, standard NanoTrasen Security colors."
|
||||
icon_state = "secponcho"
|
||||
item_state = "secponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/medical
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/medical
|
||||
name = "medical thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is white with green and blue tint, standard Medical colors."
|
||||
icon_state = "medponcho"
|
||||
item_state = "medponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/engineering
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/engineering
|
||||
name = "engineering thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is yellow and orange, standard Engineering colors."
|
||||
icon_state = "engiponcho"
|
||||
item_state = "engiponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/science
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/science
|
||||
name = "science thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is white with purple trim, standard NanoTrasen Science colors."
|
||||
icon_state = "sciponcho"
|
||||
item_state = "sciponcho"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/thermal/cargo
|
||||
/obj/item/clothing/accessory/storage/poncho/thermal/cargo
|
||||
name = "cargo thermal poncho"
|
||||
desc = "A simple, comfortable poncho with a thermal foil layer. This one is tan and grey, the colors of Cargo."
|
||||
icon_state = "cargoponcho"
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
|
||||
/datum/material/cloth/generate_recipes()
|
||||
recipes = list(
|
||||
new /datum/stack_recipe("poncho", /obj/item/clothing/accessory/storage/poncho/crafted, 8, time = 5 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"),
|
||||
new /datum/stack_recipe("woven net", /obj/item/material/fishing_net, 10, time = 30 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"),
|
||||
new /datum/stack_recipe("bedsheet", /obj/item/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("uniform", /obj/item/clothing/under/color/white, 8, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
/datum/material/leather/generate_recipes()
|
||||
recipes = list(
|
||||
new /datum/stack_recipe("poncho", /obj/item/clothing/accessory/storage/poncho/crafted, 8, time = 5 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"),
|
||||
new /datum/stack_recipe("bedsheet", /obj/item/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("uniform", /obj/item/clothing/under/color/white, 8, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
|
||||
new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
|
||||
|
||||
Reference in New Issue
Block a user