From 6025f402ce768edd708268fff3bf855a62b05e26 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 26 Mar 2019 20:37:20 +0100 Subject: [PATCH 1/6] refactored hoodies to work without antidrop --- code/datums/outfits/outfit_admin.dm | 2 +- code/game/gamemodes/cult/cult_items.dm | 17 +++-- code/modules/clothing/head/jobs.dm | 6 +- code/modules/clothing/suits/hood.dm | 52 ++++++++------- code/modules/clothing/suits/jobs.dm | 6 +- code/modules/clothing/suits/miscellaneous.dm | 66 ++++++++++---------- code/modules/customitems/item_defines.dm | 30 ++++----- 7 files changed, 91 insertions(+), 88 deletions(-) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 3ac473edfeb..867ef7cac4d 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -1138,7 +1138,7 @@ uniform = /obj/item/clothing/under/color/black suit = /obj/item/clothing/suit/hooded/chaplain_hoodie back = /obj/item/storage/backpack - head = /obj/item/clothing/head/chaplain_hood + head = /obj/item/clothing/head/hooded/chaplain_hood gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/black l_ear = /obj/item/radio/headset/syndicate diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 45f2f2853bc..8b09d4d1577 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -61,7 +61,7 @@ breakouttime = 45 weaken = 1 -/obj/item/clothing/head/culthood +/obj/item/clothing/head/hooded/culthood name = "cult hood" icon_state = "culthood" desc = "A hood worn by the followers of a cult." @@ -72,7 +72,7 @@ min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT -/obj/item/clothing/head/culthood/alt +/obj/item/clothing/head/hooded/culthood/alt icon_state = "cult_hoodalt" item_state = "cult_hoodalt" @@ -83,7 +83,7 @@ icon_state = "cultrobes" item_state = "cultrobes" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - hoodtype = /obj/item/clothing/head/culthood + hoodtype = /obj/item/clothing/head/hooded/culthood allowed = list(/obj/item/tome,/obj/item/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50, energy = 20, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEJUMPSUIT @@ -91,7 +91,7 @@ /obj/item/clothing/suit/hooded/cultrobes/alt icon_state = "cultrobesalt" item_state = "cultrobesalt" - hoodtype = /obj/item/clothing/head/culthood/alt + hoodtype = /obj/item/clothing/head/hooded/culthood/alt /obj/item/clothing/head/magus name = "magus helm" @@ -140,15 +140,14 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/tome,/obj/item/melee/cultblade) var/current_charges = 3 - hoodtype = /obj/item/clothing/head/cult_hoodie + hoodtype = /obj/item/clothing/head/hooded/cult_hoodie -/obj/item/clothing/head/cult_hoodie +/obj/item/clothing/head/hooded/cult_hoodie name = "empowered cultist robe" desc = "Empowered garb which creates a powerful shield around the user." icon_state = "cult_hoodalt" armor = list(melee = 50, bullet = 40, laser = 50, energy = 30, bomb = 50, bio = 30, rad = 30) body_parts_covered = HEAD - flags = NODROP flags_inv = HIDEFACE flags_cover = HEADCOVERSEYES @@ -182,10 +181,10 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS armor = list(melee = -50, bullet = -50, laser = -100, energy = -50, bomb = -50, bio = -50, rad = -50) slowdown = -1 - hoodtype = /obj/item/clothing/head/berserkerhood + hoodtype = /obj/item/clothing/head/hooded/berserkerhood -/obj/item/clothing/head/berserkerhood +/obj/item/clothing/head/hooded/berserkerhood name = "flagellant's robes" desc = "Blood-soaked garb infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage." icon_state = "culthood" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index adcc828d8d5..c31ab1ad2e4 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -39,7 +39,7 @@ //Chaplain -/obj/item/clothing/head/chaplain_hood +/obj/item/clothing/head/hooded/chaplain_hood name = "chaplain's hood" desc = "It's hood that covers the head. It keeps you warm during the space winters." icon_state = "chaplain_hood" @@ -47,7 +47,7 @@ flags_cover = HEADCOVERSEYES //Chaplain -/obj/item/clothing/head/nun_hood +/obj/item/clothing/head/hooded/nun_hood name = "nun hood" desc = "Maximum piety in this star system." icon_state = "nun_hood" @@ -55,7 +55,7 @@ flags_cover = HEADCOVERSEYES //Chaplain -/obj/item/clothing/head/monk_hood +/obj/item/clothing/head/hooded/monk_hood name = "monk hood" desc = "Wooden board not included." icon_state = "monk_hood" diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm index 3718a16602c..829d1f68092 100644 --- a/code/modules/clothing/suits/hood.dm +++ b/code/modules/clothing/suits/hood.dm @@ -2,38 +2,21 @@ /obj/item/clothing/suit/hooded actions_types = list(/datum/action/item_action/toggle) - var/obj/item/clothing/head/hood - var/hoodtype = /obj/item/clothing/head/winterhood //so the chaplain hoodie or other hoodies can override this - -/obj/item/clothing/head/chaplain_hood - flags = NODROP - -/obj/item/clothing/head/nun_hood - flags = NODROP - -/obj/item/clothing/head/monk_hood - flags = NODROP - -/obj/item/clothing/head/culthood - flags = NODROP - -/obj/item/clothing/head/culthood/alt - flags = NODROP - -/obj/item/clothing/head/berserkerhood - flags = NODROP + var/obj/item/clothing/head/hooded/hood + var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this /obj/item/clothing/suit/hooded/New() + . = ..() MakeHood() - ..() /obj/item/clothing/suit/hooded/Destroy() + . = ..() QDEL_NULL(hood) - return ..() /obj/item/clothing/suit/hooded/proc/MakeHood() if(!hood) - var/obj/item/clothing/head/W = new hoodtype(src) + var/obj/item/clothing/head/hooded/W = new hoodtype(src) + W.suit = src hood = W /obj/item/clothing/suit/hooded/ui_action_click() @@ -57,7 +40,7 @@ var/mob/living/carbon/H = hood.loc H.unEquip(hood, 1) H.update_inv_wear_suit() - hood.loc = src + hood.forceMove(src) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() @@ -77,6 +60,7 @@ to_chat(H,"You're already wearing something on your head!") return else if(H.equip_to_slot_if_possible(hood,slot_head,0,0,1)) + hood.forceMove(H) suit_adjusted = 1 icon_state = "[initial(icon_state)]_hood" H.update_inv_wear_suit() @@ -85,3 +69,23 @@ A.UpdateButtonIcon() else RemoveHood() + +/obj/item/clothing/head/hooded + var/obj/item/clothing/suit/hooded/suit + +/obj/item/clothing/head/hooded/Destroy() + suit = null + return ..() + +/obj/item/clothing/head/hooded/dropped() + ..() + if(suit) + suit.RemoveHood() + +/obj/item/clothing/head/hooded/equipped(mob/user, slot) + ..() + if(slot != SLOT_HEAD) + if(suit) + suit.RemoveHood() + else + qdel(src) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 3b59e5e2d16..59e5ce301d0 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -79,7 +79,7 @@ icon_state = "chaplain_hoodie" item_state = "chaplain_hoodie" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - hoodtype = /obj/item/clothing/head/chaplain_hood + hoodtype = /obj/item/clothing/head/hooded/chaplain_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen) species_fit = list("Vox") sprite_sheets = list( @@ -94,7 +94,7 @@ item_state = "nun" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS flags_inv = HIDESHOES|HIDEJUMPSUIT - hoodtype = /obj/item/clothing/head/nun_hood + hoodtype = /obj/item/clothing/head/hooded/nun_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen) species_fit = list("Vox") sprite_sheets = list( @@ -109,7 +109,7 @@ item_state = "monkrobe" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS flags_inv = HIDESHOES|HIDEJUMPSUIT - hoodtype = /obj/item/clothing/head/monk_hood + hoodtype = /obj/item/clothing/head/hooded/monk_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen) /obj/item/clothing/suit/witchhunter diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 9ce1953379b..70c9fd31632 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -304,7 +304,7 @@ body_parts_covered = HEAD cold_protection = HEAD min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT - flags = NODROP|BLOCKHAIR + flags = BLOCKHAIR flags_inv = HIDEEARS /obj/item/clothing/suit/hooded/bee_costume // It's Hip! @@ -321,7 +321,7 @@ desc = "A hood attached to a bee costume." icon_state = "bee" body_parts_covered = HEAD - flags = THICKMATERIAL|NODROP|BLOCKHAIR + flags = THICKMATERIAL|BLOCKHAIR flags_inv = HIDEEARS /obj/item/clothing/suit/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!? @@ -354,14 +354,14 @@ species_fit = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') -/obj/item/clothing/head/winterhood +/obj/item/clothing/head/hooded/winterhood name = "winter hood" desc = "A hood attached to a heavy winter jacket." icon_state = "winterhood" body_parts_covered = HEAD cold_protection = HEAD min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT - flags = NODROP|BLOCKHAIR + flags = BLOCKHAIR flags_inv = HIDEEARS species_fit = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') @@ -371,9 +371,9 @@ icon_state = "wintercoat_captain" armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0) allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) - hoodtype = /obj/item/clothing/head/winterhood/captain + hoodtype = /obj/item/clothing/head/hooded/winterhood/captain -/obj/item/clothing/head/winterhood/captain +/obj/item/clothing/head/hooded/winterhood/captain icon_state = "winterhood_captain" /obj/item/clothing/suit/hooded/wintercoat/security @@ -381,9 +381,9 @@ icon_state = "wintercoat_sec" armor = list(melee = 10, bullet = 10, laser = 10, energy = 5, bomb = 15, bio = 0, rad = 0) allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) - hoodtype = /obj/item/clothing/head/winterhood/security + hoodtype = /obj/item/clothing/head/hooded/winterhood/security -/obj/item/clothing/head/winterhood/security +/obj/item/clothing/head/hooded/winterhood/security icon_state = "winterhood_sec" /obj/item/clothing/suit/hooded/wintercoat/medical @@ -391,9 +391,9 @@ icon_state = "wintercoat_med" allowed = list(/obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0) - hoodtype = /obj/item/clothing/head/winterhood/medical + hoodtype = /obj/item/clothing/head/hooded/winterhood/medical -/obj/item/clothing/head/winterhood/medical +/obj/item/clothing/head/hooded/winterhood/medical icon_state = "winterhood_med" /obj/item/clothing/suit/hooded/wintercoat/science @@ -401,9 +401,9 @@ icon_state = "wintercoat_sci" allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0) - hoodtype = /obj/item/clothing/head/winterhood/science + hoodtype = /obj/item/clothing/head/hooded/winterhood/science -/obj/item/clothing/head/winterhood/science +/obj/item/clothing/head/hooded/winterhood/science icon_state = "winterhood_sci" /obj/item/clothing/suit/hooded/wintercoat/engineering @@ -411,34 +411,34 @@ icon_state = "wintercoat_engi" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20) allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd) - hoodtype = /obj/item/clothing/head/winterhood/engineering + hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering -/obj/item/clothing/head/winterhood/engineering +/obj/item/clothing/head/hooded/winterhood/engineering icon_state = "winterhood_engi" /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos name = "atmospherics winter coat" icon_state = "wintercoat_atmos" - hoodtype = /obj/item/clothing/head/winterhood/engineering/atmos + hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/atmos -/obj/item/clothing/head/winterhood/engineering/atmos +/obj/item/clothing/head/hooded/winterhood/engineering/atmos icon_state = "winterhood_atmos" /obj/item/clothing/suit/hooded/wintercoat/hydro name = "hydroponics winter coat" icon_state = "wintercoat_hydro" allowed = list(/obj/item/reagent_containers/spray, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/hatchet, /obj/item/storage/bag/plants) - hoodtype = /obj/item/clothing/head/winterhood/hydro + hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro -/obj/item/clothing/head/winterhood/hydro +/obj/item/clothing/head/hooded/winterhood/hydro icon_state = "winterhood_hydro" /obj/item/clothing/suit/hooded/wintercoat/cargo name = "cargo winter coat" icon_state = "wintercoat_cargo" - hoodtype = /obj/item/clothing/head/winterhood/cargo + hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo -/obj/item/clothing/head/winterhood/cargo +/obj/item/clothing/head/hooded/winterhood/cargo icon_state = "winterhood_cargo" /obj/item/clothing/suit/hooded/wintercoat/miner @@ -446,9 +446,9 @@ icon_state = "wintercoat_miner" allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - hoodtype = /obj/item/clothing/head/winterhood/miner + hoodtype = /obj/item/clothing/head/hooded/winterhood/miner -/obj/item/clothing/head/winterhood/miner +/obj/item/clothing/head/hooded/winterhood/miner icon_state = "winterhood_miner" @@ -464,65 +464,65 @@ item_state = "blueshieldcoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen) - hoodtype = /obj/item/clothing/head/hood + hoodtype = /obj/item/clothing/head/hooded/hood species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) -/obj/item/clothing/head/hood +/obj/item/clothing/head/hooded/hood name = "black hood" desc = "A hood attached to a hoodie." icon_state = "blackhood" body_parts_covered = HEAD cold_protection = HEAD - flags = NODROP|BLOCKHAIR + flags = BLOCKHAIR flags_inv = HIDEEARS species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) -/obj/item/clothing/head/hood/blue +/obj/item/clothing/head/hooded/hood/blue icon_state = "bluehood" -/obj/item/clothing/head/hood/white +/obj/item/clothing/head/hooded/hood/white icon_state = "whitehood" /obj/item/clothing/suit/hooded/hoodie/blue name = "blue hoodie" icon_state = "blue_hoodie" - hoodtype = /obj/item/clothing/head/hood/blue + hoodtype = /obj/item/clothing/head/hooded/hood/blue /obj/item/clothing/suit/hooded/hoodie/mit name = "Martian Institute of Technology hoodie" desc = "A hoodie proudly worn by students and graduates alike, has the letters 'MIT' on the back." icon_state = "mit_hoodie" - hoodtype = /obj/item/clothing/head/hood + hoodtype = /obj/item/clothing/head/hooded/hood /obj/item/clothing/suit/hooded/hoodie/cut name = "Canaan University of Technology hoodie" desc = "A bright hoodie with the Canaan University of Technology logo on the front." icon_state = "cut_hoodie" - hoodtype = /obj/item/clothing/head/hood/white + hoodtype = /obj/item/clothing/head/hooded/hood/white /obj/item/clothing/suit/hooded/hoodie/lam name = "Lunar Academy of Medicine hoodie" desc = "A bright hoodie with the Lunar Academy of Medicine logo on the back." icon_state = "lam_hoodie" - hoodtype = /obj/item/clothing/head/hood/white + hoodtype = /obj/item/clothing/head/hooded/hood/white /obj/item/clothing/suit/hooded/hoodie/nt name = "Nanotrasen hoodie" desc = "A blue hoodie with the Nanotrasen logo on the back." icon_state = "nt_hoodie" - hoodtype = /obj/item/clothing/head/hood/blue + hoodtype = /obj/item/clothing/head/hooded/hood/blue /obj/item/clothing/suit/hooded/hoodie/tp name = "Tharsis Polytech hoodie" desc = "A dark hoodie with the Tharsis Polytech logo on the back." icon_state = "tp_hoodie" - hoodtype = /obj/item/clothing/head/hood + hoodtype = /obj/item/clothing/head/hooded/hood /obj/item/clothing/suit/straight_jacket name = "straight jacket" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 09ecdad8ed7..df20ebd06fa 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1020,9 +1020,9 @@ desc = "A green hoodie with the Nanotrasen logo on the back. It looks weathered." icon = 'icons/obj/custom_items.dmi' icon_state = "linda_hoodie" - hoodtype = /obj/item/clothing/head/hood/fluff/linda + hoodtype = /obj/item/clothing/head/hooded/hood/fluff/linda -/obj/item/clothing/head/hood/fluff/linda //Epic_Charger: Linda Clark +/obj/item/clothing/head/hooded/hood/fluff/linda //Epic_Charger: Linda Clark icon_state = "greenhood" /obj/item/clothing/suit/hooded/hoodie/hylo //Hylocereus: Sam Aria @@ -1030,9 +1030,9 @@ desc = "A soft, cozy longline hoodie. It looks old and worn, but well cared for. There's no label, but a series of dates and names is penned on a scrap of fabric sewn on the inside of the left side of the chest - 'Sam Aria' is scrawled atop them all, next to the words 'Please Remember'." icon = 'icons/obj/custom_items.dmi' icon_state = "sam_hoodie" - hoodtype = /obj/item/clothing/head/hood/hylo + hoodtype = /obj/item/clothing/head/hooded/hood/hylo -/obj/item/clothing/head/hood/hylo +/obj/item/clothing/head/hooded/hood/hylo icon = 'icons/obj/custom_items.dmi' icon_state = "sam_hood" @@ -1042,9 +1042,9 @@ body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS icon = 'icons/obj/custom_items.dmi' icon_state = "skeleton_suit" - hoodtype = /obj/item/clothing/head/hood/fluff/skeleton + hoodtype = /obj/item/clothing/head/hooded/hood/fluff/skeleton -/obj/item/clothing/head/hood/fluff/skeleton +/obj/item/clothing/head/hooded/hood/fluff/skeleton icon = 'icons/obj/custom_items.dmi' icon_state = "skeleton_hood" @@ -1090,18 +1090,18 @@ desc = "A velvety smooth black winter coat with white and red stripes on the side." icon = 'icons/obj/custom_items.dmi' icon_state = "xantholne_wintercoat" - hoodtype = /obj/item/clothing/head/hood/fluff/xantholne + hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xantholne body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) -/obj/item/clothing/head/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur +/obj/item/clothing/head/hooded/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur name = "black winter hood" desc = "A black hood attached to a stripped winter coat." icon = 'icons/obj/custom_items.dmi' icon_state = "xantholne_winterhood" body_parts_covered = HEAD - flags = NODROP|BLOCKHAIR + flags = BLOCKHAIR flags_inv = HIDEEARS /obj/item/clothing/suit/hooded/hoodie/fluff/xydonus //Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage) @@ -1110,18 +1110,18 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "xydonus_jacket" ignore_suitadjust = 0 - hoodtype = /obj/item/clothing/head/hood/fluff/xydonus + hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xydonus body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter) -/obj/item/clothing/head/hood/fluff/xydonus +/obj/item/clothing/head/hooded/hood/fluff/xydonus name = "custom fit hood" desc = "A hood with some horns glued to them, or something like that. Custom fit for a Unathi's head shape." icon = 'icons/obj/custom_items.dmi' icon_state = "xydonus_bomberhood" body_parts_covered = HEAD - flags = NODROP|BLOCKHAIR + flags = BLOCKHAIR flags_inv = HIDEEARS /obj/item/clothing/suit/fluff/pineapple //Pineapple Salad: Dan Jello @@ -1156,17 +1156,17 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "shesicoat" item_state = "shesicoat" - hoodtype = /obj/item/clothing/head/hood/fluff/shesi + hoodtype = /obj/item/clothing/head/hooded/hood/fluff/shesi body_parts_covered = UPPER_TORSO|LOWER_TORSO cold_protection = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/head/hood/fluff/shesi //MrSynnester : Shesi Skaklas +/obj/item/clothing/head/hooded/hood/fluff/shesi //MrSynnester : Shesi Skaklas name = "custom made winter hood" desc = "A custom made winter coat hood. Looks comfy." icon = 'icons/obj/custom_items.dmi' icon_state = "shesicoat_hood2" body_parts_covered = HEAD - flags = NODROP|BLOCKHAIR + flags = BLOCKHAIR flags_inv = HIDEEARS /obj/item/clothing/suit/jacket/dtx //AffectedArc07: DTX From bcde0acbaefc18c7f65b1bec146e4b400462e390 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 26 Mar 2019 21:04:04 +0100 Subject: [PATCH 2/6] map updates --- _maps/map_files/templates/spacehotel/s_01.dmm | 2 +- _maps/map_files/templates/spacehotel/s_02.dmm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/templates/spacehotel/s_01.dmm b/_maps/map_files/templates/spacehotel/s_01.dmm index f7c6ba629c6..89fe83c521f 100644 --- a/_maps/map_files/templates/spacehotel/s_01.dmm +++ b/_maps/map_files/templates/spacehotel/s_01.dmm @@ -38,7 +38,7 @@ "f" = ( /obj/structure/rack, /obj/item/clothing/head/collectable/police, -/obj/item/clothing/head/nun_hood, +/obj/item/clothing/head/hooded/nun_hood, /obj/item/clothing/head/mailman, /obj/item/clothing/head/nursehat, /obj/item/clothing/head/wizard/fake, diff --git a/_maps/map_files/templates/spacehotel/s_02.dmm b/_maps/map_files/templates/spacehotel/s_02.dmm index 5aa78f57470..09dee220922 100644 --- a/_maps/map_files/templates/spacehotel/s_02.dmm +++ b/_maps/map_files/templates/spacehotel/s_02.dmm @@ -38,7 +38,7 @@ "f" = ( /obj/structure/rack, /obj/item/clothing/head/collectable/police, -/obj/item/clothing/head/nun_hood, +/obj/item/clothing/head/hooded/nun_hood, /obj/item/clothing/head/mailman, /obj/item/clothing/head/nursehat, /obj/item/clothing/head/wizard/fake, From efea18c5be1d35720519113510e3b7efe10a7084 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 2 Apr 2019 18:13:38 +0200 Subject: [PATCH 3/6] fixes --- code/modules/clothing/suits/hood.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm index 829d1f68092..57959f00d90 100644 --- a/code/modules/clothing/suits/hood.dm +++ b/code/modules/clothing/suits/hood.dm @@ -5,13 +5,13 @@ var/obj/item/clothing/head/hooded/hood var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this -/obj/item/clothing/suit/hooded/New() +/obj/item/clothing/suit/hooded/Initialize(mapload) . = ..() MakeHood() /obj/item/clothing/suit/hooded/Destroy() - . = ..() QDEL_NULL(hood) + . = ..() /obj/item/clothing/suit/hooded/proc/MakeHood() if(!hood) @@ -59,7 +59,7 @@ if(H.head) to_chat(H,"You're already wearing something on your head!") return - else if(H.equip_to_slot_if_possible(hood,slot_head,0,0,1)) + else if(H.equip_to_slot_if_possible(hood, slot_head, 0, 0, 1)) hood.forceMove(H) suit_adjusted = 1 icon_state = "[initial(icon_state)]_hood" From 3d3ae1fdaea84dcc922e42442132aba9a489925d Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 2 Apr 2019 18:27:51 +0200 Subject: [PATCH 4/6] fucking caps version --- code/modules/clothing/suits/hood.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm index 57959f00d90..83f0fcfc211 100644 --- a/code/modules/clothing/suits/hood.dm +++ b/code/modules/clothing/suits/hood.dm @@ -60,7 +60,6 @@ to_chat(H,"You're already wearing something on your head!") return else if(H.equip_to_slot_if_possible(hood, slot_head, 0, 0, 1)) - hood.forceMove(H) suit_adjusted = 1 icon_state = "[initial(icon_state)]_hood" H.update_inv_wear_suit() @@ -84,7 +83,7 @@ /obj/item/clothing/head/hooded/equipped(mob/user, slot) ..() - if(slot != SLOT_HEAD) + if(slot != slot_head) if(suit) suit.RemoveHood() else From daa63bd313d6d15878ed2e79c406d3087da261a7 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Thu, 15 Aug 2019 18:27:34 +0200 Subject: [PATCH 5/6] merge de maste --- code/game/gamemodes/cult/cult_items.dm | 4 ++-- code/modules/clothing/suits/miscellaneous.dm | 1 - .../mob/living/simple_animal/hostile/mining/hivelord.dm | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 7e849b54bbe..db0145bb51b 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -363,7 +363,7 @@ force = 15 flags = NODROP | DROPDEL -/obj/item/clothing/head/culthood/alt/ghost +/obj/item/clothing/head/hooded/culthood/alt/ghost flags = NODROP | DROPDEL /obj/item/clothing/suit/cultrobesghost @@ -388,5 +388,5 @@ uniform = /obj/item/clothing/under/color/black suit = /obj/item/clothing/suit/cultrobesghost shoes = /obj/item/clothing/shoes/cult/ghost - head = /obj/item/clothing/head/culthood/alt/ghost + head = /obj/item/clothing/head/hooded/culthood/alt/ghost r_hand = /obj/item/melee/cultblade/ghost \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 084637e2943..7b04e03f34c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -474,7 +474,6 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen) hoodtype = /obj/item/clothing/head/hooded/hood - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm index 60c1f5e08e7..d6b5a4e7149 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm @@ -459,7 +459,7 @@ if("Cultist") uniform = /obj/item/clothing/under/roman suit = /obj/item/clothing/suit/hooded/cultrobes - head = /obj/item/clothing/head/culthood + head = /obj/item/clothing/head/hooded/culthood suit_store = /obj/item/tome r_pocket = /obj/item/restraints/legcuffs/bola/cult l_pocket = /obj/item/melee/cultblade/dagger From fb968787f824793e493a1af188078cd14d5bb051 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Fri, 30 Aug 2019 20:02:32 +0200 Subject: [PATCH 6/6] merge de maste --- code/modules/clothing/suits/miscellaneous.dm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 7b04e03f34c..56204c5d3c2 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -424,8 +424,8 @@ /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos name = "atmospherics winter coat" icon_state = "wintercoat_atmos" - hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/atmos item_state = "coatatmos" + hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/atmos /obj/item/clothing/head/hooded/winterhood/engineering/atmos icon_state = "winterhood_atmos" @@ -443,8 +443,8 @@ /obj/item/clothing/suit/hooded/wintercoat/cargo name = "cargo winter coat" icon_state = "wintercoat_cargo" - hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo item_state = "coatcargo" + hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo /obj/item/clothing/head/hooded/winterhood/cargo icon_state = "winterhood_cargo" @@ -757,6 +757,7 @@ allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter) body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT actions_types = list(/datum/action/item_action/zipper) adjust_flavour = "unzip" @@ -1003,3 +1004,14 @@ icon_state = "old_mantle" item_state = "old_mantle" +/obj/item/clothing/suit/ghost_sheet + name = "ghost sheet" + desc = "The hands float by themselves, so it's extra spooky." + icon_state = "ghost_sheet" + item_state = "ghost_sheet" + throwforce = 0 + throw_speed = 1 + throw_range = 2 + w_class = WEIGHT_CLASS_TINY + flags = BLOCKHAIR + flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE