diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm index 0647bd233e6..50b18e8ecfa 100644 --- a/code/modules/clothing/suits/hood.dm +++ b/code/modules/clothing/suits/hood.dm @@ -6,6 +6,7 @@ var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this /// If this variable is true, the hood can not be removed if the hood is nodrop var/respects_nodrop = FALSE + w_class = WEIGHT_CLASS_NORMAL /obj/item/clothing/suit/hooded/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 2aa30cefbea..39649d2d164 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -452,7 +452,6 @@ /obj/item/clothing/suit/hooded/wintercoat/captain name = "captain's winter coat" icon_state = "wintercoat_captain" - w_class = WEIGHT_CLASS_NORMAL item_state = "coatcaptain" armor = list(MELEE = 15, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 0, ACID = 50) 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) @@ -472,7 +471,6 @@ /obj/item/clothing/suit/hooded/wintercoat/security name = "security winter coat" icon_state = "wintercoat_sec" - w_class = WEIGHT_CLASS_NORMAL item_state = "coatsecurity" armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 20, ACID = 20) 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) @@ -494,7 +492,6 @@ /obj/item/clothing/suit/hooded/wintercoat/medical name = "medical winter coat" icon_state = "wintercoat_med" - w_class = WEIGHT_CLASS_NORMAL item_state = "coatmedical" 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/reagent_containers/applicator,/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, RAD = 0, FIRE = 0, ACID = 40) @@ -514,7 +511,6 @@ /obj/item/clothing/suit/hooded/wintercoat/science name = "science winter coat" icon_state = "wintercoat_sci" - w_class = WEIGHT_CLASS_NORMAL item_state = "coatscience" 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/reagent_containers/applicator,/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 = 5, RAD = 0, FIRE = 0, ACID = 0) @@ -534,7 +530,6 @@ /obj/item/clothing/suit/hooded/wintercoat/engineering name = "engineering winter coat" icon_state = "wintercoat_engi" - w_class = WEIGHT_CLASS_NORMAL item_state = "coatengineer" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd) @@ -607,7 +602,6 @@ /obj/item/clothing/suit/hooded/wintercoat/miner name = "mining winter coat" icon_state = "wintercoat_miner" - w_class = WEIGHT_CLASS_NORMAL item_state = "coatminer" allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/t_scanner/adv_mining_scanner, /obj/item/storage/bag/ore, /obj/item/gun/energy/kinetic_accelerator) armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) @@ -640,7 +634,6 @@ desc = "A cutting-edge ablative armor system developed by Nanotrasen. Miniaturized shielding systems deflect incoming energy projectiles, while prototype heatsinks and dissipation materials blunt any energy weapon that makes impact. \ Unfortunately, if offers little to no protection against solid impacts." icon_state = "ablativecoat" - w_class = WEIGHT_CLASS_NORMAL item_state = "ablativecoat" body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS @@ -677,6 +670,7 @@ desc = "It's a hoodie. It has a hood. Most hoodies do." icon_state = "black_hoodie" item_state = "blueshieldcoat" + w_class = WEIGHT_CLASS_SMALL body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen) hoodtype = /obj/item/clothing/head/hooded/hood @@ -1292,7 +1286,6 @@ //Syndicate Chaplain Robe (WOLOLO!) /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe - w_class = WEIGHT_CLASS_NORMAL armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 10, FIRE = 20, ACID = 20) var/obj/item/nullrod/missionary_staff/linked_staff = null diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 94fde2346fa..eab7f769fb5 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -16,6 +16,12 @@ /obj/item/fluff var/used = FALSE +/obj/item/clothing/suit/hooded/hoodie/fluff + w_class = WEIGHT_CLASS_SMALL + +/obj/item/clothing/suit/hooded/fluff + w_class = WEIGHT_CLASS_SMALL + /// Generic tattoo gun, make subtypes for different folks /obj/item/fluff/tattoo_gun name = "disposable tattoo pen" @@ -152,7 +158,6 @@ flags = CONDUCT slot_flags = ITEM_SLOT_BELT throwforce = 5 - w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced") hitsound = 'sound/weapons/bladeslice.ogg' @@ -944,14 +949,14 @@ icon_state = "greenhood" /// Hylocereus: Sam Aria -/obj/item/clothing/suit/hooded/hoodie/hylo +/obj/item/clothing/suit/hooded/hoodie/fluff/hylo name = "worn assymetrical hoodie" 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/hooded/hood/hylo + hoodtype = /obj/item/clothing/head/hooded/hood/fluff/hylo -/obj/item/clothing/head/hooded/hood/hylo +/obj/item/clothing/head/hooded/hood/fluff/hylo icon = 'icons/obj/custom_items.dmi' icon_state = "sam_hood" @@ -1075,8 +1080,6 @@ if(target.change_hair("Sasook Hair", 1)) to_chat(target, "You dump some of [src] on your head and style it around.") - - /// MrSynnester : Shesi Skaklas /obj/item/clothing/suit/hooded/wintercoat/fluff/shesi name = "custom made winter coat" @@ -1358,7 +1361,6 @@ flags = BLOCKHAIR flags_inv = HIDEFACE - /obj/item/clothing/shoes/fluff/arachno_boots name = "Arachno-Man boots" desc = "These boots were made for crawlin'." @@ -1366,7 +1368,6 @@ icon_state = "superior_boots" item_state = "superior_boots" - /// chronx100: Hughe O'Splash /obj/item/nullrod/fluff/chronx fluff_transformations = list(/obj/item/nullrod/fluff/chronx/scythe) @@ -1547,7 +1548,6 @@ if(target.change_hair("Zekes Tentacles", 1)) to_chat(target, "You take time to admire yourself in [src], brushing your tendrils down and revealing their true length.") - /// Fethas: Sefra'neem /obj/item/clothing/accessory/locket/fluff/fethasnecklace name = "Orange gemmed locket" @@ -1569,7 +1569,6 @@ item_state = "sheetcosmos" item_color = "sheetcosmos" - /// Lightfire: Hyperion /obj/item/clothing/head/fluff/lfbowler name = "classy bowler hat" @@ -1589,7 +1588,6 @@ item_color = "victorianlightfire" displays_id = FALSE - /// LightFire53: Ikelos /obj/item/fluff/lighty_plasman_modkit name = "plasmaman suit modkit" @@ -1765,8 +1763,6 @@ item_color = "kiamask" species_restricted = list("Vox") - - /obj/item/clothing/gloves/ring/fluff name = "fluff ring" desc = "Someone forgot to set this fluff item's description, notify a coder!" @@ -1780,15 +1776,12 @@ /obj/item/clothing/gloves/ring/fluff/attackby__legacy__attackchain(obj/item/I as obj, mob/user as mob, params) return - - /// Benjaminfallout: Pretzel Brassheart /obj/item/clothing/gloves/ring/fluff/benjaminfallout name = "Pretzel's Ring" desc = "A small platinum ring with a large light blue diamond. Engraved inside the band are the words: 'To my lovely Pristine Princess. Forever yours, Savinien.'" icon_state = "benjaminfallout_ring" - /// Gangelwaefre: Kikeri /obj/item/clothing/under/fluff/kikeridress name = "Kikeri's Dress"