diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 9df2287ad84..014371cabf9 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -38,6 +38,7 @@
armor = list(melee = 30, bullet = 10, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECITON_TEMPERATURE
+ siemens_coefficient = 0
/obj/item/clothing/head/culthood/alt
@@ -58,6 +59,7 @@
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
flags_inv = HIDEJUMPSUIT
+ siemens_coefficient = 0
/obj/item/clothing/head/magus
name = "magus helm"
@@ -67,6 +69,7 @@
flags_inv = HIDEFACE
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
armor = list(melee = 30, bullet = 30, laser = 30,energy = 20, bomb = 0, bio = 0, rad = 0)
+ siemens_coefficient = 0
/obj/item/clothing/suit/magusred
name = "magus robes"
@@ -78,6 +81,7 @@
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ siemens_coefficient = 0
/obj/item/clothing/head/helmet/space/cult
@@ -86,6 +90,7 @@
icon_state = "cult_helmet"
item_state = "cult_helmet"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+ siemens_coefficient = 0
/obj/item/clothing/suit/space/cult
name = "cult armour"
@@ -95,4 +100,5 @@
w_class = 3
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 1
- armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
\ No newline at end of file
+ armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+ siemens_coefficient = 0
\ No newline at end of file
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 964fe964353..8556b15abcf 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -645,7 +645,7 @@
user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])"
M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])"
-
+ msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") //BS12 EDIT ALG
log_attack(" [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])")
src.add_fingerprint(user)
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 024dcd60084..daebf114d2f 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -209,7 +209,7 @@
*/
/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
- if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife))
+ if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/kitchenknife) || istype(W, /obj/item/weapon/kitchenknife/ritual))
user << "You use [W] to fashion a pipe out of the corn cob!"
new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
del(src)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index c0be248e635..23debe8aab1 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -10,6 +10,7 @@
min_cold_protection_temperature = HELMET_MIN_COLD_PROTECITON_TEMPERATURE
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECITON_TEMPERATURE
+ siemens_coefficient = 0
/obj/item/clothing/head/helmet/warden
name = "warden's hat"
@@ -46,6 +47,7 @@
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECITON_TEMPERATURE
+ siemens_coefficient = 1
/obj/item/clothing/head/helmet/gladiator
name = "gladiator helmet"
@@ -53,4 +55,5 @@
icon_state = "gladiator"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
item_state = "gladiator"
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
\ No newline at end of file
+ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+ siemens_coefficient = 1
\ No newline at end of file
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index edad100ff6e..52b28bd8f1e 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -71,6 +71,7 @@
flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
w_class = 2
gas_transfer_coefficient = 0.90
+ siemens_coefficient = 0
/obj/item/clothing/mask/pig
name = "pig mask"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index ee105caa14e..ef3ab188c0c 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -7,6 +7,7 @@
flags = NOSLIP
origin_tech = "syndicate=3"
var/list/clothing_choices = list()
+ siemens_coefficient = 0
/obj/item/clothing/shoes/mime
name = "mime shoes"
@@ -19,6 +20,7 @@
icon_state = "swat"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags = NOSLIP
+ siemens_coefficient = 0
/obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes.
name = "combat boots"
@@ -26,6 +28,7 @@
icon_state = "swat"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags = NOSLIP
+ siemens_coefficient = 0
cold_protection = FEET
min_cold_protection_temperature = SHOE_MIN_COLD_PROTECITON_TEMPERATURE
@@ -39,6 +42,7 @@
permeability_coefficient = 0.01
flags = NOSLIP
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+ siemens_coefficient = 0
cold_protection = FEET
min_cold_protection_temperature = SHOE_MIN_COLD_PROTECITON_TEMPERATURE
@@ -78,6 +82,7 @@
icon_state = "jackboots"
item_state = "jackboots"
color = "hosred"
+ siemens_coefficient = 0
/obj/item/clothing/shoes/cult
name = "boots"
@@ -85,6 +90,7 @@
icon_state = "cult"
item_state = "cult"
color = "cult"
+ siemens_coefficient = 0
cold_protection = FEET
min_cold_protection_temperature = SHOE_MIN_COLD_PROTECITON_TEMPERATURE
diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm
index cd2b456becb..56537aec50e 100644
--- a/code/modules/clothing/spacesuits/captain.dm
+++ b/code/modules/clothing/spacesuits/captain.dm
@@ -26,3 +26,4 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECITON_TEMPERATURE
+ siemens_coefficient = 0
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 1d917a21d75..7b01ae1cf98 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -4,6 +4,7 @@
icon_state = "ert_commander"
item_state = "helm-command"
armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
+ siemens_coefficient = 0
/obj/item/clothing/suit/space/ert
name = "emergency response team suit"
@@ -18,6 +19,7 @@
/obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/device/multitool, \
/obj/item/device/radio, /obj/item/device/analyzer, /obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, \
/obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/gun)
+ siemens_coefficient = 0
//Commander
/obj/item/clothing/head/helmet/space/ert/commander
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index fa3d9790f4f..bf62ddfef31 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -25,6 +25,7 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECITON_TEMPERATURE
+ siemens_coefficient = 0
//Deathsquad suit
/obj/item/clothing/head/helmet/space/deathsquad
@@ -33,6 +34,7 @@
icon_state = "deathsquad"
item_state = "deathsquad"
armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
+ siemens_coefficient = 0
/obj/item/clothing/head/helmet/space/deathsquad/beret
name = "officer's beret"
diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm
index 7a275944c1c..086ac7a2c98 100644
--- a/code/modules/clothing/spacesuits/ninja.dm
+++ b/code/modules/clothing/spacesuits/ninja.dm
@@ -5,6 +5,7 @@
item_state = "s-ninja_mask"
allowed = list(/obj/item/weapon/cell)
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
+ siemens_coefficient = 0
/obj/item/clothing/suit/space/space_ninja
@@ -15,6 +16,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,/obj/item/weapon/cell)
slowdown = 0
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+ siemens_coefficient = 0
//Important parts of the suit.
var/mob/living/carbon/affecting = null//The wearer.
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index 7bbf889a2cb..d63b11b001a 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -86,6 +86,7 @@
item_state = "syndie_helm"
color = "syndi"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
+ siemens_coefficient = 0
/obj/item/clothing/suit/space/rig/syndi
@@ -97,6 +98,7 @@
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/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
//Wizard Rig
@@ -108,6 +110,7 @@
color = "wiz"
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
/obj/item/clothing/suit/space/rig/wizard
icon_state = "rig-wiz"
@@ -118,6 +121,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
//Medical Rig
@@ -144,6 +148,7 @@
item_state = "sec_helm"
color = "sec"
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
+ siemens_coefficient = 0
/obj/item/clothing/suit/space/rig/security
icon_state = "rig-sec"
@@ -152,6 +157,7 @@
item_state = "sec_hardsuit"
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/baton)
+ siemens_coefficient = 0
//Atmospherics Rig (BS12)
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index c0f44c39cd8..e2fc9e6d649 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -6,6 +6,7 @@
item_state = "syndicate"
desc = "Has a tag: Totally not property of an enemy corporation, honest."
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+ siemens_coefficient = 0
/obj/item/clothing/suit/space/syndicate
name = "red space suit"
@@ -16,6 +17,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
//Green syndicate space suit
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 34e310a2d8d..4e10a8ce630 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -8,6 +8,7 @@
min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECITON_TEMPERATURE
heat_protection = UPPER_TORSO|LOWER_TORSO
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECITON_TEMPERATURE
+ siemens_coefficient = 0
/obj/item/clothing/suit/armor/vest
@@ -171,9 +172,11 @@
desc = "Reddish armor."
icon_state = "tdred"
item_state = "tdred"
+ siemens_coefficient = 1
/obj/item/clothing/suit/armor/tdome/green
name = "Thunderdome suit (green)"
desc = "Pukish armor."
icon_state = "tdgreen"
- item_state = "tdgreen"
\ No newline at end of file
+ item_state = "tdgreen"
+ siemens_coefficient = 1
\ No newline at end of file
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index b6d2607eb7f..f888a6c7134 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -50,6 +50,7 @@
flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+ siemens_coefficient = 0
/obj/item/clothing/suit/bomb_suit
@@ -67,6 +68,7 @@
flags_inv = HIDEJUMPSUIT
heat_protection = UPPER_TORSO|LOWER_TORSO
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECITON_TEMPERATURE
+ siemens_coefficient = 0
/obj/item/clothing/head/bomb_hood/security
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
index c655617db62..84b5fc213be 100644
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -6,6 +6,7 @@
color = "black"
desc = "It's a plain jumpsuit. It seems to have a small dial on the wrist."
origin_tech = "syndicate=3"
+ siemens_coefficient = 0
var/list/clothing_choices = list()
New()
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index d98df1aad2f..bbc6e492af9 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -75,6 +75,7 @@
color = "hosred"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS
+ siemens_coefficient = 0
/obj/item/clothing/head/helmet/HoS
@@ -85,6 +86,7 @@
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
flags_inv = 0
flags_inv = HIDEEARS
+ siemens_coefficient = 0
/obj/item/clothing/suit/armor/hos
@@ -95,6 +97,7 @@
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
/obj/item/clothing/head/helmet/HoS/dermal
@@ -110,10 +113,12 @@
icon_state = "jensen"
item_state = "jensen"
color = "jensen"
+ siemens_coefficient = 0
/obj/item/clothing/suit/armor/hos/jensen
name = "armored trenchcoat"
desc = "A trenchcoat augmented with a special alloy for some protection and style."
icon_state = "jensencoat"
item_state = "jensencoat"
- flags_inv = 0
\ No newline at end of file
+ flags_inv = 0
+ siemens_coefficient = 0
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 577ae6bbe35..ef2c7bff21c 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -103,6 +103,7 @@
armor = list(melee = 100, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100)
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECITON_TEMPERATURE
+ siemens_coefficient = 0
/obj/item/clothing/under/owl
name = "owl uniform"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 1ca2d8d952b..facfc396466 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -6,6 +6,7 @@
color = "syndicate"
has_sensor = 0
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+ siemens_coefficient = 0
/obj/item/clothing/under/syndicate/combat
name = "combat turtleneck"
@@ -16,5 +17,6 @@
icon_state = "tactifool"
item_state = "bl_suit"
color = "tactifool"
+ siemens_coefficient = 1
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 34a57cd9316..3dd6a74b437 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -10,6 +10,28 @@ emp_act
/mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone)
+// BEGIN TASER NERF
+ if(istype(P, /obj/item/projectile/energy/electrode))
+ var/datum/organ/external/select_area = get_organ(def_zone) // We're checking the outside, buddy!
+ var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking?
+ for(var/bp in body_parts) //Make an unregulated var to pass around.
+ if(!bp)
+ continue //Does this thing we're shooting even exist?
+ if(bp && istype(bp ,/obj/item/clothing)) // If it exists, and it's clothed
+ var/obj/item/clothing/C = bp // Then call an argument C to be that clothing!
+ if(C.body_parts_covered & select_area.body_part) // Is that body part being targeted covered?
+ if(C.siemens_coefficient == 0) //If so, is that clothing shock proof?
+ visible_message("\red The [P.name] gets deflected by [src]'s [C.name]!") //DEFLECT!
+ del P
+
+/* Commenting out old Taser nerf
+ if(wear_suit && istype(wear_suit, /obj/item/clothing/suit/armor))
+ if(istype(P, /obj/item/projectile/energy/electrode))
+ visible_message("\red The [P.name] gets deflected by [src]'s [wear_suit.name]!")
+ del P
+ return -1
+*/
+// END TASER NERF
if(wear_suit && istype(wear_suit, /obj/item/clothing/suit/armor/laserproof))
if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
var/reflectchance = 40 - round(P.damage/3)
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 671d2e40a89..02456cc1ea2 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -9,10 +9,15 @@
/obj/item/projectile/energy/electrode
name = "electrode"
icon_state = "spark"
- nodamage = 1
+ /* - Old taser bit
+ nodamage = 0
stun = 10
weaken = 10
stutter = 10
+ */
+ damage = 40
+ damage_type = HALLOSS
+
/obj/item/projectile/energy/declone
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 2d4079f37f7..4d681afb9f9 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ