mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
[MIRROR] More deletion cleanup (#1112)
* More deletion cleanup (#53681) - Observer mobs not delling correctly - AI delling basically nothing - pods not delling glow effect - minor slime cleanup * More deletion cleanup Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
This commit is contained in:
@@ -6,6 +6,11 @@
|
||||
qdel(src)
|
||||
owner = new_owner
|
||||
|
||||
/datum/spawners_menu/Destroy()
|
||||
owner = null
|
||||
return ..()
|
||||
|
||||
|
||||
/datum/spawners_menu/ui_state(mob/user)
|
||||
return GLOB.observer_state
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
. += decal
|
||||
return
|
||||
else if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML) //If we're not a normal pod shape (aka, if we don't have fins), just add the door without masking
|
||||
. += door
|
||||
. += door
|
||||
else
|
||||
var/icon/masked_door = new(icon, door) //The door we want to apply
|
||||
var/icon/fin_masker = new(icon, "mask_[fin_mask]") //The fin shape we want to 'cut out' of the door
|
||||
@@ -456,9 +456,11 @@
|
||||
return
|
||||
glow_effect.layer = LOW_ITEM_LAYER
|
||||
glow_effect.fadeAway(delays[POD_OPENING])
|
||||
glow_effect = null
|
||||
|
||||
/obj/structure/closet/supplypod/Destroy()
|
||||
deleteRubble()
|
||||
endGlow()
|
||||
open_pod(src, broken = TRUE) //Lets dump our contents by opening up
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -39,10 +39,11 @@
|
||||
var/can_be_carded = TRUE
|
||||
var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list(), "Burglar"=list())
|
||||
var/viewalerts = 0
|
||||
var/icon/holo_icon//Default is assigned when AI is created.
|
||||
var/icon/holo_icon //Default is assigned when AI is created.
|
||||
var/obj/vehicle/sealed/mecha/controlled_mech //For controlled_mech a mech, to determine whether to relaymove or use the AI eye.
|
||||
var/radio_enabled = TRUE //Determins if a carded AI can speak with its built in radio or not.
|
||||
radiomod = ";" //AIs will, by default, state their laws on the internal radio.
|
||||
///Used as a fake multitoool in tcomms machinery
|
||||
var/obj/item/multitool/aiMulti
|
||||
var/mob/living/simple_animal/bot/Bot
|
||||
var/tracking = FALSE //this is 1 if the AI is currently tracking somebody, but the track has not yet been completed.
|
||||
@@ -193,10 +194,18 @@
|
||||
GLOB.ai_list -= src
|
||||
GLOB.shuttle_caller_list -= src
|
||||
SSshuttle.autoEvac()
|
||||
qdel(eyeobj) // No AI, no Eye
|
||||
QDEL_NULL(eyeobj) // No AI, no Eye
|
||||
QDEL_NULL(spark_system)
|
||||
QDEL_NULL(malf_picker)
|
||||
QDEL_NULL(doomsday_device)
|
||||
QDEL_NULL(robot_control)
|
||||
QDEL_NULL(aiMulti)
|
||||
malfhack = null
|
||||
|
||||
. = ..()
|
||||
current = null
|
||||
Bot = null
|
||||
controlled_mech = null
|
||||
linked_core = null
|
||||
return ..()
|
||||
|
||||
/// Removes all malfunction-related abilities from the AI
|
||||
/mob/living/silicon/ai/proc/remove_malf_abilities()
|
||||
|
||||
@@ -109,8 +109,7 @@
|
||||
AC.Remove(src)
|
||||
Target = null
|
||||
Leader = null
|
||||
Friends.Cut()
|
||||
speech_buffer.Cut()
|
||||
Friends = null
|
||||
return ..()
|
||||
|
||||
/mob/living/simple_animal/slime/proc/set_colour(new_colour)
|
||||
|
||||
@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
|
||||
if(buckled)
|
||||
to_chat(src, "<i>I can't vent crawl while feeding...</i>")
|
||||
return
|
||||
..()
|
||||
return ..()
|
||||
|
||||
|
||||
/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine)
|
||||
|
||||
@@ -274,4 +274,4 @@ Charged extracts:
|
||||
for(var/i in 1 to 3)
|
||||
var/mob/living/simple_animal/slime/S = new(get_turf(user))
|
||||
S.random_colour()
|
||||
..()
|
||||
return ..()
|
||||
|
||||
@@ -238,7 +238,7 @@ Chilling extracts:
|
||||
user.visible_message("<span class='notice'>[src] lets out a peaceful ring as it shatters, and nearby slimes seem calm.</span>")
|
||||
else
|
||||
user.visible_message("<span class='notice'>[src] lets out a peaceful ring as it shatters, but nothing happens...</span>")
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/item/slimecross/chilling/green
|
||||
colour = "green"
|
||||
|
||||
@@ -25,9 +25,9 @@
|
||||
return
|
||||
|
||||
to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
|
||||
var/I = new /obj/item/stack/sheet/metal(user.loc)
|
||||
var/trash = new /obj/item/stack/sheet/metal(user.loc)
|
||||
qdel(src)
|
||||
user.put_in_hands(I)
|
||||
user.put_in_hands(trash)
|
||||
|
||||
/obj/item/mecha_ammo/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user