mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +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:
@@ -15,6 +15,10 @@
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/effect/expl_particles/Destroy()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/datum/effect/system/expl_particles
|
||||
var/number = 10
|
||||
var/turf/location
|
||||
|
||||
@@ -92,7 +92,8 @@
|
||||
|
||||
/obj/effect/landmark/Destroy()
|
||||
GLOB.landmarks_list -= src
|
||||
return ..()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/obj/effect/landmark/start
|
||||
name = "start"
|
||||
|
||||
@@ -242,7 +242,6 @@
|
||||
for(var/thing in contents)
|
||||
var/obj/O = thing
|
||||
O.forceMove(get_turf(src))
|
||||
O.throw_at_random(FALSE, 3, THROWNOBJ_KNOCKBACK_SPEED)
|
||||
var/area/A = get_area(src)
|
||||
message_all_revenants(FONT_LARGE(SPAN_WARNING("The rift keeping us here has been destroyed in [A.name]!")))
|
||||
return ..()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -38,6 +38,10 @@ var/global/list/datum/stack_recipe/rod_recipes = list(
|
||||
stacktype = /obj/item/stack/rods
|
||||
icon_has_variants = TRUE
|
||||
|
||||
/obj/item/stack/rods/Destroy()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/obj/item/stack/rods/full/Initialize()
|
||||
. = ..()
|
||||
amount = max_amount
|
||||
|
||||
@@ -126,7 +126,8 @@ var/const/NO_EMAG_ACT = -50
|
||||
|
||||
/obj/item/card/id/Destroy()
|
||||
QDEL_NULL(chat_user)
|
||||
return ..()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/obj/item/card/id/examine(mob/user, distance)
|
||||
. = ..()
|
||||
@@ -162,6 +163,8 @@ var/const/NO_EMAG_ACT = -50
|
||||
side.Scale(128, 128)
|
||||
|
||||
/mob/proc/set_id_info(var/obj/item/card/id/id_card)
|
||||
SHOULD_NOT_SLEEP(TRUE)
|
||||
|
||||
id_card.age = 0
|
||||
id_card.registered_name = real_name
|
||||
id_card.sex = capitalize(gender)
|
||||
|
||||
@@ -38,11 +38,15 @@
|
||||
M.disable_cloaking_device()
|
||||
M.update_icon()
|
||||
|
||||
/obj/item/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve
|
||||
/obj/item/grenade/flashbang/clusterbang //Created by Polymorph, fixed by Sieve
|
||||
name = "clusterbang"
|
||||
icon = 'icons/obj/grenade.dmi'
|
||||
icon_state = "clusterbang"
|
||||
|
||||
/obj/item/grenade/flashbang/clusterbang/Destroy()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/obj/item/grenade/flashbang/clusterbang/prime()
|
||||
var/numspawned = rand(4,8)
|
||||
var/again = 0
|
||||
@@ -103,3 +107,7 @@
|
||||
var/dettime = rand(15,60)
|
||||
addtimer(CALLBACK(src, PROC_REF(prime)), dettime)
|
||||
..()
|
||||
|
||||
/obj/item/grenade/flashbang/cluster/Destroy()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
@@ -21,10 +21,24 @@
|
||||
var/list/possible_explosions = list("Localized Limb", "Destroy Body")
|
||||
var/warning_message = "Tampering detected. Tampering detected."
|
||||
|
||||
/obj/item/implant/explosive/New()
|
||||
..()
|
||||
become_hearing_sensitive(ROUNDSTART_TRAIT)
|
||||
|
||||
/obj/item/implant/explosive/Initialize()
|
||||
. = ..()
|
||||
setFrequency(frequency)
|
||||
|
||||
/obj/item/implant/explosive/Destroy()
|
||||
lose_hearing_sensitivity(ROUNDSTART_TRAIT)
|
||||
|
||||
if(frequency)
|
||||
SSradio.remove_object_all(src)
|
||||
frequency = null
|
||||
radio_connection = null
|
||||
|
||||
. = ..()
|
||||
|
||||
/obj/item/implant/explosive/get_data()
|
||||
. = {"
|
||||
<b>Implant Specifications:</b><BR>
|
||||
@@ -180,7 +194,7 @@
|
||||
M.gib() //Simple mobs just get got
|
||||
qdel(src)
|
||||
|
||||
/proc/explosion_spread(turf/epicenter, power, adminlog = 1, z_transfer = UP|DOWN)
|
||||
/obj/item/implant/explosive/proc/explosion_spread(turf/epicenter, power, adminlog = 1, z_transfer = UP|DOWN)
|
||||
var/datum/explosiondata/data = new
|
||||
data.epicenter = epicenter
|
||||
data.rec_pow = power
|
||||
@@ -223,13 +237,6 @@
|
||||
/obj/item/implant/explosive/isLegal()
|
||||
return FALSE
|
||||
|
||||
/obj/item/implant/explosive/New()
|
||||
..()
|
||||
become_hearing_sensitive(ROUNDSTART_TRAIT)
|
||||
|
||||
/obj/item/implant/explosive/Destroy()
|
||||
return ..()
|
||||
|
||||
/obj/item/implant/explosive/full
|
||||
possible_explosions = list("Localized Limb", "Destroy Body", "Full Explosion")
|
||||
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
drop_sound = 'sound/effects/glass_step.ogg'
|
||||
surgerysound = 'sound/items/surgery/scalpel.ogg'
|
||||
|
||||
/obj/item/material/shard/Destroy()
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
/obj/item/material/shard/set_material(var/new_material)
|
||||
..(new_material)
|
||||
if(!istype(material))
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
QDEL_NULL(storage_start)
|
||||
QDEL_NULL(storage_continue)
|
||||
QDEL_NULL(storage_end)
|
||||
QDEL_NULL_LIST(storage_screens)
|
||||
QDEL_LIST(storage_screens)
|
||||
QDEL_NULL(closer)
|
||||
return ..()
|
||||
|
||||
@@ -208,7 +208,7 @@
|
||||
user.s_active = null
|
||||
if(!length(can_see_contents()))
|
||||
storage_start.vis_contents = list()
|
||||
QDEL_NULL_LIST(storage_screens)
|
||||
QDEL_LIST(storage_screens)
|
||||
storage_screens = list()
|
||||
|
||||
/obj/item/storage/proc/close_all()
|
||||
@@ -309,7 +309,7 @@
|
||||
var/endpoint = 1
|
||||
|
||||
storage_start.vis_contents = list()
|
||||
QDEL_NULL_LIST(storage_screens)
|
||||
QDEL_LIST(storage_screens)
|
||||
storage_screens = list()
|
||||
|
||||
for(var/obj/item/O in contents)
|
||||
|
||||
Reference in New Issue
Block a user