Skip to content

Commit

Permalink
insulation begone
Browse files Browse the repository at this point in the history
removes shock insulation from non-engi gloves and hardsuits, adds it to engi soft suits
  • Loading branch information
Apogee-dev committed Aug 29, 2024
1 parent 5d7af6f commit 7a71cb7
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion code/datums/martial/krav_maga.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
name = "combat gloves plus"
desc = "These tactical gloves are fireproof and electrically insulated, and through the use of nanochip technology will teach you the martial art of krav maga."
icon_state = "black"
siemens_coefficient = 0
siemens_coefficient = 0.5
permeability_coefficient = 0.05
strip_delay = 80
cold_protection = HANDS
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/religion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
name = "Plate Gauntlets"
icon_state = "crusader"
desc = "They're like gloves, but made of metal."
siemens_coefficient = 0
siemens_coefficient = 0.5
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/factions/gezena.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
name = "\improper PGFN Captain's Ihuz-irra Gloves"
desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Bears the silver standard of a Gezenan captain."
icon_state = "captaingloves"
siemens_coefficient = 0
siemens_coefficient = 0.5

//Boots

Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/factions/suns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,10 @@

/obj/item/clothing/gloves/suns/captain
name = "\improper SUNS captain's gloves"
desc = "Fancy black gloves for trusted SUNS members. Sports a complex lining that prevents the wearer from being shocked."
desc = "Fancy black gloves for trusted SUNS members."
icon_state = "suns_captaingloves"
item_state = "suns_blackgloves"
siemens_coefficient = 0
siemens_coefficient = 0.5
permeability_coefficient = 0.05
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/gloves/color.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@
icon_state = "brown"

/obj/item/clothing/gloves/color/captain
desc = "Regal white gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
desc = "Regal white gloves, with a nice gold trim, an integrated thermal barrier, and armoured bracers. Swanky."
name = "captain's gloves"
icon_state = "captain"
siemens_coefficient = 0
siemens_coefficient = 0.5
permeability_coefficient = 0.05
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
Expand Down Expand Up @@ -231,7 +231,7 @@
name = "infiltrator gloves"
desc = "Specialized combat gloves for carrying people around. Transfers tactical kidnapping knowledge into the user via nanochips."
icon_state = "infiltrator"
siemens_coefficient = 0
siemens_coefficient = 0.5
permeability_coefficient = 0.3
resistance_flags = FIRE_PROOF | ACID_PROOF

Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/gloves/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

/obj/item/clothing/gloves/combat
name = "combat gloves"
desc = "These tactical gloves are fireproof and electrically insulated."
desc = "These tactical gloves are extra-durable, offering some fire and acid protection."
icon_state = "combat"
siemens_coefficient = 0
siemens_coefficient = 0.5
permeability_coefficient = 0.05
strip_delay = 80
cold_protection = HANDS
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/gloves/tacklers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
name = "guerrilla gloves"
desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
icon_state = "combat"
siemens_coefficient = 0
siemens_coefficient = 0.5
permeability_coefficient = 0.05

/obj/item/clothing/gloves/tackler/rocket
Expand Down
4 changes: 3 additions & 1 deletion code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
max_integrity = 300
armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
siemens_coefficient = 0
siemens_coefficient = 0.5
var/obj/item/clothing/head/helmet/space/hardsuit/helmet
actions_types = list(/datum/action/item_action/toggle_helmet)
var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
Expand Down Expand Up @@ -207,6 +207,7 @@
desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
icon_state = "hardsuit-engineering"
item_state = "eng_hardsuit"
siemens_coefficient = 0
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
Expand Down Expand Up @@ -1065,6 +1066,7 @@
icon_state = "space-independent-eng"
item_state = "space-independent-eng"
desc = "A civilian space suit designed for construction and salvage in hazardous, low-pressure environments. Has shielding against radiation and heat and abundant storage.<br>Though they lack the physical protection of more expensive hardsuits, this type of suit is extremely common wherever construction and salvage work must be done in open space."
siemens_coefficient = 0
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 20, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
resistance_flags = FIRE_PROOF
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/spacesuits/syndi.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
desc = "A space suit made of high-grade ballistic fabric with thermal and radiation shielding. More compact than a normal space suit while amost matching powered hardsuits for protection. Almost."
siemens_coefficient = 0
armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
resistance_flags = FIRE_PROOF
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mining/equipment/explorer_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@

/obj/item/clothing/gloves/explorer/old
name = "prototype exploration gauntlets"
desc = "Thick-fingered gloves with a heavy layer of armor plating, meant to stop all but the most brutal of stovetop-touching accidents in the field. This premium pre-run prototype comes with an added layer of electrical insulation."
desc = "Thick-fingered gloves with a heavy layer of armor plating, meant to stop all but the most brutal of stovetop-touching accidents in the field."
icon_state = "explorerold"
armor = list("melee" = 25, "bullet" = 10, "laser" = 15, "energy" = 15, "bomb" = 65, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 75)
siemens_coefficient = 0
siemens_coefficient = 0.5
permeability_coefficient = 0.05

/obj/item/clothing/suit/hooded/survivor
Expand Down

0 comments on commit 7a71cb7

Please sign in to comment.