mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
Fixes few runtimes. (#24930)
* Fixes regenerate organs runtime on simple animals * Status display initialize * Security records runtime (this code is bad) * Moves record removal to destroy
This commit is contained in:
@@ -16,6 +16,17 @@
|
||||
name = "record"
|
||||
var/list/fields = list()
|
||||
|
||||
/datum/data/record/Destroy()
|
||||
if(src in data_core.medical)
|
||||
data_core.medical -= src
|
||||
if(src in data_core.security)
|
||||
data_core.security -= src
|
||||
if(src in data_core.general)
|
||||
data_core.general -= src
|
||||
if(src in data_core.locked)
|
||||
data_core.locked -= src
|
||||
. = ..()
|
||||
|
||||
/datum/data/crime
|
||||
name = "crime"
|
||||
var/crimeName = ""
|
||||
|
||||
@@ -460,7 +460,7 @@
|
||||
else if(href_list["del_r2"])
|
||||
investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", "records")
|
||||
if(active2)
|
||||
data_core.medical -= active2
|
||||
qdel(active2)
|
||||
active2 = null
|
||||
|
||||
else if(href_list["d_rec"])
|
||||
|
||||
@@ -702,7 +702,6 @@ What a mess.*/
|
||||
if("Delete Record (Security) Execute")
|
||||
investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records")
|
||||
if(active2)
|
||||
data_core.security -= active2
|
||||
qdel(active2)
|
||||
active2 = null
|
||||
|
||||
@@ -711,15 +710,12 @@ What a mess.*/
|
||||
investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records")
|
||||
for(var/datum/data/record/R in data_core.medical)
|
||||
if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
|
||||
data_core.medical -= R
|
||||
qdel(R)
|
||||
break
|
||||
data_core.general -= active1
|
||||
qdel(active1)
|
||||
active1 = null
|
||||
|
||||
if(active2)
|
||||
data_core.security -= active2
|
||||
qdel(active2)
|
||||
active2 = null
|
||||
else
|
||||
|
||||
@@ -45,6 +45,7 @@
|
||||
// register for radio system
|
||||
|
||||
/obj/machinery/status_display/Initialize()
|
||||
..()
|
||||
SSradio.add_object(src, frequency)
|
||||
|
||||
/obj/machinery/status_display/Destroy()
|
||||
|
||||
@@ -704,6 +704,8 @@
|
||||
return 0
|
||||
|
||||
/mob/living/carbon/regenerate_organs()
|
||||
CHECK_DNA_AND_SPECIES(src)
|
||||
|
||||
if(!(NOBREATH in dna.species.species_traits) && !getorganslot("lungs"))
|
||||
var/obj/item/organ/lungs/L = new()
|
||||
L.Insert(src)
|
||||
|
||||
Reference in New Issue
Block a user