mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 21:40:55 +01:00
Updated SSgarbage (#18173)
* pain * sadfas * sdfa * sdfasf * sfa * sdf * might the lord have mercy on our soul * i cri everidai * adeste fideles * sdf * where will this lead, what's coming next, from your inventions * dear lord * gjvhk * i cri everidai * fsgf * sdfa * sdaf * hiuhi
This commit is contained in:
@@ -70,9 +70,7 @@
|
||||
if(!M.moved_recently && M.last_move)
|
||||
M.moved_recently = 1
|
||||
step(M, M.last_move)
|
||||
sleep(50)
|
||||
if(M)
|
||||
M.moved_recently = 0
|
||||
addtimer(CALLBACK(src, PROC_REF(update_move_recently)), 50 SECONDS)
|
||||
to_chat(M, "<span class='danger'>You feel a sharp shock!</span>")
|
||||
spark(M, 3)
|
||||
|
||||
@@ -82,6 +80,13 @@
|
||||
master.receive_signal()
|
||||
return
|
||||
|
||||
/obj/item/device/radio/electropack/proc/update_move_recently()
|
||||
var/mob/M = loc
|
||||
|
||||
if(M)
|
||||
M.moved_recently = 0
|
||||
|
||||
|
||||
/obj/item/device/radio/electropack/attack_self(mob/user as mob, flag1)
|
||||
|
||||
if(!istype(user, /mob/living/carbon/human))
|
||||
|
||||
@@ -783,6 +783,10 @@
|
||||
var/myAi = null // Atlantis: Reference back to the AI which has this radio.
|
||||
var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
|
||||
|
||||
/obj/item/device/radio/headset/heads/ai_integrated/Destroy()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/obj/item/device/radio/headset/heads/ai_integrated/can_receive(input_frequency, level)
|
||||
return ..(input_frequency, level, !disabledAi)
|
||||
|
||||
|
||||
@@ -565,7 +565,8 @@ var/global/list/default_interrogation_channels = list(
|
||||
|
||||
/obj/item/device/radio/borg/Destroy()
|
||||
myborg = null
|
||||
return ..()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/obj/item/device/radio/borg/list_channels(var/mob/user)
|
||||
return list_secure_channels(user)
|
||||
|
||||
Reference in New Issue
Block a user