cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-25 05:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9587 from Ghommie/Ghommie-cit258

Browse Source 
Porting components updates and fixing phantom thief component.
This commit is contained in:
kevinz000
2021-06-25 21:06:34 -03:00
committed by Archie
parent 69a3b58ae0
commit 470cb0a588
34 changed files with 2205 additions and 2253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/geiger_counter.dm
+10 -6
View File
@@ -205,21 +205,25 @@
obj_flags |= EMAGGED
/obj/item/geiger_counter/cyborg
var/datum/component/mobhook
var/mob/listeningTo
/obj/item/geiger_counter/cyborg/equipped(mob/user)
. = ..()
if (mobhook && mobhook.parent != user)
QDEL_NULL(mobhook)
if (!mobhook)
mobhook = user.AddComponent(/datum/component/redirect, list(COMSIG_ATOM_RAD_ACT = CALLBACK(src, .proc/redirect_rad_act)))
if(listeningTo == user)
return
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
RegisterSignal(user, COMSIG_ATOM_RAD_ACT, .proc/redirect_rad_act)
listeningTo = user
/obj/item/geiger_counter/cyborg/proc/redirect_rad_act(datum/source, amount)
rad_act(amount)
/obj/item/geiger_counter/cyborg/dropped()
. = ..()
QDEL_NULL(mobhook)
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
listeningTo = null
#undef RAD_LEVEL_NORMAL
#undef RAD_LEVEL_MODERATE