diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 80ce70964d3..805f85f8755 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -158,8 +158,6 @@ BLIND // can't see anything body_parts_covered = HEAD slot_flags = SLOT_HEAD w_class = 2.0 - sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') - //Mask /obj/item/clothing/mask @@ -196,7 +194,6 @@ BLIND // can't see anything var/blood_overlay_type = "suit" siemens_coefficient = 0.9 w_class = 3 - sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Spacesuit //Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together. @@ -214,7 +211,6 @@ BLIND // can't see anything min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 species_restricted = list("exclude","Diona","Vox") - sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/suit/space name = "Space suit" diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index ba498495a4e..c944fbd63b6 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -9,6 +9,7 @@ name = "ultra rare hat" desc = "an ultra rare hat. It commands a certain respect." icon_state = "petehat" + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/head/collectable/slime name = "collectable slime cap!" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 4130812d386..8ad2e7751eb 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -11,7 +11,7 @@ blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/nutrient,/obj/item/weapon/minihoe) - + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Captain /obj/item/clothing/suit/captunic name = "captain's parade tunic" @@ -20,6 +20,7 @@ item_state = "bio_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') /obj/item/clothing/suit/captunic/capjacket name = "captain's uniform jacket" @@ -36,6 +37,7 @@ icon_state = "chaplain_hoodie" item_state = "chaplain_hoodie" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Chaplain /obj/item/clothing/suit/nun @@ -45,6 +47,7 @@ item_state = "nun" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS flags_inv = HIDESHOES|HIDEJUMPSUIT + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Chef /obj/item/clothing/suit/chef @@ -56,6 +59,7 @@ permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list (/obj/item/weapon/kitchenknife,/obj/item/weapon/butch) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Chef /obj/item/clothing/suit/chef/classic @@ -76,6 +80,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') /obj/item/clothing/suit/storage/det_suit/black icon_state = "detective2" @@ -110,6 +115,8 @@ /obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/weapon/tank/emergency_oxygen, \ /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') + //Lawyer /obj/item/clothing/suit/storage/lawyer/bluejacket name = "Blue Suit Jacket" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index ca6d5cc5976..4cb25f57cf9 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -7,6 +7,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') verb/toggle() set name = "Toggle Labcoat Buttons" diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index d65679d947a..747467a66f9 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -4,6 +4,7 @@ desc = "You shouldn't ever see this." icon = 'icons/obj/objects.dmi' slot_flags = SLOT_HEAD + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/weapon/holder/New() ..() diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 21acb32fe7b..1d57e629d0c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -308,6 +308,6 @@ emp_act if(damtype != BURN && damtype != BRUTE) return var/obj/item/clothing/suit/space/SS = wear_suit - var/penetrated_dam = max(0,(damage - max(0,(SS.breach_threshold - SS.damage)))) + var/penetrated_dam = max(0,(damage - SS.breach_threshold)) // - SS.damage)) - Consider uncommenting this if suits seem too hardy on dev. if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam) diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi index 7149efa9d50..d0097e8d00d 100644 Binary files a/icons/mob/species/vox/head.dmi and b/icons/mob/species/vox/head.dmi differ diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi index 42dfea23ec7..e3b02e5c6a3 100644 Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/species/vox/uniform.dmi index 4dc9382a839..69376d1955e 100644 Binary files a/icons/mob/species/vox/uniform.dmi and b/icons/mob/species/vox/uniform.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 05d27bcc067..47d928e2d11 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ