Porting tesla/electrocute code updates. (#12280)

* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah

code/_globalvars/bitfields.dm

@@ -132,9 +132,11 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NO_RUINS_1" = NO_RUINS_1,
 		"PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1,
 		"HOLOGRAM_1" = HOLOGRAM_1,
-		"TESLA_IGNORE_1" = TESLA_IGNORE_1,
+		"SHOCKED_1" = SHOCKED_1,
 		"INITIALIZED_1" = INITIALIZED_1,
 		"ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1,
+		"BLOCK_FACE_ATOM_1" = BLOCK_FACE_ATOM_1,
+		"PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1
 		),
 	"clothing_flags" = list(
 		"LAVAPROTECT" = LAVAPROTECT,
@@ -148,12 +150,12 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"IGNORE_HAT_TOSS" = IGNORE_HAT_TOSS,
 		"SCAN_REAGENTS" = SCAN_REAGENTS
 		),
-	"tesla_flags" = list(
-		"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,
-		"TESLA_OBJ_DAMAGE" = TESLA_OBJ_DAMAGE,
-		"TESLA_MOB_STUN" = TESLA_MOB_STUN,
-		"TESLA_ALLOW_DUPLICATES" = TESLA_ALLOW_DUPLICATES,
-		"TESLA_MACHINE_EXPLOSIVE" = TESLA_MACHINE_EXPLOSIVE,
+	"zap_flags" = list(
+		"ZAP_MOB_DAMAGE" = ZAP_MOB_DAMAGE,
+		"ZAP_OBJ_DAMAGE" = ZAP_OBJ_DAMAGE,
+		"ZAP_MOB_STUN" = ZAP_MOB_STUN,
+		"ZAP_ALLOW_DUPLICATES" = ZAP_ALLOW_DUPLICATES,
+		"ZAP_MACHINE_EXPLOSIVE" = ZAP_MACHINE_EXPLOSIVE,
 		),
 	"smooth" = list(
 		"SMOOTH_TRUE" = SMOOTH_TRUE,

code/_globalvars/traits.dm

@@ -29,6 +29,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE,
 		"TRAIT_PUSHIMMUNE" = TRAIT_PUSHIMMUNE,
 		"TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE,
+		"TRAIT_TESLA_SHOCKIMMUNE" = TRAIT_TESLA_SHOCKIMMUNE,
 		"TRAIT_STABLEHEART" = TRAIT_STABLEHEART,
 		"TRAIT_STABLELIVER" = TRAIT_STABLELIVER,
 		"TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT,