mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 16:38:22 +01:00
@@ -56,7 +56,7 @@
|
||||
*****************/
|
||||
/datum/category_item
|
||||
var/name = ""
|
||||
var/list/datum/category_group/category // The group this item belongs to
|
||||
var/datum/category_group/category // The group this item belongs to
|
||||
|
||||
/datum/category_item/New(var/datum/category_group/cg)
|
||||
..()
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
// This should be overridden to remove all references pointing to the object being destroyed.
|
||||
// Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
|
||||
/datum/proc/Destroy(force=FALSE)
|
||||
SHOULD_CALL_PARENT(1)
|
||||
|
||||
weakref = null
|
||||
destroyed_event.raise_event(src)
|
||||
SSnanoui.close_uis(src)
|
||||
|
||||
+1
-1
@@ -259,7 +259,7 @@
|
||||
var/mob/def_target = null
|
||||
var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain)
|
||||
if (objective&&(objective.type in objective_list) && objective:target)
|
||||
def_target = objective:target.current
|
||||
def_target = objective.target.current
|
||||
|
||||
var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
|
||||
if (!new_target) return
|
||||
|
||||
+16
-9
@@ -1,5 +1,6 @@
|
||||
// Generic data stored in record
|
||||
/datum/record
|
||||
var/name
|
||||
var/id
|
||||
var/notes = "No notes found."
|
||||
|
||||
@@ -25,7 +26,8 @@
|
||||
for(var/variable in src.vars)
|
||||
if(exclusions[variable]) continue
|
||||
if(istype(src.vars[variable], /datum/record) || istype(src.vars[variable], /list))
|
||||
copied.vars[variable] = src.vars[variable].Copy()
|
||||
var/list/V = vars[variable]
|
||||
copied.vars[variable] = V.Copy()
|
||||
else
|
||||
copied.vars[variable] = src.vars[variable]
|
||||
return copied
|
||||
@@ -45,18 +47,21 @@
|
||||
if(!exclusions[variable])
|
||||
if(deep && (istype(src.vars[variable], /datum/record)))
|
||||
if(to_update)
|
||||
var/listified = src.vars[variable].Listify(to_update = to_update[variable])
|
||||
var/datum/record/R = src.vars[variable]
|
||||
var/listified = R.Listify(to_update = to_update[variable])
|
||||
if(listified)
|
||||
record[variable] = listified
|
||||
. = record
|
||||
else
|
||||
record[variable] = src.vars[variable].Listify()
|
||||
var/datum/record/R = src.vars[variable]
|
||||
record[variable] = R.Listify()
|
||||
else if(deep && istype(src.vars[variable], /list) && is_list_containing_type(src.vars[variable], /datum/record))
|
||||
record[variable] = list()
|
||||
for(var/subr in src.vars[variable])
|
||||
var/datum/record/r = subr
|
||||
record[variable] += list(r.Listify())
|
||||
if(to_update && to_update[variable].len != record[variable].len)
|
||||
var/list/L = to_update[variable]
|
||||
if(L.len != LAZYLEN(record[variable]))
|
||||
. = record
|
||||
else if(istype(src.vars[variable], /list) || istext(src.vars[variable]) || isnum(src.vars[variable]))
|
||||
if(to_update && record[variable] != src.vars[variable])
|
||||
@@ -77,7 +82,8 @@
|
||||
for(var/variable in src.vars)
|
||||
if(!exclusions[variable])
|
||||
if(istype(src.vars[variable], /datum/record))
|
||||
extendedVars[variable] = src.vars[variable]
|
||||
var/datum/record/R = src.vars[variable]
|
||||
extendedVars[variable] = R
|
||||
// . += "<h3>[variable]</h3>"
|
||||
// . += src.vars[variable].Printify()
|
||||
else if(istype(src.vars[variable], /list))
|
||||
@@ -87,7 +93,8 @@
|
||||
. += "<b>[get_field_name(variable)]:</b> [src.vars[variable]]<br>"
|
||||
for(var/variable in extendedVars)
|
||||
. += "<center><h3>[get_field_name(variable)]</h3></center>"
|
||||
. += src.vars[variable].Printify()
|
||||
var/datum/record/R = src.vars[variable]
|
||||
. += R.Printify()
|
||||
|
||||
/datum/record/proc/get_field_name(var/field)
|
||||
. = SSrecords.localized_fields[src.type][field]
|
||||
@@ -96,7 +103,7 @@
|
||||
|
||||
// Record for storing general data, data tree top level datum
|
||||
/datum/record/general
|
||||
var/name = "New Record"
|
||||
name = "New Record"
|
||||
var/real_rank = "Unassigned"
|
||||
var/rank = "Unassigned"
|
||||
var/age = 0
|
||||
@@ -209,7 +216,7 @@
|
||||
/datum/record/warrant
|
||||
var/authorization = "Unauthorized"
|
||||
var/wtype = "Unknown"
|
||||
var/name = "Unknown"
|
||||
name = "Unknown"
|
||||
notes = "No charges present"
|
||||
cmp_field = "name"
|
||||
|
||||
@@ -220,7 +227,7 @@ var/warrant_uid = 0
|
||||
|
||||
// Virus record
|
||||
/datum/record/virus
|
||||
var/name = "Unknown"
|
||||
name = "Unknown"
|
||||
var/description = ""
|
||||
var/antigen
|
||||
var/spread_type = "Unknown"
|
||||
|
||||
Reference in New Issue
Block a user