")
- text = replacetext(text, "\[time\]", "[gameTimestamp()]") // TO DO
+ text = replacetext(text, "\[time\]", "[station_time_timestamp()]") // TO DO
if(P)
text = "[text]"
else
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 6d28c2c0cd4..57adb01c2cb 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -1,7 +1,15 @@
// So you can be all 10 SECONDS
#define SECONDS *10
-#define MINUTES *600
-#define HOURS *36000
+
+#define MINUTES SECONDS*60
+
+#define HOURS MINUTES*60
+
+#define TICKS *world.tick_lag
+
+#define DS2TICKS(DS) ((DS)/world.tick_lag)
+
+#define TICKS2DS(T) ((T) TICKS)
#define TimeOfGame (get_game_time())
#define TimeOfTick (world.tick_usage*0.01*world.tick_lag)
@@ -22,16 +30,36 @@
return wtime + (time_offset + wusage) * world.tick_lag
-//Returns the world time in english
-/proc/worldtime2text(time = world.time)
+/* This proc should only be used for world/Topic.
+ * If you want to display the time for which dream daemon has been running ("round time") use worldtime2text.
+ * If you want to display the canonical station "time" (aka the in-character time of the station) use station_time_timestamp
+ */
+/proc/classic_worldtime2text(time = world.time)
time = (round_start_time ? (time - round_start_time) : (time - world.time))
return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"
-/proc/time_stamp()
- return time2text(world.timeofday, "hh:mm:ss")
+//Returns the world time in english
+/proc/worldtime2text()
+ return gameTimestamp("hh:mm:ss", world.time)
-/proc/gameTimestamp(format = "hh:mm:ss") // Get the game time in text
- return time2text(world.time - timezoneOffset + 432000, format)
+/proc/time_stamp(format = "hh:mm:ss", show_ds)
+ var/time_string = time2text(world.timeofday, format)
+ return show_ds ? "[time_string]:[world.timeofday % 10]" : time_string
+
+/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
+ if(!wtime)
+ wtime = world.time
+ return time2text(wtime - GLOB.timezoneOffset, format)
+
+/* This is used for displaying the "station time" equivelent of a world.time value
+ Calling it with no args will give you the current time, but you can specify a world.time-based value as an argument
+ - You can use this, for example, to do "This will expire at [station_time_at(world.time + 500)]" to display a "station time" expiration date
+ which is much more useful for a player)*/
+/proc/station_time(time=world.time, display_only=FALSE)
+ return ((((time - round_start_time)) + GLOB.gametime_offset) % 864000) - (display_only ? GLOB.timezoneOffset : 0)
+
+/proc/station_time_timestamp(format = "hh:mm:ss", time=world.time)
+ return time2text(station_time(time, TRUE), format)
/* Returns 1 if it is the selected month and day */
proc/isDay(var/month, var/day)
@@ -172,4 +200,4 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
/proc/update_midnight_rollover()
if(world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS!
return GLOB.midnight_rollovers++
- return GLOB.midnight_rollovers
\ No newline at end of file
+ return GLOB.midnight_rollovers
diff --git a/code/__HELPERS/unique_ids.dm b/code/__HELPERS/unique_ids.dm
index f6f9393d937..1e9c699dcb9 100644
--- a/code/__HELPERS/unique_ids.dm
+++ b/code/__HELPERS/unique_ids.dm
@@ -16,7 +16,6 @@
var/global/next_unique_datum_id = 1
-/datum/var/tmp/unique_datum_id = null
/client/var/tmp/unique_datum_id = null
/datum/proc/UID()
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 82d9326252a..690b945cc63 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -526,6 +526,14 @@ proc/GaussRandRound(var/sigma,var/roundto)
return toReturn
+//Searches contents of the atom and returns the sum of all w_class of obj/item within
+/atom/proc/GetTotalContentsWeight(searchDepth = 5)
+ var/weight = 0
+ var/list/content = GetAllContents(searchDepth)
+ for(var/obj/item/I in content)
+ weight += I.w_class
+ return weight
+
//Step-towards method of determining whether one atom can see another. Similar to viewers()
/proc/can_see(var/atom/source, var/atom/target, var/length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate.
var/turf/current = get_turf(source)
@@ -1474,13 +1482,13 @@ var/mob/dview/dview_mob = new
/mob/dview/New() //For whatever reason, if this isn't called, then BYOND will throw a type mismatch runtime when attempting to add this to the mobs list. -Fox
-/proc/IsValidSrc(var/A)
+/proc/IsValidSrc(A)
if(istype(A, /datum))
- var/datum/B = A
- return isnull(B.gcDestroyed)
+ var/datum/D = A
+ return !QDELETED(D)
if(istype(A, /client))
- return 1
- return 0
+ return TRUE
+ return FALSE
//Get the dir to the RIGHT of dir if they were on a clock
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 5e9d9462d7f..c6b63b77271 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -1,6 +1,14 @@
#define DEBUG
//#define TESTING
+#ifdef TESTING
+//#define GC_FAILURE_HARD_LOOKUP //makes paths that fail to GC call find_references before del'ing.
+ //implies FIND_REF_NO_CHECK_TICK
+
+//#define FIND_REF_NO_CHECK_TICK //Sets world.loop_checks to false and prevents find references from sleeping
+
+#endif
+
#define IS_MODE_COMPILED(MODE) (ispath(text2path("/datum/game_mode/"+(MODE))))
#define BACKGROUND_ENABLED 0 // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm
index 7042cbe932a..30809943a8a 100644
--- a/code/_globalvars/lists/reagents.dm
+++ b/code/_globalvars/lists/reagents.dm
@@ -55,7 +55,7 @@ var/global/list/blocked_chems = list("polonium", "initropidril", "concentrated_i
"syndicate_nanites", "ripping_tendrils", "boiling_oil",
"envenomed_filaments", "lexorin_jelly", "kinetic",
"cryogenic_liquid", "dark_matter", "b_sorium",
- "reagent", "life","dragonsbreath")
+ "reagent", "life","dragonsbreath", "nanocalcium")
var/global/list/safe_chem_list = list("antihol", "charcoal", "epinephrine", "insulin", "teporone","silver_sulfadiazine", "salbutamol",
"omnizine", "stimulants", "synaptizine", "potass_iodide", "oculine", "mannitol", "styptic_powder",
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index bc61c854ab4..91514a79a7e 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -2,8 +2,6 @@ var/global/obj/effect/overlay/plmaster = null
var/global/obj/effect/overlay/slmaster = null
var/global/obj/effect/overlay/icemaster = null
-// nanomanager, the manager for Nano UIs
-var/datum/nanomanager/nanomanager = new()
// Event Manager, the manager for events.
var/datum/event_manager/event_manager = new()
// Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it.
@@ -74,8 +72,10 @@ var/score_dmgestkey = null
var/TAB = " "
-var/timezoneOffset = 0 // The difference betwen midnight (of the host computer) and 0 world.ticks.
+GLOBAL_VAR_INIT(timezoneOffset, 0) // The difference betwen midnight (of the host computer) and 0 world.ticks.
// For FTP requests. (i.e. downloading runtime logs.)
// However it'd be ok to use for accessing attack logs and such too, which are even laggier.
-var/fileaccess_timer = 0
\ No newline at end of file
+var/fileaccess_timer = 0
+
+GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds
\ No newline at end of file
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 58b12ed8857..3abef4e0cc5 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -2,7 +2,7 @@
if(pre_attackby(target, user, params))
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
var/resolved = target.attackby(src, user, params)
- if(!resolved && target && !qdeleted(src))
+ if(!resolved && target && !QDELETED(src))
afterattack(target, user, 1, params) // 1: clicking something Adjacent
// Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown.
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 02c2954b61f..5ab67ffb611 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -62,9 +62,9 @@ var/const/tk_maxrange = 15
desc = "Magic"
icon = 'icons/obj/magic.dmi'//Needs sprites
icon_state = "2"
- flags = NOBLUDGEON | ABSTRACT
+ flags = NOBLUDGEON | ABSTRACT | DROPDEL
//item_state = null
- w_class = 10
+ w_class = WEIGHT_CLASS_GIGANTIC
layer = 20
plane = HUD_PLANE
@@ -82,9 +82,8 @@ var/const/tk_maxrange = 15
/obj/item/tk_grab/dropped(mob/user)
if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item
if(focus.Adjacent(loc))
- focus.loc = loc
-
- qdel(src)
+ focus.forceMove(loc)
+ . = ..()
//stops TK grabs being equipped anywhere but into hands
diff --git a/code/controllers/ProcessScheduler/core/process.dm b/code/controllers/ProcessScheduler/core/process.dm
index 4fc377e9e37..9e777d07ea3 100644
--- a/code/controllers/ProcessScheduler/core/process.dm
+++ b/code/controllers/ProcessScheduler/core/process.dm
@@ -393,7 +393,7 @@
exceptions[eid] = 0
/datum/controller/process/proc/catchBadType(var/datum/caught)
- if(isnull(caught) || !istype(caught) || !isnull(caught.gcDestroyed))
+ if(isnull(caught) || !istype(caught) || QDELETED(caught))
return // Only bother with types we can identify and that don't belong
catchException("Type [caught.type] does not belong in process' queue")
diff --git a/code/controllers/Processes/air.dm b/code/controllers/Processes/air.dm
deleted file mode 100644
index e7937593c19..00000000000
--- a/code/controllers/Processes/air.dm
+++ /dev/null
@@ -1,197 +0,0 @@
-var/kill_air = 0
-
-var/global/datum/controller/process/air_system/air_master
-
-/datum/controller/process/air_system
- var/list/excited_groups = list()
- var/list/active_turfs = list()
- var/list/hotspots = list()
-
- //Special functions lists
- var/list/turf/simulated/active_super_conductivity = list()
- var/list/turf/simulated/high_pressure_delta = list()
-
- var/current_cycle = 0
- var/failed_ticks = 0
- var/tick_progress = 0
-
- // Stats
- var/last_active = 0
- var/last_excited = 0
- var/last_hpd = 0
- var/last_hotspots = 0
- var/last_asc = 0
-
-
-/datum/controller/process/air_system/setup()
- name = "air"
- schedule_interval = 4
- start_delay = 4
-
- var/watch = start_watch()
- log_startup_progress("Processing geometry...")
- setup_overlays() // Assign icons and such for gas-turf-overlays
- setup_allturfs() // Get all currently active tiles that need processing each atmos tick.
- log_startup_progress(" Geometry processed in [stop_watch(watch)]s.")
-
-/datum/controller/process/air_system/doWork()
- if(kill_air)
- return 1
- current_cycle++
- process_pipenets()
- process_atmos_machinery()
- process_active_turfs()
- process_excited_groups()
- process_high_pressure_delta()
- process_hotspots()
- process_super_conductivity()
- return 1
-
-/datum/controller/process/air_system/statProcess()
- ..()
- stat(null, "[last_active] active")
- stat(null, "[last_excited] EG | [last_hpd] HPD | [last_asc] ASC | [last_hotspots] Hot")
- stat(null, "[pipe_networks.len] pipe nets, [deferred_pipenet_rebuilds.len] deferred")
- stat(null, "[atmos_machinery.len] atmos machines")
-
-DECLARE_GLOBAL_CONTROLLER(air_system, air_master)
-
-/datum/controller/process/air_system/proc/process_hotspots()
- last_hotspots = hotspots.len
- for(var/obj/effect/hotspot/H in hotspots)
- H.process()
- SCHECK
-
-/datum/controller/process/air_system/proc/process_super_conductivity()
- last_asc = active_super_conductivity.len
- for(var/turf/simulated/T in active_super_conductivity)
- T.super_conduct()
- SCHECK
-
-/datum/controller/process/air_system/proc/process_high_pressure_delta()
- last_hpd = high_pressure_delta.len
- for(var/turf/T in high_pressure_delta)
- T.high_pressure_movements()
- T.pressure_difference = 0
- SCHECK
- high_pressure_delta.Cut()
-
-/datum/controller/process/air_system/proc/process_active_turfs()
- last_active = active_turfs.len
- for(var/turf/simulated/T in active_turfs)
- T.process_cell()
- SCHECK
-
-/datum/controller/process/air_system/proc/process_pipenets()
- for(last_object in deferred_pipenet_rebuilds)
- var/obj/machinery/atmospherics/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
- try
- M.build_network()
- catch(var/exception/e)
- catchException(e, M)
- SCHECK
- else
- catchBadType(M)
- deferred_pipenet_rebuilds -= M
-
- for(last_object in pipe_networks)
- var/datum/pipeline/pipeNetwork = last_object
- if(istype(pipeNetwork) && isnull(pipeNetwork.gcDestroyed))
- try
- pipeNetwork.process()
- catch(var/exception/e)
- catchException(e, pipeNetwork)
- SCHECK
- else
- catchBadType(pipeNetwork)
- pipe_networks -= pipeNetwork
-
-/datum/controller/process/air_system/proc/process_atmos_machinery()
- for(last_object in atmos_machinery)
- var/obj/machinery/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
- try
- if(M.process_atmos() == PROCESS_KILL)
- atmos_machinery.Remove(M)
- continue
- catch(var/exception/e)
- catchException(e, M)
- else
- catchBadType(M)
- atmos_machinery -= M
-
- SCHECK
-
-
-/datum/controller/process/air_system/proc/remove_from_active(var/turf/simulated/T)
- if(istype(T))
- T.excited = 0
- active_turfs -= T
- if(T.excited_group)
- T.excited_group.garbage_collect()
-
-/datum/controller/process/air_system/proc/add_to_active(var/turf/simulated/T, var/blockchanges = 1)
- if(istype(T) && T.air)
- T.excited = 1
- active_turfs |= T
- if(blockchanges && T.excited_group)
- T.excited_group.garbage_collect()
- else
- for(var/direction in cardinal)
- if(!(T.atmos_adjacent_turfs & direction))
- continue
- var/turf/simulated/S = get_step(T, direction)
- if(istype(S))
- add_to_active(S)
-
-/datum/controller/process/air_system/proc/setup_allturfs(var/turfs_in = world)
- for(var/turf/simulated/T in turfs_in)
- T.CalculateAdjacentTurfs()
- if(!T.blocks_air)
- T.update_visuals()
- for(var/direction in cardinal)
- if(!(T.atmos_adjacent_turfs & direction))
- continue
- var/turf/enemy_tile = get_step(T, direction)
- if(istype(enemy_tile,/turf/simulated/))
- var/turf/simulated/enemy_simulated = enemy_tile
- if(!T.air.compare(enemy_simulated.air))
- T.excited = 1
- active_turfs |= T
- break
- else
- if(!T.air.check_turf_total(enemy_tile))
- T.excited = 1
- active_turfs |= T
-
-/datum/controller/process/air_system/proc/process_excited_groups()
- last_excited = excited_groups.len
- for(var/datum/excited_group/EG in excited_groups)
- EG.breakdown_cooldown++
- if(EG.breakdown_cooldown == 10)
- EG.self_breakdown()
- SCHECK
- return
- if(EG.breakdown_cooldown > 20)
- EG.dismantle()
- SCHECK
-
-/datum/controller/process/air_system/proc/setup_overlays()
- plmaster = new /obj/effect/overlay()
- plmaster.icon = 'icons/effects/tile_effects.dmi'
- plmaster.icon_state = "plasma"
- plmaster.layer = FLY_LAYER
- plmaster.mouse_opacity = 0
-
- slmaster = new /obj/effect/overlay()
- slmaster.icon = 'icons/effects/tile_effects.dmi'
- slmaster.icon_state = "sleeping_agent"
- slmaster.layer = FLY_LAYER
- slmaster.mouse_opacity = 0
-
- icemaster = new /obj/effect/overlay()
- icemaster.icon = 'icons/turf/overlays.dmi'
- icemaster.icon_state = "snowfloor"
- icemaster.layer = TURF_LAYER+0.1
- icemaster.mouse_opacity = 0
diff --git a/code/controllers/Processes/garbage.dm b/code/controllers/Processes/garbage.dm
deleted file mode 100644
index 1a93c8f13db..00000000000
--- a/code/controllers/Processes/garbage.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-var/global/datum/controller/process/garbage_collector/garbageCollector
-
-/datum/controller/process/garbage_collector/setup()
- name = "garbage"
- schedule_interval = 10
- start_delay = 3
-
-/datum/controller/process/garbage_collector/doWork()
- // Garbage collection code can be found in code\modules\garbage collection\garbage_collector.dm
- processGarbage()
-
-/datum/controller/process/garbage_collector/statProcess()
- ..()
- stat(null, "[del_everything ? "Off" : "On"], [queue.len] queued")
- stat(null, "Dels: [dels_count], [soft_dels] soft, [hard_dels] hard")
-
-DECLARE_GLOBAL_CONTROLLER(garbage_collector, garbageCollector)
diff --git a/code/controllers/Processes/inactivity.dm b/code/controllers/Processes/inactivity.dm
deleted file mode 100644
index b08df7983fc..00000000000
--- a/code/controllers/Processes/inactivity.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-/*/datum/controller/process/inactivity/setup()
- name = "inactivity"
- schedule_interval = INACTIVITY_KICK
-
-/datum/controller/process/inactivity/doWork()
- if(config.kick_inactive)
- for(var/client/C in clients)
- if(C.is_afk(INACTIVITY_KICK))
- if(!istype(C.mob, /mob/dead))
- log_access("AFK: [key_name(C)]")
- to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.")
- del(C)
-
- SCHECK
-
-#undef INACTIVITY_KICK*/
diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm
index 268e1c073a2..2466f802740 100644
--- a/code/controllers/Processes/machinery.dm
+++ b/code/controllers/Processes/machinery.dm
@@ -24,7 +24,7 @@
/datum/controller/process/machinery/proc/process_machines()
for(last_object in machine_processing)
var/obj/machinery/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
try
if(M.process() == PROCESS_KILL)
machine_processing.Remove(M)
@@ -43,7 +43,7 @@
/datum/controller/process/machinery/proc/process_power()
for(last_object in deferred_powernet_rebuilds)
var/obj/O = last_object
- if(istype(O) && isnull(O.gcDestroyed))
+ if(istype(O) && !QDELETED(O))
try
var/datum/powernet/newPN = new()// creates a new powernet...
propagate_network(O, newPN)//... and propagates it to the other side of the cable
@@ -56,7 +56,7 @@
for(last_object in powernets)
var/datum/powernet/powerNetwork = last_object
- if(istype(powerNetwork) && isnull(powerNetwork.gcDestroyed))
+ if(istype(powerNetwork) && !QDELETED(powerNetwork))
try
powerNetwork.reset()
catch(var/exception/e)
diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm
index 86c76604606..2b11eff99be 100644
--- a/code/controllers/Processes/mob.dm
+++ b/code/controllers/Processes/mob.dm
@@ -21,7 +21,7 @@ var/global/datum/controller/process/mob/mob_master
/datum/controller/process/mob/doWork()
for(last_object in mob_list)
var/mob/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
try
M.Life()
catch(var/exception/e)
diff --git a/code/controllers/Processes/npcai.dm b/code/controllers/Processes/npcai.dm
index 09d8556187e..1f8d2a34e9e 100644
--- a/code/controllers/Processes/npcai.dm
+++ b/code/controllers/Processes/npcai.dm
@@ -25,7 +25,7 @@ var/global/datum/controller/process/npcai/npcai_master
/datum/controller/process/npcai/doWork()
for(last_object in simple_animal_list)
var/mob/living/simple_animal/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
if(!M.client && M.stat == CONSCIOUS)
try
M.process_ai()
@@ -44,7 +44,7 @@ var/global/datum/controller/process/npcai/npcai_master
for(last_object in snpc_list)
var/mob/living/carbon/human/interactive/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
try
if(!M.alternateProcessing || M.forceProcess)
M.doProcess()
diff --git a/code/controllers/Processes/obj.dm b/code/controllers/Processes/obj.dm
index 0e573bcc05c..454709b6194 100644
--- a/code/controllers/Processes/obj.dm
+++ b/code/controllers/Processes/obj.dm
@@ -15,7 +15,7 @@
/datum/controller/process/obj/doWork()
for(last_object in processing_objects)
var/datum/O = last_object
- if(istype(O) && isnull(O.gcDestroyed))
+ if(istype(O) && !QDELETED(O))
try
// Reagent datums get shoved in here, but the process proc isn't on the
// base datum type, so we just call it blindly.
diff --git a/code/controllers/Processes/shuttles.dm b/code/controllers/Processes/shuttles.dm
index 4f47bda014c..57ca886d6e1 100644
--- a/code/controllers/Processes/shuttles.dm
+++ b/code/controllers/Processes/shuttles.dm
@@ -13,6 +13,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
var/emergencyCallTime = 6000 //time taken for emergency shuttle to reach the station when called (in deciseconds)
var/emergencyDockTime = 1800 //time taken for emergency shuttle to leave again once it has docked (in deciseconds)
var/emergencyEscapeTime = 1200 //time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds)
+ var/emergency_sec_level_time = 0 // time sec level was last raised to red or higher
var/area/emergencyLastCallLoc
var/emergencyNoEscape
@@ -134,7 +135,11 @@ DECLARE_GLOBAL_CONTROLLER(shuttle, shuttle_master)
var/area/signal_origin = get_area(user)
var/emergency_reason = "\nNature of emergency:\n\n[call_reason]"
if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes.
- emergency.request(null, 0.5, signal_origin, html_decode(emergency_reason), 1)
+ var/extra_minutes = 0
+ var/priority_time = emergencyCallTime * 0.5
+ if(world.time - emergency_sec_level_time < priority_time)
+ extra_minutes = 5
+ emergency.request(null, 0.5 + extra_minutes / (emergencyCallTime / 600), signal_origin, html_decode(emergency_reason), 1)
else
emergency.request(null, 1, signal_origin, html_decode(emergency_reason), 0)
diff --git a/code/controllers/Processes/spacedrift.dm b/code/controllers/Processes/spacedrift.dm
deleted file mode 100644
index d799aeb99d9..00000000000
--- a/code/controllers/Processes/spacedrift.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-var/global/datum/controller/process/spacedrift/drift_master
-
-/datum/controller/process/spacedrift
- var/list/processing_list = list()
-
-/datum/controller/process/spacedrift/setup()
- name = "spacedrift"
- schedule_interval = 5
- start_delay = 20
- log_startup_progress("Spacedrift starting up.")
-
-/datum/controller/process/spacedrift/statProcess()
- ..()
- stat(null, "P:[processing_list.len]")
-
-/datum/controller/process/spacedrift/doWork()
- var/list/currentrun = processing_list.Copy()
-
- while(currentrun.len)
- var/atom/movable/AM = currentrun[currentrun.len]
- currentrun.len--
- if(!AM)
- processing_list -= AM
- SCHECK
- continue
-
- if(AM.inertia_next_move > world.time)
- SCHECK
- continue
-
- if(!AM.loc || AM.loc != AM.inertia_last_loc || AM.Process_Spacemove(0))
- AM.inertia_dir = 0
-
- if(!AM.inertia_dir)
- AM.inertia_last_loc = null
- processing_list -= AM
- SCHECK
- continue
-
- var/old_dir = AM.dir
- var/old_loc = AM.loc
- AM.inertia_moving = TRUE
- step(AM, AM.inertia_dir)
- AM.inertia_moving = FALSE
- AM.inertia_next_move = world.time + AM.inertia_move_delay
- if(AM.loc == old_loc)
- AM.inertia_dir = 0
-
- AM.setDir(old_dir)
- AM.inertia_last_loc = AM.loc
- SCHECK
-
-DECLARE_GLOBAL_CONTROLLER(spacedrift, drift_master)
\ No newline at end of file
diff --git a/code/controllers/Processes/sun.dm b/code/controllers/Processes/sun.dm
deleted file mode 100644
index bd9644b4536..00000000000
--- a/code/controllers/Processes/sun.dm
+++ /dev/null
@@ -1,61 +0,0 @@
-var/global/datum/controller/process/sun/sun
-
-/datum/controller/process/sun
- var/angle
- var/dx
- var/dy
- var/rate
- var/list/solars = list() // for debugging purposes, references solars list at the constructor
-
-/datum/controller/process/sun/setup()
- name = "sun"
- schedule_interval = 600 // every 60 seconds
- log_startup_progress("Sun ticker starting up.")
-
- angle = rand (0,360) // the station position to the sun is randomised at round start
- rate = rand(50,200)/100 // 50% - 200% of standard rotation
- if(prob(50)) // same chance to rotate clockwise than counter-clockwise
- rate = -rate
-
-/datum/controller/process/sun/doWork()
- calc_position()
- update_solar_machinery()
-
-DECLARE_GLOBAL_CONTROLLER(sun, sun)
-
-// calculate the sun's position given the time of day
-// at the standard rate (100%) the angle is increase/decreased by 6 degrees every minute.
-// a full rotation thus take a game hour in that case
-/datum/controller/process/sun/proc/calc_position()
- angle = (360 + angle + rate * 6) % 360 // increase/decrease the angle to the sun, adjusted by the rate
-
- // now calculate and cache the (dx,dy) increments for line drawing
- var/s = sin(angle)
- var/c = cos(angle)
-
- // Either "abs(s) < abs(c)" or "abs(s) >= abs(c)"
- // In both cases, the greater is greater than 0, so, no "if 0" check is needed for the divisions
-
- if(abs(s) < abs(c))
- dx = s / abs(c)
- dy = c / abs(c)
- else
- dx = s / abs(s)
- dy = c / abs(s)
-
-//now tell the solar control computers to update their status and linked devices
-/datum/controller/process/sun/proc/update_solar_machinery()
- for(last_object in solars)
- var/obj/machinery/power/solar_control/SC = last_object
- if(istype(SC) && isnull(SC.gcDestroyed))
- if(!SC.powernet)
- solars -= SC
- continue
- try
- SC.update()
- catch(var/exception/e)
- catchException(e, SC)
- SCHECK
- else
- catchBadType(SC)
- solars -= SC
diff --git a/code/controllers/Processes/throwing.dm b/code/controllers/Processes/throwing.dm
deleted file mode 100644
index a11c1252d35..00000000000
--- a/code/controllers/Processes/throwing.dm
+++ /dev/null
@@ -1,138 +0,0 @@
-#define MAX_THROWING_DIST 512 // 2 z-levels on default width
-#define MAX_TICKS_TO_MAKE_UP 3 //how many missed ticks will we attempt to make up for this run.
-
-var/global/datum/controller/process/throwing/throw_master
-
-/datum/controller/process/throwing
- var/list/processing_list
-
-/datum/controller/process/throwing/setup()
- name = "throwing"
- schedule_interval = 1
- start_delay = 20
- log_startup_progress("Throw ticker starting up.")
-
-/datum/controller/process/throwing/statProcess()
- ..()
- stat(null, "P:[processing_list.len]")
-
-/datum/controller/process/throwing/started()
- ..()
- if(!processing_list)
- processing_list = list()
-
-/datum/controller/process/throwing/doWork()
- for(last_object in processing_list)
- var/atom/movable/AM = last_object
- if(istype(AM) && isnull(AM.gcDestroyed))
- var/datum/thrownthing/TT = processing_list[AM]
- if(istype(TT) && isnull(TT.gcDestroyed))
- TT.tick()
- SCHECK
- else
- catchBadType(TT)
- processing_list -= AM
- AM.throwing = null
- else
- catchBadType(AM)
- processing_list -= AM
- SCHECK
-
-DECLARE_GLOBAL_CONTROLLER(throwing, throw_master)
-
-/datum/thrownthing
- var/atom/movable/thrownthing
- var/atom/target
- var/turf/target_turf
- var/init_dir
- var/maxrange
- var/speed
- var/mob/thrower
- var/diagonals_first
- var/dist_travelled = 0
- var/start_time
- var/dist_x
- var/dist_y
- var/dx
- var/dy
- var/pure_diagonal
- var/diagonal_error
- var/datum/callback/callback
-
-/datum/thrownthing/proc/tick()
- var/atom/movable/AM = thrownthing
- if(!isturf(AM.loc) || !AM.throwing)
- finalize()
- return
-
- if(dist_travelled && hitcheck()) //to catch sneaky things moving on our tile while we slept
- finalize()
- return
-
- var/atom/step
-
- // calculate how many tiles to move, making up for any missed ticks.
- if((dist_travelled >= maxrange || AM.loc == target_turf) && has_gravity(AM, AM.loc))
- finalize()
- return
-
- if(dist_travelled <= max(dist_x, dist_y)) //if we haven't reached the target yet we home in on it, otherwise we use the initial direction
- step = get_step(AM, get_dir(AM, target_turf))
- else
- step = get_step(AM, init_dir)
-
- if(!pure_diagonal && !diagonals_first) // not a purely diagonal trajectory and we don't want all diagonal moves to be done first
- if(diagonal_error >= 0 && max(dist_x, dist_y) - dist_travelled != 1) // we do a step forward unless we're right before the target
- step = get_step(AM, dx)
- diagonal_error += (diagonal_error < 0) ? dist_x / 2 : -dist_y
-
- if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
- finalize()
- return
-
- AM.Move(step, get_dir(AM, step))
-
- if(!AM.throwing) // we hit something during our move
- finalize(hit = TRUE)
- return
-
- dist_travelled++
-
- if(dist_travelled > MAX_THROWING_DIST)
- finalize()
- return
-
-/datum/thrownthing/proc/finalize(hit = FALSE)
- set waitfor = 0
- throw_master.processing_list -= thrownthing
- // done throwning, either because it hit something or it finished moving
- thrownthing.throwing = null
- if(!hit)
- for(var/thing in get_turf(thrownthing)) //looking for our target on the turf we land on.
- var/atom/A = thing
- if(A == target)
- hit = 1
- thrownthing.throw_impact(A, src)
- break
- if(!hit)
- thrownthing.throw_impact(get_turf(thrownthing), src) // we haven't hit something yet and we still must, let's hit the ground.
- thrownthing.newtonian_move(init_dir)
- else
- thrownthing.newtonian_move(init_dir)
- if(callback)
- callback.Invoke()
-
-/datum/thrownthing/proc/hit_atom(atom/A)
- thrownthing.throw_impact(A, src)
- thrownthing.newtonian_move(init_dir)
- finalize(TRUE)
-
-/datum/thrownthing/proc/hitcheck()
- for(var/thing in get_turf(thrownthing))
- var/atom/movable/AM = thing
- if(AM == thrownthing)
- continue
- if(AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags & ON_BORDER))
- thrownthing.throwing = null
- thrownthing.throw_impact(AM, src)
- return TRUE
\ No newline at end of file
diff --git a/code/controllers/Processes/timer.dm b/code/controllers/Processes/timer.dm
index 0dcaf128193..4b42d69221d 100644
--- a/code/controllers/Processes/timer.dm
+++ b/code/controllers/Processes/timer.dm
@@ -19,7 +19,7 @@ var/global/datum/controller/process/timer/timer_master
return
for(last_object in processing_timers)
var/datum/timedevent/event = last_object
- if(!event.thingToCall || qdeleted(event.thingToCall))
+ if(!event.thingToCall || check_datum_qdeleted(event.thingToCall))
qdel(event)
if(event.timeToRun <= world.time)
runevent(event)
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 88fdb83da10..7750a40074f 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -199,22 +199,22 @@
var/high_pop_mc_mode_amount = 65
var/disable_high_pop_mc_mode_amount = 60
-/datum/configuration/New()
- var/list/L = subtypesof(/datum/game_mode)
- for(var/T in L)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
- var/datum/game_mode/M = new T()
+ // Nightshift
+ var/randomize_shift_time = FALSE
+ var/enable_night_shifts = FALSE
- if(M.config_tag)
- if(!(M.config_tag in modes)) // ensure each mode is added only once
- diary << "Adding game mode [M.name] ([M.config_tag]) to configuration."
- src.modes += M.config_tag
- src.mode_names[M.config_tag] = M.name
- src.probabilities[M.config_tag] = M.probability
- if(M.votable)
- src.votable_modes += M.config_tag
- qdel(M)
+/datum/configuration/New()
+ for(var/T in subtypesof(/datum/game_mode))
+ var/datum/game_mode/M = T
+
+ if(initial(M.config_tag))
+ if(!(initial(M.config_tag) in modes)) // ensure each mode is added only once
+ diary << "Adding game mode [initial(M.name)] ([initial(M.config_tag)]) to configuration."
+ src.modes += initial(M.config_tag)
+ src.mode_names[initial(M.config_tag)] = initial(M.name)
+ src.probabilities[initial(M.config_tag)] = initial(M.probability)
+ if(initial(M.votable))
+ src.votable_modes += initial(M.config_tag)
src.votable_modes += "secret"
/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
@@ -605,19 +605,18 @@
shutdown_shell_command = value
if("disable_karma")
- disable_karma = 1
+ config.disable_karma = 1
if("tick_limit_mc_init")
- tick_limit_mc_init = text2num(value)
+ config.tick_limit_mc_init = text2num(value)
if("base_mc_tick_rate")
- base_mc_tick_rate = text2num(value)
+ config.base_mc_tick_rate = text2num(value)
if("high_pop_mc_tick_rate")
- high_pop_mc_tick_rate = text2num(value)
+ config.high_pop_mc_tick_rate = text2num(value)
if("high_pop_mc_mode_amount")
- high_pop_mc_mode_amount = text2num(value)
+ config.high_pop_mc_mode_amount = text2num(value)
if("disable_high_pop_mc_mode_amount")
- disable_high_pop_mc_mode_amount = text2num(value)
-
+ config.disable_high_pop_mc_mode_amount = text2num(value)
else
diary << "Unknown setting in configuration: '[name]'"
@@ -680,6 +679,10 @@
MAX_EX_FLAME_RANGE = BombCap
if("default_laws")
config.default_laws = text2num(value)
+ if("randomize_shift_time")
+ config.randomize_shift_time = TRUE
+ if("enable_night_shifts")
+ config.enable_night_shifts = TRUE
else
diary << "Unknown setting in configuration: '[name]'"
@@ -750,13 +753,10 @@
config.overflow_whitelist += t
/datum/configuration/proc/pick_mode(mode_name)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
for(var/T in subtypesof(/datum/game_mode))
- var/datum/game_mode/M = new T()
- if(M.config_tag && M.config_tag == mode_name)
- return M
- qdel(M)
+ var/datum/game_mode/M = T
+ if(initial(M.config_tag) && initial(M.config_tag) == mode_name)
+ return new T()
return new /datum/game_mode/extended()
/datum/configuration/proc/get_runnable_modes()
@@ -773,4 +773,4 @@
if(M.can_start())
runnable_modes[M] = probabilities[M.config_tag]
// to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]")
- return runnable_modes
+ return runnable_modes
\ No newline at end of file
diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm
index 78303449f26..923dece3c6b 100644
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -28,7 +28,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
/datum/controller/failsafe/Initialize()
set waitfor = 0
Failsafe.Loop()
- if(!qdeleted(src))
+ if(!QDELETED(src))
qdel(src) //when Loop() returns, we delete ourselves and let the mc recreate us
/datum/controller/failsafe/Destroy()
diff --git a/code/controllers/subsystem/fires.dm b/code/controllers/subsystem/fires.dm
index 50624aa8db0..ce66405e1c9 100644
--- a/code/controllers/subsystem/fires.dm
+++ b/code/controllers/subsystem/fires.dm
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(fires)
while(currentrun.len)
var/obj/O = currentrun[currentrun.len]
currentrun.len--
- if(!O || qdeleted(O))
+ if(!O || QDELETED(O))
processing -= O
if(MC_TICK_CHECK)
return
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
new file mode 100644
index 00000000000..05dab2bd97b
--- /dev/null
+++ b/code/controllers/subsystem/garbage.dm
@@ -0,0 +1,466 @@
+SUBSYSTEM_DEF(garbage)
+ name = "Garbage"
+ priority = FIRE_PRIORITY_GARBAGE
+ wait = 2 SECONDS
+ flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
+ runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
+ init_order = INIT_ORDER_GARBAGE
+
+ var/list/collection_timeout = list(0, 2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level
+
+ //Stat tracking
+ var/delslasttick = 0 // number of del()'s we've done this tick
+ var/gcedlasttick = 0 // number of things that gc'ed last tick
+ var/totaldels = 0
+ var/totalgcs = 0
+
+ var/highest_del_time = 0
+ var/highest_del_tickusage = 0
+
+ var/list/pass_counts
+ var/list/fail_counts
+
+ var/list/items = list() // Holds our qdel_item statistics datums
+
+ //Queue
+ var/list/queues
+
+ #ifdef TESTING
+ var/list/reference_find_on_fail = list()
+ #endif
+
+
+/datum/controller/subsystem/garbage/PreInit()
+ queues = new(GC_QUEUE_COUNT)
+ pass_counts = new(GC_QUEUE_COUNT)
+ fail_counts = new(GC_QUEUE_COUNT)
+ for(var/i in 1 to GC_QUEUE_COUNT)
+ queues[i] = list()
+ pass_counts[i] = 0
+ fail_counts[i] = 0
+
+/datum/controller/subsystem/garbage/stat_entry(msg)
+ var/list/counts = list()
+ for(var/list/L in queues)
+ counts += length(L)
+ msg += "Q:[counts.Join(",")]|D:[delslasttick]|G:[gcedlasttick]|"
+ msg += "GR:"
+ if(!(delslasttick + gcedlasttick))
+ msg += "n/a|"
+ else
+ msg += "[round((gcedlasttick / (delslasttick + gcedlasttick)) * 100, 0.01)]%|"
+
+ msg += "TD:[totaldels]|TG:[totalgcs]|"
+ if(!(totaldels + totalgcs))
+ msg += "n/a|"
+ else
+ msg += "TGR:[round((totalgcs / (totaldels + totalgcs)) * 100, 0.01)]%"
+ msg += " P:[pass_counts.Join(",")]"
+ msg += "|F:[fail_counts.Join(",")]"
+ ..(msg)
+
+/* TO-DO
+/datum/controller/subsystem/garbage/Shutdown()
+ //Adds the del() log to the qdel log file
+ var/list/dellog = list()
+
+ //sort by how long it's wasted hard deleting
+ sortTim(items, cmp=/proc/cmp_qdel_item_time, associative = TRUE)
+ for(var/path in items)
+ var/datum/qdel_item/I = items[path]
+ dellog += "Path: [path]"
+ if(I.failures)
+ dellog += "\tFailures: [I.failures]"
+ dellog += "\tqdel() Count: [I.qdels]"
+ dellog += "\tDestroy() Cost: [I.destroy_time]ms"
+ if(I.hard_deletes)
+ dellog += "\tTotal Hard Deletes [I.hard_deletes]"
+ dellog += "\tTime Spent Hard Deleting: [I.hard_delete_time]ms"
+ if(I.slept_destroy)
+ dellog += "\tSleeps: [I.slept_destroy]"
+ if(I.no_respect_force)
+ dellog += "\tIgnored force: [I.no_respect_force] times"
+ if(I.no_hint)
+ dellog += "\tNo hint: [I.no_hint] times"
+ log_qdel(dellog.Join("\n"))
+*/
+
+/datum/controller/subsystem/garbage/fire()
+ //the fact that this resets its processing each fire (rather then resume where it left off) is intentional.
+ var/queue = GC_QUEUE_PREQUEUE
+
+ while(state == SS_RUNNING)
+ switch(queue)
+ if(GC_QUEUE_PREQUEUE)
+ HandlePreQueue()
+ queue = GC_QUEUE_PREQUEUE + 1
+ if(GC_QUEUE_CHECK)
+ HandleQueue(GC_QUEUE_CHECK)
+ queue = GC_QUEUE_CHECK + 1
+ if(GC_QUEUE_HARDDELETE)
+ HandleQueue(GC_QUEUE_HARDDELETE)
+ break
+
+ if(state == SS_PAUSED) //make us wait again before the next run.
+ state = SS_RUNNING
+
+//If you see this proc high on the profile, what you are really seeing is the garbage collection/soft delete overhead in byond.
+//Don't attempt to optimize, not worth the effort.
+/datum/controller/subsystem/garbage/proc/HandlePreQueue()
+ var/list/tobequeued = queues[GC_QUEUE_PREQUEUE]
+ var/static/count = 0
+ if(count)
+ var/c = count
+ count = 0 //so if we runtime on the Cut, we don't try again.
+ tobequeued.Cut(1, c + 1)
+
+ for(var/ref in tobequeued)
+ count++
+ Queue(ref, GC_QUEUE_PREQUEUE + 1)
+ if(MC_TICK_CHECK)
+ break
+ if(count)
+ tobequeued.Cut(1, count + 1)
+ count = 0
+
+/datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_CHECK)
+ if(level == GC_QUEUE_CHECK)
+ delslasttick = 0
+ gcedlasttick = 0
+ var/cut_off_time = world.time - collection_timeout[level] //ignore entries newer then this
+ var/list/queue = queues[level]
+ var/static/lastlevel
+ var/static/count = 0
+ if(count) //runtime last run before we could do this.
+ var/c = count
+ count = 0 //so if we runtime on the Cut, we don't try again.
+ var/list/lastqueue = queues[lastlevel]
+ lastqueue.Cut(1, c + 1)
+
+ lastlevel = level
+
+ for(var/refID in queue)
+ if(!refID)
+ count++
+ if(MC_TICK_CHECK)
+ break
+ continue
+
+ var/GCd_at_time = queue[refID]
+ if(GCd_at_time > cut_off_time)
+ break // Everything else is newer, skip them
+ count++
+
+ var/datum/D
+ D = locate(refID)
+
+ if(!D || D.gc_destroyed != GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake
+ ++gcedlasttick
+ ++totalgcs
+ pass_counts[level]++
+ #ifdef TESTING
+ reference_find_on_fail -= refID //It's deleted we don't care anymore.
+ #endif
+ if(MC_TICK_CHECK)
+ break
+ continue
+
+ // Something's still referring to the qdel'd object.
+ fail_counts[level]++
+ switch(level)
+ if(GC_QUEUE_CHECK)
+ #ifdef TESTING
+ if(reference_find_on_fail[refID])
+ D.find_references()
+ #ifdef GC_FAILURE_HARD_LOOKUP
+ else
+ D.find_references()
+ #endif
+ reference_find_on_fail -= refID
+ #endif
+ var/type = D.type
+ var/datum/qdel_item/I = items[type]
+ testing("GC: -- \ref[src] | [type] was unable to be GC'd --")
+ I.failures++
+ if(GC_QUEUE_HARDDELETE)
+ HardDelete(D)
+ if(MC_TICK_CHECK)
+ break
+ continue
+
+ Queue(D, level + 1)
+
+ if(MC_TICK_CHECK)
+ break
+ if(count)
+ queue.Cut(1, count + 1)
+ count = 0
+
+/datum/controller/subsystem/garbage/proc/PreQueue(datum/D)
+ if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
+ queues[GC_QUEUE_PREQUEUE] += D
+ D.gc_destroyed = GC_QUEUED_FOR_QUEUING
+
+/datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_CHECK)
+ if(isnull(D))
+ return
+ if(D.gc_destroyed == GC_QUEUED_FOR_HARD_DEL)
+ level = GC_QUEUE_HARDDELETE
+ if(level > GC_QUEUE_COUNT)
+ HardDelete(D)
+ return
+ var/gctime = world.time
+ var/refid = "\ref[D]"
+
+ D.gc_destroyed = gctime
+ var/list/queue = queues[level]
+ if(queue[refid])
+ queue -= refid // Removing any previous references that were GC'd so that the current object will be at the end of the list.
+
+ queue[refid] = gctime
+
+//this is mainly to separate things profile wise.
+/datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
+ var/time = world.timeofday
+ var/tick = TICK_USAGE
+ var/ticktime = world.time
+ ++delslasttick
+ ++totaldels
+ var/type = D.type
+ var/refID = "\ref[D]"
+
+ del(D)
+
+ tick = (TICK_USAGE - tick + ((world.time - ticktime) / world.tick_lag * 100))
+
+ var/datum/qdel_item/I = items[type]
+
+ I.hard_deletes++
+ I.hard_delete_time += TICK_DELTA_TO_MS(tick)
+
+
+ if(tick > highest_del_tickusage)
+ highest_del_tickusage = tick
+ time = world.timeofday - time
+ if(!time && TICK_DELTA_TO_MS(tick) > 1)
+ time = TICK_DELTA_TO_MS(tick) / 100
+ if(time > highest_del_time)
+ highest_del_time = time
+ if(time > 10)
+ log_game("Error: [type]([refID]) took longer than 1 second to delete (took [time / 10] seconds to delete)")
+ message_admins("Error: [type]([refID]) took longer than 1 second to delete (took [time / 10] seconds to delete).")
+ postpone(time)
+
+/datum/controller/subsystem/garbage/proc/HardQueue(datum/D)
+ if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
+ queues[GC_QUEUE_PREQUEUE] += D
+ D.gc_destroyed = GC_QUEUED_FOR_HARD_DEL
+
+/datum/controller/subsystem/garbage/Recover()
+ if(istype(SSgarbage.queues))
+ for(var/i in 1 to SSgarbage.queues.len)
+ queues[i] |= SSgarbage.queues[i]
+
+
+/datum/qdel_item
+ var/name = ""
+ var/qdels = 0 //Total number of times it's passed thru qdel.
+ var/destroy_time = 0 //Total amount of milliseconds spent processing this type's Destroy()
+ var/failures = 0 //Times it was queued for soft deletion but failed to soft delete.
+ var/hard_deletes = 0 //Different from failures because it also includes QDEL_HINT_HARDDEL deletions
+ var/hard_delete_time = 0//Total amount of milliseconds spent hard deleting this type.
+ var/no_respect_force = 0//Number of times it's not respected force=TRUE
+ var/no_hint = 0 //Number of times it's not even bother to give a qdel hint
+ var/slept_destroy = 0 //Number of times it's slept in its destroy
+
+/datum/qdel_item/New(mytype)
+ name = "[mytype]"
+
+#ifdef TESTING
+/proc/qdel_and_find_ref_if_fail(datum/D, force = FALSE)
+ SSgarbage.reference_find_on_fail["\ref[D]"] = TRUE
+ qdel(D, force)
+#endif
+
+// Should be treated as a replacement for the 'del' keyword.
+// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
+/proc/qdel(datum/D, force = FALSE, ...)
+ if(!istype(D))
+ del(D)
+ return
+ var/datum/qdel_item/I = SSgarbage.items[D.type]
+ if(!I)
+ I = SSgarbage.items[D.type] = new /datum/qdel_item(D.type)
+ I.qdels++
+
+
+ if(isnull(D.gc_destroyed))
+ D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
+ var/start_time = world.time
+ var/start_tick = world.tick_usage
+ var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
+ if(world.time != start_time)
+ I.slept_destroy++
+ else
+ I.destroy_time += TICK_USAGE_TO_MS(start_tick)
+ if(!D)
+ return
+ switch(hint)
+ if(QDEL_HINT_QUEUE) //qdel should queue the object for deletion.
+ SSgarbage.PreQueue(D)
+ if(QDEL_HINT_IWILLGC)
+ D.gc_destroyed = world.time
+ return
+ if(QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory.
+ if(!force)
+ D.gc_destroyed = null //clear the gc variable (important!)
+ return
+ // Returning LETMELIVE after being told to force destroy
+ // indicates the objects Destroy() does not respect force
+ #ifdef TESTING
+ if(!I.no_respect_force)
+ testing("WARNING: [D.type] has been force deleted, but is \
+ returning an immortal QDEL_HINT, indicating it does \
+ not respect the force flag for qdel(). It has been \
+ placed in the queue, further instances of this type \
+ will also be queued.")
+ #endif
+ I.no_respect_force++
+
+ SSgarbage.PreQueue(D)
+ if(QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete using a hard reference to save time from the locate()
+ SSgarbage.HardQueue(D)
+ if(QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste.
+ SSgarbage.HardDelete(D)
+ if(QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion.
+ SSgarbage.PreQueue(D)
+ #ifdef TESTING
+ D.find_references()
+ #endif
+ if(QDEL_HINT_IFFAIL_FINDREFERENCE)
+ SSgarbage.PreQueue(D)
+ #ifdef TESTING
+ SSgarbage.reference_find_on_fail["\ref[D]"] = TRUE
+ #endif
+ else
+ #ifdef TESTING
+ if(!I.no_hint)
+ testing("WARNING: [D.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.")
+ #endif
+ I.no_hint++
+ SSgarbage.PreQueue(D)
+ else if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
+ CRASH("[D.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic")
+
+#ifdef TESTING
+
+/datum/verb/find_refs()
+ set category = "Debug"
+ set name = "Find References"
+ set src in world
+
+ find_references(FALSE)
+
+/datum/proc/find_references(skip_alert)
+ running_find_references = type
+ if(usr && usr.client)
+ if(usr.client.running_find_references)
+ testing("CANCELLED search for references to a [usr.client.running_find_references].")
+ usr.client.running_find_references = null
+ running_find_references = null
+ //restart the garbage collector
+ SSgarbage.can_fire = 1
+ SSgarbage.next_fire = world.time + world.tick_lag
+ return
+
+ if(!skip_alert)
+ if(alert("Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", "Yes", "No") == "No")
+ running_find_references = null
+ return
+
+ //this keeps the garbage collector from failing to collect objects being searched for in here
+ SSgarbage.can_fire = 0
+
+ if(usr && usr.client)
+ usr.client.running_find_references = type
+
+ testing("Beginning search for references to a [type].")
+ last_find_references = world.time
+
+ DoSearchVar(GLOB) //globals
+ for(var/datum/thing in world) //atoms (don't beleive it's lies)
+ DoSearchVar(thing, "World -> [thing]")
+
+ for(var/datum/thing) //datums
+ DoSearchVar(thing, "World -> [thing]")
+
+ for(var/client/thing) //clients
+ DoSearchVar(thing, "World -> [thing]")
+
+ testing("Completed search for references to a [type].")
+ if(usr && usr.client)
+ usr.client.running_find_references = null
+ running_find_references = null
+
+ //restart the garbage collector
+ SSgarbage.can_fire = 1
+ SSgarbage.next_fire = world.time + world.tick_lag
+
+/datum/verb/qdel_then_find_references()
+ set category = "Debug"
+ set name = "qdel() then Find References"
+ set src in world
+
+ qdel(src, TRUE) //Force.
+ if(!running_find_references)
+ find_references(TRUE)
+
+/datum/verb/qdel_then_if_fail_find_references()
+ set category = "Debug"
+ set name = "qdel() then Find References if GC failure"
+ set src in world
+
+ qdel_and_find_ref_if_fail(src, TRUE)
+
+/datum/proc/DoSearchVar(X, Xname, recursive_limit = 64)
+ if(usr && usr.client && !usr.client.running_find_references)
+ return
+ if(!recursive_limit)
+ return
+
+ if(istype(X, /datum))
+ var/datum/D = X
+ if(D.last_find_references == last_find_references)
+ return
+
+ D.last_find_references = last_find_references
+ var/list/L = D.vars
+
+ for(var/varname in L)
+ if(varname == "vars")
+ continue
+ var/variable = L[varname]
+
+ if(variable == src)
+ testing("Found [src.type] \ref[src] in [D.type]'s [varname] var. [Xname]")
+
+ else if(islist(variable))
+ DoSearchVar(variable, "[Xname] -> list", recursive_limit - 1)
+
+ else if(islist(X))
+ var/normal = IS_NORMAL_LIST(X)
+ for(var/I in X)
+ if(I == src)
+ testing("Found [src.type] \ref[src] in list [Xname].")
+
+ else if(I && !isnum(I) && normal && X[I] == src)
+ testing("Found [src.type] \ref[src] in list [Xname]\[[I]\]")
+
+ else if(islist(I))
+ DoSearchVar(I, "[Xname] -> list", recursive_limit - 1)
+
+#ifndef FIND_REF_NO_CHECK_TICK
+ CHECK_TICK
+#endif
+
+#endif
diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm
new file mode 100644
index 00000000000..c8cbbc62013
--- /dev/null
+++ b/code/controllers/subsystem/nanoui.dm
@@ -0,0 +1,33 @@
+SUBSYSTEM_DEF(nanoui)
+ name = "Nanoui"
+ wait = 9
+ flags = SS_NO_INIT
+ priority = FIRE_PRIORITY_NANOUI
+ runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
+
+ var/list/currentrun = list()
+ var/list/open_uis = list() // A list of open UIs, grouped by src_object and ui_key.
+ var/list/processing_uis = list() // A list of processing UIs, ungrouped.
+
+/datum/controller/subsystem/nanoui/Shutdown()
+ close_all_uis()
+
+/datum/controller/subsystem/nanoui/stat_entry()
+ ..("P:[processing_uis.len]")
+
+/datum/controller/subsystem/nanoui/fire(resumed = 0)
+ if(!resumed)
+ src.currentrun = processing_uis.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+
+ while(currentrun.len)
+ var/datum/nanoui/ui = currentrun[currentrun.len]
+ currentrun.len--
+ if(ui && ui.user && ui.src_object)
+ ui.process()
+ else
+ processing_uis.Remove(ui)
+ if(MC_TICK_CHECK)
+ return
+
diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm
new file mode 100644
index 00000000000..813cfd5012a
--- /dev/null
+++ b/code/controllers/subsystem/nightshift.dm
@@ -0,0 +1,61 @@
+SUBSYSTEM_DEF(nightshift)
+ name = "Night Shift"
+ init_order = INIT_ORDER_NIGHTSHIFT
+ priority = FIRE_PRIORITY_NIGHTSHIFT
+ wait = 600
+ flags = SS_NO_TICK_CHECK
+
+ var/nightshift_active = FALSE
+ var/nightshift_start_time = 702000 //7:30 PM, station time
+ var/nightshift_end_time = 270000 //7:30 AM, station time
+ var/nightshift_first_check = 30 SECONDS
+
+ var/high_security_mode = FALSE
+
+/datum/controller/subsystem/nightshift/Initialize()
+ if(!config.enable_night_shifts)
+ can_fire = FALSE
+ if(config.randomize_shift_time)
+ GLOB.gametime_offset = rand(0, 23) HOURS
+ return ..()
+
+/datum/controller/subsystem/nightshift/fire(resumed = FALSE)
+ if(world.time - round_start_time < nightshift_first_check)
+ return
+ check_nightshift()
+
+/datum/controller/subsystem/nightshift/proc/announce(message)
+ priority_announcement.Announce(message, new_sound = 'sound/misc/notice2.ogg', new_title = "Automated Lighting System Announcement")
+
+/datum/controller/subsystem/nightshift/proc/check_nightshift(check_canfire=FALSE)
+ if(check_canfire && !can_fire)
+ return
+ var/emergency = security_level >= SEC_LEVEL_RED
+ var/announcing = TRUE
+ var/time = station_time()
+ var/night_time = (time < nightshift_end_time) || (time > nightshift_start_time)
+ if(high_security_mode != emergency)
+ high_security_mode = emergency
+ if(night_time)
+ announcing = FALSE
+ if(!emergency)
+ announce("Restoring night lighting configuration to normal operation.")
+ else
+ announce("Disabling night lighting: Station is in a state of emergency.")
+ if(emergency)
+ night_time = FALSE
+ if(nightshift_active != night_time)
+ update_nightshift(night_time, announcing)
+
+/datum/controller/subsystem/nightshift/proc/update_nightshift(active, announce = TRUE)
+ nightshift_active = active
+ if(announce)
+ if(active)
+ announce("Good evening, crew. To reduce power consumption and stimulate the circadian rhythms of some species, all of the lights aboard the station have been dimmed for the night.")
+ else
+ announce("Good morning, crew. As it is now day time, all of the lights aboard the station have been restored to their former brightness.")
+ for(var/A in apcs)
+ var/obj/machinery/power/apc/APC = A
+ if(is_station_level(APC.z))
+ APC.set_nightshift(active)
+ CHECK_TICK
diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm
new file mode 100644
index 00000000000..8e5e47e7abf
--- /dev/null
+++ b/code/controllers/subsystem/sun.dm
@@ -0,0 +1,42 @@
+SUBSYSTEM_DEF(sun)
+ name = "Sun"
+ wait = 600
+ flags = SS_NO_TICK_CHECK|SS_NO_INIT
+ var/angle
+ var/dx
+ var/dy
+ var/rate
+ var/list/solars = list()
+
+/datum/controller/subsystem/sun/PreInit()
+ angle = rand (0,360) // the station position to the sun is randomised at round start
+ rate = rand(50,200)/100 // 50% - 200% of standard rotation
+ if(prob(50)) // same chance to rotate clockwise than counter-clockwise
+ rate = -rate
+
+/datum/controller/subsystem/sun/stat_entry(msg)
+ ..("P:[solars.len]")
+
+/datum/controller/subsystem/sun/fire()
+ angle = (360 + angle + rate * 6) % 360 // increase/decrease the angle to the sun, adjusted by the rate
+
+ // now calculate and cache the (dx,dy) increments for line drawing
+ var/s = sin(angle)
+ var/c = cos(angle)
+
+ // Either "abs(s) < abs(c)" or "abs(s) >= abs(c)"
+ // In both cases, the greater is greater than 0, so, no "if 0" check is needed for the divisions
+
+ if(abs(s) < abs(c))
+ dx = s / abs(c)
+ dy = c / abs(c)
+ else
+ dx = s / abs(s)
+ dy = c / abs(s)
+
+ //now tell the solar control computers to update their status and linked devices
+ for(var/obj/machinery/power/solar_control/SC in solars)
+ if(!SC.powernet)
+ solars.Remove(SC)
+ continue
+ SC.update()
\ No newline at end of file
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index bad73292c82..73104f212ff 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -49,7 +49,7 @@
debug_variables(job_master)
feedback_add_details("admin_verb","DJobs")
if("Sun")
- debug_variables(sun)
+ debug_variables(SSsun)
feedback_add_details("admin_verb","DSun")
if("Radio")
debug_variables(radio_controller)
@@ -70,10 +70,10 @@
debug_variables(alarm_manager)
feedback_add_details("admin_verb", "DAlarm")
if("Garbage")
- debug_variables(garbageCollector)
+ debug_variables(SSgarbage)
feedback_add_details("admin_verb","DGarbage")
if("Nano")
- debug_variables(nanomanager)
+ debug_variables(SSnanoui)
feedback_add_details("admin_verb","DNano")
if("Vote")
debug_variables(vote)
diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index 55abf2834f1..a8890186bae 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -20,9 +20,9 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo
qdel(vote)
vote = src
spawn(0)
- while(!gcDestroyed)
+ while(!QDELETED(src))
try
- while(!gcDestroyed)
+ while(!QDELETED(src))
sleep(10)
process()
catch(var/exception/e)
diff --git a/code/datums/action.dm b/code/datums/action.dm
index e12bd371a6d..4ee33474049 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -101,7 +101,7 @@
//Presets for item actions
/datum/action/item_action
check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_CONSCIOUS
-
+ var/use_itemicon = TRUE
/datum/action/item_action/New(Target)
..()
var/obj/item/I = target
@@ -121,17 +121,19 @@
return 1
/datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button)
- current_button.overlays.Cut()
- if(target)
- var/obj/item/I = target
- var/old_layer = I.layer
- var/old_plane = I.plane
- I.layer = 21
- I.plane = HUD_PLANE
- current_button.overlays += I
- I.layer = old_layer
- I.plane = old_plane
-
+ if(use_itemicon)
+ current_button.overlays.Cut()
+ if(target)
+ var/obj/item/I = target
+ var/old_layer = I.layer
+ var/old_plane = I.plane
+ I.layer = 21
+ I.plane = HUD_PLANE
+ current_button.overlays += I
+ I.layer = old_layer
+ I.plane = old_plane
+ else
+ ..()
/datum/action/item_action/toggle_light
name = "Toggle Light"
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 558f6407528..96c663fb703 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -468,137 +468,142 @@ var/record_id_num = 1001
var/icon/clothes_s = null
- switch(H.mind.assigned_role)
- if("Head of Personnel")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Nanotrasen Representative")
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- if("Blueshield")
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
- if("Magistrate")
- clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_OVERLAY)
- if("Bartender")
- clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Botanist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Chef")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Janitor")
- clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Librarian")
- clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Quartermaster")
- clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Cargo Technician")
- clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Shaft Miner")
- clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Lawyer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Chaplain")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Research Director")
- clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if("Scientist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
- if("Chemist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
- if("Chief Medical Officer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
- if("Medical Doctor")
- clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if("Geneticist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
- if("Virologist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
- if("Psychiatrist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "psych_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_UNDERLAY)
- if("Paramedic")
- clothes_s = new /icon('icons/mob/uniform.dmi', "paramedic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Captain")
- clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Head of Security")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if("Warden")
- clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if("Detective")
- clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
- if("Security Pod Pilot")
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
- if("Brig Physician")
- clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
- if("Security Officer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if("Chief Engineer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Station Engineer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Life Support Specialist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Mechanic")
- clothes_s = new /icon('icons/mob/uniform.dmi', "mechanic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Roboticist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- else if(H.mind.assigned_role in get_all_centcom_jobs())
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- else
- clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(H.mind)
+ switch(H.mind.assigned_role)
+ if("Head of Personnel")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Nanotrasen Representative")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ if("Blueshield")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
+ if("Magistrate")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_OVERLAY)
+ if("Bartender")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Botanist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Chef")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Janitor")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Librarian")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Quartermaster")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Cargo Technician")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Shaft Miner")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Lawyer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Chaplain")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Research Director")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ if("Scientist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+ if("Chemist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+ if("Chief Medical Officer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+ if("Medical Doctor")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ if("Geneticist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+ if("Virologist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+ if("Psychiatrist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "psych_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_UNDERLAY)
+ if("Paramedic")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "paramedic_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Captain")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Head of Security")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ if("Warden")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ if("Detective")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+ if("Security Pod Pilot")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
+ if("Brig Physician")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+ if("Security Officer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ if("Chief Engineer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Station Engineer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Life Support Specialist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Mechanic")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "mechanic_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Roboticist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ else if(H.mind.assigned_role in get_all_centcom_jobs())
+ clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ else
+ clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ else
+ clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+
preview_icon.Blend(face_s, ICON_OVERLAY) // Why do we do this twice
if(clothes_s)
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
new file mode 100644
index 00000000000..68745b4dda1
--- /dev/null
+++ b/code/datums/datum.dm
@@ -0,0 +1,18 @@
+/datum
+ var/gc_destroyed //Time when this object was destroyed.
+
+ var/var_edited = FALSE //Warranty void if seal is broken
+
+ var/tmp/unique_datum_id = null
+
+#ifdef TESTING
+ var/running_find_references
+ var/last_find_references = 0
+#endif
+
+// Default implementation of clean-up code.
+// 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, ...)
+ tag = null
+ return QDEL_HINT_QUEUE
\ No newline at end of file
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 120b36ae4dc..8e86a4eb5ed 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -1,8 +1,5 @@
// reference: /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
-/datum
- var/var_edited = FALSE //Warranty void if seal is broken
-
/datum/proc/can_vv_get(var_name)
return TRUE
diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm
new file mode 100644
index 00000000000..abad7dcf720
--- /dev/null
+++ b/code/datums/diseases/kingstons.dm
@@ -0,0 +1,95 @@
+/datum/disease/kingstons
+ name = "Kingstons Syndrome"
+ max_stages = 4
+ spread_text = "Airborne"
+ cure_text = "Milk"
+ cures = list("milk")
+ cure_chance = 50
+ agent = "Nya Virus"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ permeability_mod = 0.75
+ desc = "If left untreated the subject will turn into a feline. In felines it has... OTHER... effects."
+ severity = DANGEROUS
+
+/datum/disease/kingstons/stage_act()
+ ..()
+ switch(stage)
+ if(1)
+ if(prob(10))
+ if(affected_mob.get_species() == "Tajaran")
+ to_chat(affected_mob, "You feel good.")
+ else
+ to_chat(affected_mob, "You feel like playing with string.")
+ if(2)
+ if(prob(10))
+ if(affected_mob.get_species() == "Tajaran")
+ to_chat(affected_mob, "Something in your throat itches.")
+ else
+ to_chat(affected_mob, "You NEED to find a mouse.")
+ if(3)
+ if(prob(10))
+ if(affected_mob.get_species() == "Tajaran")
+ to_chat(affected_mob, "You feel something in your throat!")
+ affected_mob.emote("cough")
+ else
+ affected_mob.say(pick(list("Mew", "Meow!", "Nya!~")))
+ if(4)
+ if(prob(5))
+ if(affected_mob.get_species() == "Tajaran")
+ affected_mob.visible_message("[affected_mob] coughs up a hairball!", \
+ "You cough up a hairball!")
+ affected_mob.Stun(5)
+ else
+ affected_mob.visible_message("[affected_mob]'s form contorts into something more feline!", \
+ "YOU TURN INTO A TAJARAN!")
+ var/mob/living/carbon/human/catface = affected_mob
+ catface.set_species("Tajaran")
+
+
+/datum/disease/kingstons/advanced
+ name = "Advanced Kingstons Syndrome"
+ spread_text = "Airborne"
+ cure_text = "Plasma"
+ cures = list("plasma")
+ cure_chance = 50
+ agent = "AMB45DR Bacteria"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ permeability_mod = 0.75
+ desc = "If left untreated the subject will mutate to a different species."
+ severity = BIOHAZARD
+ var/list/virspecies = list("Human", "Tajaran", "Unathi", "Skrell", "Vulpkanin")//no karma races sorrys.
+ var/list/virsuffix = list("pox", "rot", "flu", "cough", "-gitis", "cold", "rash", "itch", "decay")
+ var/chosentype
+ var/chosensuff
+
+/datum/disease/kingstons/advanced/New()
+ chosentype = pick(virspecies)
+ chosensuff = pick(virsuffix)
+
+ name = "[chosentype] [chosensuff]"
+
+/datum/disease/kingstons/advanced/stage_act()
+ ..()
+ switch(stage)
+ if(1)
+ if(prob(10))
+ to_chat(affected_mob, "You feel awkward.")
+ if(2)
+ if(prob(10))
+ to_chat(affected_mob, "You itch.")
+ if(3)
+ if(prob(10))
+ to_chat(affected_mob, "Your skin starts to flake!")
+
+ if(4)
+ if(prob(5))
+ if(affected_mob.get_species() != chosentype)
+ affected_mob.visible_message("[affected_mob]'s skin splits and form contorts!", \
+ "Your body mutates into a [chosentype]!")
+ var/mob/living/carbon/human/twisted = affected_mob
+ twisted.set_species(chosentype)
+ else
+ affected_mob.visible_message("[affected_mob] scratches at thier skin!", \
+ "You scratch your skin to try not to itch!")
+ affected_mob.adjustBruteLoss(-5)
+ affected_mob.adjustStaminaLoss(5)
\ No newline at end of file
diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm
new file mode 100644
index 00000000000..2c5a8752cbb
--- /dev/null
+++ b/code/datums/diseases/lycancoughy.dm
@@ -0,0 +1,45 @@
+/datum/disease/lycan
+ name = "Lycancoughy"
+ form = "Infection"
+ max_stages = 4
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Ethanol"
+ cures = list("ethanol")
+ agent = "Excess Snuggles"
+ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
+ desc = "If left untreated subject will regurgitate... puppies."
+ severity = MEDIUM
+
+/datum/disease/lycan/stage_act()
+ ..()
+ switch(stage)
+ if(2) //also changes say, see say.dm
+ if(prob(5))
+ to_chat(affected_mob, "You itch.")
+ affected_mob.emote("cough")
+ if(3)
+ if(prob(10))
+ to_chat(affected_mob, "You hear faint barking.")
+ if(prob(5))
+ to_chat(affected_mob, "You crave meat.")
+ affected_mob.emote("cough")
+ if(prob(2))
+ to_chat(affected_mob, "Your stomach growls!")
+ if(4)
+ if(prob(10))
+ to_chat(affected_mob, "Your stomach barks?!")
+ if(prob(5))
+ affected_mob.visible_message("[affected_mob] howls!", \
+ "You howl!")
+ affected_mob.AdjustConfused(rand(6, 8))
+ if(prob(3))
+ var/list/puppytype = list(/mob/living/simple_animal/pet/corgi/puppy, /mob/living/simple_animal/pet/pug, /mob/living/simple_animal/pet/fox)
+ var/mob/living/puppypicked = pick(puppytype)
+ affected_mob.visible_message("[affected_mob] coughs up [initial(puppypicked.name)]!", \
+ "You cough up [initial(puppypicked.name)]?!")
+ affected_mob.emote("cough")
+ affected_mob.adjustBruteLoss(5)
+ new puppypicked(affected_mob.loc)
+ new puppypicked(affected_mob.loc)
+ return
diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm
index 2bf0ca308a8..f2f9e1371b1 100644
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -26,3 +26,38 @@
if(4)
if(prob(5))
affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
+
+
+/datum/disease/pierrot_throat/advanced
+ name = "Advanced Pierrot's Throat"
+ spread_text = "Airborne"
+ cure_text = "Banana products, especially banana bread."
+ cures = list("banana")
+ cure_chance = 75
+ agent = "H0NI<42.B4n4 Virus"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ permeability_mod = 0.75
+ desc = "If left untreated the subject will probably drive others to insanity and go insane themselves."
+ severity = DANGEROUS
+
+/datum/disease/pierrot_throat/advanced/stage_act()
+ ..()
+ switch(stage)
+ if(1)
+ if(prob(10))
+ to_chat(affected_mob, "You feel very silly.")
+ if(prob(5))
+ to_chat(affected_mob, "You feel like making a joke.")
+ if(2)
+ if(prob(10))
+ to_chat(affected_mob, "You don't just start seeing rainbows... YOU ARE RAINBOWS!")
+ if(3)
+ if(prob(10))
+ to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!")
+ affected_mob << 'sound/items/AirHorn.ogg'
+ if(4)
+ if(prob(5))
+ affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
+
+ if(!istype(affected_mob.wear_mask, /obj/item/clothing/mask/gas/virusclown_hat))
+ affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/virusclown_hat(src), slot_wear_mask)
\ No newline at end of file
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 3e1c3207a87..50679c408b0 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -89,7 +89,7 @@
current.mind = null
leave_all_huds() //leave all the huds in the old body, so it won't get huds if somebody else enters it
- nanomanager.user_transferred(current, new_character)
+ SSnanoui.user_transferred(current, new_character)
if(new_character.mind) //remove any mind currently in our new body's mind variable
new_character.mind.current = null
@@ -805,8 +805,8 @@
if(!(src in ticker.mode.cult))
ticker.mode.add_cultist(src)
special_role = SPECIAL_ROLE_CULTIST
- to_chat(current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].")
- to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [ticker.mode.cultdat.entity_title2] above all else. Bring It back.")
+ to_chat(current, "You catch a glimpse of the Realm of [ticker.cultdat.entity_name], [ticker.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.cultdat.entity_name].")
+ to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [ticker.cultdat.entity_title2] above all else. Bring It back.")
log_admin("[key_name(usr)] has culted [key_name(current)]")
message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]")
if("tome")
@@ -1330,13 +1330,13 @@
ticker.mode.cult += src
ticker.mode.update_cult_icons_added(src)
special_role = SPECIAL_ROLE_CULTIST
- to_chat(current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title2]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].")
+ to_chat(current, "You catch a glimpse of the Realm of [ticker.cultdat.entity_name], [ticker.cultdat.entity_title2]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.cultdat.entity_name].")
to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.")
var/datum/game_mode/cult/cult = ticker.mode
if(GAMEMODE_IS_CULT)
cult.memorize_cult_objectives(src)
else
- var/explanation = "Summon [ticker.mode.cultdat.entity_name] via the use of the appropriate rune. It will only work if nine cultists stand on and around it."
+ var/explanation = "Summon [ticker.cultdat.entity_name] via the use of the appropriate rune. It will only work if nine cultists stand on and around it."
to_chat(current, "Objective #1: [explanation]")
current.memory += "Objective #1: [explanation]" diff --git a/code/datums/mixed.dm b/code/datums/mixed.dm index 391b7090ad4..a40a9f9a34d 100644 --- a/code/datums/mixed.dm +++ b/code/datums/mixed.dm @@ -22,8 +22,15 @@ var/list/fields = list( ) /datum/data/record/Destroy() - ..() - return QDEL_HINT_HARDDEL_NOW + 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 + return ..() /datum/data/text name = "text" diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 9517ee09ef8..2d67a5d71dd 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -22,6 +22,8 @@ var/pda = null var/internals_slot = null //ID of slot containing a gas tank var/list/backpack_contents = list() // In the list(path=count,otherpath=count) format + var/list/implants = null + var/list/cybernetic_implants = null /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -89,6 +91,13 @@ var/number = backpack_contents[path] for(var/i = 0, i < number, i++) equip_item(H, path, slot_in_backpack) + if(implants) + for(var/path in implants) + var/obj/item/weapon/implant/I = new path(H) + I.implant(H) + for(var/path in cybernetic_implants) + var/obj/item/organ/internal/O = new path(H) + O.insert(H) post_equip(H, visualsOnly) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 5212570223f..ae98f702ac1 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -1,6 +1,13 @@ // Used for 'select equipment' // code/modules/admin/verbs/debug.dm 566 +/datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(!visualsOnly) + H.mind.assigned_role = name + H.job = name + + /proc/apply_to_card(obj/item/weapon/card/id/I, mob/living/carbon/human/H, list/access = list(), rank, special_icon) if(!istype(I) || !istype(H)) return 0 @@ -95,6 +102,7 @@ mask = /obj/item/clothing/mask/gas/syndicate l_ear = /obj/item/device/radio/headset/syndicate/alt glasses = /obj/item/clothing/glasses/night + shoes = /obj/item/clothing/shoes/magboots/syndie l_pocket = /obj/item/weapon/pinpointer/advpinpointer l_hand = /obj/item/weapon/tank/jetpack/oxygen/harness @@ -107,6 +115,7 @@ /obj/item/weapon/grenade/plastic/c4 = 1, /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1, /obj/item/device/flashlight = 1, + /obj/item/clothing/shoes/combat = 1 ) /datum/outfit/admin/syndicate/operative/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -131,15 +140,21 @@ /datum/outfit/admin/syndicate/officer name = "Syndicate Officer" + head = /obj/item/clothing/head/beret + mask = /obj/item/clothing/mask/cigarette/cigar/havana belt = /obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo l_ear = /obj/item/device/radio/headset/syndicate/alt l_pocket = /obj/item/weapon/pinpointer/advpinpointer backpack_contents = list( /obj/item/weapon/storage/box/engineer = 1, + /obj/item/device/flashlight = 1, /obj/item/weapon/reagent_containers/food/pill/initropidril = 1, /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1, - /obj/item/ammo_box/magazine/m50 = 2) + /obj/item/ammo_box/magazine/m50 = 2, + /obj/item/clothing/shoes/magboots/syndie/advance = 1, + /obj/item/weapon/lighter/zippo/gonzofist = 1 + ) id_icon = "commander" id_access = "Syndicate Operative Leader" @@ -152,22 +167,11 @@ var/obj/item/weapon/implant/uplink/U = new /obj/item/weapon/implant/uplink(H) U.implant(H) - U.hidden_uplink.uses = 500//a measly 1000 TC along with the uplink in the pocket + U.hidden_uplink.uses = 500 var/obj/item/weapon/implant/dust/D = new(H) D.implant(H) -/datum/outfit/admin/syndicate/bomber - name = "Syndicate Bomber" - - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/device/flashlight = 1, - /obj/item/weapon/card/emag = 1, - /obj/item/device/radio/beacon/syndicate/bomb = 2, - /obj/item/device/syndicatedetonator = 1, - /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1 - ) /datum/outfit/admin/nt_vip name = "VIP Guest" @@ -193,114 +197,6 @@ if(istype(I)) apply_to_card(I, H, get_centcom_access("VIP Guest"), "VIP Guest") -/datum/outfit/admin/nt_navy_officer - name = "NT Navy Officer" - - uniform = /obj/item/clothing/under/rank/centcom/officer - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/gun/energy/pulse/pistol - gloves = /obj/item/clothing/gloves/color/white - shoes = /obj/item/clothing/shoes/centcom - head = /obj/item/clothing/head/beret/centcom/officer - l_ear = /obj/item/device/radio/headset/centcom - glasses = /obj/item/clothing/glasses/hud/security/sunglasses - id = /obj/item/weapon/card/id/centcom - pda = /obj/item/device/pda/centcom - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1 - ) - -/datum/outfit/admin/nt_navy_officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - var/obj/item/weapon/card/id/I = H.wear_id - if(istype(I)) - apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Officer"), "Nanotrasen Navy Officer") - - var/obj/item/weapon/implant/L = new /obj/item/weapon/implant/mindshield(H) - L.implant(H) - - -/datum/outfit/admin/nt_special_ops_officer - name = "NT Special Ops Officer" - - uniform = /obj/item/clothing/under/syndicate/combat - suit = /obj/item/clothing/suit/space/deathsquad/officer - back = /obj/item/weapon/storage/backpack/security - belt = /obj/item/weapon/gun/energy/pulse/pistol/m1911 - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/helmet/space/deathsquad/beret - mask = /obj/item/clothing/mask/cigarette/cigar/cohiba - l_ear = /obj/item/device/radio/headset/centcom - glasses = /obj/item/clothing/glasses/thermal/cyber - id = /obj/item/weapon/card/id/centcom - r_pocket = /obj/item/weapon/storage/box/matches - pda = /obj/item/device/pda/centcom - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/tank/emergency_oxygen/double/full = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1, - /obj/item/weapon/twohanded/dualsaber/red = 1, - /obj/item/weapon/pinpointer/advpinpointer = 1, - /obj/item/weapon/reagent_containers/hypospray/combat/nanites = 1, - /obj/item/weapon/storage/box/zipties = 1, - /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/weapon/implanter/mindshield = 1, - ) - -/datum/outfit/admin/nt_special_ops_officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - var/obj/item/weapon/card/id/I = H.wear_id - if(istype(I)) - apply_to_card(I, H, get_centcom_access("Special Operations Officer"), "Special Operations Officer") - -/datum/outfit/admin/nt_special_ops_formal - name = "NT Special Ops Formal" - - uniform = /obj/item/clothing/under/rank/centcom/captain - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/gun/energy/pulse/pistol/m1911 - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/helmet/space/deathsquad/beret - mask = /obj/item/clothing/mask/cigarette/cigar/cohiba - l_ear = /obj/item/device/radio/headset/centcom - glasses = /obj/item/clothing/glasses/thermal/cyber - id = /obj/item/weapon/card/id/centcom - r_pocket = /obj/item/weapon/storage/box/matches - pda = /obj/item/device/pda/centcom - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/melee/classic_baton/telescopic = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1 - ) - -/datum/outfit/admin/nt_special_ops_formal/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - var/obj/item/device/pda/PDA = H.wear_pda - if(istype(PDA)) - PDA.owner = H.real_name - PDA.ownjob = "Special Operations Officer" - PDA.icon_state = "pda-syndi" - PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" - PDA.desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition designed for military field work." - - var/obj/item/weapon/card/id/I = H.wear_id - if(istype(I)) - apply_to_card(I, H, get_centcom_access("Special Operations Officer"), "Special Operations Officer") /datum/outfit/admin/nt_navy_captain name = "NT Navy Captain" @@ -316,10 +212,13 @@ id = /obj/item/weapon/card/id/centcom pda = /obj/item/device/pda/centcom backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/implanter/dust = 1, + /obj/item/weapon/storage/box/centcomofficer = 1, /obj/item/weapon/implanter/death_alarm = 1 ) + implants = list( + /obj/item/weapon/implant/mindshield, + /obj/item/weapon/implant/dust + ) /datum/outfit/admin/nt_navy_captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -330,9 +229,6 @@ if(istype(I)) apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Captain"), "Nanotrasen Navy Captain") - var/obj/item/weapon/implant/L = new /obj/item/weapon/implant/mindshield(H) - L.implant(H) - /datum/outfit/admin/nt_diplomat name = "NT Diplomat" @@ -347,9 +243,12 @@ pda = /obj/item/device/pda/centcom backpack_contents = list( /obj/item/weapon/storage/box/survival = 1, - /obj/item/weapon/implanter/dust = 1, /obj/item/weapon/implanter/death_alarm = 1, ) + implants = list( + /obj/item/weapon/implant/mindshield, + /obj/item/weapon/implant/dust + ) /datum/outfit/admin/nt_diplomat/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -360,6 +259,57 @@ if(istype(I)) apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Representative"), "Nanotrasen Diplomat") + +/datum/outfit/admin/nt_undercover + name = "NT Undercover Operative" + // Disguised NT special forces, sent to quietly eliminate mutinous people in high positions (e.g: captain) + + uniform = /obj/item/clothing/under/chameleon + back = /obj/item/weapon/storage/backpack + belt = /obj/item/weapon/storage/belt/utility/full/multitool + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/syndigaloshes + l_ear = /obj/item/device/radio/headset/heads/captain + id = /obj/item/weapon/card/id/syndicate + pda = /obj/item/device/pda + backpack_contents = list( + /obj/item/weapon/storage/box/engineer = 1, + /obj/item/device/flashlight = 1, + /obj/item/weapon/gun/projectile/automatic/proto = 1, // NT saber SMG + /obj/item/weapon/suppressor = 1, // silencer for SMG + /obj/item/ammo_box/magazine/smgm9mm = 3, // SMG ammo + /obj/item/weapon/door_remote/omni = 1, + /obj/item/weapon/implanter/mindshield = 1, // not implanted by default, as that would make them suspicious + /obj/item/weapon/implanter/storage = 1 // do not auto-implant this, that causes a bug + ) + implants = list( + /obj/item/weapon/implant/dust + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/cyberimp/eyes/xray, + /obj/item/organ/internal/cyberimp/brain/anti_drop, + /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/chest/nutriment/plus + ) + +/datum/outfit/admin/nt_undercover/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + var/obj/item/weapon/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_all_accesses(), "Civilian") + I.icon_state = "deathsquad" + + + var/obj/item/device/radio/R = H.l_ear + if(istype(R)) + R.name = "radio headset" + R.icon_state = "headset" + + /datum/outfit/admin/death_commando name = "NT Death Commando" @@ -485,12 +435,10 @@ backpack_contents = list( /obj/item/weapon/storage/box/survival = 1, /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing = 1, - /obj/item/weapon/storage/box/syndie_kit/caneshotgun = 1, /obj/item/toy/crayon/mime = 1, - /obj/item/weapon/gun/projectile/automatic/pistol = 1, - /obj/item/weapon/suppressor = 1, + /obj/item/weapon/storage/box/syndie_kit/caneshotgun = 1, /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath = 2, - /obj/item/weapon/pen/sleepy = 1, + /obj/item/device/radio/uplink = 1, /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1, /obj/item/device/flashlight = 1 ) @@ -701,7 +649,9 @@ backpack_contents = list( /obj/item/weapon/storage/box/survival = 1, /obj/item/weapon/kitchen/knife/combat = 1, - /obj/item/ammo_box/magazine/m556 = 3) + /obj/item/ammo_box/magazine/m556 = 3, + /obj/item/clothing/shoes/magboots = 1 + ) /datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -725,7 +675,9 @@ /obj/item/weapon/storage/box/survival = 1, /obj/item/weapon/kitchen/knife/combat = 1, /obj/item/weapon/melee/classic_baton/telescopic = 1, - /obj/item/ammo_box/magazine/m50 = 2) + /obj/item/ammo_box/magazine/m50 = 2, + /obj/item/clothing/shoes/magboots/advance = 1 + ) /datum/outfit/admin/chrono name = "Chrono Legionnaire" @@ -734,7 +686,7 @@ suit = /obj/item/clothing/suit/space/chronos back = /obj/item/weapon/chrono_eraser gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat + shoes = /obj/item/clothing/shoes/magboots/advance head = /obj/item/clothing/head/helmet/space/chronos mask = /obj/item/clothing/mask/gas/syndicate glasses = /obj/item/clothing/glasses/night @@ -756,7 +708,7 @@ uniform = /obj/item/clothing/under/color/grey suit = /obj/item/clothing/suit/space back = /obj/item/weapon/tank/jetpack/oxygen - shoes = /obj/item/clothing/shoes/black + shoes = /obj/item/clothing/shoes/magboots head = /obj/item/clothing/head/helmet/space mask = /obj/item/clothing/mask/breath l_ear = /obj/item/device/radio/headset @@ -779,6 +731,7 @@ /datum/outfit/admin/hardsuit back = /obj/item/weapon/tank/jetpack/oxygen mask = /obj/item/clothing/mask/breath + shoes = /obj/item/clothing/shoes/magboots id = /obj/item/weapon/card/id /datum/outfit/admin/hardsuit/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -804,6 +757,7 @@ name = "CE Hardsuit" suit = /obj/item/clothing/suit/space/hardsuit/elite head = /obj/item/clothing/head/helmet/space/hardsuit/elite + shoes = /obj/item/clothing/shoes/magboots/advance /datum/outfit/admin/hardsuit/mining name = "Mining Hardsuit" @@ -814,11 +768,13 @@ name = "Syndi Hardsuit" suit = /obj/item/clothing/suit/space/hardsuit/syndi head = /obj/item/clothing/head/helmet/space/hardsuit/syndi + shoes = /obj/item/clothing/shoes/magboots/syndie /datum/outfit/admin/hardsuit/wizard name = "Wizard Hardsuit" suit = /obj/item/clothing/suit/space/hardsuit/wizard head = /obj/item/clothing/head/helmet/space/hardsuit/wizard + shoes = /obj/item/clothing/shoes/magboots /datum/outfit/admin/hardsuit/medical name = "Medical Hardsuit" @@ -996,15 +952,15 @@ /obj/item/weapon/storage/box/survival = 1, /obj/item/device/flashlight = 1 ) + implants = list( + /obj/item/weapon/implant/dust + ) /datum/outfit/admin/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return - var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H) - D.implant(H) - var/obj/item/device/pda/PDA = H.wear_pda if(istype(PDA)) PDA.owner = H.real_name @@ -1034,7 +990,10 @@ /obj/item/weapon/suppressor = 1, /obj/item/weapon/card/emag = 1, /obj/item/device/flashlight = 1, - /obj/item/weapon/implanter/storage = 1 + /obj/item/weapon/implanter/storage = 1 // do not auto-implant this, that causes a bug + ) + implants = list( + /obj/item/weapon/implant/dust ) /datum/outfit/admin/spy/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1046,9 +1005,6 @@ if(istype(G)) G.name = "black gloves" - var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H) - D.implant(H) - var/obj/item/device/pda/PDA = H.wear_pda if(istype(PDA)) PDA.owner = H.real_name @@ -1089,6 +1045,7 @@ if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Dark Lord", "syndie") + /datum/outfit/admin/wizard uniform = /obj/item/clothing/under/color/lightpurple suit = /obj/item/clothing/suit/wizrobe @@ -1130,6 +1087,36 @@ shoes = /obj/item/clothing/shoes/sandal/marisa head = /obj/item/clothing/head/wizard/marisa +/datum/outfit/admin/wizard/arch + name = "Arch Wizard" + + suit = /obj/item/clothing/suit/wizrobe/magusred + head = /obj/item/clothing/head/wizard/magus + belt = /obj/item/weapon/storage/belt/wands/full + l_hand = null + backpack_contents = list( + /obj/item/weapon/storage/box/engineer = 1, + /obj/item/clothing/suit/space/hardsuit/wizard = 1, + /obj/item/clothing/head/helmet/space/hardsuit/wizard = 1, + /obj/item/clothing/shoes/magboots = 1, + /obj/item/weapon/kitchen/knife/ritual = 1, + /obj/item/clothing/suit/wizrobe/red = 1, + /obj/item/clothing/head/wizard/red = 1 + ) + +/datum/outfit/admin/wizard/arch/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + var/obj/item/weapon/spellbook/B = H.r_hand + if(istype(B)) + B.owner = H // force-bind it so it can never be stolen, no matter what. + B.name = "Archwizard Spellbook" + B.uses = 50 + var/obj/item/weapon/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_all_accesses(), "Arch Wizard") + /datum/outfit/admin/dark_priest name = "Dark Priest" @@ -1147,6 +1134,9 @@ /obj/item/weapon/storage/box/survival = 1, /obj/item/device/flashlight = 1, ) + implants = list( + /obj/item/weapon/implant/dust + ) /datum/outfit/admin/dark_priest/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -1163,5 +1153,3 @@ var/obj/item/device/radio/headset/R = H.l_ear if(istype(R)) R.flags |= NODROP - var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H) - D.implant(H) \ No newline at end of file diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index d855f6a3092..43c3d3a61cd 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -54,7 +54,7 @@ target.setDir(holder.dir) sleep(jaunt_in_time) qdel(holder) - if(!qdeleted(target)) + if(!QDELETED(target)) if(mobloc.density) for(var/direction in alldirs) var/turf/T = get_step(mobloc, direction) diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index bda640f80a1..84c3a552c03 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -28,7 +28,7 @@ config.continuous_rounds = 0 return ..() -/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr) +/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr) if(!config.continuous_rounds) existence_stops_round_end = 1 config.continuous_rounds = 1 @@ -49,7 +49,7 @@ charge_counter = charge_max return - if(!marked_item || qdeleted(marked_item)) //Wait nevermind + if(!marked_item || QDELETED(marked_item)) //Wait nevermind to_chat(M, "Your phylactery is gone!") return diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 15d78f37276..1feea397ac0 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -388,6 +388,15 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine containertype = /obj/structure/closet/crate/secure/plasma containername = "energy gun crate" +/datum/supply_packs/security/armory/epistol // costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person + name = "Energy Pistol Crate" + contains = list(/obj/item/weapon/gun/energy/gun/mini, + /obj/item/weapon/gun/energy/gun/mini, + /obj/item/weapon/gun/energy/gun/mini) + cost = 15 + containertype = /obj/structure/closet/crate/secure/plasma + containername = "energy gun crate" + /datum/supply_packs/security/armory/eweapons name = "Incendiary Weapons Crate" contains = list(/obj/item/weapon/flamethrower/full, diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index 644a472acf3..a901695c880 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -10,10 +10,10 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4 switch(index) if(AUTOLATHE_HACK_WIRE) return "Hack" - + if(AUTOLATHE_SHOCK_WIRE) return "Shock" - + if(AUTOLATHE_DISABLE_WIRE) return "Disable" @@ -69,6 +69,6 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4 updateUIs() /datum/wires/autolathe/proc/updateUIs() - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(holder) - nanomanager.update_uis(holder) \ No newline at end of file + SSnanoui.update_uis(holder) \ No newline at end of file diff --git a/code/datums/wires/nuclearbomb.dm b/code/datums/wires/nuclearbomb.dm index 2034c59576b..5b704a4526b 100644 --- a/code/datums/wires/nuclearbomb.dm +++ b/code/datums/wires/nuclearbomb.dm @@ -11,12 +11,12 @@ var/const/NUCLEARBOMB_WIRE_SAFETY = 4 switch(index) if(NUCLEARBOMB_WIRE_LIGHT) return "Bomb Light" - + if(NUCLEARBOMB_WIRE_TIMING) return "Bomb Timing" - + if(NUCLEARBOMB_WIRE_SAFETY) - return "Bomb Safety" + return "Bomb Safety" /datum/wires/nuclearbomb/CanUse(mob/living/L) var/obj/machinery/nuclearbomb/N = holder @@ -77,6 +77,6 @@ var/const/NUCLEARBOMB_WIRE_SAFETY = 4 N.lighthack = !N.lighthack /datum/wires/nuclearbomb/proc/updateUIs() - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(holder) - nanomanager.update_uis(holder) \ No newline at end of file + SSnanoui.update_uis(holder) \ No newline at end of file diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index b192045d29d..2b86f1247f6 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -76,7 +76,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", ui_interact(user) /datum/wires/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "wires.tmpl", holder.name, window_x, window_y) ui.open() @@ -174,7 +174,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", else to_chat(L, "You need a remote signaller!") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return 1 // @@ -184,12 +184,12 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", // Called when wires cut/mended. /datum/wires/proc/UpdateCut(index, mended) if(holder) - nanomanager.update_uis(holder) + SSnanoui.update_uis(holder) // Called when wire pulsed. Add code here. /datum/wires/proc/UpdatePulsed(index) if(holder) - nanomanager.update_uis(holder) + SSnanoui.update_uis(holder) /datum/wires/proc/CanUse(mob/L) return 1 diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index b473b830e39..83880039a73 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -53,15 +53,15 @@ return cameras -/area/proc/atmosalert(danger_level, var/alarm_source) +/area/proc/atmosalert(danger_level, var/alarm_source, var/force = FALSE) if(danger_level == ATMOS_ALARM_NONE) atmosphere_alarm.clearAlarm(src, alarm_source) else atmosphere_alarm.triggerAlarm(src, alarm_source, severity = danger_level) - //Check all the alarms before lowering atmosalm. Raising is perfectly fine. + //Check all the alarms before lowering atmosalm. Raising is perfectly fine. If force = 1 we don't care. for(var/obj/machinery/alarm/AA in src) - if(!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level) + if(!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level && !force) danger_level = max(danger_level, AA.danger_level) if(danger_level != atmosalm) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 6ca5047ac6c..3fdc402bb8a 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -144,7 +144,7 @@ if(throwing) throwing.hit_atom(A) . = 1 - if(!A || qdeleted(A)) + if(!A || QDELETED(A)) return A.Bumped(src) @@ -224,7 +224,7 @@ //called when src is thrown into hit_atom /atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum) set waitfor = 0 - if(exists(hit_atom)) + if(!QDELETED(hit_atom)) return hit_atom.hitby(src) /atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = 1, blocked) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 43054c24923..391b8fa8ee8 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -371,7 +371,7 @@ I.forceMove(src) src.disk = I to_chat(user, "You insert [I].") - nanomanager.update_uis(src) // update all UIs attached to src() + SSnanoui.update_uis(src) // update all UIs attached to src() return else ..() @@ -469,7 +469,7 @@ return // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm @@ -580,7 +580,7 @@ irradiating = src.radiation_duration var/lock_state = src.connected.locked src.connected.locked = 1//lock it - nanomanager.update_uis(src) // update all UIs attached to src + SSnanoui.update_uis(src) // update all UIs attached to src sleep(10*src.radiation_duration) // sleep for radiation_duration seconds @@ -685,7 +685,7 @@ irradiating = src.radiation_duration var/lock_state = src.connected.locked src.connected.locked = 1//lock it - nanomanager.update_uis(src) // update all UIs attached to src + SSnanoui.update_uis(src) // update all UIs attached to src sleep(10*src.radiation_duration) // sleep for radiation_duration seconds @@ -753,7 +753,7 @@ irradiating = src.radiation_duration var/lock_state = src.connected.locked src.connected.locked = 1 //lock it - nanomanager.update_uis(src) // update all UIs attached to src + SSnanoui.update_uis(src) // update all UIs attached to src sleep(10*src.radiation_duration) // sleep for radiation_duration seconds @@ -888,7 +888,7 @@ irradiating = 2 var/lock_state = src.connected.locked src.connected.locked = 1//lock it - nanomanager.update_uis(src) // update all UIs attached to src + SSnanoui.update_uis(src) // update all UIs attached to src sleep(2 SECONDS) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index fc00cfff19c..0b36449c54a 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -125,7 +125,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "arm_blade" item_state = "arm_blade" - flags = ABSTRACT | NODROP + flags = ABSTRACT | NODROP | DROPDEL w_class = WEIGHT_CLASS_HUGE sharp = 1 force = 25 @@ -140,7 +140,7 @@ /obj/item/weapon/melee/arm_blade/dropped(mob/user) user.visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "You prepare to extend a tentacle.") -/obj/item/weapon/gun/magic/tentacle/dropped() - . = ..() - qdel(src) - /obj/item/weapon/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) to_chat(user, "The [name] is not ready yet.") @@ -377,7 +373,7 @@ /obj/item/weapon/shield/changeling name = "shield-like mass" desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield." - flags = NODROP + flags = NODROP | DROPDEL icon = 'icons/obj/weapons.dmi' icon_state = "ling_shield" block_chance = 50 @@ -389,9 +385,6 @@ if(ismob(loc)) loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") -/obj/item/weapon/shield/changeling/dropped() - qdel(src) - /obj/item/weapon/shield/changeling/hit_reaction() if(remaining_uses < 1) if(ishuman(loc)) @@ -429,7 +422,7 @@ name = "flesh mass" icon_state = "lingspacesuit" desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." - flags = STOPSPRESSUREDMAGE | NODROP + flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/tank/oxygen) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all. @@ -439,9 +432,6 @@ loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") processing_objects += src -/obj/item/clothing/suit/space/changeling/dropped() - qdel(src) - /obj/item/clothing/suit/space/changeling/process() if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -451,12 +441,9 @@ name = "flesh mass" icon_state = "lingspacehelmet" desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front." - flags = BLOCKHAIR | STOPSPRESSUREDMAGE | NODROP + flags = BLOCKHAIR | STOPSPRESSUREDMAGE | NODROP | DROPDEL armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/head/helmet/space/changeling/dropped() - qdel(src) - /***************************************\ |*****************ARMOR*****************| @@ -481,7 +468,7 @@ name = "chitinous mass" desc = "A tough, hard covering of black chitin." icon_state = "lingarmor" - flags = NODROP + flags = NODROP | DROPDEL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0) flags_inv = HIDEJUMPSUIT @@ -495,16 +482,10 @@ if(ismob(loc)) loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!") -/obj/item/clothing/suit/armor/changeling/dropped() - qdel(src) - /obj/item/clothing/head/helmet/changeling name = "chitinous mass" desc = "A tough, hard covering of black chitin with transparent chitin in front." icon_state = "lingarmorhelmet" - flags = BLOCKHAIR | NODROP + flags = BLOCKHAIR | NODROP | DROPDEL armor = list(melee = 30, bullet = 30, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0) - flags_inv = HIDEEARS - -/obj/item/clothing/head/helmet/changeling/dropped() - qdel(src) + flags_inv = HIDEEARS \ No newline at end of file diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 2ac7d46dfba..3cca118bf03 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -119,7 +119,7 @@ var/global/list/all_cults = list() var/datum/action/innate/cultcomm/C = new() C.Grant(cult_mind.current) update_cult_icons_added(cult_mind) - to_chat(cult_mind.current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].") + to_chat(cult_mind.current, "You catch a glimpse of the Realm of [ticker.cultdat.entity_name], [ticker.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.cultdat.entity_name].") first_phase() @@ -133,16 +133,16 @@ var/global/list/all_cults = list() if("survive") explanation = "Our knowledge must live on. Make sure at least [acolytes_needed] acolytes escape on the shuttle to spread their work on an another station." if("convert") - explanation = "We must increase our influence before we can summon [ticker.mode.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." + explanation = "We must increase our influence before we can summon [ticker.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." if("bloodspill") - explanation = "We must prepare this place for [ticker.mode.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." + explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." if("sacrifice") if(sacrifice_target) explanation = "Sacrifice [sacrifice_target.current.real_name], the [sacrifice_target.assigned_role]. You will need the sacrifice rune and three acolytes to do so." else explanation = "Free objective." if("eldergod") - explanation = "Summon [ticker.mode.cultdat.entity_name] by invoking the 'Tear Reality' rune.The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin." + explanation = "Summon [ticker.cultdat.entity_name] by invoking the 'Tear Reality' rune.The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin." to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") cult_mind.memory += "Objective #[obj_count]: [explanation]
" @@ -308,10 +308,10 @@ var/global/list/all_cults = list() feedback_add_details("cult_objective","cult_sacrifice|FAIL|GIBBED") if("eldergod") if(!eldergod) - explanation = "Summon [ticker.mode.cultdat.entity_name]. Success!" + explanation = "Summon [ticker.cultdat.entity_name]. Success!" feedback_add_details("cult_objective","cult_narsie|SUCCESS") else - explanation = "Summon [ticker.mode.cultdat.entity_name]. Fail." + explanation = "Summon [ticker.cultdat.entity_name]. Fail." feedback_add_details("cult_objective","cult_narsie|FAIL") if("slaughter") if(demons_summoned) @@ -339,10 +339,10 @@ var/global/list/all_cults = list() if("harvest") if(harvested > harvest_target) - explanation = "Offer [harvest_target] humans for [ticker.mode.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Success!" + explanation = "Offer [harvest_target] humans for [ticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Success!" feedback_add_details("cult_objective","cult_harvest|SUCCESS") else - explanation = "Offer [harvest_target] humans for [ticker.mode.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Fail!" + explanation = "Offer [harvest_target] humans for [ticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Fail!" feedback_add_details("cult_objective","cult_harvest|FAIL") if("hijack") diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 00592b7812d..057de105c41 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -361,32 +361,16 @@ /obj/item/weapon/melee/cultblade/ghost name = "eldritch sword" force = 15 - flags = NODROP - -/obj/item/weapon/melee/cultblade/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /obj/item/clothing/head/culthood/alt/ghost - flags = NODROP - -/obj/item/clothing/head/culthood/alt/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /obj/item/clothing/suit/cultrobes/alt/ghost - flags = NODROP - -/obj/item/clothing/suit/cultrobes/alt/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /obj/item/clothing/shoes/cult/ghost - flags = NODROP - -/obj/item/clothing/shoes/cult/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /datum/outfit/ghost_cultist name = "Cultist Ghost" diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index d489387ad76..5ddc8ccdf98 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -19,10 +19,10 @@ switch(new_objective) if("convert") - explanation = "We must increase our influence before we can summon [ticker.mode.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." + explanation = "We must increase our influence before we can summon [ticker.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." if("bloodspill") spilltarget = 100 + rand(0,player_list.len * 3) - explanation = "We must prepare this place for [ticker.mode.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." + explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." if("sacrifice") explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for their blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual." @@ -59,8 +59,8 @@ message_admins("The Cult has already completed [prenarsie_objectives] objectives! Nar-Sie objective unlocked.") log_admin("The Cult has already completed [prenarsie_objectives] objectives! Nar-Sie objective unlocked.") else - message_admins("There are less than 4 cultists! [ticker.mode.cultdat.entity_name] objective unlocked.") - log_admin("There are less than 4 cultists! [ticker.mode.cultdat.entity_name] objective unlocked.") + message_admins("There are less than 4 cultists! [ticker.cultdat.entity_name] objective unlocked.") + log_admin("There are less than 4 cultists! [ticker.cultdat.entity_name] objective unlocked.") gtfo_phase() if(!sacrificed.len && (new_objective != "sacrifice")) @@ -76,10 +76,10 @@ switch(new_objective) if("convert") - explanation = "We must increase our influence before we can summon [ticker.mode.cultdat.entity_name]. Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." + explanation = "We must increase our influence before we can summon [ticker.cultdat.entity_name]. Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." if("bloodspill") spilltarget = 100 + rand(0,player_list.len * 3) - explanation = "We must prepare this place for [ticker.mode.cultdat.entity_title1]'s coming. Spread blood and gibs over [spilltarget] of the Station's floor tiles." + explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spread blood and gibs over [spilltarget] of the Station's floor tiles." if("sacrifice") explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for their blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual." @@ -111,7 +111,7 @@ if(prob(40))//split the chance of this objectives += "eldergod" - explanation = "Summon [ticker.mode.cultdat.entity_name] on the Station via the use of the Tear Reality rune. The veil is weak enough in [english_list(summon_spots)] for the ritual to begin." + explanation = "Summon [ticker.cultdat.entity_name] on the Station via the use of the Tear Reality rune. The veil is weak enough in [english_list(summon_spots)] for the ritual to begin." else objectives += "slaughter" explanation = "Bring the Slaughter via the rune 'Bring forth the slaughter'. The veil is weak enough in [english_list(summon_spots)] for the ritual to begin." @@ -135,11 +135,11 @@ switch(last_objective) if("harvest") - explanation = "[ticker.mode.cultdat.entity_title1] hungers for their first meal of this never-ending day. Offer them [harvest_target] humans in sacrifice." + explanation = "[ticker.cultdat.entity_title1] hungers for their first meal of this never-ending day. Offer them [harvest_target] humans in sacrifice." if("hijack") - explanation = "[ticker.mode.cultdat.entity_name] wishes for their troops to start the assault on Centcom immediately. Hijack the escape shuttle and don't let a single non-cultist board it." + explanation = "[ticker.cultdat.entity_name] wishes for their troops to start the assault on Centcom immediately. Hijack the escape shuttle and don't let a single non-cultist board it." if("massacre") - explanation = "[ticker.mode.cultdat.entity_name] wants to watch you as you massacre the remaining humans on the station (until less than [massacre_target] humans are left alive)." + explanation = "[ticker.cultdat.entity_name] wants to watch you as you massacre the remaining humans on the station (until less than [massacre_target] humans are left alive)." for(var/datum/mind/cult_mind in cult) if(cult_mind) diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index e5f2ce5d4ef..5e304407302 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -98,7 +98,7 @@ return var/choice = input(user, selection_prompt, selection_title) as null|anything in choosable_items var/pickedtype = choosable_items[choice] - if(pickedtype && Adjacent(user) && src && !qdeleted(src) && !user.incapacitated() && cooldowntime <= world.time) + if(pickedtype && Adjacent(user) && src && !QDELETED(src) && !user.incapacitated() && cooldowntime <= world.time) cooldowntime = world.time + creation_delay var/obj/item/N = new pickedtype(get_turf(src)) to_chat(user, replacetext("[creation_message]", "%ITEM%", "[N]")) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 72535d9d1e5..0e9158294f1 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -42,13 +42,13 @@ if(!ticker.mode) icon_state = "tome" else - icon_state = ticker.mode.cultdat.tome_icon + icon_state = ticker.cultdat.tome_icon ..() /obj/item/weapon/tome/examine(mob/user) ..() if(iscultist(user) || user.stat == DEAD) - to_chat(user, "The scriptures of [ticker.mode.cultdat.entity_title3]. Allows the scribing of runes and access to the knowledge archives of the cult of [ticker.mode.cultdat.entity_name].") + to_chat(user, "The scriptures of [ticker.cultdat.entity_title3]. Allows the scribing of runes and access to the knowledge archives of the cult of [ticker.cultdat.entity_name].") to_chat(user, "Striking another cultist with it will purge holy water from them.") to_chat(user, "Striking a noncultist, however, will sear their flesh.") @@ -91,7 +91,7 @@ /obj/item/weapon/tome/proc/read_tome(mob/user) var/text = list() - text += "
" + text += "
" text += "A rune's name and effects can be revealed by examining the rune.<
" text += "Rite of Binding
This rune is one of the most important runes the cult has, being the only way to create new talismans. A blank sheet of paper must be on top of the rune. After \ @@ -102,7 +102,7 @@ text += "Rite of Enlightenment
This rune is critical to the success of the cult. It will allow you to convert normal crew members into cultists. \ To do this, simply place the crew member upon the rune and invoke it. This rune requires two invokers to use. If the target to be converted is mindshielded or a certain assignment, they will \ - be unable to be converted. People [ticker.mode.cultdat.entity_title3] wishes sacrificed will also be ineligible for conversion, and anyone with a shielding presence like the null rod will not be converted.
\ + be unable to be converted. People [ticker.cultdat.entity_title3] wishes sacrificed will also be ineligible for conversion, and anyone with a shielding presence like the null rod will not be converted.
\ Successful conversions will produce a tome for the new cultist.
" text += "Rite of Tribute
This rune is necessary to achieve your goals. Simply place any dead creature upon the rune and invoke it (this will not \ @@ -135,12 +135,12 @@ text += "Leeching
When invoked, this rune will transfer lifeforce from the victim to the invoker.
" - text += "Rite of Spectral Manifestation
This rune allows you to summon spirits as humanoid fighters. When invoked, a spirit above the rune will be brought to life as a human, wearing nothing, that seeks only to serve you and [ticker.mode.cultdat.entity_title3]. \ + text += "Rite of Spectral Manifestation
This rune allows you to summon spirits as humanoid fighters. When invoked, a spirit above the rune will be brought to life as a human, wearing nothing, that seeks only to serve you and [ticker.cultdat.entity_title3]. \ However, the spirit's link to reality is fragile - you must remain on top of the rune, and you will slowly take damage. Upon stepping off the rune, all summoned spirits will dissipate, dropping their items to the ground. You may manifest \ multiple spirits with one rune, but you will rapidly take damage in doing so.
" text += "Ritual of Dimensional Rending
This rune is necessary to achieve your goals. On attempting to scribe it, it will produce shields around you and alert everyone you are attempting to scribe it; it takes a very long time to scribe, \ - and does massive damage to the one attempting to scribe it.
Invoking it requires 9 invokers and the sacrifice of a specific crewmember, and once invoked, will summon [ticker.mode.cultdat.entity_title3], [ticker.mode.cultdat.entity_name]. \ + and does massive damage to the one attempting to scribe it.
Invoking it requires 9 invokers and the sacrifice of a specific crewmember, and once invoked, will summon [ticker.cultdat.entity_title3], [ticker.cultdat.entity_name]. \ This will complete your objectives.
" text += "Talisman of Teleportation
The talisman form of the Teleport rune will transport the invoker to a selected Teleport rune once.
" @@ -206,7 +206,7 @@ if(GAMEMODE_IS_CULT) if(!canbypass)//not an admin-tome, check things if(!cult_mode.narsie_condition_cleared) - to_chat(user, "There is still more to do before unleashing [cult_mode.cultdat.entity_name] power!") + to_chat(user, "There is still more to do before unleashing [ticker.cultdat.entity_name] power!") return 0 if(!cult_mode.eldergod) to_chat(user, "\"I am already here. There is no need to try to summon me now.\"") @@ -215,19 +215,19 @@ to_chat(user, "\"We are already here. There is no need to try to summon us now.\"") return 0 if(!((CULT_ELDERGOD in cult_mode.objectives) || (CULT_SLAUGHTER in cult_mode.objectives))) - to_chat(user, "[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!") + to_chat(user, "[ticker.cultdat.entity_name]'s power does not wish to be unleashed!") return 0 if(!(A in summon_spots)) - to_chat(user, "[cult_mode.cultdat.entity_name] can only be summoned where the veil is weak - in [english_list(summon_spots)]!") + to_chat(user, "[ticker.cultdat.entity_name] can only be summoned where the veil is weak - in [english_list(summon_spots)]!") return 0 - var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") + var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [ticker.cultdat.entity_name]!", "No") if(confirm_final == "No" || confirm_final == null) to_chat(user, "You decide to prepare further before scribing the rune.") return 0 else return 1 else//the game mode is not cult..but we ARE a cultist...ALL ON THE ADMINBUS - var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") + var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [ticker.cultdat.entity_name]!", "No") if(confirm_final == "No" || confirm_final == null) to_chat(user, "You decide to prepare further before scribing the rune.") return 0 @@ -252,7 +252,7 @@ if(!possible_runes.len) return entered_rune_name = input(user, "Choose a rite to scribe.", "Sigils of Power") as null|anything in possible_runes - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return for(var/T in typesof(/obj/effect/rune)) var/obj/effect/rune/R = T @@ -271,7 +271,7 @@ if(locate(/obj/effect/rune) in runeturf) to_chat(user, "There is already a rune here.") return - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(ispath(rune_to_scribe, /obj/effect/rune/narsie) || ispath(rune_to_scribe, /obj/effect/rune/slaughter))//may need to change this - Fethas if(finale_runes_ok(user,rune_to_scribe)) @@ -294,22 +294,22 @@ var/mob/living/carbon/human/H = user var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot") var/obj/item/organ/external/affecting = H.get_organ(ran_zone(dam_zone)) - user.visible_message("[user] cuts open their [affecting] and begins writing in their own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.mode.cultdat.entity_title3].") + user.visible_message("[user] cuts open their [affecting] and begins writing in their own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.cultdat.entity_title3].") user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE , affecting) if(!do_after(user, initial(rune_to_scribe.scribe_delay)-scribereduct, target = get_turf(user))) for(var/V in shields) var/obj/machinery/shield/S = V - if(S && !qdeleted(S)) + if(S && !QDELETED(S)) qdel(S) return if(locate(/obj/effect/rune) in runeturf) to_chat(user, "There is already a rune here.") return user.visible_message("[user] creates a strange circle in their own blood.", \ - "You finish drawing the arcane markings of [ticker.mode.cultdat.entity_title3].") + "You finish drawing the arcane markings of [ticker.cultdat.entity_title3].") for(var/V in shields) var/obj/machinery/shield/S = V - if(S && !qdeleted(S)) + if(S && !QDELETED(S)) qdel(S) var/obj/effect/rune/R = new rune_to_scribe(runeturf, chosen_keyword) R.blood_DNA = list() diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 9b94627d664..ce98bb7f241 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -194,7 +194,7 @@ structure_check() searches for nearby cultist structures required for the invoca ..() for(var/M in invokers) var/mob/living/L = M - to_chat(L, "You feel your life force draining. [ticker.mode.cultdat.entity_title3] is displeased.") + to_chat(L, "You feel your life force draining. [ticker.cultdat.entity_title3] is displeased.") qdel(src) /mob/proc/null_rod_check() //The null rod, if equipped, will protect the holder from the effects of most runes @@ -238,7 +238,7 @@ structure_check() searches for nearby cultist structures required for the invoca possible_talismans[talisman_cult_name] = J //This is to allow the menu to let cultists select talismans by name entered_talisman_name = input(user, "Choose a talisman to imbue.", "Talisman Choices") as null|anything in possible_talismans talisman_type = possible_talismans[entered_talisman_name] - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || rune_in_use || !talisman_type) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || rune_in_use || !talisman_type) return ..() visible_message("Dark power begins to channel into the paper!.") @@ -303,7 +303,7 @@ var/list/teleport_runes = list() var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || !actual_selected_rune) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || !actual_selected_rune) fail_invoke() return @@ -374,7 +374,7 @@ var/list/teleport_runes = list() new_cultist.mind.special_role = "Cultist" to_chat(new_cultist, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \ and something evil takes root.") - to_chat(new_cultist, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve [ticker.mode.cultdat.entity_title3] above all else. Bring it back.\ + to_chat(new_cultist, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve [ticker.cultdat.entity_title3] above all else. Bring it back.\ ") //Rite of Tribute: Sacrifices a crew member to Nar-Sie. Places them into a soul shard if they're in their body. @@ -388,7 +388,7 @@ var/list/teleport_runes = list() /obj/effect/rune/sacrifice/New() ..() - cultist_desc = "sacrifices a crew member to [ticker.mode.cultdat.entity_title3]. May place them into a soul shard if their spirit remains in their body." + cultist_desc = "sacrifices a crew member to [ticker.cultdat.entity_title3]. May place them into a soul shard if their spirit remains in their body." /obj/effect/rune/sacrifice/invoke(var/list/invokers) if(rune_in_use) @@ -406,7 +406,7 @@ var/list/teleport_runes = list() var/mob/offering if(possible_targets.len > 1) //If there's more than one target, allow choice offering = input(user, "Choose an offering to sacrifice.", "Unholy Tribute") as null|anything in possible_targets - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return else if(possible_targets.len) //Otherwise, if there's a target at all, pick the only one offering = possible_targets[possible_targets.len] @@ -492,8 +492,8 @@ var/list/teleport_runes = list() /obj/effect/rune/narsie/New() ..() - cultist_name = "Summon [ticker.mode.cultdat.entity_name]" - cultist_desc = "tears apart dimensional barriers, calling forth [ticker.mode.cultdat.entity_title3]. Requires 9 invokers." + cultist_name = "Summon [ticker.cultdat.entity_name]" + cultist_desc = "tears apart dimensional barriers, calling forth [ticker.cultdat.entity_title3]. Requires 9 invokers." /obj/effect/rune/narsie/check_icon() @@ -519,7 +519,7 @@ var/list/teleport_runes = list() return if(!cult_mode.eldergod) for(var/M in invokers) - to_chat(M, "[ticker.mode.cultdat.entity_name] is already on this plane!") + to_chat(M, "[ticker.cultdat.entity_name] is already on this plane!") log_game("Summon god rune failed - already summoned") return //BEGIN THE SUMMONING @@ -654,7 +654,7 @@ var/list/teleport_runes = list() log_game("Raise Dead rune failed - no catalyst corpse") return mob_to_sacrifice = input(user, "Choose a corpse to sacrifice.", "Corpse to Sacrifice") as null|anything in potential_sacrifice_mobs - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || !mob_to_sacrifice || rune_in_use) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || !mob_to_sacrifice || rune_in_use) return for(var/mob/living/M in T.contents) if(M.stat == DEAD) @@ -664,7 +664,7 @@ var/list/teleport_runes = list() log_game("Raise Dead rune failed - no corpse to revive") return mob_to_revive = input(user, "Choose a corpse to revive.", "Corpse to Revive") as null|anything in potential_revive_mobs - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || rune_in_use || !mob_to_revive) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || rune_in_use || !mob_to_revive) return if(!in_range(mob_to_sacrifice,src)) to_chat(user, "The sacrificial target has been moved!") @@ -857,8 +857,8 @@ var/list/teleport_runes = list() for(var/datum/mind/M in ticker.mode.cult) if(!(M.current in invokers) && M.current && M.current.stat != DEAD) cultists |= M.current - var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of [ticker.mode.cultdat.entity_title3]") as null|anything in cultists - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of [ticker.cultdat.entity_title3]") as null|anything in cultists + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_summon) to_chat(user, "You require a summoning target!") @@ -866,7 +866,7 @@ var/list/teleport_runes = list() log_game("Summon Cultist rune failed - no target") return if(!iscultist(cultist_to_summon)) - to_chat(user, "[cultist_to_summon] is not a follower of [ticker.mode.cultdat.entity_title3]!") + to_chat(user, "[cultist_to_summon] is not a follower of [ticker.cultdat.entity_title3]!") fail_invoke() log_game("Summon Cultist rune failed - no target") return @@ -975,7 +975,7 @@ var/list/teleport_runes = list() /obj/effect/rune/manifest/New(loc) ..() - cultist_desc = "manifests a spirit as a servant of [ticker.mode.cultdat.entity_title3]. The invoker must not move from atop the rune, and will take damage for each summoned spirit." + cultist_desc = "manifests a spirit as a servant of [ticker.cultdat.entity_title3]. The invoker must not move from atop the rune, and will take damage for each summoned spirit." notify_ghosts("Manifest rune created in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src) @@ -1034,7 +1034,7 @@ var/list/teleport_runes = list() ticker.mode.add_cultist(new_human.mind, 0) summoned_guys |= new_human ghosts++ - to_chat(new_human, "You are a servant of [ticker.mode.cultdat.entity_title3]. You have been made semi-corporeal by the cult of [ticker.mode.cultdat.entity_name], and you are to serve them at all costs.") + to_chat(new_human, "You are a servant of [ticker.cultdat.entity_title3]. You have been made semi-corporeal by the cult of [ticker.cultdat.entity_name], and you are to serve them at all costs.") while(user in get_turf(src)) if(user.stat) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 9b0e2e9ab7e..152c5e57994 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -41,7 +41,7 @@ invocation = "Ra'sha yoka!" /obj/item/weapon/paper/talisman/malformed/invoke(mob/living/user, successfuluse = 1) - to_chat(user, "You feel a pain in your head. [ticker.mode.cultdat.entity_title3] is displeased.") + to_chat(user, "You feel a pain in your head. [ticker.cultdat.entity_title3] is displeased.") if(iscarbon(user)) var/mob/living/carbon/C = user C.apply_damage(10, BRUTE, "head") @@ -148,7 +148,7 @@ var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? - if(!src || qdeleted(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune) + if(!src || QDELETED(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune) return ..(user, 0) user.visible_message("Dust flows from [user]'s hand, and they disappear in a flash of red light!", \ @@ -412,7 +412,11 @@ trashtype = /obj/item/weapon/restraints/handcuffs/energy/used origin_tech = "materials=2;magnets=5" +/obj/item/weapon/restraints/handcuffs/energy/used + desc = "energy discharge" + flags = DROPDEL + /obj/item/weapon/restraints/handcuffs/energy/cult/used/dropped(mob/user) user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \ "Your [src] shatters in a discharge of dark magic!") - qdel(src) + . = ..() \ No newline at end of file diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 42fb3105f18..76e81c234e4 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -29,7 +29,6 @@ var/ert_disabled = 0 var/uplink_welcome = "Syndicate Uplink Console:" var/uplink_uses = 20 - var/datum/cult_info/cultdat //here instead of cult for adminbus purposes var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) @@ -164,7 +163,7 @@ T.purpose = "Payment" T.amount = pay T.date = current_date_string - T.time = worldtime2text() + T.time = station_time_timestamp() T.source_terminal = "\[CLASSIFIED\] Terminal #[rand(111,333)]" M.mind.initial_account.transaction_log.Add(T) msg += "You have been sent the $[pay], as agreed." @@ -281,10 +280,11 @@ // Get a list of all the people who want to be the antagonist for this round, except those with incompatible species for(var/mob/new_player/player in players) - if((role in player.client.prefs.be_special) && !(player.client.prefs.species in protected_species)) - player_draft_log += "[player.key] had [roletext] enabled, so we are drafting them." - candidates += player.mind - players -= player + if(!player.skip_antag) + if((role in player.client.prefs.be_special) && !(player.client.prefs.species in protected_species)) + player_draft_log += "[player.key] had [roletext] enabled, so we are drafting them." + candidates += player.mind + players -= player // If we don't have enough antags, draft people who voted for the round. if(candidates.len < recommended_enemies) @@ -374,7 +374,6 @@ /datum/game_mode/New() newscaster_announcements = pick(newscaster_standard_feeds) - cultdat = setupcult() ////////////////////////// //Reports player logouts// diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 6612f1e7192..8058ff6e5c9 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -20,6 +20,8 @@ var/round_start_time = 0 var/Bible_name // name of the bible var/Bible_deity_name + var/datum/cult_info/cultdat = null //here instead of cult for adminbus purposes + var/random_players = 0 // if set to nonzero, ALL players who latejoin or declare-ready join will have random appearances/genders var/list/syndicate_coalition = list() // list of traitor-compatible factions @@ -35,7 +37,8 @@ var/round_start_time = 0 var/obj/screen/cinematic = null //used for station explosion cinematic - var/round_end_announced = 0 // Spam Prevention. Announce round end only once. + var/round_end_announced = 0 // Spam Prevention. Announce round end only once.\ + /datum/controller/gameticker/proc/pregame() login_music = pick(\ @@ -70,6 +73,7 @@ var/round_start_time = 0 votetimer() /datum/controller/gameticker/proc/setup() + cultdat = setupcult() //Create and announce mode if(master_mode=="secret") src.hide_mode = 1 diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index e644af03f3c..8ab83c01253 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -331,7 +331,7 @@ audible_message("You hear a loud electrical buzzing sound!") to_chat(src, "Reprogramming machine behaviour...") spawn(50) - if(M && !qdeleted(M)) + if(M && !QDELETED(M)) new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, src, 1) else to_chat(src, "Out of uses.") diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index c8bc0e1e15e..f6dc76c7b27 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -454,6 +454,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/weapon/restraints/handcuffs/energy/used desc = "energy discharge" + flags = DROPDEL /obj/item/weapon/restraints/handcuffs/energy/used/dropped(mob/user) user.visible_message("[user]'s [src] break in a discharge of energy!", \ @@ -461,7 +462,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} var/datum/effect_system/spark_spread/S = new S.set_up(4,0,user.loc) S.start() - qdel(src) + . = ..() /obj/item/weapon/abductor_baton/examine(mob/user) ..() diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index ba7f91e2c37..5851023fce9 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -134,7 +134,7 @@ if(stat != CONSCIOUS) return var/be_borer = alert("Become a cortical borer? (Warning, You can no longer be cloned!)",,"Yes","No") - if(be_borer == "No" || !src || qdeleted(src)) + if(be_borer == "No" || !src || QDELETED(src)) return if(key) return @@ -175,7 +175,7 @@ if(!input) return - if(src && !qdeleted(src) && !qdeleted(host)) + if(src && !QDELETED(src) && !QDELETED(host)) var/say_string = (docile) ? "slurs" :"states" if(host) to_chat(host, "[truename] [say_string]: [input]") @@ -538,7 +538,7 @@ /mob/living/simple_animal/borer/proc/let_go() - if(!host || !src || qdeleted(host) || qdeleted(src)) + if(!host || !src || QDELETED(host) || QDELETED(src)) return if(!leaving) return @@ -605,7 +605,7 @@ to_chat(src, "You begin delicately adjusting your connection to the host brain...") - if(qdeleted(src) || qdeleted(host)) + if(QDELETED(src) || QDELETED(host)) return bonding = TRUE @@ -805,7 +805,7 @@ if(!candidate || !candidate.mob) return - if(!qdeleted(candidate) || !qdeleted(candidate.mob)) + if(!QDELETED(candidate) || !QDELETED(candidate.mob)) var/datum/mind/M = create_borer_mind(candidate.ckey) M.transfer_to(src) candidate.mob = src diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index be18793554f..c3401db2a58 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -47,7 +47,7 @@ if(crit_fail)//in case it depowers while ghost is looking at yes/no to_chat(user, "This swarmer shell is completely depowered. You cannot activate it.") return - if(qdeleted(src)) + if(QDELETED(src)) to_chat(user, "Swarmer has been occupied by someone else.") return var/mob/living/simple_animal/hostile/swarmer/S = new /mob/living/simple_animal/hostile/swarmer(get_turf(loc)) diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index ea11fc5cfdd..3aaeebbc513 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -53,12 +53,12 @@ removechains() /mob/living/simple_animal/hostile/guardian/beam/proc/cleardeletedchains() - if(summonerchain && qdeleted(summonerchain)) + if(summonerchain && QDELETED(summonerchain)) summonerchain = null if(enemychains.len) for(var/chain in enemychains) var/datum/cd = chain - if(!chain || qdeleted(cd)) + if(!chain || QDELETED(cd)) enemychains -= chain /mob/living/simple_animal/hostile/guardian/beam/proc/shockallchains() diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index fbb7d249ba0..e3e30f51a36 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -46,7 +46,7 @@ var/bomb_set if(timeleft <= 0) spawn explode() - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return /obj/machinery/nuclearbomb/attackby(obj/item/weapon/O as obj, mob/user as mob, params) @@ -177,7 +177,7 @@ var/bomb_set return /obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "nuclear_bomb.tmpl", "Nuke Control Panel", 450, 550, state = physical_state) ui.open() @@ -280,11 +280,11 @@ var/bomb_set timeleft = min(max(round(src.timeleft), 120), 600) if(href_list["timer"]) if(timing == -1.0) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(safety) to_chat(usr, "The safety is still on.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return timing = !(timing) if(timing) @@ -314,7 +314,7 @@ var/bomb_set if(removal_stage == 5) anchored = 0 visible_message("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(!isinspace()) @@ -326,7 +326,7 @@ var/bomb_set else to_chat(usr, "There is nothing to anchor to!") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/machinery/nuclearbomb/ex_act(severity) return diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index 7c69b02eda1..00c6bc67ee2 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -151,12 +151,12 @@ ticker.syndicate_coalition.Add(S) /proc/setupcult() - var/static/picked_cult // Only needs to get picked once + var/static/datum/cult_info/picked_cult // Only needs to get picked once if(picked_cult) return picked_cult - var/random_cult = pick(all_cults) + var/random_cult = pick(typesof(/datum/cult_info)) picked_cult = new random_cult() if(!picked_cult) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 439d3cb237d..76129be2d71 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -240,7 +240,7 @@ Made by Xhuis M.visible_message("[M] screams and contorts!", \ "THE LIGHT-- YOUR MIND-- BURNS--") spawn(30) - if(!M || qdeleted(M)) + if(!M || QDELETED(M)) return M.visible_message("[M] suddenly bloats and explodes!", \ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA----") diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 394f7fcc7da..781d417929f 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -384,8 +384,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha var/ay = owner.y for(var/i = 1 to 20) - ax += sun.dx - ay += sun.dy + ax += SSsun.dx + ay += SSsun.dy var/turf/T = locate(round(ax, 0.5), round(ay, 0.5), owner.z) diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index c78cc55676f..1b5921119db 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -349,6 +349,7 @@ to_chat(user, "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp.") add_logs(user, H, "vampire-thralled") + /obj/effect/proc_holder/spell/vampire/self/cloak name = "Cloak of Darkness" desc = "Toggles whether you are currently cloaking yourself in darkness." diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 16f9adb8dd9..979a28379ea 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "syndballoon" item_state = null - flags = ABSTRACT | NODROP + flags = ABSTRACT | NODROP | DROPDEL w_class = WEIGHT_CLASS_HUGE force = 0 throwforce = 0 @@ -32,10 +32,10 @@ attached_spell.attached_hand = null qdel(src) -/obj/item/weapon/melee/touch_attack/dropped() +/obj/item/weapon/melee/touch_attack/Destroy() if(attached_spell) attached_spell.attached_hand = null - qdel(src) + return ..() /obj/item/weapon/melee/touch_attack/disintegrate name = "disintegrating touch" diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index 64298b70fbe..b07b2655f28 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -28,16 +28,13 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses id = /obj/item/weapon/card/id/centcom pda = /obj/item/device/pda/centcom - backpack_contents = list( - /obj/item/weapon/gun/energy/pulse/pistol = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1 + belt = /obj/item/weapon/gun/energy/pulse/pistol + implants = list( + /obj/item/weapon/implant/mindshield, + /obj/item/weapon/implant/dust ) - - implants = list(/obj/item/weapon/implant/mindshield) - backpack = /obj/item/weapon/storage/backpack/satchel - + box = /obj/item/weapon/storage/box/centcomofficer // CC Officials who lead ERTs, Death Squads, etc. @@ -61,22 +58,33 @@ /datum/outfit/job/ntspecops name = "Special Operations Officer" jobtype = /datum/job/ntspecops - - uniform = /obj/item/clothing/under/syndicate/combat + uniform = /obj/item/clothing/under/rank/centcom_commander suit = /obj/item/clothing/suit/space/deathsquad/officer + back = /obj/item/weapon/storage/backpack/security + belt = /obj/item/weapon/gun/energy/pulse/pistol/m1911 gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/beret/centcom/officer/navy + mask = /obj/item/clothing/mask/cigarette/cigar/cohiba + head = /obj/item/clothing/head/helmet/space/deathsquad/beret l_ear = /obj/item/device/radio/headset/centcom glasses = /obj/item/clothing/glasses/hud/security/sunglasses id = /obj/item/weapon/card/id/centcom pda = /obj/item/device/pda/centcom + r_pocket = /obj/item/weapon/storage/box/matches + box = /obj/item/weapon/storage/box/centcomofficer + backpack = /obj/item/weapon/storage/backpack/satchel backpack_contents = list( - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/gun/energy/pulse/pistol/m1911 = 1, - /obj/item/weapon/implanter/death_alarm = 1 + /obj/item/clothing/shoes/magboots/advance = 1, + /obj/item/weapon/twohanded/dualsaber/red = 1, + /obj/item/weapon/storage/box/zipties = 1 ) - - implants = list(/obj/item/weapon/implant/mindshield) - - backpack = /obj/item/weapon/storage/backpack/satchel \ No newline at end of file + implants = list( + /obj/item/weapon/implant/mindshield, + /obj/item/weapon/implant/dust + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/eyes/xray, + /obj/item/organ/internal/cyberimp/brain/anti_drop, + /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/chest/nutriment/plus + ) \ No newline at end of file diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 477321a69ec..f573467cc41 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -94,7 +94,7 @@ department_head = list("Chief Engineer") selection_color = "#fff5cc" access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_mineral_storeroom) - minimal_access = list(access_eva, access_atmospherics, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_construction, access_mineral_storeroom) + minimal_access = list(access_eva, access_atmospherics, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_construction, access_mineral_storeroom, access_tech_storage) alt_titles = list("Atmospheric Technician") minimal_player_age = 7 exp_requirements = 300 diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index cfb4e9418a9..a611735701a 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -142,8 +142,6 @@ shoes = /obj/item/clothing/shoes/black pda = /obj/item/device/pda - var/list/implants = null - var/backpack = /obj/item/weapon/storage/backpack var/satchel = /obj/item/weapon/storage/backpack/satchel_norm var/dufflebag = /obj/item/weapon/storage/backpack/duffel @@ -210,11 +208,6 @@ imprint_pda(H) - if(implants) - for(var/implant_type in implants) - var/obj/item/weapon/implant/I = new implant_type(H) - I.implant(H) - if(gear_leftovers.len) for(var/datum/gear/G in gear_leftovers) var/atom/placed_in = H.equip_or_collect(G.spawn_item(null, H.client.prefs.gear[G.display_name])) diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index d373b09edd6..55d7588c152 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -100,7 +100,7 @@ /obj/machinery/atmospherics/unary/cold_sink/freezer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm @@ -258,7 +258,7 @@ /obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 728575fee21..a8f79cab534 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -140,7 +140,7 @@ ui_interact(user) /obj/machinery/sleeper/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "sleeper.tmpl", "Sleeper", 550, 770) ui.open() diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 3b20943e46d..0a6ea8c784d 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -1,6 +1,4 @@ /obj/machinery/bodyscanner - var/mob/living/carbon/occupant - var/locked name = "body scanner" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "bodyscanner-open" @@ -11,6 +9,16 @@ active_power_usage = 2500 light_color = "#00FF00" + var/obj/machinery/body_scanconsole/console = null + var/mob/living/carbon/occupant = null + var/locked + +/obj/machinery/bodyscanner/Destroy() + go_out() + if(console) + console.connected = null + console = null + return ..() /obj/machinery/bodyscanner/power_change() ..() @@ -207,9 +215,6 @@ return /obj/machinery/body_scanconsole - var/obj/machinery/bodyscanner/connected - var/delete - var/temphtml name = "Body Scanner Console" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "bodyscannerconsole" @@ -218,6 +223,9 @@ dir = 8 idle_power_usage = 250 active_power_usage = 500 + var/obj/machinery/bodyscanner/connected = null + var/delete + var/temphtml var/printing = null var/printing_text = null var/known_implants = list(/obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/mindshield, /obj/item/weapon/implant/tracking, /obj/item/weapon/implant/health) @@ -243,6 +251,12 @@ RefreshParts() findscanner() +/obj/machinery/body_scanconsole/Destroy() + if(connected) + connected.console = null + connected = null + return ..() + /obj/machinery/body_scanconsole/ex_act(severity) switch(severity) if(1.0) @@ -269,15 +283,13 @@ return /obj/machinery/body_scanconsole/proc/findscanner() - var/obj/machinery/bodyscanner/bodyscannernew = null - // Loop through every direction for(dir in list(NORTH,EAST,SOUTH,WEST)) // Try to find a scanner in that direction var/temp = locate(/obj/machinery/bodyscanner, get_step(src, dir)) - if(!isnull(temp)) - bodyscannernew = temp - src.connected = bodyscannernew - return + if(temp) + connected = temp + connected.console = src + break /obj/machinery/body_scanconsole/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params) @@ -321,7 +333,7 @@ /obj/machinery/body_scanconsole/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "adv_med.tmpl", "Body Scanner", 690, 600) ui.open() @@ -474,7 +486,7 @@ var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) P.info = "
" - P.info += "Time of scan: [worldtime2text(world.time)]
" + P.info += "Time of scan: [station_time_timestamp()]
" P.info += "[printing_text]" P.info += "
Notes:
" P.name = "Body Scan - [href_list["name"]]" diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 7694ff41ca0..c0197b136a3 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -212,6 +212,7 @@ air_alarms -= src if(radio_controller) radio_controller.remove_object(src, frequency) + radio_connection = null air_alarm_repository.update_cache(src) QDEL_NULL(wires) if(alarm_area && alarm_area.master_air_alarm == src) @@ -796,7 +797,7 @@ return thresholds /obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "air_alarm.tmpl", name, 570, 410, state = state) ui.open() @@ -922,7 +923,7 @@ return 1 if(href_list["atmos_reset"]) - if(alarm_area.atmosalert(ATMOS_ALARM_NONE, src)) + if(alarm_area.atmosalert(ATMOS_ALARM_NONE, src, TRUE)) apply_danger_level(ATMOS_ALARM_NONE) alarmActivated = 0 update_icon() diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index fcb9bd0d28e..eebf66bc447 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -135,7 +135,8 @@ obj/machinery/air_sensor Destroy() SSair.atmos_machinery -= src if(radio_controller) - radio_controller.remove_object(src,frequency) + radio_controller.remove_object(src, frequency) + radio_connection = null return ..() @@ -156,6 +157,12 @@ obj/machinery/air_sensor var/list/sensor_information = list() var/datum/radio_frequency/radio_connection + Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + attack_hand(mob/user) if(..(user)) return diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 00ca34e9a30..f4ae632791f 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -367,7 +367,7 @@ update_flag ..() - nanomanager.update_uis(src) // Update all NanoUIs attached to src + SSnanoui.update_uis(src) // Update all NanoUIs attached to src @@ -389,7 +389,7 @@ update_flag return // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 4fca317bf0d..fb7732018e9 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -107,7 +107,7 @@ /obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 17f671d9cc8..7ebadb0b5de 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -12,7 +12,7 @@ volume = 750 var/minrate = 0//probably useless, but whatever - var/maxrate = 10 * ONE_ATMOSPHERE + var/maxrate = 10 * ONE_ATMOSPHERE / 4 /obj/machinery/portable_atmospherics/scrubber/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -118,7 +118,7 @@ /obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 346949414fa..dfc983bb803 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -82,7 +82,7 @@ ui_interact(user) /obj/machinery/autolathe/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "autolathe.tmpl", name, 800, 550) ui.open() @@ -175,7 +175,7 @@ return 1 if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(exchange_parts(user, O)) @@ -239,7 +239,7 @@ use_power(max(500, inserted / 10)) qdel(O) busy = 0 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/machinery/autolathe/attack_ghost(mob/user) interact(user) @@ -318,7 +318,7 @@ screen = AUTOLATHE_SEARCH_MENU - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return 1 /obj/machinery/autolathe/RefreshParts() @@ -353,7 +353,7 @@ else var/list/materials_used = list(MAT_METAL=metal_cost/coeff, MAT_GLASS=glass_cost/coeff) materials.use_amount(materials_used) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) sleep(32/coeff) if(is_stack) var/obj/item/stack/S = new D.build_path(BuildTurf) @@ -362,7 +362,7 @@ var/obj/item/new_item = new D.build_path(BuildTurf) new_item.materials[MAT_METAL] /= coeff new_item.materials[MAT_GLASS] /= coeff - nanomanager.update_uis(src) + SSnanoui.update_uis(src) desc = initial(desc) /obj/machinery/autolathe/proc/can_build(datum/design/D, multiplier = 1, custom_metal, custom_glass) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 80cfef47d88..91852deaf73 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -48,13 +48,14 @@ /obj/machinery/driver_button/Destroy() if(radio_controller) - radio_controller.remove_object(src,frequency) + radio_controller.remove_object(src, frequency) + radio_connection = null return ..() /obj/machinery/driver_button/attack_ai(mob/user as mob) return attack_hand(user) - + /obj/machinery/driver_button/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) return attack_hand(user) @@ -167,7 +168,7 @@ /obj/machinery/ignition_switch/attack_ai(mob/user) return attack_hand(user) - + /obj/machinery/ignition_switch/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) return attack_hand(user) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 61bcf2a15b8..5e03043d6c3 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -91,7 +91,7 @@ cameranet.addCamera(src) emped = 0 //Resets the consecutive EMP count spawn(100) - if(!qdeleted(src)) + if(!QDELETED(src)) cancelCameraAlarm() for(var/mob/O in mob_list) if(O.client && O.client.eye == src) @@ -275,7 +275,7 @@ change_msg = "reactivates" triggerCameraAlarm() spawn(100) - if(!qdeleted(src)) + if(!QDELETED(src)) cancelCameraAlarm() if(displaymessage) if(user) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 1a53fcfa4a5..e9f36eb4eaa 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -93,7 +93,7 @@ // onclose(user, "op") /obj/machinery/computer/operating/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)//ui is mostly copy pasta from the sleeper ui - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "op_computer.tmpl", "Patient Monitor", 650, 455) ui.open() diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index bcdd075bea6..a3b9bd25815 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -33,7 +33,7 @@ to_chat(user, "You have been locked out from this console!") /obj/machinery/computer/aifixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "ai_fixer.tmpl", "AI System Integrity Restorer", 550, 500) @@ -90,7 +90,7 @@ if(radio == 0 || radio == 1) occupant.aiRadio.disabledAi = radio - nanomanager.update_uis(src) + SSnanoui.update_uis(src) update_icon() return diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 67a6c6801b8..9284ac7d03d 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -22,7 +22,7 @@ var/global/list/minor_air_alarms = list() ui_interact(user) /obj/machinery/computer/atmos_alert/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "atmos_alert.tmpl", src.name, 500, 500) ui.open() diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 1a90398f922..4721131f8cc 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -125,7 +125,7 @@ return access /obj/machinery/computer/security/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "sec_camera.tmpl", "Camera Console", 900, 800) @@ -211,7 +211,7 @@ network += net break - nanomanager.update_uis(src) + SSnanoui.update_uis(src) // Check if camera is accessible when jumping /obj/machinery/computer/security/proc/can_access_camera(var/obj/machinery/camera/C, var/mob/M) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index d6792073f9d..f8c8b810e09 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -138,7 +138,7 @@ var/time_last_changed_position = 0 id_card.loc = src modify = id_card - nanomanager.update_uis(src) + SSnanoui.update_uis(src) attack_hand(user) //Check if you can't touch a job in any way whatsoever @@ -225,7 +225,7 @@ var/time_last_changed_position = 0 /obj/machinery/computer/card/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "identification_computer.tmpl", src.name, 775, 700) ui.open() @@ -373,6 +373,7 @@ var/time_last_changed_position = 0 //let custom jobs function as an impromptu alt title, mainly for sechuds if(temp_t && modify) modify.assignment = temp_t + log_game("[key_name(usr)] has given \"[modify.registered_name]\" the custom job title \"[temp_t]\".") else var/list/access = list() if(is_centcom()) @@ -390,6 +391,11 @@ var/time_last_changed_position = 0 access = jobdatum.get_access() + var/jobnamedata = modify.getRankAndAssignment() + log_game("[key_name(usr)] has reassigned \"[modify.registered_name]\" from \"[jobnamedata]\" to \"[t1]\".") + if(t1 == "Civilian") + message_admins("[key_name_admin(usr)] has reassigned \"[modify.registered_name]\" from \"[jobnamedata]\" to \"[t1]\".") + modify.access = access modify.rank = t1 modify.assignment = t1 @@ -406,7 +412,7 @@ var/time_last_changed_position = 0 modify.registered_name = temp_name else visible_message("[src] buzzes rudely.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if("account") if(is_authenticated(usr) && !target_dept) @@ -414,7 +420,7 @@ var/time_last_changed_position = 0 if((modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf))) var/account_num = text2num(href_list["account"]) modify.associated_account_number = account_num - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if("mode") mode = text2num(href_list["mode_target"]) @@ -425,11 +431,11 @@ var/time_last_changed_position = 0 playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) spawn(50) printing = null - nanomanager.update_uis(src) + SSnanoui.update_uis(src) var/obj/item/weapon/paper/P = new(loc) if(mode == 2) - P.name = text("crew manifest ([])", worldtime2text()) + P.name = "crew manifest ([station_time_timestamp()])" P.info = {"
Crew Manifest
[data_core ? data_core.get_manifest(0) : ""] @@ -454,6 +460,9 @@ var/time_last_changed_position = 0 if("terminate") if(is_authenticated(usr) && !target_dept) + var/jobnamedata = modify.getRankAndAssignment() + log_game("[key_name(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\".") + message_admins("[key_name_admin(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\".") modify.assignment = "Terminated" modify.access = list() callHook("terminate_employee", list(modify)) @@ -471,6 +480,10 @@ var/time_last_changed_position = 0 var/datum/job/jobdatum = new /datum/job/civilian access = jobdatum.get_access() + var/jobnamedata = modify.getRankAndAssignment() + log_game("[key_name(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" to \"Civilian (Unassigned)\".") + message_admins("[key_name_admin(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" to \"Civilian (Unassigned)\".") + modify.access = access modify.rank = "Civilian" modify.assignment = "Unassigned" @@ -493,7 +506,7 @@ var/time_last_changed_position = 0 opened_positions[edit_job_target]++ log_game("[key_name(usr)] has opened a job slot for job \"[j]\".") message_admins("[key_name_admin(usr)] has opened a job slot for job \"[j.title]\".") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if("make_job_unavailable") // MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS @@ -513,7 +526,7 @@ var/time_last_changed_position = 0 opened_positions[edit_job_target]-- log_game("[key_name(usr)] has closed a job slot for job \"[j]\".") message_admins("[key_name_admin(usr)] has closed a job slot for job \"[j.title]\".") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if("prioritize_job") // TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 1eef8430d7b..9e7daea4661 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -88,7 +88,7 @@ W.loc = src src.diskette = W to_chat(user, "You insert [W].") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return else if(istype(W, /obj/item/device/multitool)) var/obj/item/device/multitool/M = W @@ -122,7 +122,7 @@ return // Set up the Nano UI - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "cloning_console.tmpl", "Cloning Console UI", 640, 520) ui.open() @@ -204,16 +204,16 @@ scan_mob(scanner.occupant) loading = 0 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(href_list["task"]) switch(href_list["task"]) if("autoprocess") autoprocess = 1 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if("stopautoprocess") autoprocess = 0 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) //No locking an open scanner. else if((href_list["lock"]) && (!isnull(src.scanner))) @@ -257,12 +257,12 @@ if("load") if((isnull(src.diskette)) || isnull(src.diskette.buf)) src.temp = "Error: The disk's data could not be read." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(isnull(src.active_record)) src.temp = "Error: No active record was found." src.menu = 1 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return src.active_record = src.diskette.buf.copy() @@ -277,7 +277,7 @@ else if(href_list["save_disk"]) //Save to disk! if((isnull(src.diskette)) || (src.diskette.read_only) || (isnull(src.active_record))) src.temp = "Error: The data could not be saved." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return // DNA2 makes things a little simpler. @@ -294,7 +294,7 @@ src.temp = "Save \[[href_list["save_disk"]]\] successful." else if(href_list["refresh"]) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["selectpod"]) var/obj/machinery/clonepod/selected = locate(href_list["selectpod"]) @@ -346,7 +346,7 @@ scan_mode = 0 src.add_fingerprint(usr) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return /obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob, var/scan_brain = 0) @@ -358,7 +358,7 @@ return if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (NO_SCAN in subject.species.species_traits)) scantemp = "Error: Unable to locate valid genetic data." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(subject.get_int_organ(/obj/item/organ/internal/brain)) var/obj/item/organ/internal/brain/Brn = subject.get_int_organ(/obj/item/organ/internal/brain) @@ -366,31 +366,31 @@ var/datum/species/S = all_species[Brn.dna.species] // stepladder code wooooo if(NO_SCAN in S.species_traits) scantemp = "Error: Subject's brain is incompatible." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(!subject.get_int_organ(/obj/item/organ/internal/brain)) scantemp = "Error: No signs of intelligence detected." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(subject.suiciding) scantemp = "Error: Subject's brain is not responding to scanning stimuli." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if((!subject.ckey) || (!subject.client)) scantemp = "Error: Mental interface failure." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if((NOCLONE in subject.mutations) && src.scanner.scan_level < 2) scantemp = "Error: Mental interface failure." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(scan_brain && !subject.get_int_organ(/obj/item/organ/internal/brain)) scantemp = "Error: No brain found." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(!isnull(find_record(subject.ckey))) scantemp = "Subject already in database." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return subject.dna.check_integrity() @@ -427,7 +427,7 @@ src.records += R scantemp = "Subject successfully scanned. " + extra_info - nanomanager.update_uis(src) + SSnanoui.update_uis(src) //Find a specific record by key. /obj/machinery/computer/cloning/proc/find_record(var/find_key) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index e46182b735e..76d583df982 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -95,14 +95,14 @@ if(istype(id)) crew_announcement.announcer = GetNameAndAssignmentFromId(id) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(href_list["logout"]) authenticated = COMM_AUTHENTICATION_NONE crew_announcement.announcer = "" setMenuState(usr,COMM_SCREEN_MAIN) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(!is_authenticated(usr)) @@ -145,11 +145,11 @@ if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) if(message_cooldown) to_chat(usr, "Please allow at least one minute to pass between announcements.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") if(!input || message_cooldown || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return crew_announcement.Announce(input) message_cooldown = 1 @@ -159,7 +159,7 @@ if("callshuttle") var/input = input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null if(!input || ..() || !is_authenticated(usr)) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return call_shuttle_proc(usr, input) @@ -170,7 +170,7 @@ if("cancelshuttle") if(isAI(usr) || isrobot(usr)) to_chat(usr, "Firewalls prevent you from recalling the shuttle.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return 1 var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No") if(response == "Yes") @@ -229,11 +229,11 @@ if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") as text|null if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return Nuke_request(input, usr) to_chat(usr, "Request sent.") @@ -248,14 +248,14 @@ if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return Centcomm_announce(input, usr) - print_centcom_report(input, worldtime2text() +" Captain's Message") + print_centcom_report(input, station_time_timestamp() + " Captain's Message") to_chat(usr, "Message transmitted.") log_say("[key_name(usr)] has made a Centcomm announcement: [input]") centcomm_message_cooldown = 1 @@ -268,11 +268,11 @@ if((is_authenticated(usr) == COMM_AUTHENTICATION_MAX) && (src.emagged)) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return Syndicate_announce(input, usr) to_chat(usr, "Message transmitted.") @@ -313,14 +313,14 @@ atc.squelched = !atc.squelched to_chat(usr, "ATC traffic is now: [atc.squelched ? "Disabled" : "Enabled"].") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return 1 /obj/machinery/computer/communications/emag_act(user as mob) if(!emagged) src.emagged = 1 to_chat(user, "You scramble the communication routing circuits!") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/machinery/computer/communications/attack_ai(var/mob/user as mob) return src.attack_hand(user) @@ -340,7 +340,7 @@ /obj/machinery/computer/communications/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index d016a0df7bd..5e16fe42828 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -5,7 +5,7 @@ #define MED_DATA_V_DATA 5 // Virus database #define MED_DATA_MEDBOT 6 // Medbot monitor -/obj/machinery/computer/med_data//TODO:SANITY +/obj/machinery/computer/med_data //TODO:SANITY name = "medical records console" desc = "This can be used to check medical records." icon_keyboard = "med_key" @@ -23,6 +23,11 @@ light_color = LIGHT_COLOR_DARKBLUE +/obj/machinery/computer/med_data/Destroy() + active1 = null + active2 = null + return ..() + /obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) usr.drop_item() @@ -41,7 +46,7 @@ ui_interact(user) /obj/machinery/computer/med_data/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "med_data.tmpl", name, 800, 380) ui.open() @@ -453,7 +458,7 @@ var/t1 = copytext(trim(sanitize(input("Add Comment:", "Med. records", null, null) as message)), 1, MAX_MESSAGE_LEN) if(!t1 || ..() || active2 != a2) return 1 - active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [worldtime2text()]
[t1]" + active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [station_time_timestamp()]
[t1]" if(href_list["del_c"]) var/index = min(max(text2num(href_list["del_c"]) + 1, 1), length(active2.fields["comments"])) @@ -515,7 +520,7 @@ else P.info += "Medical Record Lost!
" P.info += "" - P.name = "paper- 'Medical Record'" + P.name = "paper- 'Medical Record: [active1.fields["name"]]'" printing = 0 return 1 diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 75bad25bfab..a9e967ab171 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -14,7 +14,7 @@ ui_interact(user) /obj/machinery/computer/podtracker/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "pod_tracking.tmpl", "Pod Tracking Console", 400, 500) ui.open() @@ -47,4 +47,4 @@ return 1 if(href_list["refresh"]) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index ec41de193b8..c3d367ae716 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -35,7 +35,7 @@ return 0 /obj/machinery/computer/robotics/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "robot_control.tmpl", "Robotic Control Console", 400, 500) ui.open() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 8289e8714e3..0600f8c1a08 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -24,6 +24,10 @@ light_color = LIGHT_COLOR_RED +/obj/machinery/computer/secure_data/Destroy() + active1 = null + active2 = null + return ..() /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) @@ -44,7 +48,7 @@ ui_interact(user) /obj/machinery/computer/secure_data/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "secure_data.tmpl", name, 800, 380) ui.open() @@ -198,7 +202,7 @@ active2.fields["criminal"] = "Released" var/newstatus = active2.fields["criminal"] log_admin("[key_name_admin(usr)] set secstatus of [their_rank] [their_name] to [newstatus], comment: [t1]") - active2.fields["comments"] += "Set to [newstatus] by [usr.name] ([rank]) on [current_date_string] [worldtime2text()], comment: [t1]" + active2.fields["comments"] += "Set to [newstatus] by [usr.name] ([rank]) on [current_date_string] [station_time_timestamp()], comment: [t1]" update_all_mob_security_hud() if("rank") if(active1) @@ -366,7 +370,7 @@ else P.info += "Security Record Lost!
" P.info += "" - P.name = "paper - 'Security Record'" + P.name = "paper - 'Security Record: [active1.fields["name"]]'" printing = 0 /* Removed due to BYOND issue @@ -404,7 +408,7 @@ var/t1 = copytext(trim(sanitize(input("Add Comment:", "Secure. records", null, null) as message)), 1, MAX_MESSAGE_LEN) if(!t1 || ..() || active2 != a2) return 1 - active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [worldtime2text()]
[t1]" + active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [station_time_timestamp()]
[t1]" else if(href_list["del_c"]) var/index = min(max(text2num(href_list["del_c"]) + 1, 1), length(active2.fields["comments"])) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 66d0bfdbaee..5c0a0cffd55 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -23,6 +23,9 @@ var/sortBy = "name" var/order = 1 // -1 = Descending - 1 = Ascending +/obj/machinery/computer/skills/Destroy() + active1 = null + return ..() /obj/machinery/computer/skills/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) @@ -43,7 +46,7 @@ ui_interact(user) /obj/machinery/computer/skills/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "skills_data.tmpl", name, 800, 380) ui.open() @@ -232,7 +235,7 @@ else P.info += "General Record Lost!
" P.info += "" - P.name = "paper - 'Employment Record'" + P.name = "paper - 'Employment Record: [active1.fields["name"]]'" printing = 0 if(href_list["field"]) diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index e2119247409..4006e005b12 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -137,7 +137,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F var/list/transferlog = list() /obj/machinery/computer/telecrystals/boss/proc/logTransfer(var/logmessage) - transferlog += ("[worldtime2text()] [logmessage]") + transferlog += ("[station_time_timestamp()] [logmessage]") /obj/machinery/computer/telecrystals/boss/proc/scanUplinkers() for(var/obj/machinery/computer/telecrystals/uplinker/A in range(scanrange, src.loc)) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index bb33210f780..2c862b5cb0c 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -185,7 +185,7 @@ */ /obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 0cc98cd8622..039e40d67f1 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -371,7 +371,7 @@ cult_mode.sacrifice_target = pick(p_s_t) for(var/datum/mind/H in ticker.mode.cult) if(H.current) - to_chat(H.current, "[ticker.mode.cultdat.entity_name] murmurs, [occupant] is beyond your reach. Sacrifice [cult_mode.sacrifice_target.current] instead...") + to_chat(H.current, "[ticker.cultdat.entity_name] murmurs, [occupant] is beyond your reach. Sacrifice [cult_mode.sacrifice_target.current] instead...") else cult_mode.bypass_phase() diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index a7ddc648df6..fc8f8032863 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -118,7 +118,7 @@ add_fingerprint(usr) switch(href_list["action"]) if("toggle") - if(qdeleted(src)) + if(QDELETED(src)) return if(!active) if(stop > world.time) @@ -143,7 +143,7 @@ for(var/datum/track/S in songs) available[S.song_name] = S var/selected = input(usr, "Choose your song", "Track:") as null|anything in available - if(qdeleted(src) || !selected || !istype(available[selected], /datum/track)) + if(QDELETED(src) || !selected || !istype(available[selected], /datum/track)) return selection = available[selected] updateUsrDialog() @@ -165,7 +165,7 @@ deejay('sound/ai/harmalarm.ogg') /obj/machinery/disco/proc/deejay(S) - if(qdeleted(src) || !active || charge < 5) + if(QDELETED(src) || !active || charge < 5) to_chat(usr, "The device is not able to play more DJ sounds at this time.") return charge -= 5 @@ -241,7 +241,7 @@ /obj/machinery/disco/proc/lights_spin() for(var/i in 1 to 25) - if(qdeleted(src) || !active) + if(QDELETED(src) || !active) return var/obj/effect/overlay/sparkles/S = new /obj/effect/overlay/sparkles(src) S.alpha = 0 @@ -266,7 +266,7 @@ reveal.alpha = 255 while(active) for(var/obj/item/device/flashlight/spotlight/glow in spotlights) // The multiples reflects custom adjustments to each colors after dozens of tests - if(qdeleted(src) || !active || qdeleted(glow)) + if(QDELETED(src) || !active || QDELETED(glow)) return if(glow.light_color == "red") glow.light_color = "nw" diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 723a2cc3770..88210652e99 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -79,7 +79,7 @@ for reference: user.visible_message("[user] is prying apart \the [src].", "You begin to pry apart \the [src].") playsound(src, W.usesound, 200, 1) - if(do_after(user, 300 * W.toolspeed, target = src) && src && !src.gcDestroyed) + if(do_after(user, 300 * W.toolspeed, target = src) && !QDELETED(src)) user.visible_message("[user] pries apart \the [src].", "You pry apart \the [src].") dismantle() return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b215839a0ca..074e29096a6 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -140,6 +140,7 @@ About the new airlock wires panel: /obj/machinery/door/airlock/Destroy() QDEL_NULL(electronics) QDEL_NULL(wires) + QDEL_NULL(note) if(main_power_timer) deltimer(main_power_timer) main_power_timer = null @@ -149,7 +150,9 @@ About the new airlock wires panel: if(electrified_timer) deltimer(electrified_timer) electrified_timer = null - qdel(note) + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null return ..() /obj/machinery/door/airlock/handle_atom_del(atom/A) @@ -180,7 +183,7 @@ About the new airlock wires panel: /obj/machinery/door/airlock/autoclose() autoclose_timer = 0 - if(!qdeleted(src) && !density && !operating && !locked && !welded && autoclose) + if(!QDELETED(src) && !density && !operating && !locked && !welded && autoclose) close() return @@ -547,7 +550,7 @@ About the new airlock wires panel: ui_interact(user) /obj/machinery/door/airlock/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "door_control.tmpl", "Door Controls - [src]", 600, 375) ui.open() @@ -1161,7 +1164,7 @@ About the new airlock wires panel: operating = TRUE update_icon(AIRLOCK_EMAG, 1) sleep(6) - if(qdeleted(src)) + if(QDELETED(src)) return operating = FALSE if(!open()) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index cc7da319ddd..8a53dd3de8c 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -216,6 +216,12 @@ if(radio_controller) set_frequency(frequency) +/obj/machinery/airlock_sensor/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + /obj/machinery/airlock_sensor/airlock_interior command = "cycle_interior" @@ -279,6 +285,12 @@ if(radio_controller) set_frequency(frequency) +/obj/machinery/access_button/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + /obj/machinery/access_button/airlock_interior frequency = 1379 command = "cycle_interior" diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 5914d9b5d87..b8f00b60131 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -40,11 +40,11 @@ for(var/obj/machinery/computer/prisoner/C in prisoncomputer_list) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(C.loc) - P.name = "[id] log - [logname] [worldtime2text()]" + P.name = "[id] log - [logname] [station_time_timestamp()]" P.info = "
" P.info += {"
- Log generated at: [worldtime2text()]
+ Log generated at: [station_time_timestamp()]
Detainee: [logname]
Duration: [seconds_to_time(timetoset / 10)]
Charge(s): [logcharges]
@@ -68,7 +68,7 @@ rank = I.assignment if(!R.fields["comments"] || !islist(R.fields["comments"])) //copied from security computer code because apparently these need to be initialized R.fields["comments"] = list() - R.fields["comments"] += "Autogenerated by [name] on [current_date_string] [worldtime2text()]
Sentenced to [timetoset/10] seconds for the charges of \"[logcharges]\" by [rank] [usr.name]." + R.fields["comments"] += "Autogenerated by [name] on [current_date_string] [station_time_timestamp()]
Sentenced to [timetoset/10] seconds for the charges of \"[logcharges]\" by [rank] [usr.name]." update_all_mob_security_hud() return 1 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index bfb758bae75..bb6702ec89a 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -94,12 +94,8 @@ M.last_bumped = world.time if(M.restrained() && !check_access(null)) return - if(M.mob_size > MOB_SIZE_SMALL) + if(M.mob_size > MOB_SIZE_TINY) bumpopen(M) - else if(ispet(M)) - var/mob/living/simple_animal/A = AM - if(A.collar) - bumpopen(M) return if(ismecha(AM)) @@ -353,7 +349,7 @@ /obj/machinery/door/proc/autoclose() autoclose_timer = 0 - if(!qdeleted(src) && !density && !operating && !locked && !welded && autoclose) + if(!QDELETED(src) && !density && !operating && !locked && !welded && autoclose) close() /obj/machinery/door/proc/update_freelook_sight() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5490b529564..e5211f48407 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -77,7 +77,7 @@ if(!ticker) return var/mob/living/M = AM - if(!M.restrained() && M.mob_size > MOB_SIZE_SMALL && (!(isrobot(M) && M.stat))) + if(!M.restrained() && M.mob_size > MOB_SIZE_TINY && (!(isrobot(M) && M.stat))) bumpopen(M) /obj/machinery/door/window/bumpopen(mob/user) diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index 99b5189e206..27ee0197514 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -21,7 +21,7 @@ name = "Advanced Airlock Controller" /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "advanced_airlock_console.tmpl", name, 470, 290) ui.open() @@ -77,7 +77,7 @@ tag_secure = 1 /obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "simple_airlock_console.tmpl", name, 470, 290) ui.open() @@ -140,7 +140,7 @@ icon_state = "access_control_off" /obj/machinery/embedded_controller/radio/airlock/access_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "door_access_console.tmpl", name, 330, 220) ui.open() diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index a4a656fa5d6..08143524744 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -58,6 +58,12 @@ ..() set_frequency(frequency) +/obj/machinery/embedded_controller/radio/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + /obj/machinery/embedded_controller/radio/update_icon() if(on && program) if(program.memory["processing"]) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 56a36b07e92..523a11884a9 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -169,7 +169,7 @@ FIRE ALARM ui_interact(user) /obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "firealarm.tmpl", name, 400, 400, state = state) ui.open() diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index bc70868cf8f..8e043af82ad 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -19,9 +19,9 @@ /obj/item/weapon/card/id/guest/examine(mob/user) ..(user) if(world.time < expiration_time) - to_chat(user, "This pass expires at [worldtime2text(expiration_time)].") + to_chat(user, "This pass expires at [station_time_timestamp("hh:mm:ss", expiration_time)].") else - to_chat(user, "It expired at [worldtime2text(expiration_time)].") + to_chat(user, "It expired at [station_time_timestamp("hh:mm:ss", expiration_time)].") to_chat(user, "It grants access to following areas:") for(var/A in temp_access) to_chat(user, "[get_access_desc(A)].") @@ -166,13 +166,13 @@ if("issue") if(giver) var/number = add_zero("[rand(0,9999)]", 4) - var/entry = "\[[worldtime2text()]\] Pass #[number] issued by [giver.registered_name] ([giver.assignment]) to [giv_name]. Reason: [reason]. Grants access to following areas: " + var/entry = "\[[station_time()]\] Pass #[number] issued by [giver.registered_name] ([giver.assignment]) to [giv_name]. Reason: [reason]. Grants access to following areas: " for(var/i=1 to accesses.len) var/A = accesses[i] if(A) var/area = get_access_desc(A) entry += "[i > 1 ? ", [area]" : "[area]"]" - entry += ". Expires at [worldtime2text(world.time + duration*10*60)]." + entry += ". Expires at [station_time(world.time + duration*10*60)]." internal_log.Add(entry) var/obj/item/weapon/card/id/guest/pass = new(src.loc) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 644b5a73ab9..abe9f38f363 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -56,7 +56,8 @@ /obj/machinery/light_switch/Destroy() if(radio_controller) - radio_controller.remove_object(src,frequency) + radio_controller.remove_object(src, frequency) + radio_connection = null return ..() /obj/machinery/light_switch/proc/updateicon() @@ -75,7 +76,7 @@ /obj/machinery/light_switch/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) return attack_hand(user) - + /obj/machinery/light_switch/attack_hand(mob/user) on = !on updateicon() diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 362b9718b3a..0ff8847a8d8 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -236,6 +236,12 @@ filter_path() // renders rpath + Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + process() if(magnets.len == 0 && autolink) for(var/obj/machinery/magnetic_module/M in world) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 7cc40fdc62e..36b1ca0d837 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -186,7 +186,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co user.set_machine(src) if(can_scan(user)) scan_user(user) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "newscaster.tmpl", name, 400, 600) ui.open() @@ -566,7 +566,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else if(href_list["jobs"]) screen = NEWSCASTER_JOBS - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return 1 /obj/machinery/newscaster/attackby(obj/item/I, mob/living/user, params) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index c169f3c0a59..661a814c6fb 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -100,7 +100,10 @@ if(drownee.losebreath > 20) //You've probably got bigger problems than drowning at this point, so we won't add to it until you get that under control. return - add_logs(src, drownee, "drowned", null, null, 0) //log it to their VV, but don't spam the admins' chats with the logs + if(isLivingSSD(drownee)) + add_logs(src, drownee, "drowned", null, null, 0, 1) // Notify admins, since the person is SSD + else + add_logs(src, drownee, "drowned", null, null, 0, 0) // Do not notify admins. if(drownee.stat) //Mob is in critical. drownee.AdjustLoseBreath(3, bound_lower = 0, bound_upper = 20) drownee.visible_message("\The [drownee] appears to be drowning!","You're quickly drowning!") //inform them that they are fucked. @@ -126,7 +129,7 @@ /obj/machinery/poolcontroller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "poolcontroller.tmpl", "Pool Controller Interface", 520, 410) ui.open() diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm index 1944da8f071..610f7d22f9c 100644 --- a/code/game/machinery/portable_tag_turret.dm +++ b/code/game/machinery/portable_tag_turret.dm @@ -43,7 +43,7 @@ iconholder = 1 /obj/machinery/porta_turret/tag/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 300) ui.open() diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 01486963356..73431fc0c94 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -212,7 +212,7 @@ var/list/turret_icons ui_interact(user) /obj/machinery/porta_turret/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 320) ui.open() diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index d742ab00658..86c11f7cbe9 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -71,7 +71,7 @@ to_chat(user, "The panel must be closed before operating this machine!") return - if(!linked_pad || qdeleted(linked_pad)) + if(!linked_pad || QDELETED(linked_pad)) to_chat(user, "There is no linked pad!") return @@ -108,14 +108,14 @@ teleporting = 1 spawn(teleport_speed) - if(!src || qdeleted(src)) + if(!src || QDELETED(src)) teleporting = 0 return if(stat & NOPOWER) to_chat(user, "[src] is unpowered!") teleporting = 0 return - if(!linked_pad || qdeleted(linked_pad) || linked_pad.stat & NOPOWER) + if(!linked_pad || QDELETED(linked_pad) || linked_pad.stat & NOPOWER) to_chat(user, "Linked pad is not responding to ping. Teleport aborted.") teleporting = 0 return diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 43fda1c6e00..142683e8962 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -112,7 +112,7 @@ var/const/SAFETY_COOLDOWN = 100 for(var/i in to_eat) var/atom/movable/AM = i - if(!exists(AM)) + if(QDELETED(AM)) continue else if(isliving(AM)) if(emagged) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index c10f4044f78..d3799a5a20b 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -131,7 +131,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() ui_interact(user) /obj/machinery/requests_console/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "request_console.tmpl", "[department] Request Console", 520, 410) ui.open() @@ -221,7 +221,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() radiochannel = "AI Private" if(recipient == "Cargo Bay") radiochannel = "Supply" - message_log += "Message sent to [recipient] at [worldtime2text()]
[message]" + message_log += "Message sent to [recipient] at [station_time_timestamp()]
[message]" Radio.autosay("Alert; a new requests console message received for [recipient] from [department]", null, "[radiochannel]") else audible_message(text("[bicon(src)] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) @@ -265,7 +265,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(href_list["toggleSilent"]) silent = !silent - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return //err... hacking code, which has no reason for existing... but anyway... it was once supposed to unlock priority 3 messanging on that console (EXTREME priority...), but the code for that was removed. diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index ca6484d8dd4..822cc6d9978 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -22,7 +22,7 @@ ui_interact(user) /obj/machinery/slot_machine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "slotmachine.tmpl", name, 350, 200) ui.open() @@ -113,5 +113,5 @@ T.purpose = "Slot Winnings" T.amount = "[amt]" T.date = current_date_string - T.time = worldtime2text() + T.time = station_time_timestamp() account.transaction_log.Add(T) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 614f4d8f53f..414ec8d2e62 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -98,7 +98,7 @@ message2 = "Error!" else message1 = "TIME" - message2 = worldtime2text() + message2 = station_time_timestamp("hh:mm") update_display(message1, message2, use_warn) return 1 if(STATUS_DISPLAY_MESSAGE) //custom messages @@ -126,7 +126,7 @@ return 1 if(STATUS_DISPLAY_TIME) message1 = "TIME" - message2 = worldtime2text() + message2 = station_time_timestamp("hh:mm") update_display(message1, message2) return 1 return 0 diff --git a/code/game/machinery/supply_display.dm b/code/game/machinery/supply_display.dm index 9c945fff989..863d76ef7b6 100644 --- a/code/game/machinery/supply_display.dm +++ b/code/game/machinery/supply_display.dm @@ -10,7 +10,7 @@ message2 = "Docked" else message1 = "TIME" - message2 = worldtime2text() + message2 = station_time_timestamp("hh:mm") else message1 = "CARGO" message2 = shuttle_master.supply.getTimerStr() diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 8479e4e051b..843b889478d 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -70,7 +70,7 @@ return // Set up the Nano UI - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "teleporter_console.tmpl", "Teleporter Console UI", 400, 400) ui.open() @@ -99,16 +99,16 @@ if(href_list["eject"]) eject() - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(!check_hub_connection()) to_chat(usr, "Error: Unable to detect hub.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(calibrating) to_chat(usr, "Error: Calibration in progress. Stand by.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(href_list["regimeset"]) @@ -116,32 +116,32 @@ power_station.teleporter_hub.update_icon() power_station.teleporter_hub.calibrated = 0 reset_regime() - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(href_list["settarget"]) power_station.engaged = 0 power_station.teleporter_hub.update_icon() power_station.teleporter_hub.calibrated = 0 set_target(usr) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(href_list["lock"]) power_station.engaged = 0 power_station.teleporter_hub.update_icon() power_station.teleporter_hub.calibrated = 0 target = get_turf(locked.locked_location) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(href_list["calibrate"]) if(!target) to_chat(usr, "Error: No target set to calibrate to.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accurate >= 3) to_chat(usr, "Hub is already calibrated.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return src.visible_message("Processing hub calibration to target...") calibrating = 1 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) spawn(50 * (3 - power_station.teleporter_hub.accurate)) //Better parts mean faster calibration calibrating = 0 if(check_hub_connection()) @@ -149,9 +149,9 @@ src.visible_message("Calibration complete.") else src.visible_message("Error: Unable to detect hub.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/machinery/computer/teleporter/proc/check_hub_connection() if(!power_station) diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index ad5aeb5fc61..4bcf869ba64 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -25,7 +25,7 @@ var/check_anomalies = 1 //checks if it can shoot at unidentified lifeforms (ie xenos) var/check_synth = 0 //if active, will shoot at anything not an AI or cyborg var/ailock = 0 //Silicons cannot use this - + var/syndicate = 0 var/faction = "" // Turret controls can only access turrets that are in the same faction @@ -39,21 +39,21 @@ enabled = 1 lethal = 1 icon_state = "control_kill" - + /obj/machinery/turretid/syndicate enabled = 1 lethal = 1 icon_state = "control_kill" - + lethal = 1 check_arrest = 0 check_records = 0 check_weapons = 0 check_access = 0 - check_anomalies = 1 + check_anomalies = 1 check_synth = 1 ailock = 1 - + syndicate = 1 faction = "syndicate" @@ -139,7 +139,7 @@ ui_interact(user) /obj/machinery/turretid/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 300) ui.open() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 1329922235f..07365fb0c9a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -234,7 +234,7 @@ vend(currently_vending, usr) return else if(handled) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return // don't smack that machine with your 2 thalers if(default_unfasten_wrench(user, I, time = 60)) @@ -247,7 +247,7 @@ overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") - nanomanager.update_uis(src) // Speaker switch is on the main UI, not wires UI + SSnanoui.update_uis(src) // Speaker switch is on the main UI, not wires UI return if(panel_open) @@ -269,7 +269,7 @@ coin = I categories |= CAT_COIN to_chat(user, "You insert the [I] into the [src]") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return else if(istype(I, refill_canister) && refill_canister != null) if(stat & (BROKEN|NOPOWER)) @@ -327,14 +327,14 @@ I.forceMove(src) to_chat(user, "You insert [I] into [src].") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/machinery/vending/proc/eject_item() if(!item_slot || !inserted_item) return inserted_item.forceMove(get_turf(src)) inserted_item = null - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/machinery/vending/emag_act(user as mob) emagged = 1 @@ -430,7 +430,7 @@ T.amount = "[currently_vending.price]" T.source_terminal = src.name T.date = current_date_string - T.time = worldtime2text() + T.time = station_time_timestamp() vendor_account.transaction_log.Add(T) /obj/machinery/vending/attack_ai(mob/user) @@ -458,7 +458,7 @@ /obj/machinery/vending/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "vending_machine.tmpl", src.name, 440, 600) ui.open() @@ -545,7 +545,7 @@ vend(currently_vending, usr) return else if(handled) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return // don't smack that machine with your 2 credits if((href_list["vend"]) && vend_ready && !currently_vending) @@ -584,7 +584,7 @@ shut_up = !src.shut_up add_fingerprint(usr) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/machinery/vending/proc/vend(datum/data/vending_product/R, mob/user) if(!allowed(usr) && !usr.can_admin_interact() && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH @@ -599,7 +599,7 @@ vend_ready = 0 //One thing at a time!! status_message = "Vending..." status_error = 0 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(R.category & CAT_COIN) if(!coin) @@ -632,7 +632,7 @@ status_error = 0 vend_ready = 1 currently_vending = null - nanomanager.update_uis(src) + SSnanoui.update_uis(src) //override this proc to add handling for what to do with the vended product when you have a inserted item and remember to include a parent call for this generic handling /obj/machinery/vending/proc/do_vend(datum/data/vending_product/R) diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm index e309b562522..1a242594bfe 100644 --- a/code/game/magic/Uristrunes.dm +++ b/code/game/magic/Uristrunes.dm @@ -1,7 +1,7 @@ /proc/get_rune_cult(word) var/animated - if(word && !(ticker.mode.cultdat.theme == "fire" || ticker.mode.cultdat.theme == "death")) + if(word && !(ticker.cultdat.theme == "fire" || ticker.cultdat.theme == "death")) animated = 1 else animated = 0 @@ -20,9 +20,9 @@ var/runetype = "rune" if(!ticker.mode)//work around for maps with runes and cultdat is not loaded all the way runetype = "rune" - else if(ticker.mode.cultdat.theme == "fire") + else if(ticker.cultdat.theme == "fire") runetype = "fire-rune" - else if(ticker.mode.cultdat.theme == "death") + else if(ticker.cultdat.theme == "death") runetype = "death-rune" diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index bf547881869..1b9deed332b 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -429,7 +429,7 @@ if(!use_cable(1)) return reset() var/obj/structure/cable/NC = new(new_turf) - NC.cableColor("red") + NC.cable_color("red") NC.d1 = 0 NC.d2 = fdirn NC.updateicon() diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index b3e42bb968e..76cd58abed6 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -148,7 +148,7 @@ ui_interact(user) /obj/machinery/computer/mech_bay_power_console/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm @@ -162,11 +162,11 @@ var/data[0] if(!recharge_port) reconnect() - if(recharge_port && !qdeleted(recharge_port)) + if(recharge_port && !QDELETED(recharge_port)) data["recharge_port"] = list("mech" = null) - if(recharge_port.recharging_mecha && !qdeleted(recharge_port.recharging_mecha)) + if(recharge_port.recharging_mecha && !QDELETED(recharge_port.recharging_mecha)) data["recharge_port"]["mech"] = list("health" = recharge_port.recharging_mecha.health, "maxhealth" = initial(recharge_port.recharging_mecha.health), "cell" = null) - if(recharge_port.recharging_mecha.cell && !qdeleted(recharge_port.recharging_mecha.cell)) + if(recharge_port.recharging_mecha.cell && !QDELETED(recharge_port.recharging_mecha.cell)) data["has_mech"] = 1 data["mecha_name"] = recharge_port.recharging_mecha || "None" data["mecha_charge"] = isnull(recharge_port.recharging_mecha) ? 0 : recharge_port.recharging_mecha.cell.charge diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c3de7aa4bfb..01867405e85 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1275,7 +1275,7 @@ occupant = null return else - if(!AI.linked_core || qdeleted(AI.linked_core)) + if(!AI.linked_core || QDELETED(AI.linked_core)) to_chat(AI, "Inactive core destroyed. Unable to return.") AI.linked_core = null return diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index c14134ba2c5..531f31c3df2 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -17,7 +17,7 @@ ui_interact(user) /obj/machinery/computer/mecha/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "exosuit_control.tmpl", "Exosuit Control Console", 420, 500) ui.open() @@ -63,7 +63,7 @@ if(href_list["return"]) screen = 0 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return /obj/item/mecha_parts/mecha_tracking diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm new file mode 100644 index 00000000000..59ae654c85b --- /dev/null +++ b/code/game/objects/effects/alien_acid.dm @@ -0,0 +1,88 @@ +/* Alien shit! + * Contains: + * effect/acid + */ + + +/* + * Acid + */ +/obj/effect/acid + gender = PLURAL + name = "acid" + desc = "Burbling corrossive stuff." + icon = 'icons/effects/effects.dmi' + icon_state = "acid" + density = 0 + opacity = 0 + anchored = 1 + unacidable = 1 + var/atom/target + var/ticks = 0 + var/target_strength = 0 + + +/obj/effect/acid/New(loc, targ) + ..(loc) + target = targ + + //handle APCs and newscasters and stuff nicely + pixel_x = target.pixel_x + pixel_y = target.pixel_y + + if(isturf(target)) //Turfs take twice as long to take down. + target_strength = 640 + else + target_strength = 320 + tick() + + +/obj/effect/acid/proc/tick() + if(!target) + qdel(src) + + ticks++ + + if(ticks >= target_strength) + target.visible_message("[target] collapses under its own weight into a puddle of goop and undigested debris!") + + if(istype(target, /obj/structure/closet)) + var/obj/structure/closet/T = target + T.dump_contents() + qdel(target) + + if(istype(target, /turf/simulated/mineral)) + var/turf/simulated/mineral/M = target + M.ChangeTurf(/turf/simulated/floor/plating/airless/asteroid) + + if(istype(target, /turf/simulated/floor)) + var/turf/simulated/floor/F = target + F.ChangeTurf(/turf/space) + + if(istype(target, /turf/simulated/wall)) + var/turf/simulated/wall/W = target + W.dismantle_wall(1) + + else + qdel(target) + + qdel(src) + return + + x = target.x + y = target.y + z = target.z + + switch(target_strength - ticks) + if(480) + visible_message("[target] is holding up against the acid!") + if(320) + visible_message("[target] is being melted by the acid!") + if(160) + visible_message("[target] is struggling to withstand the acid!") + if(80) + visible_message("[target] begins to crumble under the acid!") + + spawn(1) + if(src) + tick() diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index d825a7a9146..eda338961b8 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -157,7 +157,7 @@ playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1) if(do_after(user, PLACE_SPEED, target = src)) - if(!D || qdeleted(D)) + if(!D || QDELETED(D)) return if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9d6ebd06fcb..aa59c6e2740 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -101,6 +101,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d new path(src) /obj/item/Destroy() + flags &= ~DROPDEL //prevent reqdels QDEL_NULL(hidden_uplink) if(ismob(loc)) var/mob/m = loc @@ -317,6 +318,8 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d for(var/X in actions) var/datum/action/A = X A.Remove(user) + if(flags & DROPDEL) + qdel(src) // called just as an item is picked up (loc is not yet changed) /obj/item/proc/pickup(mob/user) @@ -485,7 +488,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d else ..() /obj/item/throw_impact(atom/A) - if(A && !qdeleted(A)) + if(A && !QDELETED(A)) var/itempush = 1 if(w_class < WEIGHT_CLASS_BULKY) itempush = 0 // too light to push anything diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 0fe6cf48631..40629931aa5 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -9,6 +9,7 @@ name = "control wand" desc = "Remotely controls airlocks." w_class = WEIGHT_CLASS_TINY + flags = NOBLUDGEON var/mode = WAND_OPEN var/region_access = 1 //See access.dm var/obj/item/weapon/card/id/ID diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index f74d80f845e..88e2a7d86e5 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -41,7 +41,7 @@ /obj/item/device/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "aicard.tmpl", "[name]", 600, 400, state = state) ui.open() diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 62e4354f238..d7d416c36d0 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -96,7 +96,7 @@ var/scan_data = "" if(timeofdeath) - scan_data += "Time of death: [worldtime2text(timeofdeath)]
" + scan_data += "Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]
" var/n = 1 for(var/wdata_idx in wdata) @@ -146,7 +146,7 @@ if(damaging_weapon) scan_data += "Severity: [damage_desc]
" scan_data += "Hits by weapon: [total_hits]
" - scan_data += "Approximate time of wound infliction: [worldtime2text(age)]
" + scan_data += "Approximate time of wound infliction: [station_time(age)]
" scan_data += "Affected limbs: [D.organ_names]
" scan_data += "Possible weapons:
" for(var/weapon_name in weapon_chances) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index e8d023ff101..d8baaf0ea2c 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -99,7 +99,7 @@ /obj/item/device/radio/electropack/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "radio_electro.tmpl", "[name]", 400, 500) ui.open() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 67009e3366d..f10eeff1ebb 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -77,6 +77,7 @@ var/global/list/default_medbay_channels = list( radio_controller.remove_object(src, frequency) for(var/ch_name in channels) radio_controller.remove_object(src, radiochannels[ch_name]) + radio_connection = null global_radios -= src follow_target = null return ..() @@ -107,7 +108,7 @@ var/global/list/default_medbay_channels = list( return ui_interact(user) /obj/item/device/radio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 400, 550) ui.open() @@ -793,7 +794,7 @@ var/global/list/default_medbay_channels = list( . = ..() /obj/item/device/radio/borg/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 430, 500) ui.open() diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index dfec1d1ba09..3aba9d2d95b 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -160,7 +160,7 @@ REAGENT SCANNER user.show_message("\t Damage Specifics: [OX] - [TX] - [BU] - [BR]") user.show_message("Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) - user.show_message("Time of Death: [worldtime2text(M.timeofdeath)]") + user.show_message("Time of Death: [station_time_timestamp("hh:mm:ss", M.timeofdeath)]") if(istype(M, /mob/living/carbon/human) && mode == 1) var/mob/living/carbon/human/H = M var/list/damaged = H.get_damaged_organs(1,1) @@ -432,7 +432,7 @@ REAGENT SCANNER sleep(50) var/obj/item/weapon/paper/P = new(get_turf(src)) - P.name = "Mass Spectrometer Scanner Report: [worldtime2text()]" + P.name = "Mass Spectrometer Scanner Report: [station_time_timestamp()]" P.info = "
Trace chemicals detected:
[datatoprint]
" if(ismob(loc)) @@ -502,7 +502,7 @@ REAGENT SCANNER sleep(50) var/obj/item/weapon/paper/P = new(get_turf(src)) - P.name = "Reagent Scanner Report: [worldtime2text()]" + P.name = "Reagent Scanner Report: [station_time_timestamp()]" P.info = "
Chemical agents detected:
[datatoprint]
" if(ismob(loc)) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 9c293bd6073..c27c6a3f435 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -46,7 +46,7 @@ w_class = I.w_class update_icon() - nanomanager.update_uis(src) // update all UIs attached to src + SSnanoui.update_uis(src) // update all UIs attached to src //TODO: Have this take an assemblyholder else if(isassembly(I)) var/obj/item/device/assembly/A = I @@ -67,7 +67,7 @@ msg_admin_attack("[key_name_admin(user)]attached [A] to a transfer valve.") log_game("[key_name_admin(user)] attached [A] to a transfer valve.") attacher = user - nanomanager.update_uis(src) // update all UIs attached to src + SSnanoui.update_uis(src) // update all UIs attached to src /obj/item/device/transfer_valve/HasProximity(atom/movable/AM) @@ -90,7 +90,7 @@ /obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 0c21ef212c9..d4906aa17db 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -129,7 +129,7 @@ var/list/world_uplinks = list() if(!UI) return UI.buy(src,usr) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /* var/list/L = UI.spawn_item(get_turf(usr),src) if(ishuman(usr)) @@ -190,7 +190,7 @@ var/list/world_uplinks = list() /obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) var/title = "Remote Uplink" // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm @@ -224,7 +224,7 @@ var/list/world_uplinks = list() if(!( istype(usr, /mob/living/carbon/human))) return 1 var/mob/user = usr - var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main") + var/datum/nanoui/ui = SSnanoui.get_open_ui(user, src, "main") if((usr.contents.Find(src.loc) || (in_range(src.loc, usr) && istype(src.loc.loc, /turf)))) usr.set_machine(src) if(..(href, href_list)) @@ -246,7 +246,7 @@ var/list/world_uplinks = list() show_descriptions = !show_descriptions update_nano_data() - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return 1 /obj/item/device/uplink/hidden/proc/update_nano_data(var/id) diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 8e3c6a57e18..593ef9a820f 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -5,7 +5,8 @@ icon = 'icons/obj/nanopaste.dmi' icon_state = "tube" origin_tech = "materials=2;engineering=3" - amount = 10 + amount = 6 + max_amount = 6 toolspeed = 1 /obj/item/stack/nanopaste/attack(mob/living/M as mob, mob/user as mob) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 5e07e09b040..6a631f53e38 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -13,6 +13,7 @@ var/list/recipes = list() // /datum/stack_recipe var/singular_name var/amount = 1 + var/to_transfer = 0 var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount var/merge_type = null // This path and its children should merge with this stack, defaults to src.type @@ -26,8 +27,7 @@ /obj/item/stack/Destroy() if(usr && usr.machine == src) usr << browse(null, "window=stack") - ..() - return QDEL_HINT_HARDDEL_NOW // because qdel'd stacks act strange for cyborgs + return ..() /obj/item/stack/examine(mob/user) if(..(user, 1)) @@ -195,15 +195,18 @@ interact(usr) return -/obj/item/stack/proc/use(var/used) +/obj/item/stack/proc/use(used) if(amount < used) return 0 amount -= used if(amount < 1) // Just in case a stack's amount ends up fractional somehow + if(isrobot(loc)) + var/mob/living/silicon/robot/R = loc //Horrifying cyborg snowflake code that allows stacks to GC and cyborgs not to horrendously break + if(locate(src) in R.module.modules) + R.module.modules -= src if(usr) - usr.unEquip(src, 1) - spawn() - qdel(src) + usr.unEquip(src, TRUE) // this has to be unEquip() over drop_item() or something similar because of cyborgs + qdel(src) update_icon() return 1 @@ -229,6 +232,9 @@ /obj/item/stack/proc/get_max_amount() return max_amount +/obj/item/stack/proc/get_amount_transferred() + return to_transfer + /obj/item/stack/proc/split(mob/user, amt) var/obj/item/stack/F = new type(loc, amt) F.copy_evidences(src) @@ -255,7 +261,6 @@ if(S.amount >= max_amount) return 1 - var/to_transfer if(user.is_in_inactive_hand(src)) var/desired = input("How much would you like to transfer from this stack?", "How much?", 1) as null|num if(!desired) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5d4104f57ac..3ceb8607eba 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1357,6 +1357,7 @@ obj/item/toy/cards/deck/syndicate/black item_state = "gun" lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi' righthand_file = 'icons/mob/inhands/guns_righthand.dmi' + hitsound = "swing_hit" flags = CONDUCT slot_flags = SLOT_BELT materials = list(MAT_METAL=2000) @@ -1364,14 +1365,13 @@ obj/item/toy/cards/deck/syndicate/black throwforce = 5 throw_speed = 4 throw_range = 5 - force = 5.0 + force = 5 origin_tech = "combat=1" attack_verb = list("struck", "hit", "bashed") var/bullet_position = 1 - var/is_empty = 0 /obj/item/toy/russian_revolver/suicide_act(mob/user) - user.visible_message("[user] quickly loads six bullets into the [src.name]'s cylinder and points it at \his head before pulling the trigger! It looks like they are trying to commit suicide.") + user.visible_message("[user] quickly loads six bullets into [src]'s cylinder and points it at \his head before pulling the trigger! It looks like they are trying to commit suicide.") playsound(loc, 'sound/weapons/Gunshot.ogg', 50, 1) return (BRUTELOSS) @@ -1381,36 +1381,37 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/russian_revolver/attack_self(mob/user) - if(is_empty) - user.visible_message("[user] loads a bullet into the [src]'s cylinder.") - is_empty = 0 + if(!bullet_position) + user.visible_message("[user] loads a bullet into [src]'s cylinder.") + bullet_position = 1 else spin_cylinder() - user.visible_message("[user] spins the cylinder on the [src]!") + user.visible_message("[user] spins the cylinder on [src]!") - -/obj/item/toy/russian_revolver/attack(mob/living/carbon/M, mob/user) +/obj/item/toy/russian_revolver/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) if(M != user) //can't use this on other people + return ..() + if(!bullet_position) + to_chat(user, "[src] is empty.") return - if(is_empty) - to_chat(user, "The [src] is empty.") + if(!(user.has_organ("head"))) //For sanity + to_chat(user, "Playing this game without a head would be classed as cheating.") return - user.visible_message("[user] points the [src] at their head, ready to pull the trigger!") - if(do_after(user, 30, target = M)) - if(bullet_position != 1) + user.visible_message("[user] points [src] at their head, ready to pull the trigger!") + if(do_after(user, 30, target = user)) + if(bullet_position > 1) user.visible_message("*click*") playsound(src, 'sound/weapons/empty.ogg', 100, 1) - bullet_position -= 1 + bullet_position-- return - if(bullet_position == 1) - is_empty = 1 + else + bullet_position = null playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1) - user.visible_message("The [src] goes off!") - M.apply_damage(200, BRUTE, "head", sharp =1, used_weapon = "Self-inflicted gunshot wound to the head.") - M.death() + user.visible_message("[src] goes off!") + user.apply_damage(200, BRUTE, "head", sharp = 1, used_weapon = "Self-inflicted gunshot wound to the head.") + user.death() else - user.visible_message("[user] lowers the [src] from their head.") - + user.visible_message("[user] lowers [src] from their head.") /obj/item/toy/russian_revolver/proc/spin_cylinder() bullet_position = rand(1,6) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index cc905783223..087ced385fb 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -80,7 +80,7 @@ RCD playsound(loc, 'sound/machines/click.ogg', 50, 1) to_chat(user, "The RCD now holds [matter]/[max_matter] matter-units.") desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return @@ -92,7 +92,7 @@ RCD ui_interact(user) /obj/item/weapon/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state) ui.open() @@ -187,16 +187,16 @@ RCD if(!proximity) return if(istype(A,/area/shuttle)||istype(A,/turf/space/transit)) return 0 - if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/window))) + if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/window) || istype(A, /obj/structure/lattice))) return 0 switch(mode) if(1) - if(istype(A, /turf/space)) + if(istype(A, /turf/space) || istype(A, /obj/structure/lattice)) if(useResource(1, user)) to_chat(user, "Building Floor...") activate() - var/turf/AT = A + var/turf/AT = get_turf(A) AT.ChangeTurf(/turf/simulated/floor/plating) return 1 return 0 @@ -351,14 +351,14 @@ RCD to_chat(user, "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin.") return 0 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user) if(matter < amount) return 0 matter -= amount desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." - nanomanager.update_uis(src) + SSnanoui.update_uis(src) return 1 /obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index dc4f23657b5..f28d316f394 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -99,7 +99,6 @@ var/rank = null //actual job var/dorm = 0 // determines if this ID has claimed a dorm already - var/datum/data/record/active1 = null var/sex var/age var/photo @@ -123,9 +122,9 @@ if(guest_pass) to_chat(user, "There is a guest pass attached to this ID card") if(world.time < guest_pass.expiration_time) - to_chat(user, "It expires at [worldtime2text(guest_pass.expiration_time)].") + to_chat(user, "It expires at [station_time_timestamp("hh:mm:ss", guest_pass.expiration_time)].") else - to_chat(user, "It expired at [worldtime2text(guest_pass.expiration_time)].") + to_chat(user, "It expired at [station_time_timestamp("hh:mm:ss", guest_pass.expiration_time)].") to_chat(user, "It grants access to following areas:") for(var/A in guest_pass.temp_access) to_chat(user, "[get_access_desc(A)].") @@ -187,6 +186,14 @@ /obj/item/weapon/card/id/GetID() return src +/obj/item/weapon/card/id/proc/getRankAndAssignment() + var/jobnamedata = "" + if(rank) + jobnamedata += rank + if(rank != assignment) + jobnamedata += " (" + assignment + ")" + return jobnamedata + /obj/item/weapon/card/id/proc/is_untrackable() return untrackable @@ -440,7 +447,37 @@ RebuildHTML() if("Occupation") - var/new_job = sanitize(stripped_input(user,"What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation", "Civilian", MAX_MESSAGE_LEN)) + var/list/departments =list( + "Civilian", + "Engineering", + "Medical", + "Science", + "Security", + "Support", + "Command", + "Custom", + ) + + var/department = input(user, "What job would you like to put on this card?\nChoose a department or a custom job title.\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in departments + var/new_job = "Civilian" + + if(department == "Custom") + new_job = sanitize(stripped_input(user,"Choose a custom jon title:","Agent Card Occupation", "Civilian", MAX_MESSAGE_LEN)) + else if(department != "Civilian") + switch(department) + if("Engineering") + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in engineering_positions + if("Medical") + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in medical_positions + if("Science") + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in science_positions + if("Security") + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in security_positions + if("Support") + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in support_positions + if("Command") + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in command_positions + if(!Adjacent(user)) return src.assignment = new_job diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index ef1e2c91498..d1c052828f9 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -47,7 +47,7 @@ icon_state = "chronogun" item_state = "chronogun" w_class = WEIGHT_CLASS_NORMAL - flags = NODROP + flags = NODROP | DROPDEL ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam) can_charge = 0 fire_delay = 50 @@ -63,10 +63,6 @@ TED = new(src.loc) qdel(src) -/obj/item/weapon/gun/energy/chrono_gun/dropped() - ..() - qdel(src) - /obj/item/weapon/gun/energy/chrono_gun/update_icon() return diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 85e24757517..a46e8eefd48 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -17,7 +17,7 @@ "Vox" = 'icons/mob/species/vox/back.dmi' ) - var/on = 0 //if the paddles are equipped (1) or on the defib (0) + var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE) var/safety = 1 //if you can zap people with the defibs on harm mode var/powered = 0 //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise var/obj/item/weapon/twohanded/shockpaddles/paddles @@ -53,7 +53,7 @@ /obj/item/weapon/defibrillator/proc/update_overlays() overlays.Cut() - if(!on) + if(paddles_on_defib) overlays += "[icon_state]-paddles" if(powered) overlays += "[icon_state]-powered" @@ -130,18 +130,18 @@ /obj/item/weapon/defibrillator/verb/toggle_paddles() set name = "Toggle Paddles" set category = "Object" - on = !on var/mob/living/carbon/human/user = usr - if(on) + + if(paddles_on_defib) //Detach the paddles into the user's hands if(!usr.put_in_hands(paddles)) - on = 0 to_chat(user, "You need a free hand to hold the paddles!") update_icon() return paddles.loc = user - else + paddles_on_defib = FALSE + else if(user.is_in_active_hand(paddles)) //Remove from their hands and back onto the defib unit remove_paddles(user) @@ -163,15 +163,16 @@ if(slot == slot_back) return 1 -/obj/item/weapon/defibrillator/proc/remove_paddles(mob/user) +/obj/item/weapon/defibrillator/proc/remove_paddles(mob/user) // from your hands var/mob/living/carbon/human/M = user if(paddles in get_both_hands(M)) M.unEquip(paddles) + paddles_on_defib = TRUE update_icon() return /obj/item/weapon/defibrillator/Destroy() - if(on) + if(!paddles_on_defib) var/M = get(paddles, /mob) remove_paddles(M) QDEL_NULL(paddles) @@ -288,7 +289,7 @@ if(istype(O)) O.unwield() to_chat(user, "The paddles snap back into the main unit.") - defib.on = 0 + defib.paddles_on_defib = TRUE loc = defib defib.update_icon() update_icon() @@ -355,7 +356,7 @@ QDEL_NULL(ghost) var/tplus = world.time - H.timeofdeath - var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds) + var/tlimit = 3000 //past this much time the patient is unrecoverable (in deciseconds) var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting var/total_burn = 0 var/total_brute = 0 @@ -500,7 +501,7 @@ QDEL_NULL(ghost) var/tplus = world.time - H.timeofdeath - var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds) + var/tlimit = 3000 //past this much time the patient is unrecoverable (in deciseconds) var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting var/total_burn = 0 var/total_brute = 0 diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 58de51085de..68ccad0090d 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -132,7 +132,7 @@ /obj/item/weapon/grenade/plastic/c4/prime() var/turf/location if(target) - if(!qdeleted(target)) + if(!QDELETED(target)) location = get_turf(target) target.overlays -= image_overlay else @@ -159,7 +159,7 @@ /obj/item/weapon/grenade/plastic/x4/prime() var/turf/location if(target) - if(!qdeleted(target)) + if(!QDELETED(target)) location = get_turf(target) target.overlays -= image_overlay else @@ -193,7 +193,7 @@ /obj/item/weapon/grenade/plastic/c4_shaped/prime() var/turf/location if(target) - if(!qdeleted(target)) + if(!QDELETED(target)) location = get_turf(target) target.overlays -= image_overlay else diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index e238e3bda25..ca96006abad 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -67,7 +67,7 @@ walk_away(P,loc,rand(1,4)) spawn(rand(15,60)) - if(P && isnull(P.gcDestroyed)) + if(!QDELETED(P)) if(istype(P, /obj/item/weapon/grenade)) P.prime() qdel(src) diff --git a/code/game/objects/items/weapons/grenades/custom_grenades.dm b/code/game/objects/items/weapons/grenades/custom_grenades.dm index 82252c3a340..e9b78bbe90d 100644 --- a/code/game/objects/items/weapons/grenades/custom_grenades.dm +++ b/code/game/objects/items/weapons/grenades/custom_grenades.dm @@ -111,23 +111,23 @@ payload_name = "lubricant" stage = 2 - New() - ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - B1.reagents.add_reagent("lube",50) - beakers += B1 -/obj/item/weapon/grenade/chem_grenade/lube/remote - New() - ..() - CreateDefaultTrigger(/obj/item/device/assembly/signaler) -/obj/item/weapon/grenade/chem_grenade/lube/prox - New() - ..() - CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor) -/obj/item/weapon/grenade/chem_grenade/lube/tripwire - New() - ..() - CreateDefaultTrigger(/obj/item/device/assembly/infra) +/obj/item/weapon/grenade/chem_grenade/lube/New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) + B1.reagents.add_reagent("lube",50) + beakers += B1 + +/obj/item/weapon/grenade/chem_grenade/lube/remote/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/signaler) + +/obj/item/weapon/grenade/chem_grenade/lube/prox/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor) + +/obj/item/weapon/grenade/chem_grenade/lube/tripwire/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/infra) // Basic explosion grenade @@ -135,32 +135,68 @@ payload_name = "conventional" stage = 2 - New() - ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("glycerol",30) // todo: someone says NG is overpowered, test. - B1.reagents.add_reagent("sacid",15) - B2.reagents.add_reagent("sacid",15) - B2.reagents.add_reagent("facid",30) - beakers += B1 - beakers += B2 +/obj/item/weapon/grenade/chem_grenade/explosion/New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + B1.reagents.add_reagent("glycerol",30) // todo: someone says NG is overpowered, test. + B1.reagents.add_reagent("sacid",15) + B2.reagents.add_reagent("sacid",15) + B2.reagents.add_reagent("facid",30) + beakers += B1 + beakers += B2 // Assembly Variants -/obj/item/weapon/grenade/chem_grenade/explosion/remote - New() - ..() - CreateDefaultTrigger(/obj/item/device/assembly/signaler) +/obj/item/weapon/grenade/chem_grenade/explosion/remote/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/signaler) + +/obj/item/weapon/grenade/chem_grenade/explosion/prox/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor) + +/obj/item/weapon/grenade/chem_grenade/explosion/mine/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/mousetrap) + + +// Water + Potassium = Boom + +/obj/item/weapon/grenade/chem_grenade/waterpotassium + payload_name = "chem explosive" + stage = 2 + +/obj/item/weapon/grenade/chem_grenade/waterpotassium/New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) + B1.reagents.add_reagent("water",100) + B2.reagents.add_reagent("potassium",100) + beakers += B1 + beakers += B2 + +/obj/item/weapon/grenade/chem_grenade/waterpotassium/remote/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/signaler) + +/obj/item/weapon/grenade/chem_grenade/waterpotassium/prox/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor) + + +/obj/item/weapon/grenade/chem_grenade/waterpotassium/tripwire/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/infra) + +/obj/item/weapon/grenade/chem_grenade/waterpotassium/tripwire_armed/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/infra/armed) + +/obj/item/weapon/grenade/chem_grenade/waterpotassium/tripwire_armed_stealth/New() + ..() + CreateDefaultTrigger(/obj/item/device/assembly/infra/armed/stealth) -/obj/item/weapon/grenade/chem_grenade/explosion/prox - New() - ..() - CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor) -/obj/item/weapon/grenade/chem_grenade/explosion/mine - New() - ..() - CreateDefaultTrigger(/obj/item/device/assembly/mousetrap) // Basic EMP grenade /obj/item/weapon/grenade/chem_grenade/emp diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 24bcb7a8c2c..da24b6084c6 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -108,6 +108,18 @@ color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) ..() +/obj/item/weapon/restraints/handcuffs/cable/proc/cable_color(var/colorC) + if(colorC) + if(colorC == "rainbow") + colorC = color_rainbow() + color = colorC + else + color = COLOR_RED + +/obj/item/weapon/restraints/handcuffs/cable/proc/color_rainbow() + color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) + return color + /obj/item/weapon/restraints/handcuffs/alien icon_state = "handcuffAlien" @@ -143,6 +155,9 @@ if(!remove_item_from_storage(user)) user.unEquip(src) qdel(src) + else if(istype(I, /obj/item/toy/crayon)) + var/obj/item/toy/crayon/C = I + cable_color(C.colourName) /obj/item/weapon/restraints/handcuffs/cable/zipties name = "zipties" diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index d721aadfbed..59335cb1c3f 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -70,7 +70,7 @@ icon_state = "disintegrate" item_state = "disintegrate" desc = "This hand of yours glows with an awesome power!" - flags = ABSTRACT | NODROP + flags = ABSTRACT | NODROP| DROPDEL w_class = WEIGHT_CLASS_HUGE hitsound = 'sound/weapons/sear.ogg' damtype = BURN diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 8109e8e8b86..13826f34564 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -11,6 +11,7 @@ item_color = "b" var/allow_multiple = 0 var/uses = -1 + flags = DROPDEL /obj/item/weapon/implant/proc/trigger(emote, mob/source) @@ -82,6 +83,5 @@ return "No information available" /obj/item/weapon/implant/dropped(mob/user) - ..() . = 1 - qdel(src) + ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 21d8828310f..ae738b3ccd0 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -128,19 +128,18 @@ armed = 1 icon_state = "e_snare" trap_damage = 0 + flags = DROPDEL /obj/item/weapon/restraints/legcuffs/beartrap/energy/New() ..() - spawn(100) - if(!istype(loc, /mob)) - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread - sparks.set_up(1, 1, src) - sparks.start() - qdel(src) + addtimer(src, "dissipate", 100) -/obj/item/weapon/restraints/legcuffs/beartrap/energy/dropped() - ..() - qdel(src) +/obj/item/weapon/restraints/legcuffs/beartrap/energy/proc/dissipate() + if(!ismob(loc)) + var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread + sparks.set_up(1, 1, src) + sparks.start() + qdel(src) /obj/item/weapon/restraints/legcuffs/beartrap/energy/attack_hand(mob/user) Crossed(user) //honk diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index 85d50a6ad12..57303d72d67 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -140,7 +140,7 @@ var/list/pipemenu = list( ui_interact(user) /obj/item/weapon/rpd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "rpd.tmpl", "[name]", 400, 650, state = state) ui.open() @@ -173,7 +173,7 @@ var/list/pipemenu = list( mode = text2num(sanitize(href_list["mode"])) else return - nanomanager.update_uis(src) + SSnanoui.update_uis(src) //What the RPD actually does diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 302fa1bd0bc..30d8f8a9ef5 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -829,6 +829,26 @@ return return ..() + +/obj/item/weapon/storage/box/centcomofficer + name = "officer kit" + +/obj/item/weapon/storage/box/centcomofficer/New() + ..() + contents = list() + new /obj/item/clothing/mask/breath(src) + new /obj/item/weapon/tank/emergency_oxygen/double/full(src) + new /obj/item/device/flashlight/seclite(src) + new /obj/item/weapon/kitchen/knife/combat(src) + + new /obj/item/device/radio/centcom(src) + new /obj/item/weapon/door_remote/omni(src) + new /obj/item/weapon/implanter/death_alarm(src) + + new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src) + new /obj/item/weapon/pinpointer/advpinpointer(src) + + #undef NODESIGN #undef NANOTRASEN #undef SYNDI diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 3334fdf2de7..42dbbbda4b6 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -96,6 +96,14 @@ ..() air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/weapon/tank/jetpack/void/grey + name = "Void Jetpack (Oxygen)" + icon_state = "jetpack-void-grey" + +/obj/item/weapon/tank/jetpack/void/gold + name = "Retro Jetpack (Oxygen)" + icon_state = "jetpack-void-gold" + /obj/item/weapon/tank/jetpack/oxygen name = "Jetpack (Oxygen)" diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 3ee198e8765..b18840fc628 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -141,7 +141,7 @@ /obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 9c78e6f7b94..01379abb0c0 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -115,10 +115,12 @@ flags = ABSTRACT /obj/item/weapon/twohanded/offhand/unwield() - qdel(src) + if(!QDELETED(src)) + qdel(src) /obj/item/weapon/twohanded/offhand/wield() - qdel(src) + if(!QDELETED(src)) + qdel(src) ///////////Two hand required objects/////////////// //This is for objects that require two hands to even pick up diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index d5ef8fce545..0738d57e8fb 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -130,7 +130,7 @@ /obj/singularity_act() ex_act(1) - if(src && !qdeleted(src)) + if(src && !QDELETED(src)) qdel(src) return 2 diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 20cc3afc756..9830fdf6619 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -66,7 +66,7 @@ /obj/Destroy() machines -= src processing_objects -= src - nanomanager.close_uis(src) + SSnanoui.close_uis(src) return ..() /obj/proc/process() diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/structures/aliens.dm similarity index 81% rename from code/game/objects/effects/aliens.dm rename to code/game/objects/structures/aliens.dm index ebeda7a77c0..3960d4c8dcc 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -4,7 +4,6 @@ * Resin * Weeds * Egg - * effect/acid */ #define WEED_NORTH_EDGING "north" @@ -317,6 +316,9 @@ spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) Grow() +/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user) + return attack_hand(user) + /obj/structure/alien/egg/attack_hand(mob/living/user) if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) switch(status) @@ -420,90 +422,6 @@ #undef MIN_GROWTH_TIME #undef MAX_GROWTH_TIME - -/* - * Acid - */ -/obj/effect/acid - gender = PLURAL - name = "acid" - desc = "Burbling corrossive stuff." - icon = 'icons/effects/effects.dmi' - icon_state = "acid" - density = 0 - opacity = 0 - anchored = 1 - unacidable = 1 - var/atom/target - var/ticks = 0 - var/target_strength = 0 - - -/obj/effect/acid/New(loc, targ) - ..(loc) - target = targ - - //handle APCs and newscasters and stuff nicely - pixel_x = target.pixel_x - pixel_y = target.pixel_y - - if(isturf(target)) //Turfs take twice as long to take down. - target_strength = 640 - else - target_strength = 320 - tick() - - -/obj/effect/acid/proc/tick() - if(!target) - qdel(src) - - ticks++ - - if(ticks >= target_strength) - target.visible_message("[target] collapses under its own weight into a puddle of goop and undigested debris!") - - if(istype(target, /obj/structure/closet)) - var/obj/structure/closet/T = target - T.dump_contents() - qdel(target) - - if(istype(target, /turf/simulated/mineral)) - var/turf/simulated/mineral/M = target - M.ChangeTurf(/turf/simulated/floor/plating/airless/asteroid) - - if(istype(target, /turf/simulated/floor)) - var/turf/simulated/floor/F = target - F.ChangeTurf(/turf/space) - - if(istype(target, /turf/simulated/wall)) - var/turf/simulated/wall/W = target - W.dismantle_wall(1) - - else - qdel(target) - - qdel(src) - return - - x = target.x - y = target.y - z = target.z - - switch(target_strength - ticks) - if(480) - visible_message("[target] is holding up against the acid!") - if(320) - visible_message("[target] is being melted by the acid!") - if(160) - visible_message("[target] is struggling to withstand the acid!") - if(80) - visible_message("[target] begins to crumble under the acid!") - - spawn(1) - if(src) - tick() - #undef WEED_NORTH_EDGING #undef WEED_SOUTH_EDGING #undef WEED_EAST_EDGING diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index ba32e37f38c..06d5fd19d30 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -9,8 +9,7 @@ ..() new /obj/item/weapon/tank/jetpack/void(src) new /obj/item/clothing/mask/breath(src) - new /obj/item/clothing/head/helmet/space/nasavoid(src) - new /obj/item/clothing/suit/space/nasavoid(src) + new /obj/effect/nasavoidsuitspawner(src) new /obj/item/weapon/crowbar(src) new /obj/item/weapon/stock_parts/cell(src) new /obj/item/device/multitool(src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index a9a302dae82..19833a9933c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -53,7 +53,7 @@ new /obj/item/weapon/storage/box/ids(src) new /obj/item/weapon/storage/box/PDAs(src) new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/weapon/gun/energy/gun(src) + new /obj/item/weapon/gun/energy/gun/mini(src) new /obj/item/device/flash(src) new /obj/item/clothing/accessory/petcollar(src) new /obj/item/weapon/door_remote/civillian(src) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 744bd26fc85..ce9f8f2f7c5 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -363,7 +363,7 @@ icon_state = "crema_active" for(var/mob/living/M in search_contents_for(/mob/living)) - if(!M || !isnull(M.gcDestroyed)) + if(QDELETED(M)) continue if(M.stat!=2) M.emote("scream") @@ -372,7 +372,7 @@ user.create_attack_log("Cremated [M.name] ([M.ckey])") log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])") M.death(1) - if(!M || !isnull(M.gcDestroyed)) + if(QDELETED(M)) continue // Re-check for mobs that delete themselves on death M.ghostize() qdel(M) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 1677b776c15..da4c1181f01 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -115,7 +115,7 @@ if(!instrumentObj) return - ui = nanomanager.try_update_ui(user, instrumentObj, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, instrumentObj, ui_key, ui, force_open) if(!ui) ui = new(user, instrumentObj, ui_key, "song.tmpl", instrumentObj.name, 700, 500) ui.open() @@ -149,7 +149,7 @@ lines = new() tempo = sanitize_tempo(5) // default 120 BPM name = "" - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["import"]) playing = 0 @@ -185,11 +185,11 @@ lines.Remove(l) else linenum++ - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["help"]) help = !help - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops. if(playing) @@ -199,11 +199,11 @@ repeat = 0 if(repeat > max_repeat) repeat = max_repeat - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["tempo"]) tempo = sanitize_tempo(tempo + text2num(href_list["tempo"]) * world.tick_lag) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["play"]) if(playing) @@ -211,7 +211,7 @@ playing = 1 spawn() playsong(usr) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["insertline"]) var/num = round(text2num(href_list["insertline"])) @@ -227,14 +227,14 @@ newline = copytext(newline, 1, 200) lines.Insert(num, newline) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["deleteline"]) var/num = round(text2num(href_list["deleteline"])) if(num > lines.len || num < 1) return lines.Cut(num, num + 1) - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["modifyline"]) var/num = round(text2num(href_list["modifyline"])) @@ -246,11 +246,11 @@ if(num > lines.len || num < 1) return lines[num] = content - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else if(href_list["stop"]) playing = 0 - nanomanager.update_uis(src) + SSnanoui.update_uis(src) /datum/song/proc/sanitize_tempo(new_tempo) new_tempo = abs(new_tempo) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index fb176ce9dba..fc20d48cbe2 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -40,7 +40,7 @@ /obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) user.set_machine(src) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "tank_dispenser.tmpl", name, 275, 100, state = state) ui.open() @@ -62,7 +62,7 @@ to_chat(user, "You put [I] in [src].") else to_chat(user, "[src] is full.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(istype(I, /obj/item/weapon/tank/plasma)) if(plasmatanks < 10) user.drop_item() @@ -73,7 +73,7 @@ to_chat(user, "You put [I] in [src].") else to_chat(user, "[src] is full.") - nanomanager.update_uis(src) + SSnanoui.update_uis(src) if(istype(I, /obj/item/weapon/wrench)) if(anchored) to_chat(user, "You lean down and unwrench [src].") @@ -114,7 +114,7 @@ update_icon() add_fingerprint(usr) updateUsrDialog() - nanomanager.update_uis(src) + SSnanoui.update_uis(src) else - nanomanager.close_user_uis(usr,src) + SSnanoui.close_user_uis(usr,src) return 1 diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 18ff4d697fa..787aa4ef1a3 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -141,7 +141,7 @@ /turf/simulated/floor/engine/cult/New() ..() if(ticker.mode)//only do this if the round is going..otherwise..fucking asteroid.. - icon_state = ticker.mode.cultdat.cult_floor_icon_state + icon_state = ticker.cultdat.cult_floor_icon_state /turf/simulated/floor/engine/cult/narsie_act() return diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 8ce32658a62..18492da2d00 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -14,7 +14,7 @@ ..() if(ticker.mode)//game hasn't started offically don't do shit.. new /obj/effect/temp_visual/cult/turf(src) - icon_state = ticker.mode.cultdat.cult_wall_icon_state + icon_state = ticker.cultdat.cult_wall_icon_state /turf/simulated/wall/cult/artificer name = "runed stone wall" diff --git a/code/hub.dm b/code/hub.dm index 0dfc4359ca3..d54b49e1011 100644 --- a/code/hub.dm +++ b/code/hub.dm @@ -3,6 +3,7 @@ hub = "Exadv1.spacestation13" hub_password = "kMZy3U5jJHSiBQjr" name = "Space Station 13" + /var/hub_password_base = "kMZy3U5jJHSiBQjr" /* This is for any host that would like their server to appear on the main SS13 hub. To use it, simply replace the password above, with the password found below, and it should work. If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstation13 we can help you there. diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 28df27026a6..e3889ebf1bd 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -159,8 +159,8 @@ var/list/admin_verbs_debug = list( /client/proc/restart_controller, /client/proc/enable_debug_verbs, /client/proc/toggledebuglogs, - /client/proc/qdel_toggle, /client/proc/cmd_display_del_log, + /client/proc/cmd_display_del_log_simple, /client/proc/debugNatureMapGenerator, /client/proc/check_bomb_impacts, /client/proc/test_movable_UI, @@ -976,6 +976,7 @@ var/list/admin_verbs_ticket = list( to_chat(T, "Man up and deal with it.") to_chat(T, "Move on.") + T << 'sound/voice/ManUp1.ogg' log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.") message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.") diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 9692eac6713..21731cc8b7a 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -23,6 +23,7 @@ Show Game Mode Show Crew Manifest
Show current traitors and objectives
+ Set Night Shift Mode
Bombs
Bombing List Remove all bombs currently in existence diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index d92b9088d4a..6bb997f17f9 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1576,19 +1576,19 @@ log_admin("Admin [key_name_admin(usr)] has unlocked the Cult's next objective.") else if(href_list["cult_mindspeak"]) - var/input = stripped_input(usr, "Communicate to all the cultists with the voice of [ticker.mode.cultdat.entity_name]", "Voice of [ticker.mode.cultdat.entity_name]", "") + var/input = stripped_input(usr, "Communicate to all the cultists with the voice of [ticker.cultdat.entity_name]", "Voice of [ticker.cultdat.entity_name]", "") if(!input) return for(var/datum/mind/H in ticker.mode.cult) if (H.current) - to_chat(H.current, "[ticker.mode.cultdat.entity_name] murmurs, [input]") + to_chat(H.current, "[ticker.cultdat.entity_name] murmurs, [input]") for(var/mob/dead/observer/O in player_list) - to_chat(O, "[ticker.mode.cultdat.entity_name] murmurs, [input]") + to_chat(O, "[ticker.cultdat.entity_name] murmurs, [input]") - message_admins("Admin [key_name_admin(usr)] has talked with the Voice of [ticker.mode.cultdat.entity_name].") - log_admin("[key_name(usr)] Voice of [ticker.mode.cultdat.entity_name]: [input]") + message_admins("Admin [key_name_admin(usr)] has talked with the Voice of [ticker.cultdat.entity_name].") + log_admin("[key_name(usr)] Voice of [ticker.cultdat.entity_name]: [input]") else if(href_list["adminplayerobservecoodjump"]) if(!check_rights(R_ADMIN)) return @@ -3023,6 +3023,24 @@ dat += "
Current Time: [worldtime2text()]
Battery Life: [round(cell.charge/100)]%
Smoke Bombs: \Roman [s_bombs]