cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Allow pAIs to attack_ai the machine they're inside, (#9564)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-30 06:07:08 -07:00
committed by GitHub
parent 9f98bf2b53
commit 7c2aa4aac7
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/food/kitchen/microwave.dm
View File

@@ -219,6 +219,11 @@
..() ..()
SStgui.update_uis(src) SStgui.update_uis(src)
/obj/machinery/microwave/tgui_status(mob/user)
if(user == paicard?.pai)
return STATUS_INTERACTIVE
. = ..()
/obj/machinery/microwave/tgui_state(mob/user) /obj/machinery/microwave/tgui_state(mob/user)
return GLOB.tgui_physical_state return GLOB.tgui_physical_state

10
code/modules/mob/living/silicon/pai/pai_vr.dm
View File

@@ -323,6 +323,16 @@
if(I_GRAB) if(I_GRAB)
pai_nom(A) pai_nom(A)
// Allow card inhabited machines to be interacted with
// This has to override ClickOn because of storage depth nonsense with how pAIs are in cards in machines
/mob/living/silicon/pai/ClickOn(var/atom/A, var/params)
if(istype(A, /obj/machinery))
var/obj/machinery/M = A
if(M.paicard == card)
M.attack_ai(src)
return
return ..()
/mob/living/silicon/pai/proc/hug(var/mob/living/silicon/pai/H, var/mob/living/target) /mob/living/silicon/pai/proc/hug(var/mob/living/silicon/pai/H, var/mob/living/target)
var/t_him = "them" var/t_him = "them"