mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
more...fixes
This commit is contained in:
@@ -14,6 +14,10 @@
|
||||
crew_monitor = new(src)
|
||||
..()
|
||||
|
||||
/obj/machinery/computer/crew/Destroy()
|
||||
qdel(crew_monitor)
|
||||
crew_monitor = null
|
||||
return ..()
|
||||
|
||||
/obj/machinery/computer/crew/attack_ai(mob/user)
|
||||
attack_hand(user)
|
||||
|
||||
@@ -15,30 +15,32 @@
|
||||
..()
|
||||
power_monitors += src
|
||||
power_monitors = sortAtom(power_monitors)
|
||||
power_monitor = new(src)
|
||||
powermonitor_repository.update_cache()
|
||||
power_monitor = new(src)
|
||||
powermonitor_repository.update_cache()
|
||||
powernet = find_powernet()
|
||||
|
||||
|
||||
/obj/machinery/computer/monitor/Destroy()
|
||||
power_monitors -= src
|
||||
powermonitor_repository.update_cache()
|
||||
return ..()
|
||||
|
||||
powermonitor_repository.update_cache()
|
||||
qdel(power_monitor)
|
||||
power_monitor = null
|
||||
return ..()
|
||||
|
||||
/obj/machinery/computer/monitor/power_change()
|
||||
..()
|
||||
powermonitor_repository.update_cache()
|
||||
|
||||
/obj/machinery/computer/monitor/proc/find_powernet()
|
||||
powermonitor_repository.update_cache()
|
||||
|
||||
/obj/machinery/computer/monitor/proc/find_powernet()
|
||||
var/obj/structure/cable/attached = null
|
||||
var/turf/T = loc
|
||||
if(isturf(T))
|
||||
attached = locate() in T
|
||||
if(attached)
|
||||
return attached.get_powernet()
|
||||
|
||||
|
||||
/obj/machinery/computer/monitor/attack_ai(mob/user)
|
||||
attack_hand(user)
|
||||
|
||||
|
||||
/obj/machinery/computer/monitor/attack_hand(mob/user)
|
||||
add_fingerprint(user)
|
||||
if(stat & (BROKEN|NOPOWER))
|
||||
@@ -52,4 +54,3 @@
|
||||
|
||||
/obj/machinery/computer/monitor/interact(mob/user)
|
||||
power_monitor.ui_interact(user)
|
||||
|
||||
@@ -86,6 +86,11 @@
|
||||
|
||||
setup()
|
||||
|
||||
/obj/machinery/porta_turret/Destroy()
|
||||
qdel(spark_system)
|
||||
spark_system = null
|
||||
return ..()
|
||||
|
||||
/obj/machinery/porta_turret/centcom/New()
|
||||
..()
|
||||
if(req_one_access && req_one_access.len)
|
||||
|
||||
@@ -114,6 +114,10 @@
|
||||
radio = new /obj/item/radio/integrated/signal(src)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/cartridge/signal/Destroy()
|
||||
qdel(radio)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/cartridge/quartermaster
|
||||
name = "Space Parts & Space Vendors Cartridge"
|
||||
desc = "Perfect for the Quartermaster on the go!"
|
||||
|
||||
@@ -10,6 +10,10 @@
|
||||
verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up.
|
||||
..()
|
||||
|
||||
/obj/item/weapon/storage/internal/Destroy()
|
||||
master_item = null
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/storage/internal/attack_hand()
|
||||
return //make sure this is never picked up
|
||||
|
||||
|
||||
@@ -50,6 +50,12 @@
|
||||
icon = 'icons/misc/buildmode.dmi'
|
||||
var/obj/effect/bmode/buildholder/master = null
|
||||
|
||||
/obj/effect/bmode/Destroy()
|
||||
if(master && master.cl)
|
||||
master.cl.screen -= src
|
||||
master = null
|
||||
return ..()
|
||||
|
||||
/obj/effect/bmode/builddir
|
||||
icon_state = "build"
|
||||
screen_loc = "NORTH,WEST"
|
||||
@@ -133,6 +139,19 @@
|
||||
var/turf/cornerB = null
|
||||
var/generator_path = null
|
||||
|
||||
/obj/effect/bmode/buildholder/Destroy()
|
||||
qdel(builddir)
|
||||
builddir = null
|
||||
qdel(buildhelp)
|
||||
buildhelp = null
|
||||
qdel(buildmode)
|
||||
buildmode = null
|
||||
qdel(buildquit)
|
||||
buildquit = null
|
||||
throw_atom = null
|
||||
cl = null
|
||||
return ..()
|
||||
|
||||
/obj/effect/bmode/buildmode
|
||||
icon_state = "buildmode1"
|
||||
screen_loc = "NORTH,WEST+2"
|
||||
|
||||
@@ -8,6 +8,11 @@
|
||||
pockets.max_w_class = 2 //fit only pocket sized items
|
||||
pockets.max_combined_w_class = 4
|
||||
|
||||
/obj/item/clothing/suit/storage/Destroy()
|
||||
qdel(pockets)
|
||||
pockets = null
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/suit/storage/attack_hand(mob/user as mob)
|
||||
if (pockets.handle_attack_hand(user))
|
||||
..(user)
|
||||
|
||||
@@ -32,8 +32,13 @@
|
||||
src.emag.name = "Placeholder Emag Item"
|
||||
|
||||
/obj/item/weapon/robot_module/Destroy()
|
||||
for(var/module in modules)
|
||||
qdel(module)
|
||||
modules.Cut()
|
||||
qdel(emag)
|
||||
emag = null
|
||||
qdel(jetpack)
|
||||
jetpack = null
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/robot_module/proc/fix_modules()
|
||||
|
||||
Reference in New Issue
Block a user