mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Fixes geiger counters on engiborgs (#35423)
* a commit * Update geiger_counter.dm
This commit is contained in:
committed by
Jordan Brown
parent
6b90cc824a
commit
1c8e450f15
@@ -370,7 +370,7 @@
|
|||||||
SendSignal(COMSIG_ATOM_EMAG_ACT)
|
SendSignal(COMSIG_ATOM_EMAG_ACT)
|
||||||
|
|
||||||
/atom/proc/rad_act(strength)
|
/atom/proc/rad_act(strength)
|
||||||
SendSignal(COMSIG_ATOM_RAD_ACT)
|
SendSignal(COMSIG_ATOM_RAD_ACT, strength)
|
||||||
|
|
||||||
/atom/proc/narsie_act()
|
/atom/proc/narsie_act()
|
||||||
SendSignal(COMSIG_ATOM_NARSIE_ACT)
|
SendSignal(COMSIG_ATOM_NARSIE_ACT)
|
||||||
|
|||||||
@@ -201,6 +201,20 @@
|
|||||||
to_chat(user, "<span class='warning'>You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.</span>")
|
to_chat(user, "<span class='warning'>You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.</span>")
|
||||||
obj_flags |= EMAGGED
|
obj_flags |= EMAGGED
|
||||||
|
|
||||||
|
/obj/item/device/geiger_counter/cyborg
|
||||||
|
var/datum/component/mobhook
|
||||||
|
|
||||||
|
/obj/item/device/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, /atom.proc/rad_act))
|
||||||
|
|
||||||
|
/obj/item/device/geiger_counter/cyborg/dropped()
|
||||||
|
. = ..()
|
||||||
|
QDEL_NULL(mobhook)
|
||||||
|
|
||||||
#undef RAD_LEVEL_NORMAL
|
#undef RAD_LEVEL_NORMAL
|
||||||
#undef RAD_LEVEL_MODERATE
|
#undef RAD_LEVEL_MODERATE
|
||||||
#undef RAD_LEVEL_HIGH
|
#undef RAD_LEVEL_HIGH
|
||||||
|
|||||||
@@ -297,7 +297,7 @@
|
|||||||
/obj/item/device/multitool/cyborg,
|
/obj/item/device/multitool/cyborg,
|
||||||
/obj/item/device/t_scanner,
|
/obj/item/device/t_scanner,
|
||||||
/obj/item/device/analyzer,
|
/obj/item/device/analyzer,
|
||||||
/obj/item/device/geiger_counter,
|
/obj/item/device/geiger_counter/cyborg,
|
||||||
/obj/item/device/assembly/signaler/cyborg,
|
/obj/item/device/assembly/signaler/cyborg,
|
||||||
/obj/item/areaeditor/blueprints/cyborg,
|
/obj/item/areaeditor/blueprints/cyborg,
|
||||||
/obj/item/device/electroadaptive_pseudocircuit,
|
/obj/item/device/electroadaptive_pseudocircuit,
|
||||||
|
|||||||
Reference in New Issue
Block a user