stuff

Author: SapphicOverload

code/game/machinery/barsigns.dm

@@ -17,7 +17,7 @@
 	melee = 20
 	bullet = 20
 	laser = 20
-	energy = 100
+	energy = 20
 	fire = 50
 	acid = 50
 	electric = 100

code/game/mecha/working/ripley.dm

@@ -75,7 +75,7 @@
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	weather_protection = WEATHER_LAVA|WEATHER_STORM
 	flags_1 = HEAR_1 | RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
-	armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 60, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, ELECTRIC = 75)
+	armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 60, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, ELECTRIC = 100)
 	enclosed = TRUE
 	enter_delay = 40
 	silicon_icon_state = null

code/modules/projectiles/projectile/energy/tesla.dm

@@ -17,8 +17,8 @@
 /obj/projectile/energy/tesla/on_hit(atom/target, blocked)
 	. = ..()
 	var/atom/firer_location = get_atom_on_turf(firer)
-	tesla_zap(target, zap_range, power, tesla_flags, list(firer_location, target))
-	target.tesla_act(src, power, zap_range, tesla_flags | TESLA_NO_CHAINING, list(firer_location))
+	tesla_zap(target, zap_range, power, tesla_flags)
+	target.tesla_act(src, power, zap_range, tesla_flags | TESLA_NO_CHAINING)
 	qdel(src)
 
 /obj/projectile/energy/tesla/Destroy()