Fixes bot and borg emagging (and bot pAI slotting) (#37288)

* Fixes bot and borg emagging * Update code/game/machinery/bots/bots.dm Co-authored-by: jwhitak <[email protected]> --------- Co-authored-by: jwhitak <[email protected]>
vgstation-coders · Oct 21, 2024 · 2e2472d · 2e2472d
1 parent 7d37889
commit 2e2472d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -23,7 +23,7 @@
 		visible_message("<span class='danger'>[src] has been hit by [user] with [W].</span>")
 	if(W.material_type)
 		W.material_type.on_use(W, src, user)
-	return emag_check()
+	return emag_check(W,user)
 
 /atom/movable/proc/emag_check(obj/item/weapon/card/emag/E, mob/user)
 	if(can_emag() && istype(E) && E.canUse(user,src))

diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
@@ -622,12 +622,14 @@
 		src.explode()
 
 /obj/machinery/bot/emag_act(mob/user)
-	if(locked)
+	if(emagged >= 2)
+		return
+ 	if(locked)
 		locked = 0
 		emagged = 1
 		if(user)
 			to_chat(user, "<span class='warning'>You remove [src]'s control restrictions. Opening up its maintenance panel and swiping again will cause [src] to malfunction.</span>")
-	if(!locked && open)
+	else if(open)
 		emagged = 2
 		if(user)
 			to_chat(user, "<span class='warning'>You cause a malfunction in [src]'s behavioral matrix.</span>")
@@ -716,8 +718,6 @@
 				to_chat(user, "<span class='notice'>Unable to repair with the maintenance panel closed.</span>")
 		else
 			to_chat(user, "<span class='notice'>[src] does not need a repair.</span>")
-	else if (emagged < 2)
-		emag_check(W,user)
 	else
 		if(isobj(W))
 			W.on_attack(src, user)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
@@ -818,6 +818,8 @@
 				updateicon()
 			else
 				to_chat(user, "<span class='warning'>Access denied.</span>")
+	else if(isEmag(W))
+		emag_check(W,user)
 	else if(istype(W, /obj/item/device/toner))
 		if(toner >= tonermax)
 			to_chat(user, "The toner level of [src] is at its highest level possible")