mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-22 20:56:33 +01:00
Fix issues with New and Destroy in NTNet
- New() on atoms needs to call parent. - Destroy() needs to return a qdel hint. - Only add yourself to processing in Initialize() to make sure globals are instantiated.
This commit is contained in:
@@ -113,7 +113,7 @@
|
||||
for(var/datum/computer_file/program/ntnet_dos/D in dos_sources)
|
||||
D.target = null
|
||||
D.error = "Connection to quantum relay severed"
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/ntnet_relay/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
|
||||
if(W.is_screwdriver())
|
||||
|
||||
@@ -41,14 +41,14 @@
|
||||
/obj/item/modular_computer/proc/install_default_programs()
|
||||
return 1
|
||||
|
||||
/obj/item/modular_computer/New()
|
||||
/obj/item/modular_computer/Initialize()
|
||||
START_PROCESSING(SSobj, src)
|
||||
install_default_hardware()
|
||||
if(hard_drive)
|
||||
install_default_programs()
|
||||
update_icon()
|
||||
update_verbs()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/modular_computer/Destroy()
|
||||
kill_program(1)
|
||||
|
||||
@@ -23,7 +23,7 @@ var/global/file_uid = 0
|
||||
if(holder.holder2 && holder.holder2.active_program == src)
|
||||
holder.holder2.kill_program(1)
|
||||
holder = null
|
||||
..()
|
||||
return ..()
|
||||
|
||||
// Returns independent copy of this file.
|
||||
/datum/computer_file/proc/clone(var/rename = 0)
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]")
|
||||
|
||||
/obj/item/weapon/computer_hardware/New(var/obj/L)
|
||||
..()
|
||||
w_class = hardware_size
|
||||
if(istype(L, /obj/item/modular_computer))
|
||||
holder2 = L
|
||||
|
||||
@@ -97,4 +97,4 @@ var/global/ntnet_card_uid = 1
|
||||
/obj/item/weapon/computer_hardware/network_card/Destroy()
|
||||
if(holder2 && (holder2.network_card == src))
|
||||
holder2.network_card = null
|
||||
..()
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user