diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index b420b3d59e..8ce55ca8e4 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -60,7 +60,7 @@ var/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/suit/poncho, + /obj/item/clothing/accessory/poncho, ) var/list/raider_guns = list( diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 5bfd1293e9..f3f97a4c5d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -118,40 +118,40 @@ /datum/gear/suit/poncho display_name = "poncho selection" - path = /obj/item/clothing/suit/poncho + path = /obj/item/clothing/accessory/poncho cost = 1 /datum/gear/suit/poncho/New() ..() var/list/ponchos = list() - for(var/poncho_style in (typesof(/obj/item/clothing/suit/poncho) - typesof(/obj/item/clothing/suit/poncho/roles))) - var/obj/item/clothing/suit/storage/toggle/hoodie/poncho = poncho_style + for(var/poncho_style in (typesof(/obj/item/clothing/accessory/poncho) - typesof(/obj/item/clothing/accessory/poncho/roles))) + var/obj/item/clothing/accessory/poncho/poncho = poncho_style ponchos[initial(poncho.name)] = poncho gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos)) /datum/gear/suit/roles/poncho/security display_name = "poncho, security" - path = /obj/item/clothing/suit/poncho/roles/security + path = /obj/item/clothing/accessory/poncho/roles/security allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") /datum/gear/suit/roles/poncho/medical display_name = "poncho, medical" - path = /obj/item/clothing/suit/poncho/roles/medical + path = /obj/item/clothing/accessory/poncho/roles/medical allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist") /datum/gear/suit/roles/poncho/engineering display_name = "poncho, engineering" - path = /obj/item/clothing/suit/poncho/roles/engineering + path = /obj/item/clothing/accessory/poncho/roles/engineering allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") /datum/gear/suit/roles/poncho/science display_name = "poncho, science" - path = /obj/item/clothing/suit/poncho/roles/science + path = /obj/item/clothing/accessory/poncho/roles/science allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/suit/roles/poncho/cargo display_name = "poncho, cargo" - path = /obj/item/clothing/suit/poncho/roles/cargo + path = /obj/item/clothing/accessory/poncho/roles/cargo allowed_roles = list("Quartermaster","Cargo Technician") /datum/gear/suit/unathi_robe diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b78d78f3ff..ec3a210e4e 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -467,6 +467,8 @@ "Teshari" = 'icons/mob/species/seromi/suit.dmi' ) + valid_accessory_slots = list("over") + /obj/item/clothing/suit/update_clothing_icon() if (ismob(src.loc)) var/mob/M = src.loc @@ -505,7 +507,7 @@ //convenience var for defining the icon state for the overlay used when the clothing is worn. //Also used by rolling/unrolling. var/worn_state = null - valid_accessory_slots = list("utility","armband","decor") + valid_accessory_slots = list("utility","armband","decor","over") restricted_accessory_slots = list("utility", "armband") diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index b42b7e8735..fecc19b5a2 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -255,59 +255,6 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 2.0 -/* - * Poncho - */ -/obj/item/clothing/suit/poncho - name = "poncho" - desc = "A simple, comfortable poncho." - icon_state = "classicponcho" - -/obj/item/clothing/suit/poncho/green - name = "green poncho" - desc = "A simple, comfortable cloak without sleeves. This one is green." - icon_state = "greenponcho" - -/obj/item/clothing/suit/poncho/red - name = "red poncho" - desc = "A simple, comfortable cloak without sleeves. This one is red." - icon_state = "redponcho" - -/obj/item/clothing/suit/poncho/purple - name = "purple poncho" - desc = "A simple, comfortable cloak without sleeves. This one is purple." - icon_state = "purpleponcho" - -/obj/item/clothing/suit/poncho/blue - name = "blue poncho" - desc = "A simple, comfortable cloak without sleeves. This one is blue." - icon_state = "blueponcho" - -/obj/item/clothing/suit/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" - -/obj/item/clothing/suit/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" - -/obj/item/clothing/suit/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" - -/obj/item/clothing/suit/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" - -/obj/item/clothing/suit/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" - /obj/item/clothing/suit/jacket/puffer name = "puffer jacket" desc = "A thick jacket with a rubbery, water-resistant shell." diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 3ba56bdd6b..9878420d7c 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -36,4 +36,80 @@ /obj/item/clothing/accessory/chaps/black name = "black chaps" desc = "A pair of loose, black leather chaps." - icon_state = "chaps_black" \ No newline at end of file + icon_state = "chaps_black" + +/* + * Poncho + */ +/obj/item/clothing/accessory/poncho + name = "poncho" + desc = "A simple, comfortable poncho." + icon_state = "classicponcho" + item_state = "classicponcho" + icon_override = 'icons/mob/ties.dmi' + var/fire_resist = T0C+100 + allowed = list(/obj/item/weapon/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 + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + siemens_coefficient = 0.9 + w_class = 3 + slot = "over" + + sprite_sheets = list( + "Teshari" = 'icons/mob/species/seromi/suit.dmi' + ) + +/obj/item/clothing/accessory/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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + name = "cargo poncho" + desc = "A simple, comfortable cloak without sleeves. This one is tan and grey, the colors of Cargo." + icon_state = "cargoponcho" + item_state = "cargoponcho" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 89db40f75d..7d9712277c 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -124,10 +124,16 @@ //suit/armour if(wear_suit) + var/tie_msg + if(istype(wear_suit,/obj/item/clothing/suit)) + var/obj/item/clothing/suit/U = wear_suit + if(U.accessories.len) + tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]" + if(wear_suit.blood_DNA) msg += "[T.He] [T.is] wearing \icon[wear_suit] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [wear_suit.name]!\n" else - msg += "[T.He] [T.is] wearing \icon[wear_suit] \a [wear_suit].\n" + msg += "[T.He] [T.is] wearing \icon[wear_suit] \a [wear_suit][tie_msg].\n" //suit/armour storage if(s_store && !skipsuitstorage) diff --git a/html/changelogs/Yoshax - Ponchos.yml b/html/changelogs/Yoshax - Ponchos.yml new file mode 100644 index 0000000000..1625b5a53c --- /dev/null +++ b/html/changelogs/Yoshax - Ponchos.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Yosh + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Ponchos can now be attached to your uniform as an accessory. In addition they can also be attached to suits!" \ No newline at end of file diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index fff04a0c60..3de07fbad5 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 0fed686ea1..6343aa53cc 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e11c97c709..b64cb6027c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index e614e47e49..389d3c31ce 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ