diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c4169483b7c..c622f019b37 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -10,7 +10,7 @@ min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE - siemens_coefficient = 0.7 + siemens_coefficient = 0.5 w_class = 3 /obj/item/clothing/head/helmet/warden @@ -47,7 +47,7 @@ flags = HEADCOVERSEYES armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0) flags_inv = HIDEEARS - siemens_coefficient = 0.7 + siemens_coefficient = 0.5 /obj/item/clothing/head/helmet/swat name = "\improper SWAT helmet" @@ -94,7 +94,7 @@ armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0) flags_inv = HIDEEARS - siemens_coefficient = 0.7 + siemens_coefficient = 0.5 /obj/item/clothing/head/helmet/augment name = "Augment Array" diff --git a/code/modules/clothing/shoes/jobs.dm b/code/modules/clothing/shoes/jobs.dm index 001634b96ea..6a97d0af4a9 100644 --- a/code/modules/clothing/shoes/jobs.dm +++ b/code/modules/clothing/shoes/jobs.dm @@ -14,7 +14,7 @@ item_state = "jackboots" force = 3 armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) - siemens_coefficient = 0.7 + siemens_coefficient = 0.6 /obj/item/clothing/shoes/jackboots/unathi name = "toe-less jackboots" @@ -29,4 +29,4 @@ icon_state = "workboots" item_state = "workboots" armor = list(melee = 40, bullet = 0, laser = 0, energy = 15, bomb = 20, bio = 0, rad = 20) - siemens_coefficient = 0.7 + siemens_coefficient = 0.6 diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index fb47b46d604..21c2431da4d 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -5,6 +5,7 @@ armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100) max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list("Skrell","Human") + siemens_coefficient = 0.4 /obj/item/clothing/head/helmet/space/skrell/white icon_state = "skrell_helmet_white" @@ -22,6 +23,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list("Skrell","Human") + siemens_coefficient = 0.4 /obj/item/clothing/suit/space/skrell/white icon_state = "skrell_suit_white" @@ -38,7 +40,7 @@ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank) slowdown = 2 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.6 + siemens_coefficient = 0.3 heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list("Vox") @@ -46,7 +48,7 @@ /obj/item/clothing/head/helmet/space/vox armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.6 + siemens_coefficient = 0.3 flags = HEADCOVERSEYES|STOPPRESSUREDAMAGE species_restricted = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm index 68a7ea51d92..ae8ec7653ef 100644 --- a/code/modules/clothing/spacesuits/captain.dm +++ b/code/modules/clothing/spacesuits/captain.dm @@ -8,6 +8,7 @@ flags_inv = HIDEFACE permeability_coefficient = 0.01 armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50) + siemens_coefficient = 0.4 //Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it. /obj/item/clothing/suit/armor/captain @@ -26,4 +27,4 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - siemens_coefficient = 0.7 + siemens_coefficient = 0.4 diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 7aec6068b01..192081ca661 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -7,6 +7,7 @@ flags_inv = HIDEFACE permeability_coefficient = 0.01 armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50) + siemens_coefficient = 0.4 //Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it. /obj/item/clothing/suit/armor/captain @@ -25,7 +26,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - siemens_coefficient = 0.7 + siemens_coefficient = 0.4 //Deathsquad suit /obj/item/clothing/head/helmet/space/deathsquad @@ -35,7 +36,7 @@ item_state = "deathsquad" armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 100, rad = 60) flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPPRESSUREDAMAGE | THICKMATERIAL - siemens_coefficient = 0.6 + siemens_coefficient = 0.4 /obj/item/clothing/head/helmet/space/deathsquad/beret name = "officer's beret" @@ -43,7 +44,7 @@ icon_state = "beret_badge" armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) flags = HEADCOVERSEYES | BLOCKHAIR | STOPPRESSUREDAMAGE - siemens_coefficient = 0.9 + siemens_coefficient = 0.4 //Space santa outfit suit /obj/item/clothing/head/helmet/space/santahat @@ -71,7 +72,7 @@ armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) flags = HEADCOVERSEYES | BLOCKHAIR | STOPPRESSUREDAMAGE body_parts_covered = 0 - siemens_coefficient = 0.9 + siemens_coefficient = 0.4 /obj/item/clothing/suit/space/pirate name = "pirate coat" @@ -82,7 +83,7 @@ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.9 + siemens_coefficient = 0.4 body_parts_covered = UPPER_TORSO|ARMS //Orange emergency space suit diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 5cb1d8446e5..d09e7b4a01d 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -5,7 +5,7 @@ item_state = "space_helmet_syndicate" desc = "A crimson helmet sporting clean lines and durable plating. Engineered to look menacing." armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.6 + siemens_coefficient = 0.3 /obj/item/clothing/suit/space/syndicate name = "red space suit" @@ -16,7 +16,7 @@ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.6 + siemens_coefficient = 0.3 //Green syndicate space suit @@ -147,4 +147,4 @@ /obj/item/clothing/suit/space/syndicate/black/engie name = "black engineering space suit" icon_state = "syndicate-black-engie" - item_state = "syndicate-black" \ No newline at end of file + item_state = "syndicate-black" diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index 8362c78c5cc..4783c3d506b 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -5,7 +5,7 @@ icon_state = "rig0-syndie" item_state = "syndie_helm" armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) - siemens_coefficient = 0.6 + siemens_coefficient = 0.3 species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph") camera_networks = list("NUKE") light_overlay = "helmet_light_green" //todo: species-specific light overlays @@ -19,5 +19,5 @@ w_class = 3 armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) - siemens_coefficient = 0.6 - species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph") \ No newline at end of file + siemens_coefficient = 0.3 + species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph") diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 70eb4ee3cde..2d26afa7fd0 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -8,6 +8,7 @@ heat_protection = HEAD armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20) max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + siemens_coefficient = 0.4 //Species-specific stuff. species_restricted = list("exclude","Unathi","Tajara","Skrell","Diona","Vox", "Xenomorph") @@ -34,6 +35,7 @@ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + siemens_coefficient = 0.4 species_restricted = list("exclude","Unathi","Tajara","Diona","Vox", "Xenomorph") sprite_sheets_refit = list( @@ -241,4 +243,4 @@ tank = W return - ..() \ No newline at end of file + ..() diff --git a/code/modules/clothing/spacesuits/void/wizard.dm b/code/modules/clothing/spacesuits/void/wizard.dm index 086e9ebf465..2024ecc7140 100644 --- a/code/modules/clothing/spacesuits/void/wizard.dm +++ b/code/modules/clothing/spacesuits/void/wizard.dm @@ -6,7 +6,7 @@ item_state = "wiz_helm" unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles! armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) - siemens_coefficient = 0.7 + siemens_coefficient = 0.3 wizard_garb = 1 equipped(var/mob/user) @@ -36,7 +36,7 @@ w_class = 3 unacidable = 1 armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) - siemens_coefficient = 0.7 + siemens_coefficient = 0.3 wizard_garb = 1 equipped(var/mob/user) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 3b7c19c25cc..721d2be8e2a 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -7,7 +7,7 @@ min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE heat_protection = UPPER_TORSO|LOWER_TORSO max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE - siemens_coefficient = 0.6 + siemens_coefficient = 0.5 var/obj/item/weapon/storage/internal/pockets var/pocket_slots = 2 var/pocket_size = 2 @@ -107,7 +107,7 @@ item_state = "armor" blood_overlay_type = "armor" armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.7 + siemens_coefficient = 0.6 /obj/item/clothing/suit/armor/laserproof name = "Ablative Armor Vest" @@ -133,7 +133,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - siemens_coefficient = 0.6 + siemens_coefficient = 0.5 pocket_slots = 4//fullbody, more slots @@ -204,7 +204,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS slowdown = 1 armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 20, bio = 0, rad = 0) - siemens_coefficient = 0.7 + siemens_coefficient = 0.5 var/obj/item/clothing/accessory/holster/holster /obj/item/clothing/suit/armor/tactical/New() @@ -287,6 +287,7 @@ item_state = "kvest" armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) + siemens_coefficient = 0.5 /obj/item/clothing/suit/storage/vest/officer name = "officer armor vest" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index d77d9da989a..bce2744aa32 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -103,7 +103,8 @@ 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/flame/lighter,/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') - + siemens_coefficient = 0.7 + /obj/item/clothing/suit/storage/det_suit/black icon_state = "detective2" @@ -200,4 +201,4 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here - body_parts_covered = 0 \ No newline at end of file + body_parts_covered = 0 diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index 8b9c4613e6a..fce85b18982 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -64,6 +64,13 @@ pockets.max_w_class = 2 pockets.max_storage_space = 8 +/obj/item/clothing/suit/storage/vest/hos/New() + ..() + pockets = new/obj/item/weapon/storage/internal(src) + pockets.storage_slots = 4 + pockets.max_w_class = 2 + pockets.max_storage_space = 8 + /obj/item/clothing/suit/storage/vest var/icon_badge var/icon_nobadge diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 69e51093f9d..908998c6f3c 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -3,7 +3,7 @@ desc = "Strange-looking hat-wear that most certainly belongs to a real magic user." icon_state = "wizard" //Not given any special protective value since the magic robes are full-body protection --NEO - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 body_parts_covered = 0 wizard_garb = 1 @@ -11,7 +11,7 @@ name = "red wizard hat" desc = "Strange-looking, red, hat-wear that most certainly belongs to a real magic user." icon_state = "redwizard" - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 /obj/item/clothing/head/wizard/fake name = "wizard hat" @@ -23,27 +23,27 @@ name = "Witch Hat" desc = "Strange-looking hat-wear, makes you want to cast fireballs." icon_state = "marisa" - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 /obj/item/clothing/head/wizard/magus name = "Magus Helm" desc = "A mysterious helmet that hums with an unearthly power" icon_state = "magus" item_state = "magus" - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 body_parts_covered = HEAD|FACE|EYES /obj/item/clothing/head/wizard/amp name = "psychic amplifier" desc = "A crown-of-thorns psychic amplifier. Kind of looks like a tiara having sex with an industrial robot." icon_state = "amp" - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 /obj/item/clothing/head/wizard/cap name = "Gentlemans Cap" desc = "A checkered gray flat cap woven together with the rarest of threads." icon_state = "gentcap" - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 /obj/item/clothing/suit/wizrobe name = "wizard robe" @@ -55,7 +55,7 @@ armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20) allowed = list(/obj/item/weapon/teleportation_scroll) flags_inv = HIDEJUMPSUIT - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 wizard_garb = 1 /obj/item/clothing/suit/wizrobe/red diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 4288e172cfb..0f6c5ba99a7 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -15,7 +15,7 @@ item_state = "r_suit" worn_state = "warden" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 /obj/item/clothing/under/rank/security name = "security officer's jumpsuit" @@ -24,7 +24,7 @@ item_state = "r_suit" worn_state = "secred" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 /obj/item/clothing/under/rank/dispatch name = "dispatcher's uniform" @@ -34,7 +34,7 @@ worn_state = "dispatch" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 /obj/item/clothing/under/rank/security2 name = "security officer's uniform" @@ -43,7 +43,7 @@ item_state = "r_suit" worn_state = "redshirt2" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 /obj/item/clothing/under/rank/security/corp icon_state = "sec_corporate" @@ -62,7 +62,7 @@ //item_state = "swatunder" worn_state = "swatunder" armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 /* * Detective @@ -74,7 +74,7 @@ item_state = "det" worn_state = "detective" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 /obj/item/clothing/under/det/black icon_state = "detective2" @@ -100,7 +100,7 @@ icon_state = "detective" allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen) armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 body_parts_covered = 0 /obj/item/clothing/head/det_hat/black @@ -117,7 +117,7 @@ item_state = "r_suit" worn_state = "hosred" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.8 + siemens_coefficient = 0.7 /obj/item/clothing/under/rank/head_of_security/corp icon_state = "hos_corporate" @@ -125,33 +125,33 @@ worn_state = "hos_corporate" /obj/item/clothing/head/helmet/HoS - name = "Head of Security Hat" + name = "head of security hat" desc = "The hat of the Head of Security. For showing the officers who's in charge." icon_state = "hoscap" flags = HEADCOVERSEYES armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEEARS body_parts_covered = 0 - siemens_coefficient = 0.6 + siemens_coefficient = 0.5 /obj/item/clothing/suit/armor/hos - name = "Head of Security's jacket" + name = "head of security's jacket" desc = "An armoured jacket with golden rank pips and livery." icon_state = "hos" item_state = "hos" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) flags_inv = HIDEJUMPSUIT - siemens_coefficient = 0.6 + siemens_coefficient = 0.5 pocket_slots = 4//More slots because coat /obj/item/clothing/head/helmet/HoS/dermal - name = "Dermal Armour Patch" + name = "dermal armour patch" desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head." icon_state = "dermal" item_state = "dermal" - siemens_coefficient = 0.6 + siemens_coefficient = 0.5 //Jensen cosplay gear /obj/item/clothing/under/rank/head_of_security/jensen @@ -160,7 +160,7 @@ icon_state = "jensen" item_state = "jensen" worn_state = "jensen" - siemens_coefficient = 0.6 + siemens_coefficient = 0.7 /obj/item/clothing/suit/armor/hos/jensen name = "armored trenchcoat" @@ -168,7 +168,7 @@ icon_state = "jensencoat" item_state = "jensencoat" flags_inv = 0 - siemens_coefficient = 0.6 + siemens_coefficient = 0.5 body_parts_covered = UPPER_TORSO|ARMS pocket_slots = 4//More slots because coat diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 881e2a21270..7eabe2fde47 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -100,6 +100,7 @@ icon_state = "ert_uniform" item_state = "bl_suit" worn_state = "ert_uniform" + siemens_coefficient = 0.7 /obj/item/clothing/under/space name = "\improper NASA jumpsuit" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index f6d5f42bd4f..90425c40dcc 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -6,7 +6,7 @@ worn_state = "syndicate" has_sensor = 0 armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - siemens_coefficient = 0.9 + siemens_coefficient = 0.7 /obj/item/clothing/under/syndicate/combat name = "combat turtleneck" diff --git a/html/changelogs/alberyk-PR-826.yml b/html/changelogs/alberyk-PR-826.yml new file mode 100644 index 00000000000..7b8e68bd0b7 --- /dev/null +++ b/html/changelogs/alberyk-PR-826.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "Voidsuits, armor and armored uniforms should have a better resistance to taser and baton hits." + - tweak: "Head of security armor's options were tweaked to be more like each other."