[MIRROR] Fix vending machine shocking you twice when you pulse high v…

…oltage wire (#1528) (#2479) * Fix vending machine shocking you twice when you pulse high voltage wire (#82077) ## About The Pull Request Vending machine no longer shocks you twice when you pulse high voltage wire. as a bonus fixed a bug in airlock wires code - wires window closes when you get shocked ## Changelog :cl: fix: Vending machine no longer shocks you twice when you pulse high voltage wire. fix: Airlock wires window closes when you get shocked /:cl: * Fix vending machine shocking you twice when you pulse high voltage wire --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: antropod <[email protected]>
Fluffy-Frontier · Mar 20, 2024 · 71df808 · 71df808
1 parent fdb1d4a
commit 71df808
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
@@ -76,7 +76,7 @@
 	var/obj/machinery/door/airlock/airlock = holder
 	if(!HAS_SILICON_ACCESS(user) && !isdrone(user) && airlock.isElectrified())
 		var/mob/living/carbon/carbon_user = user
-		if (!istype(carbon_user) || carbon_user.should_electrocute(src))
+		if (!istype(carbon_user) || carbon_user.should_electrocute(get_area(airlock)))
 			return FALSE
 	if(airlock.is_secure())
 		return FALSE

diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm
@@ -24,12 +24,21 @@
 			break
 	..()
 
+/datum/wires/vending/interact(mob/user)
+	var/obj/machinery/vending/vending_machine = holder
+	if (!HAS_SILICON_ACCESS(user) && vending_machine.seconds_electrified && vending_machine.shock(user, 100))
+		return
+
+	return ..()
+
 /datum/wires/vending/interactable(mob/user)
 	if(!..())
 		return FALSE
 	var/obj/machinery/vending/vending_machine = holder
-	if(!HAS_SILICON_ACCESS(user) && vending_machine.seconds_electrified && vending_machine.shock(user, 100))
-		return FALSE
+	if(!HAS_SILICON_ACCESS(user) && vending_machine.seconds_electrified)
+		var/mob/living/carbon/carbon_user = user
+		if (!istype(carbon_user) || carbon_user.should_electrocute(get_area(vending_machine)))
+			return FALSE
 	if(vending_machine.panel_open)
 		return TRUE
 
@@ -57,6 +66,7 @@
 			vending_machine.extended_inventory = !vending_machine.extended_inventory
 		if(WIRE_SHOCK)
 			vending_machine.seconds_electrified = MACHINE_DEFAULT_ELECTRIFY_TIME
+			vending_machine.shock(usr, 100)
 		if(WIRE_IDSCAN)
 			vending_machine.scan_id = !vending_machine.scan_id
 		if(WIRE_SPEAKER)
@@ -74,7 +84,11 @@
 		if(WIRE_CONTRABAND)
 			vending_machine.extended_inventory = FALSE
 		if(WIRE_SHOCK)
-			vending_machine.seconds_electrified = mend ? MACHINE_NOT_ELECTRIFIED : MACHINE_ELECTRIFIED_PERMANENT
+			if (mend)
+				vending_machine.seconds_electrified = MACHINE_NOT_ELECTRIFIED
+			else
+				vending_machine.seconds_electrified = MACHINE_ELECTRIFIED_PERMANENT
+				vending_machine.shock(usr, 100)
 		if(WIRE_IDSCAN)
 			vending_machine.scan_id = mend
 		if(WIRE_SPEAKER)