cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes swoopie special clicks, simplemob held ID stuff, and synth metabolism toggle (#7079)

Browse Source
This commit is contained in:
Verkister
2023-10-12 22:59:35 +03:00
committed by GitHub
parent c81676a813
commit 32dfabd62d
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/simple_mob/simple_mob_vr.dm
View File

@@ -73,6 +73,11 @@
//For all those ID-having mobs //For all those ID-having mobs
/mob/living/simple_mob/GetIdCard() /mob/living/simple_mob/GetIdCard()
if(get_active_hand()) //CHOMPAdd Start
var/obj/item/I = get_active_hand()
var/id = I.GetID()
if(id)
return id //CHOMPAdd End
if(myid) if(myid)
return myid return myid

2
code/modules/reagents/reagents/_reagents.dm
View File

@@ -64,7 +64,7 @@
return return
if(!affects_dead && M.stat == DEAD) if(!affects_dead && M.stat == DEAD)
return return
if(!affects_robots && M.isSynthetic() && M.synth_reag_processing) //CHOMPEdit if(M.isSynthetic() && (!M.synth_reag_processing || !affects_robots)) //CHOMPEdit
return return
if(!istype(location)) if(!istype(location))
return return

3
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm
View File

@@ -163,6 +163,9 @@
say_got_target = list("PEST DETECTED!") say_got_target = list("PEST DETECTED!")
/mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/ClickOn(var/atom/A, var/params) /mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/ClickOn(var/atom/A, var/params)
var/list/modifiers = params2list(params)
if(modifiers["shift"] || modifiers["ctrl"] || modifiers["middle"] || modifiers["alt"])
return ..()
if(istype(Vac) && A.Adjacent(src)) if(istype(Vac) && A.Adjacent(src))
face_atom(A) face_atom(A)
if(A == src) if(A == src)