")
+ text = replacetext(text, "\[logo\]", "")
text = replacetext(text, "\[time\]", "[station_time_timestamp()]") // TO DO
if(!no_font)
if(P)
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 7e57a394988..fc0f7520e0e 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -2017,5 +2017,10 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
set waitfor = FALSE
return call(source, proctype)(arglist(arguments))
+/proc/IsFrozen(atom/A)
+ if(A in GLOB.frozen_atom_list)
+ return TRUE
+ return FALSE
+
/// Waits at a line of code until X is true
#define UNTIL(X) while(!(X)) stoplag()
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index f5f71e65c57..50e70bc62a4 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -34,4 +34,6 @@ GLOBAL_PROTECT(IClog)
GLOBAL_LIST_EMPTY(OOClog)
GLOBAL_PROTECT(OOClog)
+GLOBAL_DATUM_INIT(logging, /datum/logging, new /datum/logging())
+
GLOBAL_LIST_INIT(investigate_log_subjects, list("notes", "watchlist", "hrefs"))
diff --git a/code/_globalvars/mapping.dm b/code/_globalvars/mapping.dm
index d67875db2de..e43062a18b7 100644
--- a/code/_globalvars/mapping.dm
+++ b/code/_globalvars/mapping.dm
@@ -55,3 +55,7 @@ GLOBAL_LIST_EMPTY(space_ruins_templates)
GLOBAL_LIST_EMPTY(lava_ruins_templates)
GLOBAL_LIST_EMPTY(shelter_templates)
GLOBAL_LIST_EMPTY(shuttle_templates)
+
+// Teleport locations
+GLOBAL_LIST_EMPTY(teleportlocs)
+GLOBAL_LIST_EMPTY(ghostteleportlocs)
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index c541e40768a..283d92a954f 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -89,7 +89,7 @@ GLOBAL_VAR_INIT(copier_items_printed_logged, FALSE)
GLOBAL_VAR(map_name) // Self explanatory
-GLOBAL_DATUM(data_core, /datum/datacore) // Station datacore, manifest, etc
+GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) // Station datacore, manifest, etc
GLOBAL_VAR_INIT(panic_bunker_enabled, FALSE) // Is the panic bunker enabled
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index d840f64bb4a..36b6d647b7d 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -73,7 +73,9 @@
var/dragged = modifiers["drag"]
if(dragged && !modifiers[dragged])
return
-
+ if(IsFrozen(A) && !is_admin(usr))
+ to_chat(usr, "Interacting with admin-frozen players is not permitted.")
+ return
if(modifiers["middle"] && modifiers["shift"] && modifiers["ctrl"])
MiddleShiftControlClickOn(A)
return
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index a93e65c762b..7b53bce22de 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -3,7 +3,7 @@
//PUBLIC - call these wherever you want
-/mob/proc/throw_alert(category, type, severity, obj/new_master, override = FALSE)
+/mob/proc/throw_alert(category, type, severity, obj/new_master, override = FALSE, timeout_override, no_anim)
/*
Proc to create or update an alert. Returns the alert if the alert is new or updated, 0 if it was thrown already
@@ -59,14 +59,16 @@
LAZYSET(alerts, category, alert) // This also creates the list if it doesn't exist
if(client && hud_used)
hud_used.reorganize_alerts()
- alert.transform = matrix(32, 6, MATRIX_TRANSLATE)
- animate(alert, transform = matrix(), time = 2.5, easing = CUBIC_EASING)
- if(alert.timeout)
- spawn(alert.timeout)
- if(alert.timeout && alerts[category] == alert && world.time >= alert.timeout)
- clear_alert(category)
- alert.timeout = world.time + alert.timeout - world.tick_lag
+ if(!no_anim)
+ alert.transform = matrix(32, 6, MATRIX_TRANSLATE)
+ animate(alert, transform = matrix(), time = 2.5, easing = CUBIC_EASING)
+
+ var/timeout = timeout_override || alert.timeout
+ if(timeout)
+ addtimer(CALLBACK(alert, /obj/screen/alert/.proc/do_timeout, src, category), timeout)
+ alert.timeout = world.time + timeout - world.tick_lag
+
return alert
// Proc to clear an existing alert.
@@ -94,7 +96,6 @@
var/alerttooltipstyle = ""
var/override_alerts = FALSE //If it is overriding other alerts of the same type
-
/obj/screen/alert/MouseEntered(location,control,params)
openToolTip(usr, src, params, title = name, content = desc, theme = alerttooltipstyle)
@@ -102,6 +103,12 @@
/obj/screen/alert/MouseExited()
closeToolTip(usr)
+/obj/screen/alert/proc/do_timeout(mob/M, category)
+ if(!M || !M.alerts)
+ return
+
+ if(timeout && M.alerts[category] == src && world.time >= timeout)
+ M.clear_alert(category)
//Gas alerts
/obj/screen/alert/not_enough_oxy
@@ -507,6 +514,34 @@ so as to remain in compliance with the most up-to-date laws."
timeout = 300
var/atom/target = null
var/action = NOTIFY_JUMP
+ var/show_time_left = FALSE // If true you need to call START_PROCESSING manually
+ var/image/time_left_overlay // The last image showing the time left
+ var/datum/candidate_poll/poll // If set, on Click() it'll register the player as a candidate
+
+/obj/screen/alert/notify_action/process()
+ if(show_time_left)
+ var/timeleft = timeout - world.time
+ if(timeleft <= 0)
+ return PROCESS_KILL
+
+ if(time_left_overlay)
+ overlays -= time_left_overlay
+
+ var/obj/O = new
+ O.maptext = "[CEILING(timeleft / 10, 1)]"
+ O.maptext_width = O.maptext_height = 128
+ var/matrix/M = new
+ M.Translate(4, 16)
+ O.transform = M
+
+ var/image/I = image(O)
+ I.layer = FLOAT_LAYER
+ I.plane = FLOAT_PLANE + 1
+ overlays += I
+
+ time_left_overlay = I
+ qdel(O)
+ ..()
/obj/screen/alert/notify_action/Destroy()
target = null
@@ -515,20 +550,55 @@ so as to remain in compliance with the most up-to-date laws."
/obj/screen/alert/notify_action/Click()
if(!usr || !usr.client)
return
- if(!target)
- return
var/mob/dead/observer/G = usr
if(!istype(G))
return
- switch(action)
- if(NOTIFY_ATTACK)
- target.attack_ghost(G)
- if(NOTIFY_JUMP)
- var/turf/T = get_turf(target)
- if(T && isturf(T))
- G.loc = T
- if(NOTIFY_FOLLOW)
- G.ManualFollow(target)
+
+ if(poll)
+ if(poll.sign_up(G))
+ // Add a small overlay to indicate we've signed up
+ display_signed_up()
+ else if(target)
+ switch(action)
+ if(NOTIFY_ATTACK)
+ target.attack_ghost(G)
+ if(NOTIFY_JUMP)
+ var/turf/T = get_turf(target)
+ if(T && isturf(T))
+ G.loc = T
+ if(NOTIFY_FOLLOW)
+ G.ManualFollow(target)
+
+/obj/screen/alert/notify_action/Topic(href, href_list)
+ if(..())
+ return TRUE
+
+ if(href_list["signup"] && isobserver(usr) && poll?.sign_up(usr))
+ display_signed_up()
+
+/obj/screen/alert/notify_action/proc/display_signed_up()
+ var/image/I = image('icons/mob/screen_gen.dmi', icon_state = "selector")
+ I.layer = FLOAT_LAYER
+ I.plane = FLOAT_PLANE + 2
+ overlays += I
+
+/obj/screen/alert/notify_action/proc/display_stacks(stacks = 1)
+ if(stacks <= 1)
+ return
+
+ var/obj/O = new
+ O.maptext = "[stacks]x"
+ O.maptext_width = O.maptext_height = 128
+ var/matrix/M = new
+ M.Translate(4, 2)
+ O.transform = M
+
+ var/image/I = image(O)
+ I.layer = FLOAT_LAYER
+ I.plane = FLOAT_PLANE + 1
+ overlays += I
+
+ qdel(O)
/obj/screen/alert/notify_soulstone
name = "Soul Stone"
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index f88244c0cd8..4fd5b956df5 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -81,7 +81,7 @@
user.do_attack_animation(M)
. = M.attacked_by(src, user, def_zone)
- add_attack_logs(user, M, "Attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL)
+ add_attack_logs(user, M, "Attacked with [name] ([uppertext(user.a_intent)]) ([uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL)
add_fingerprint(user)
diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm
deleted file mode 100644
index ff55f35cb57..00000000000
--- a/code/_onclick/rig.dm
+++ /dev/null
@@ -1,84 +0,0 @@
-
-#define MIDDLE_CLICK 0
-#define ALT_CLICK 1
-#define CTRL_CLICK 2
-#define MAX_HARDSUIT_CLICK_MODE 2
-
-/client
- var/hardsuit_click_mode = MIDDLE_CLICK
-
-/client/verb/toggle_hardsuit_mode()
- set name = "Toggle Hardsuit Activation Mode"
- set desc = "Switch between hardsuit activation modes."
- set category = "OOC"
-
- hardsuit_click_mode++
- if(hardsuit_click_mode > MAX_HARDSUIT_CLICK_MODE)
- hardsuit_click_mode = 0
-
- switch(hardsuit_click_mode)
- if(MIDDLE_CLICK)
- to_chat(src, "Hardsuit activation mode set to middle-click.")
- if(ALT_CLICK)
- to_chat(src, "Hardsuit activation mode set to alt-click.")
- if(CTRL_CLICK)
- to_chat(src, "Hardsuit activation mode set to control-click.")
- else
- // should never get here, but just in case:
- log_runtime(EXCEPTION("Bad hardsuit click mode: [hardsuit_click_mode] - expected 0 to [MAX_HARDSUIT_CLICK_MODE]"), src)
- to_chat(src, "Somehow you bugged the system. Setting your hardsuit mode to middle-click.")
- hardsuit_click_mode = MIDDLE_CLICK
-
-/mob/living/MiddleClickOn(atom/A)
- if(client && client.hardsuit_click_mode == MIDDLE_CLICK)
- if(HardsuitClickOn(A))
- return
- ..()
-
-/mob/living/AltClickOn(atom/A)
- if(client && client.hardsuit_click_mode == ALT_CLICK)
- if(HardsuitClickOn(A))
- return
- ..()
-
-/mob/living/CtrlClickOn(atom/A)
- if(client && client.hardsuit_click_mode == CTRL_CLICK)
- if(HardsuitClickOn(A))
- return
- ..()
-
-/mob/living/proc/can_use_rig()
- return 0
-
-/mob/living/carbon/human/can_use_rig()
- return 1
-
-/mob/living/carbon/brain/can_use_rig()
- return istype(loc, /obj/item/mmi)
-
-/mob/living/silicon/ai/can_use_rig()
- return istype(loc, /obj/item/aicard)
-
-/mob/living/silicon/pai/can_use_rig()
- return loc == card
-
-/mob/living/proc/HardsuitClickOn(var/atom/A, var/alert_ai = 0)
- if(!can_use_rig() || (next_move > world.time))
- return 0
- var/obj/item/rig/rig = get_rig()
- if(istype(rig) && !rig.offline && rig.selected_module)
- if(src != rig.wearer)
- if(rig.ai_can_move_suit(src, check_user_module = 1))
- message_admins("[key_name_admin(src)] is trying to force \the [key_name_admin(rig.wearer)] to use a hardsuit module.")
- else
- return 0
- rig.selected_module.engage(A, alert_ai)
- if(ismob(A)) // No instant mob attacking - though modules have their own cooldowns
- changeNext_move(CLICK_CD_MELEE)
- return 1
- return 0
-
-#undef MIDDLE_CLICK
-#undef ALT_CLICK
-#undef CTRL_CLICK
-#undef MAX_HARDSUIT_CLICK_MODE
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index f4f2f72b16b..756ce6f8527 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -61,7 +61,6 @@
var/usewhitelist = 0
var/mods_are_mentors = 0
var/load_jobs_from_txt = 0
- var/ToRban = 0
var/automute_on = 0 //enables automuting/spam prevention
var/jobs_have_minimal_access = 0 //determines whether jobs use minimal access or expanded access.
var/round_abandon_penalty_period = 30 MINUTES // Time from round start during which ghosting out is penalized
@@ -578,9 +577,6 @@
if("humans_need_surnames")
humans_need_surnames = 1
- if("tor_ban")
- ToRban = 1
-
if("automute_on")
automute_on = 1
diff --git a/code/controllers/hooks-defs.dm b/code/controllers/hooks-defs.dm
deleted file mode 100644
index 59510162e1c..00000000000
--- a/code/controllers/hooks-defs.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Startup hook.
- * Called in world.dm when the server starts.
- */
-/hook/startup
-
-/**
- * Roundstart hook.
- * Called in gameticker.dm when a round starts.
- */
-/hook/roundstart
diff --git a/code/controllers/hooks.dm b/code/controllers/hooks.dm
deleted file mode 100644
index 48f1199ef76..00000000000
--- a/code/controllers/hooks.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file hooks.dm
- * Implements hooks, a simple way to run code on pre-defined events.
- */
-
-/** @page hooks Code hooks
- * @section hooks Hooks
- * A hook is defined under /hook in the type tree.
- *
- * To add some code to be called by the hook, define a proc under the type, as so:
- * @code
- /hook/foo/proc/bar()
- if(1)
- return 1 //Sucessful
- else
- return 0 //Error, or runtime.
- * @endcode
- * All hooks must return nonzero on success, as runtimes will force return null.
- */
-
-/**
- * Calls a hook, executing every piece of code that's attached to it.
- * @param hook Identifier of the hook to call.
- * @returns 1 if all hooked code runs successfully, 0 otherwise.
- */
-/proc/callHook(hook, list/args=null)
- var/hook_path = text2path("/hook/[hook]")
- if(!hook_path)
- error("Invalid hook '/hook/[hook]' called.")
- return 0
-
- var/caller = new hook_path
- var/status = 1
- for(var/P in typesof("[hook_path]/proc"))
- if(!call(caller, P)(arglist(args)))
- error("Hook '[P]' failed or runtimed.")
- status = 0
-
- return status
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index 03e54df61c5..c9934b128cf 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -35,7 +35,7 @@
var/static/list/failure_strikes //How many times we suspect a subsystem type has crashed the MC, 3 strikes and you're out!
- var/offline_implications = "None" // What are the implications of this SS being offlined?
+ var/offline_implications = "None. No immediate action is needed." // What are the implications of this SS being offlined?
//Do not override
///datum/controller/subsystem/New()
diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm
index 951a7fb1786..25ccda3349c 100644
--- a/code/controllers/subsystem/afk.dm
+++ b/code/controllers/subsystem/afk.dm
@@ -21,7 +21,8 @@ SUBSYSTEM_DEF(afk)
/datum/controller/subsystem/afk/fire()
var/list/toRemove = list()
- for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/H = thing
if(!H?.ckey) // Useless non ckey creatures
continue
diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index 1a6e073c808..390c6bc1a62 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -212,38 +212,38 @@ SUBSYSTEM_DEF(events)
if(href_list["toggle_report"])
report_at_round_end = !report_at_round_end
- admin_log_and_message_admins("has [report_at_round_end ? "enabled" : "disabled"] the round end event report.")
+ log_and_message_admins("has [report_at_round_end ? "enabled" : "disabled"] the round end event report.")
else if(href_list["dec_timer"])
var/datum/event_container/EC = locate(href_list["event"])
var/decrease = (60 * RaiseToPower(10, text2num(href_list["dec_timer"])))
EC.next_event_time -= decrease
- admin_log_and_message_admins("decreased timer for [GLOB.severity_to_string[EC.severity]] events by [decrease/600] minute(s).")
+ log_and_message_admins("decreased timer for [GLOB.severity_to_string[EC.severity]] events by [decrease/600] minute(s).")
else if(href_list["inc_timer"])
var/datum/event_container/EC = locate(href_list["event"])
var/increase = (60 * RaiseToPower(10, text2num(href_list["inc_timer"])))
EC.next_event_time += increase
- admin_log_and_message_admins("increased timer for [GLOB.severity_to_string[EC.severity]] events by [increase/600] minute(s).")
+ log_and_message_admins("increased timer for [GLOB.severity_to_string[EC.severity]] events by [increase/600] minute(s).")
else if(href_list["select_event"])
var/datum/event_container/EC = locate(href_list["select_event"])
var/datum/event_meta/EM = EC.SelectEvent()
if(EM)
- admin_log_and_message_admins("has queued the [GLOB.severity_to_string[EC.severity]] event '[EM.name]'.")
+ log_and_message_admins("has queued the [GLOB.severity_to_string[EC.severity]] event '[EM.name]'.")
else if(href_list["pause"])
var/datum/event_container/EC = locate(href_list["pause"])
EC.delayed = !EC.delayed
- admin_log_and_message_admins("has [EC.delayed ? "paused" : "resumed"] countdown for [GLOB.severity_to_string[EC.severity]] events.")
+ log_and_message_admins("has [EC.delayed ? "paused" : "resumed"] countdown for [GLOB.severity_to_string[EC.severity]] events.")
else if(href_list["interval"])
var/delay = input("Enter delay modifier. A value less than one means events fire more often, higher than one less often.", "Set Interval Modifier") as num|null
if(delay && delay > 0)
var/datum/event_container/EC = locate(href_list["interval"])
EC.delay_modifier = delay
- admin_log_and_message_admins("has set the interval modifier for [GLOB.severity_to_string[EC.severity]] events to [EC.delay_modifier].")
+ log_and_message_admins("has set the interval modifier for [GLOB.severity_to_string[EC.severity]] events to [EC.delay_modifier].")
else if(href_list["stop"])
if(alert("Stopping an event may have unintended side-effects. Continue?","Stopping Event!","Yes","No") != "Yes")
return
var/datum/event/E = locate(href_list["stop"])
var/datum/event_meta/EM = E.event_meta
- admin_log_and_message_admins("has stopped the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+ log_and_message_admins("has stopped the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
E.kill()
else if(href_list["view_events"])
selected_event_container = locate(href_list["view_events"])
@@ -265,23 +265,23 @@ SUBSYSTEM_DEF(events)
var/datum/event_meta/EM = locate(href_list["set_weight"])
EM.weight = weight
if(EM != new_event)
- admin_log_and_message_admins("has changed the weight of the [GLOB.severity_to_string[EM.severity]] event '[EM.name]' to [EM.weight].")
+ log_and_message_admins("has changed the weight of the [GLOB.severity_to_string[EM.severity]] event '[EM.name]' to [EM.weight].")
else if(href_list["toggle_oneshot"])
var/datum/event_meta/EM = locate(href_list["toggle_oneshot"])
EM.one_shot = !EM.one_shot
if(EM != new_event)
- admin_log_and_message_admins("has [EM.one_shot ? "set" : "unset"] the oneshot flag for the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+ log_and_message_admins("has [EM.one_shot ? "set" : "unset"] the oneshot flag for the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["toggle_enabled"])
var/datum/event_meta/EM = locate(href_list["toggle_enabled"])
EM.enabled = !EM.enabled
- admin_log_and_message_admins("has [EM.enabled ? "enabled" : "disabled"] the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+ log_and_message_admins("has [EM.enabled ? "enabled" : "disabled"] the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["remove"])
if(alert("This will remove the event from rotation. Continue?","Removing Event!","Yes","No") != "Yes")
return
var/datum/event_meta/EM = locate(href_list["remove"])
var/datum/event_container/EC = locate(href_list["EC"])
EC.available_events -= EM
- admin_log_and_message_admins("has removed the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+ log_and_message_admins("has removed the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["add"])
if(!new_event.name || !new_event.event_type)
return
@@ -289,12 +289,12 @@ SUBSYSTEM_DEF(events)
return
new_event.severity = selected_event_container.severity
selected_event_container.available_events += new_event
- admin_log_and_message_admins("has added \a [GLOB.severity_to_string[new_event.severity]] event '[new_event.name]' of type [new_event.event_type] with weight [new_event.weight].")
+ log_and_message_admins("has added \a [GLOB.severity_to_string[new_event.severity]] event '[new_event.name]' of type [new_event.event_type] with weight [new_event.weight].")
new_event = new
else if(href_list["clear"])
var/datum/event_container/EC = locate(href_list["clear"])
if(EC.next_event)
- admin_log_and_message_admins("has dequeued the [GLOB.severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
+ log_and_message_admins("has dequeued the [GLOB.severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
EC.next_event = null
Interact(usr)
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 619508544a6..e50c372584a 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(garbage)
wait = 2 SECONDS
flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
- init_order = INIT_ORDER_GARBAGE
+ init_order = INIT_ORDER_GARBAGE // Why does this have an init order if it has SS_NO_INIT?
offline_implications = "Garbage collection is no longer functional, and objects will not be qdel'd. Immediate server restart recommended."
var/list/collection_timeout = list(2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level
diff --git a/code/controllers/subsystem/ghost_spawns.dm b/code/controllers/subsystem/ghost_spawns.dm
new file mode 100644
index 00000000000..ea0aefb88bd
--- /dev/null
+++ b/code/controllers/subsystem/ghost_spawns.dm
@@ -0,0 +1,275 @@
+SUBSYSTEM_DEF(ghost_spawns)
+ name = "Ghost Spawns"
+ init_order = INIT_ORDER_EVENTS
+ flags = SS_BACKGROUND
+ wait = 1 SECONDS
+ runlevels = RUNLEVEL_GAME
+ offline_implications = "Ghosts will no longer be able to respawn as event mobs (Blob, etc..). Shuttle call recommended."
+
+ /// List of polls currently ongoing, to be checked on next fire()
+ var/list/datum/candidate_poll/currently_polling
+ /// Whether there are active polls or not
+ var/polls_active = FALSE
+ /// Number of polls performed since the start
+ var/total_polls = 0
+ /// The poll that's closest to finishing
+ var/datum/candidate_poll/next_poll_to_finish
+
+/datum/controller/subsystem/ghost_spawns/fire()
+ if(!polls_active)
+ return
+ if(!currently_polling) // if polls_active is TRUE then this shouldn't happen, but still..
+ currently_polling = list()
+
+ for(var/poll in currently_polling)
+ var/datum/candidate_poll/P = poll
+ if(P.time_left() <= 0)
+ polling_finished(P)
+
+/**
+ * Polls for candidates with a question and a preview of the role
+ *
+ * This proc replaces /proc/pollCandidates.
+ * Should NEVER be used in a proc that has waitfor set to FALSE/0 (due to #define UNTIL)
+ * Arguments:
+ * * question - The question to ask to potential candidates
+ * * role - The role to poll for. Should be a ROLE_x enum. If set, potential candidates who aren't eligible will be ignored
+ * * antag_age_check - Whether to filter out potential candidates who don't have an old enough account
+ * * poll_time - How long to poll for in deciseconds
+ * * ignore_respawnability - Whether to ignore the player's respawnability
+ * * min_hours - The amount of hours needed for a potential candidate to be eligible
+ * * flash_window - Whether the poll should flash a potential candidate's game window
+ * * check_antaghud - Whether to filter out potential candidates who enabled AntagHUD
+ * * source - The atom, atom prototype, icon or mutable appearance to display as an icon in the alert
+ */
+/datum/controller/subsystem/ghost_spawns/proc/poll_candidates(question = "Would you like to play a special role?", role, antag_age_check = FALSE, poll_time = 30 SECONDS, ignore_respawnability = FALSE, min_hours = 0, flash_window = TRUE, check_antaghud = TRUE, source)
+ log_debug("Polling candidates [role ? "for [get_roletext(role)]" : "\"[question]\""] for [poll_time / 10] seconds")
+
+ // Start firing
+ polls_active = TRUE
+ total_polls++
+
+ var/datum/candidate_poll/P = new(role, question, poll_time)
+ LAZYADD(currently_polling, P)
+
+ // We're the poll closest to completion
+ if(!next_poll_to_finish || poll_time < next_poll_to_finish.time_left())
+ next_poll_to_finish = P
+
+ var/category = "[P.hash]_notify_action"
+
+ for(var/mob/dead/observer/M in (ignore_respawnability ? GLOB.player_list : GLOB.respawnable_list))
+ if(!is_eligible(M, role, antag_age_check, role, min_hours, check_antaghud))
+ continue
+
+ SEND_SOUND(M, 'sound/misc/notice2.ogg')
+ if(flash_window)
+ window_flash(M.client)
+
+ // If we somehow send two polls for the same mob type, but with a duration on the second one shorter than the time left on the first one,
+ // we need to keep the first one's timeout rather than use the shorter one
+ var/obj/screen/alert/notify_action/current_alert = LAZYACCESS(M.alerts, category)
+ var/alert_time = poll_time
+ var/alert_poll = P
+ if(current_alert && current_alert.timeout > (world.time + poll_time - world.tick_lag))
+ alert_time = current_alert.timeout - world.time + world.tick_lag
+ alert_poll = current_alert.poll
+
+ // Send them an on-screen alert
+ var/obj/screen/alert/notify_action/A = M.throw_alert(category, /obj/screen/alert/notify_action, timeout_override = alert_time, no_anim = TRUE)
+ if(!A)
+ continue
+
+ A.icon = ui_style2icon(M.client?.prefs.UI_style)
+ A.name = "Looking for candidates"
+ A.desc = "[question]\n\n(expires in [poll_time / 10] seconds)"
+ A.show_time_left = TRUE
+ A.poll = alert_poll
+
+ // Sign up inheritance and stacking
+ var/inherited_sign_up = FALSE
+ var/num_stack = 1
+ for(var/existing_poll in currently_polling)
+ var/datum/candidate_poll/P2 = existing_poll
+ if(P != P2 && P.hash == P2.hash)
+ // If there's already a poll for an identical mob type ongoing and the client is signed up for it, sign them up for this one
+ if(!inherited_sign_up && (M in P2.signed_up) && P.sign_up(M, TRUE))
+ A.display_signed_up()
+ inherited_sign_up = TRUE
+ // This number is used to display the number of polls the alert regroups
+ num_stack++
+ if(num_stack > 1)
+ A.display_stacks(num_stack)
+
+ // Image to display
+ var/image/I
+ if(source)
+ if(!ispath(source))
+ var/atom/S = source
+ var/old_layer = S.layer
+ var/old_plane = S.plane
+
+ S.layer = FLOAT_LAYER
+ S.plane = FLOAT_PLANE
+ A.overlays += S
+ S.layer = old_layer
+ S.plane = old_plane
+ else
+ I = image(source, layer = FLOAT_LAYER, dir = SOUTH)
+ else
+ // Just use a generic image
+ I = image('icons/effects/effects.dmi', icon_state = "static", layer = FLOAT_LAYER, dir = SOUTH)
+
+ if(I)
+ I.layer = FLOAT_LAYER
+ I.plane = FLOAT_PLANE
+ A.overlays += I
+
+ // Chat message
+ var/act_jump = ""
+ if(isatom(source))
+ act_jump = "\[Teleport]"
+ var/act_signup = "\[Sign Up]"
+ to_chat(M, "Now looking for candidates [role ? "to play as \an [get_roletext(role)]" : "\"[question]\""]. [act_jump] [act_signup]")
+
+ // Start processing it so it updates visually the timer
+ START_PROCESSING(SSprocessing, A)
+ A.process()
+
+ // Sleep until the time is up
+ UNTIL(P.finished)
+ return P.signed_up
+
+/**
+ * Returns whether an observer is eligible to be an event mob
+ *
+ * Arguments:
+ * * M - The mob to check eligibility
+ * * role - The role to check eligibility for. Checks 1. the client has enabled the role 2. the account's age for this role if antag_age_check is TRUE
+ * * antag_age_check - Whether to check the account's age or not for the given role.
+ * * role_text - The role's clean text. Used for checking job bans to determine eligibility
+ * * min_hours - The amount of minimum hours the client needs before being eligible
+ * * check_antaghud - Whether to consider a client who enabled AntagHUD ineligible or not
+ */
+/datum/controller/subsystem/ghost_spawns/proc/is_eligible(mob/M, role, antag_age_check, role_text, min_hours, check_antaghud)
+ . = FALSE
+ if(!M.key || !M.client)
+ return
+ if(role)
+ if(!(role in M.client.prefs.be_special))
+ return
+ if(antag_age_check)
+ if(!player_old_enough_antag(M.client, role))
+ return
+ if(role_text)
+ if(jobban_isbanned(M, role_text) || jobban_isbanned(M, "Syndicate"))
+ return
+ if(config.use_exp_restrictions && min_hours)
+ if(M.client.get_exp_type_num(EXP_TYPE_LIVING) < min_hours * 60)
+ return
+ if(check_antaghud && cannotPossess(M))
+ return
+
+ return TRUE
+
+/**
+ * Called by the subsystem when a poll's timer runs out
+ *
+ * Can be called manually to finish a poll prematurely
+ * Arguments:
+ * * P - The poll to finish
+ */
+/datum/controller/subsystem/ghost_spawns/proc/polling_finished(datum/candidate_poll/P)
+ // Trim players who aren't eligible anymore
+ var/len_pre_trim = length(P.signed_up)
+ P.trim_candidates()
+ log_debug("Candidate poll [P.role ? "for [get_roletext(P.role)]" : "\"[P.question]\""] finished. [len_pre_trim] players signed up, [length(P.signed_up)] after trimming")
+
+ P.finished = TRUE
+ currently_polling -= P
+
+ // Determine which is the next poll closest the completion or "disable" firing if there's none
+ if(!length(currently_polling))
+ polls_active = FALSE
+ next_poll_to_finish = null
+ else if(P == next_poll_to_finish)
+ next_poll_to_finish = null
+ for(var/poll in currently_polling)
+ var/datum/candidate_poll/P2 = poll
+ if(!next_poll_to_finish || P2.time_left() < next_poll_to_finish.time_left())
+ next_poll_to_finish = P2
+
+/datum/controller/subsystem/ghost_spawns/stat_entry(msg)
+ msg += "Active: [length(currently_polling)] | Total: [total_polls]"
+ if(next_poll_to_finish)
+ msg += " | Next: [DisplayTimeText(next_poll_to_finish.time_left())] ([length(next_poll_to_finish.signed_up)] candidates)"
+ ..(msg)
+
+// The datum that describes one instance of candidate polling
+/datum/candidate_poll
+ var/role // The role the poll is for
+ var/question // The question asked to observers
+ var/duration // The duration of the poll
+ var/list/mob/dead/observer/signed_up // The players who signed up to this poll
+ var/time_started // The world.time at which the poll was created
+ var/finished = FALSE // Whether the polling is finished
+ var/hash // Used to categorize in the alerts system
+
+/datum/candidate_poll/New(polled_role, polled_question, poll_duration)
+ role = polled_role
+ question = polled_question
+ duration = poll_duration
+ signed_up = list()
+ time_started = world.time
+ hash = copytext(md5("[question]_[role ? role : "0"]"), 1, 7)
+ return ..()
+
+/**
+ * Attempts to sign a (controlled) mob up
+ *
+ * Will fail if the mob is already signed up or the poll's timer ran out.
+ * Does not check for eligibility
+ * Arguments:
+ * * M - The (controlled) mob to sign up
+ * * silent - Whether no messages should appear or not. If not TRUE, signing up to this poll will also sign the mob up for identical polls
+ */
+/datum/candidate_poll/proc/sign_up(mob/dead/observer/M, silent = FALSE)
+ . = FALSE
+ if(!istype(M) || !M.key || !M.client)
+ return
+ if(M in signed_up)
+ if(!silent)
+ to_chat(M, "You have already signed up for this!")
+ return
+ if(time_left() <= 0)
+ if(!silent)
+ to_chat(M, "Sorry, you were too late for the consideration!")
+ SEND_SOUND(M, 'sound/machines/buzz-sigh.ogg')
+ return
+
+ signed_up += M
+ if(!silent)
+ to_chat(M, "You have signed up for this role! A candidate will be picked randomly soon..")
+ // Sign them up for any other polls with the same mob type
+ for(var/existing_poll in SSghost_spawns.currently_polling)
+ var/datum/candidate_poll/P = existing_poll
+ if(src != P && hash == P.hash && !(M in P.signed_up))
+ P.sign_up(M, TRUE)
+
+ return TRUE
+
+/**
+ * Deletes any candidates who may have disconnected from the list
+ */
+/datum/candidate_poll/proc/trim_candidates()
+ listclearnulls(signed_up)
+ for(var/mob in signed_up)
+ var/mob/M = mob
+ if(!M.key || !M.client)
+ signed_up -= M
+
+/**
+ * Returns the time left for a poll
+ */
+/datum/candidate_poll/proc/time_left()
+ return duration - (world.time - time_started)
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index 289505a153c..8d6a7e39852 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -19,8 +19,18 @@ SUBSYSTEM_DEF(icon_smooth)
can_fire = 0
/datum/controller/subsystem/icon_smooth/Initialize()
- smooth_zlevel(1,TRUE)
- smooth_zlevel(2,TRUE)
+ log_startup_progress("Smoothing atoms...")
+ // Smooth EVERYTHING in the world
+ for(var/turf/T in world)
+ if(T.smooth)
+ smooth_icon(T)
+ for(var/A in T)
+ var/atom/AA = A
+ if(AA.smooth)
+ smooth_icon(AA)
+ CHECK_TICK
+
+ // Incase any new atoms were added to the smoothing queue for whatever reason
var/queue = smooth_queue
smooth_queue = list()
for(var/V in queue)
diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
index ef89317d0f5..3adfdf3972f 100644
--- a/code/controllers/subsystem/jobs.dm
+++ b/code/controllers/subsystem/jobs.dm
@@ -27,7 +27,7 @@ SUBSYSTEM_DEF(jobs)
/datum/controller/subsystem/jobs/fire()
if(!config.sql_enabled || !config.use_exp_tracking)
return
- update_exp(5,0)
+ INVOKE_ASYNC(GLOBAL_PROC, /.proc/update_exp, 5, 0)
/datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station"))
occupations = list()
@@ -644,6 +644,27 @@ SUBSYSTEM_DEF(jobs)
oldjobdatum.current_positions--
newjobdatum.current_positions++
+/datum/controller/subsystem/jobs/proc/notify_dept_head(jobtitle, antext)
+ // Used to notify the department head of jobtitle X that their employee was brigged, demoted or terminated
+ if(!jobtitle || !antext)
+ return
+ var/datum/job/tgt_job = GetJob(jobtitle)
+ if(!tgt_job)
+ return
+ if(!tgt_job.department_head[1])
+ return
+ var/boss_title = tgt_job.department_head[1]
+ var/obj/item/pda/target_pda
+ for(var/obj/item/pda/check_pda in GLOB.PDAs)
+ if(check_pda.ownrank == boss_title)
+ target_pda = check_pda
+ break
+ if(!target_pda)
+ return
+ var/datum/data/pda/app/messenger/PM = target_pda.find_program(/datum/data/pda/app/messenger)
+ if(PM && PM.can_receive())
+ PM.notify("Automated Notification: \"[antext]\" (Unable to Reply)")
+
/datum/controller/subsystem/jobs/proc/fetch_transfer_record_html(var/centcom)
var/record_html = "| [T.content[i]] |
" - dat += "Re-Open[check_rights(R_ADMIN|R_MOD, 0) ? "Auto": ""]Resolve
" + dat += "Re-Open[check_rights(rights_needed, 0) ? "Auto": ""]Resolve
" if(!T.staffAssigned) dat += "No staff member assigned to this [ticket_name] - Take Ticket
" @@ -366,6 +404,7 @@ UI STUFF dat += "
" dat += "Close Ticket" + dat += "Convert Ticket" var/datum/browser/popup = new(user, "[ticket_system_name]detail", "[ticket_system_name] #[T.ticketNum]", 1000, 600) popup.set_content(dat) @@ -448,7 +487,6 @@ UI STUFF if(closeTicket(indexNum)) showDetailUI(usr, indexNum) - if(href_list["detailreopen"]) var/indexNum = text2num(href_list["detailreopen"]) if(openTicket(indexNum)) @@ -468,6 +506,10 @@ UI STUFF var/indexNum = text2num(href_list["autorespond"]) autoRespond(indexNum) + if(href_list["convert_ticket"]) + var/indexNum = text2num(href_list["convert_ticket"]) + convert_to_other_ticket(indexNum) + if(href_list["resolveall"]) if(ticket_system_name == "Mentor Tickets") usr.client.resolveAllMentorTickets() diff --git a/code/modules/fancytitle/fancytitle.dm b/code/controllers/subsystem/titlescreen.dm similarity index 85% rename from code/modules/fancytitle/fancytitle.dm rename to code/controllers/subsystem/titlescreen.dm index d1cf08ff58c..e597f74e05f 100644 --- a/code/modules/fancytitle/fancytitle.dm +++ b/code/controllers/subsystem/titlescreen.dm @@ -1,4 +1,9 @@ -/hook/startup/proc/setup_title_screen() +SUBSYSTEM_DEF(title) + name = "Title Screen" + flags = SS_NO_FIRE + init_order = INIT_ORDER_TITLE + +/datum/controller/subsystem/title/Initialize() var/list/provisional_title_screens = flist("config/title_screens/images/") var/list/title_screens = list() var/use_rare_screens = prob(1) @@ -29,5 +34,5 @@ for(var/turf/unsimulated/wall/splashscreen/splash in world) splash.icon = icon - return TRUE - return FALSE + + return ..() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index b0110258da7..0b91e6b3467 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -367,7 +367,7 @@ SUBSYSTEM_DEF(vote) var/votedesc = capitalize(mode) if(mode == "custom") votedesc += " ([question])" - admin_log_and_message_admins("cancelled the running [votedesc] vote.") + log_and_message_admins("cancelled the running [votedesc] vote.") reset() if("toggle_restart") if(admin) diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index 3eaed85c303..abb0b604069 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -7,7 +7,7 @@ set name = "Restart Controller" set desc = "Restart one of the various periodic loop controllers for the game (be careful!)" - if(!holder) + if(!check_rights(R_DEBUG)) return switch(controller) if("Master") @@ -26,7 +26,8 @@ set name = "Debug Controller" set desc = "Debug the various periodic loop controllers for the game (be careful!)" - if(!holder) return + if(!check_rights(R_DEBUG)) + return switch(controller) if("failsafe") debug_variables(Failsafe) diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 19935bda130..3b5c9d2f5fb 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -131,6 +131,5 @@ /atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=3) var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time) - spawn(0) - newbeam.Start() + INVOKE_ASYNC(newbeam, /datum/beam.proc/Start) return newbeam diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 3bd740973a3..fc781b288a9 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -42,7 +42,7 @@ if(!(flags & CALTROP_BYPASS_SHOES) && (H.shoes || feetCover)) return - if((H.flying) || H.buckled) + if(H.flying || H.floating || H.buckled) return var/damage = rand(min_damage, max_damage) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 88e51209afb..a7b81856468 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -51,6 +51,6 @@ Additionally calls the parent's `after_slip()` proc on the `victim`. */ /datum/component/slippery/proc/Slip(datum/source, mob/living/carbon/human/victim) - if(istype(victim) && prob(slip_chance) && victim.slip(description, stun, weaken, slip_tiles, walking_is_safe, slip_always, slip_verb)) + if(istype(victim) && !victim.flying && prob(slip_chance) && victim.slip(description, stun, weaken, slip_tiles, walking_is_safe, slip_always, slip_verb)) var/atom/movable/owner = parent owner.after_slip(victim) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index 4c55ad2ad82..f79439f2b3b 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -67,6 +67,14 @@ var/obj/item/projectile/P = AM if(P.original != parent) return + if(ismob(AM)) + var/mob/M = AM + if(M.flying) + return + if(isliving(AM)) + var/mob/living/L = M + if(L.floating) + return var/atom/current_parent = parent if(isturf(current_parent.loc)) play_squeak() diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 7bfc79e4e71..0e98179e2f9 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -1,7 +1,3 @@ -/hook/startup/proc/createDatacore() - GLOB.data_core = new /datum/datacore() - return 1 - /datum/datacore var/list/medical = list() var/list/general = list() diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 34c41c581f2..318dd176e45 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -395,8 +395,9 @@ GLOBAL_LIST_INIT(advance_cures, list( for(var/datum/disease/advance/AD in GLOB.active_diseases) AD.Refresh() - for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list)) - if(!is_station_level(H.z)) + for(var/thing in shuffle(GLOB.human_list)) + var/mob/living/carbon/human/H = thing + if(H.stat == DEAD || !is_station_level(H.z)) continue if(!H.HasDisease(D)) H.ForceContractDisease(D) diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index f619e9aa9bd..3e3e1696e61 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -57,6 +57,9 @@ W.plane = initial(W.plane) W.loc = affected_mob.loc W.dropped(affected_mob) + if(isobj(affected_mob.loc)) + var/obj/O = affected_mob.loc + O.force_eject_occupant() var/mob/living/new_mob = new new_form(affected_mob.loc) if(istype(new_mob)) new_mob.a_intent = "harm" diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm index a54707842db..ee5a4df4f5b 100644 --- a/code/datums/helper_datums/map_template.dm +++ b/code/datums/helper_datums/map_template.dm @@ -17,7 +17,7 @@ name = rename /datum/map_template/proc/preload_size(path) - var/bounds = GLOB.maploader.load_map(file(path), 1, 1, 1, cropMap = 0, measureOnly = 1) + var/bounds = GLOB.maploader.load_map(file(path), 1, 1, 1, shouldCropMap = FALSE, measureOnly = TRUE) if(bounds) width = bounds[MAP_MAXX] // Assumes all templates are rectangular, have a single Z level, and begin at 1,1,1 height = bounds[MAP_MAXY] @@ -49,7 +49,7 @@ // if given a multi-z template // it might need to be adapted for that when that time comes GLOB.space_manager.add_dirt(placement.z) - var/list/bounds = GLOB.maploader.load_map(get_file(), min_x, min_y, placement.z, cropMap = 1) + var/list/bounds = GLOB.maploader.load_map(get_file(), min_x, min_y, placement.z, shouldCropMap = TRUE) if(!bounds) return 0 if(bot_left == null || top_right == null) diff --git a/code/datums/log_record.dm b/code/datums/log_record.dm index 9b7d52b5390..2a659477b47 100644 --- a/code/datums/log_record.dm +++ b/code/datums/log_record.dm @@ -3,32 +3,51 @@ var/raw_time // When did this happen? var/what // What happened var/who // Who did it - var/target // Who/what was targeted (can be a string) - var/turf/where // Where did it happen + var/target // Who/what was targeted + var/where // Where did it happen /datum/log_record/New(_log_type, _who, _what, _target, _where, _raw_time) log_type = _log_type - - who = get_subject_text(_who) + + who = get_subject_text(_who, _log_type) what = _what - target = get_subject_text(_target) - if(!_where) + target = get_subject_text(_target, _log_type) + if(!istext(_where) && !isturf(_where)) _where = get_turf(_who) - where = _where + if(isturf(_where)) + var/turf/T = _where + where = ADMIN_COORDJMP(T) + else + where = _where if(!_raw_time) _raw_time = world.time raw_time = _raw_time -/datum/log_record/proc/get_subject_text(subject) +/datum/log_record/proc/get_subject_text(subject, log_type) if(ismob(subject) || isclient(subject) || istype(subject, /datum/mind)) - return key_name_admin(subject) - if(isatom(subject)) + . = key_name_admin(subject) + if(should_log_health(log_type) && isliving(subject)) + . += get_health_string(subject) + else if(isatom(subject)) var/atom/A = subject - return A.name - if(istype(subject, /datum)) + . = A.name + else if(istype(subject, /datum)) var/datum/D = subject return D.type - return subject + else + . = subject + +/datum/log_record/proc/get_health_string(var/mob/living/L) + var/OX = L.getOxyLoss() > 50 ? "[L.getOxyLoss()]" : L.getOxyLoss() + var/TX = L.getToxLoss() > 50 ? "[L.getToxLoss()]" : L.getToxLoss() + var/BU = L.getFireLoss() > 50 ? "[L.getFireLoss()]" : L.getFireLoss() + var/BR = L.getBruteLoss() > 50 ? "[L.getBruteLoss()]" : L.getBruteLoss() + return " ([L.health]: [OX] - [TX] - [BU] - [BR])" + +/datum/log_record/proc/should_log_health(log_type) + if(log_type == ATTACK_LOG || log_type == DEFENSE_LOG) + return TRUE + return FALSE /proc/compare_log_record(datum/log_record/A, datum/log_record/B) var/time_diff = A.raw_time - B.raw_time diff --git a/code/datums/log_viewer.dm b/code/datums/log_viewer.dm index 67eb3d21d86..c5a17507606 100644 --- a/code/datums/log_viewer.dm +++ b/code/datums/log_viewer.dm @@ -1,31 +1,45 @@ -#define ALL_LOGS list(ATTACK_LOG, DEFENSE_LOG, CONVERSION_LOG, SAY_LOG, EMOTE_LOG, MISC_LOG) +#define UPDATE_CKEY_MOB(__ckey) var/mob/result = selected_ckeys_mobs[__ckey];\ +if(!result || result.ckey != __ckey){\ + result = get_mob_by_ckey(__ckey);\ + selected_ckeys_mobs[__ckey] = result;\ +} + +#define RECORD_WARN_LIMIT 1000 +#define RECORD_HARD_LIMIT 2500 /datum/log_viewer var/time_from = 0 var/time_to = 4 HOURS // 4 Hours should be enough. INFINITY would screw the UI up - var/list/selected_mobs = list() // The mobs in question - var/list/selected_log_types = list() // The log types being searched for - + var/list/selected_mobs = list() // The mobs in question. + var/list/selected_ckeys = list() // The ckeys selected to search for. Will show all mobs the ckey is attached to + var/list/mob/selected_ckeys_mobs = list() + var/list/selected_log_types = ALL_LOGS // The log types being searched for var/list/log_records = list() // Found and sorted records /datum/log_viewer/proc/clear_all() selected_mobs.Cut() - selected_log_types.Cut() + selected_log_types = ALL_LOGS + selected_ckeys.Cut() + selected_ckeys_mobs.Cut() time_from = initial(time_from) time_to = initial(time_to) log_records.Cut() return -/datum/log_viewer/proc/search() +/datum/log_viewer/proc/search(user) log_records.Cut() // Empty the old results var/list/invalid_mobs = list() + var/list/ckeys = selected_ckeys.Copy() for(var/i in selected_mobs) var/mob/M = i - if(!M || QDELETED(M)) + if(!M || QDELETED(M) || !M.last_known_ckey) invalid_mobs |= M continue + ckeys |= M.last_known_ckey + + for(var/ckey in ckeys) for(var/log_type in selected_log_types) - var/list/logs = M.logs[log_type] + var/list/logs = GLOB.logging.get_logs_by_type(ckey, log_type) var/len_logs = length(logs) if(len_logs) var/start_index = get_earliest_log_index(logs) @@ -36,8 +50,8 @@ continue log_records.Add(logs.Copy(start_index, end_index + 1)) - if(invalid_mobs.len) - to_chat(usr, "The search criteria contained invalid mobs. They have been removed from the criteria.") + if(length(invalid_mobs)) + to_chat(user, "The search criteria contained invalid mobs. They have been removed from the criteria.") for(var/i in invalid_mobs) selected_mobs -= i // Cleanup @@ -91,9 +105,23 @@ return start return 0 -/datum/log_viewer/proc/add_mob(mob/user, mob/M) +/datum/log_viewer/proc/add_mobs(list/mob/mobs) + if(!length(mobs)) + return + for(var/i in mobs) + add_mob(usr, i, FALSE) + +/datum/log_viewer/proc/add_ckey(mob/user, ckey) + if(!user || !ckey) + return + selected_ckeys |= ckey + UPDATE_CKEY_MOB(ckey) + show_ui(user) + +/datum/log_viewer/proc/add_mob(mob/user, mob/M, show_the_ui = TRUE) if(!M || !user) return + selected_mobs |= M show_ui(user) @@ -102,9 +130,9 @@ var/all_log_types = ALL_LOGS var/trStyleTop = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;" var/trStyle = "border-top:1px solid; border-bottom:1px solid; padding-top: 5px; padding-bottom: 5px;" - var/dat - dat += "" - dat += "
"
+ var/list/dat = list()
+ dat += ""
+ dat += "
"
dat += "Time Search Range: [gameTimestamp(wtime = time_from)]"
dat += " To: [gameTimestamp(wtime = time_to)]"
dat += "
" @@ -115,20 +143,26 @@ if(QDELETED(M)) selected_mobs -= i continue - dat += "[M.name]" + dat += "[get_display_name(M)]" dat += "Add Mob" dat += "Clear All Mobs" dat += "
" + dat += "Ckeys being used:" + for(var/ckey in selected_ckeys) + dat += "[get_ckey_name(ckey)]" + dat += "Add ckey" + dat += "Clear All ckeys" + dat += "
" + dat += "Log Types:" - for(var/i in all_log_types) - var/log_type = i + for(var/log_type in all_log_types) var/enabled = (log_type in selected_log_types) var/text var/style if(enabled) text = "[log_type]" - style = "background: [get_logtype_color(i)]" + style = "background: [get_logtype_color(log_type)]" else text = log_type @@ -142,9 +176,9 @@ // Search results var/tdStyleTime = "width:80px; text-align:center;" var/tdStyleType = "width:80px; text-align:center;" - var/tdStyleWho = "width:300px; text-align:center;" + var/tdStyleWho = "width:400px; text-align:center;" var/tdStyleWhere = "width:150px; text-align:center;" - dat += "
" @@ -115,20 +143,26 @@ if(QDELETED(M)) selected_mobs -= i continue - dat += "[M.name]" + dat += "[get_display_name(M)]" dat += "Add Mob" dat += "Clear All Mobs" dat += "
" + dat += "Ckeys being used:" + for(var/ckey in selected_ckeys) + dat += "[get_ckey_name(ckey)]" + dat += "Add ckey" + dat += "Clear All ckeys" + dat += "
" + dat += "Log Types:" - for(var/i in all_log_types) - var/log_type = i + for(var/log_type in all_log_types) var/enabled = (log_type in selected_log_types) var/text var/style if(enabled) text = "[log_type]" - style = "background: [get_logtype_color(i)]" + style = "background: [get_logtype_color(log_type)]" else text = log_type @@ -142,9 +176,9 @@ // Search results var/tdStyleTime = "width:80px; text-align:center;" var/tdStyleType = "width:80px; text-align:center;" - var/tdStyleWho = "width:300px; text-align:center;" + var/tdStyleWho = "width:400px; text-align:center;" var/tdStyleWhere = "width:150px; text-align:center;" - dat += "
"
+ dat += "
")) - to_chat(current, line) + if(current) + to_chat(current, "Your current objectives:") + for(var/line in splittext(gen_objective_text(), "
")) + to_chat(current, line) /datum/mind/proc/find_syndicate_uplink() var/list/L = current.get_contents() @@ -1593,25 +1583,6 @@ L = agent_landmarks[team] H.forceMove(L.loc) - -// check whether this mind's mob has been brigged for the given duration -// have to call this periodically for the duration to work properly -/datum/mind/proc/is_brigged(duration) - var/turf/T = current.loc - if(!istype(T)) - brigged_since = -1 - return 0 - - var/is_currently_brigged = current.is_in_brig() - if(!is_currently_brigged) - brigged_since = -1 - return 0 - - if(brigged_since == -1) - brigged_since = world.time - - return (duration <= world.time - brigged_since) - /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S) spell_list += S S.action.Grant(current) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 14bc959fbb1..2b48d5da5f7 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -222,10 +222,10 @@ name = "NT Undercover Operative" // Disguised NT special forces, sent to quietly eliminate or keep tabs on people in high positions (e.g: captain) - uniform = /obj/item/clothing/under/color/black + uniform = /obj/item/clothing/under/color/random back = /obj/item/storage/backpack belt = /obj/item/storage/belt/utility/full/multitool - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/color/yellow shoes = /obj/item/clothing/shoes/chameleon/noslip l_ear = /obj/item/radio/headset/centcom id = /obj/item/card/id diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index b81587440d4..799a12f4db9 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -175,6 +175,7 @@ description = "The crew of a space station awaken one hundred years after a crisis. Awaking to a derelict space station on the verge of collapse, and a hostile force of invading \ hivebots. Can the surviving crew overcome the odds and survive and rebuild, or will the cold embrace of the stars become their new home?" cost = 2 + allow_duplicates = FALSE /datum/map_template/ruin/space/wizardcrash id = "wizardcrash" diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 53517d5dbc9..4d6310041e5 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -9,8 +9,9 @@ var/admin_notes /datum/map_template/shuttle/New() - shuttle_id = "[port_id]_[suffix]" - mappath = "[prefix][shuttle_id].dmm" + if(port_id && suffix) + shuttle_id = "[port_id]_[suffix]" + mappath = "[prefix][shuttle_id].dmm" . = ..() /datum/map_template/shuttle/emergency diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 3855dbcfac3..cb10700e5c6 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -444,6 +444,11 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) return +// Normally, AoE spells will generate an attack log for every turf they loop over, while searching for targets. +// With this override, all /aoe_turf type spells will only generate 1 log, saying that the user has cast the spell. +/obj/effect/proc_holder/spell/aoe_turf/perform(list/targets, recharge, mob/user, make_attack_logs) + add_attack_logs(user, null, "Cast the AoE spell [name]", ATKLOG_ALL) + return ..(targets, recharge, user, FALSE) /obj/effect/proc_holder/spell/targeted/proc/los_check(mob/A,mob/B) //Checks for obstacles from A to B diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm index 88f5eec9474..e4c652ae1d3 100644 --- a/code/datums/spells/knock.dm +++ b/code/datums/spells/knock.dm @@ -13,11 +13,6 @@ action_icon_state = "knock" sound = 'sound/magic/knock.ogg' -// Knock doesn't need to generate an attack log for every turf, set `make_attack_logs` to FALSE and just create a custom one. -/obj/effect/proc_holder/spell/aoe_turf/knock/perform(list/targets, recharge, mob/user) - add_attack_logs(user, user, "cast the spell [name]", ATKLOG_ALL) - return ..(targets, recharge, user, make_attack_logs = FALSE) - /obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets, mob/user = usr) for(var/turf/T in targets) for(var/obj/machinery/door/door in T.contents) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index a18a9d74f28..c8f2b6bb99b 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -633,7 +633,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY contains = list(/obj/machinery/power/emitter, /obj/machinery/power/emitter) cost = 10 - containertype = /obj/structure/closet/crate/secure containername = "emitter crate" access = ACCESS_CE containertype = /obj/structure/closet/crate/secure/engineering @@ -717,7 +716,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY name = "Supermatter Shard Crate" contains = list(/obj/machinery/power/supermatter_shard) cost = 50 //So cargo thinks twice before killing themselves with it - containertype = /obj/structure/closet/crate/secure + containertype = /obj/structure/closet/crate/secure/engineering containername = "supermatter shard crate" access = ACCESS_CE @@ -728,7 +727,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/pipe/circulator, /obj/item/pipe/circulator) cost = 25 - containertype = /obj/structure/closet/crate/secure + containertype = /obj/structure/closet/crate/secure/engineering containername = "thermo-electric generator crate" access = ACCESS_CE announce_beacons = list("Engineering" = list("Chief Engineer's Desk", "Atmospherics")) @@ -1174,11 +1173,10 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY containername = "fox crate" /datum/supply_packs/organic/butterfly - name = "Butterflies Crate" + name = "Butterfly Crate" cost = 50 containertype = /obj/structure/closet/critter/butterfly - containername = "butterflies crate" - contraband = 1 + containername = "butterfly crate" /datum/supply_packs/organic/deer name = "Deer Crate" @@ -1767,6 +1765,16 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY cost = 20 containername = "polo supply crate" +/datum/supply_packs/misc/boxing //For non log spamming cargo brawls! + name = "Boxing Supply Crate" + // 4 boxing gloves + contains = list(/obj/item/clothing/gloves/boxing/blue, + /obj/item/clothing/gloves/boxing/green, + /obj/item/clothing/gloves/boxing/yellow, + /obj/item/clothing/gloves/boxing) + cost = 15 + containername = "boxing supply crate" + ///////////// Station Goals /datum/supply_packs/misc/station_goal diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm index 9f98a481dbf..0233e0aee71 100644 --- a/code/datums/weather/weather_types/floor_is_lava.dm +++ b/code/datums/weather/weather_types/floor_is_lava.dm @@ -35,6 +35,8 @@ return if(!L.client) //Only sentient people are going along with it! return + if(L.flying) + return L.adjustFireLoss(3) /datum/weather/floor_is_lava/fake diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 789a0472869..04a9509cfe2 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -15,16 +15,16 @@ switch(index) if(BORG_WIRE_MAIN_POWER) return "Main Power" - + if(BORG_WIRE_LOCKED_DOWN) return "Lockdown" - + if(BORG_WIRE_CAMERA) return "Camera" - + if(BORG_WIRE_AI_CONTROL) return "AI Control" - + if(BORG_WIRE_LAWCHECK) return "Law Check" @@ -52,7 +52,7 @@ if(BORG_WIRE_AI_CONTROL) //Cut the AI wire to reset AI control if(!mended) if(R.connected_ai) - R.connected_ai = null + R.disconnect_from_ai() if(BORG_WIRE_CAMERA) if(!isnull(R.camera) && !R.scrambledcodes) @@ -74,8 +74,7 @@ switch(index) if(BORG_WIRE_AI_CONTROL) //pulse the AI wire to make the borg reselect an AI if(!R.emagged) - R.connected_ai = select_active_ai() - R.notify_ai(1) + R.connect_to_ai(select_active_ai()) if(BORG_WIRE_CAMERA) if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 09c874ce8a8..40aeda21b58 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -194,7 +194,7 @@ GLOBAL_LIST_INIT(wireColours, list("red", "blue", "green", "black", "orange", "b return 1 /datum/wires/CanUseTopic(mob/user, datum/topic_state/state) - if(!CanUse(user)) + if(!holder || !CanUse(user)) return STATUS_CLOSE return ..() diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 1f8c83f5f04..1d6fa5619e2 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -29,15 +29,15 @@ Actual Adjacent procs : ////////////////////// //A* nodes variables -/PathNode +/datum/pathnode var/turf/source //turf associated with the PathNode - var/PathNode/prevNode //link to the parent PathNode + var/datum/pathnode/prevNode //link to the parent PathNode var/f //A* Node weight (f = g + h) var/g //A* movement cost variable var/h //A* heuristic variable var/nt //count the number of Nodes traversed -/PathNode/New(s,p,pg,ph,pnt) +/datum/pathnode/New(s,p,pg,ph,pnt) source = s prevNode = p g = pg @@ -46,7 +46,7 @@ Actual Adjacent procs : source.PNode = src nt = pnt -/PathNode/proc/calc_f() +/datum/pathnode/proc/calc_f() f = g + h ////////////////////// @@ -54,11 +54,11 @@ Actual Adjacent procs : ////////////////////// //the weighting function, used in the A* algorithm -/proc/PathWeightCompare(PathNode/a, PathNode/b) +/proc/PathWeightCompare(datum/pathnode/a, datum/pathnode/b) return a.f - b.f //reversed so that the Heap is a MinHeap rather than a MaxHeap -/proc/HeapPathWeightCompare(PathNode/a, PathNode/b) +/proc/HeapPathWeightCompare(datum/pathnode/a, datum/pathnode/b) return b.f - a.f //wrapper that returns an empty list if A* failed to find a path @@ -82,13 +82,13 @@ Actual Adjacent procs : return 0 maxnodedepth = maxnodes //no need to consider path longer than maxnodes - var/Heap/open = new /Heap(/proc/HeapPathWeightCompare) //the open list + var/datum/heap/open = new /datum/heap(/proc/HeapPathWeightCompare) //the open list var/list/closed = new() //the closed list var/list/path = null //the returned path, if any - var/PathNode/cur //current processed turf + var/datum/pathnode/cur //current processed turf //initialization - open.Insert(new /PathNode(start,null,0,call(start,dist)(end),0)) + open.Insert(new /datum/pathnode(start,null,0,call(start,dist)(end),0)) //then run the main loop while(!open.IsEmpty() && !path) @@ -125,7 +125,7 @@ Actual Adjacent procs : var/newg = cur.g + call(cur.source,dist)(T) if(!T.PNode) //is not already in open list, so add it - open.Insert(new /PathNode(T,cur,newg,call(T,dist)(end),cur.nt+1)) + open.Insert(new /datum/pathnode(T,cur,newg,call(T,dist)(end),cur.nt+1)) else //is already in open list, check if it's a better way from the current turf if(newg < T.PNode.g) T.PNode.prevNode = cur @@ -137,7 +137,7 @@ Actual Adjacent procs : } //cleaning after us - for(var/PathNode/PN in open.L) + for(var/datum/pathnode/PN in open.L) PN.source.PNode = null for(var/turf/T in closed) T.PNode = null diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm index fb8ca665906..23b485ad252 100644 --- a/code/defines/procs/admin.dm +++ b/code/defines/procs/admin.dm @@ -83,10 +83,6 @@ var/message = "[key_name(whom, 0)][isAntag(whom) ? "(ANTAG)" : ""][isLivingSSD(whom) ? "(SSD!)": ""]" return message -/proc/log_and_message_admins(var/message as text) +/proc/log_and_message_admins(message) log_admin("[key_name(usr)] " + message) message_admins("[key_name_admin(usr)] " + message) - -/proc/admin_log_and_message_admins(var/message as text) - log_admin("[key_name(usr)] " + message) - message_admins("[key_name_admin(usr)] " + message, 1) diff --git a/code/defines/vox_sounds.dm b/code/defines/vox_sounds.dm index 1d7bb9753a0..5b44f80895b 100644 --- a/code/defines/vox_sounds.dm +++ b/code/defines/vox_sounds.dm @@ -1,7 +1,16 @@ // List is required to compile the resources into the game when it loads. // Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable. -GLOBAL_LIST_INIT(vox_sounds, list("," = 'sound/vox_fem/,.ogg', +GLOBAL_LIST_INIT(vox_alerts, list( +"bizwarn" = 'sound/vox_fem/bizwarn.ogg', +"bloop" = 'sound/vox_fem/bloop.ogg', +"buzwarn" = 'sound/vox_fem/buzwarn.ogg', +"dadeda" = 'sound/vox_fem/dadeda.ogg', +"deeoo" = 'sound/vox_fem/deeoo.ogg' +)) + +GLOBAL_LIST_INIT(vox_sounds, list( +"," = 'sound/vox_fem/,.ogg', "." = 'sound/vox_fem/..ogg', "a" = 'sound/vox_fem/a.ogg', "abortions" = 'sound/vox_fem/abortions.ogg', diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index c7936f2a91b..c33e7609685 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -13,35 +13,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station */ -/*Adding a wizard area teleport list because motherfucking lag -- Urist*/ -/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/ -GLOBAL_LIST_EMPTY(teleportlocs) -/hook/startup/proc/process_teleport_locs() - for(var/area/AR in world) - if(AR.no_teleportlocs) continue - if(GLOB.teleportlocs.Find(AR.name)) continue - var/turf/picked = safepick(get_area_turfs(AR.type)) - if(picked && is_station_level(picked.z)) - GLOB.teleportlocs += AR.name - GLOB.teleportlocs[AR.name] = AR - - GLOB.teleportlocs = sortAssoc(GLOB.teleportlocs) - - return 1 - -GLOBAL_LIST_EMPTY(ghostteleportlocs) -/hook/startup/proc/process_ghost_teleport_locs() - for(var/area/AR in world) - if(GLOB.ghostteleportlocs.Find(AR.name)) continue - var/list/turfs = get_area_turfs(AR.type) - if(turfs.len) - GLOB.ghostteleportlocs += AR.name - GLOB.ghostteleportlocs[AR.name] = AR - - GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs) - - return 1 - /*-----------------------------------------------------------------------------*/ diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index ab5ff19462a..d463c85eaf6 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -61,7 +61,7 @@ /atom/movable/proc/get_cell() return -/atom/movable/proc/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE) +/atom/movable/proc/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE) if(QDELETED(AM)) return FALSE if(!(AM.can_be_pulled(src, state, force))) @@ -87,7 +87,7 @@ if(ismob(AM)) var/mob/M = AM add_attack_logs(src, M, "passively grabbed", ATKLOG_ALMOSTALL) - if(!supress_message) + if(show_message) visible_message("[src] has grabbed [M] passively!") return TRUE @@ -120,12 +120,18 @@ if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1) //separated from our puller and not in the middle of a diagonal move. pulledby.stop_pulling() -/atom/movable/proc/can_be_pulled(user, grab_state, force) +/atom/movable/proc/can_be_pulled(user, grab_state, force, show_message = FALSE) if(src == user || !isturf(loc)) return FALSE - if(anchored || throwing) + if(anchored || move_resist == INFINITY) + if(show_message) + to_chat(user, "[src] appears to be anchored to the ground!") + return FALSE + if(throwing) return FALSE if(force < (move_resist * MOVE_FORCE_PULL_RATIO)) + if(show_message) + to_chat(user, "[src] is too heavy to pull!") return FALSE return TRUE @@ -506,6 +512,7 @@ return //don't do an animation if attacking self var/pixel_x_diff = 0 var/pixel_y_diff = 0 + var/direction = get_dir(src, A) if(direction & NORTH) pixel_y_diff = 8 @@ -525,7 +532,8 @@ if(visual_effect_icon) I = image('icons/effects/effects.dmi', A, visual_effect_icon, A.layer + 0.1) else if(used_item) - I = image(used_item.icon, A, used_item.icon_state, A.layer + 0.1) + I = image(icon = used_item, loc = A, layer = A.layer + 0.1) + I.plane = GAME_PLANE // Scale the icon. I.transform *= 0.75 @@ -567,3 +575,6 @@ /atom/movable/proc/portal_destroyed(obj/effect/portal/P) return + +/atom/movable/proc/decompile_act(obj/item/matter_decompiler/C, mob/user) // For drones to decompile mobs and objs. See drone for an example. + return FALSE diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index fb0ccff32cb..d887153c6d5 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -282,6 +282,9 @@ occupant = null icon_state = "scanner_open" +/obj/machinery/dna_scannernew/force_eject_occupant() + go_out(null, TRUE) + /obj/machinery/dna_scannernew/ex_act(severity) if(occupant) occupant.ex_act(severity) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 9c7fb99fe81..8f6ba965222 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -18,7 +18,7 @@ intercepttext += "
Note in the event of a quarantine breach or uncontrolled spread of the biohazard, the directive 7-10 may be upgraded to a directive 7-12.
" intercepttext += "Message ends." if(2) - var/nukecode = rand(10000, 99999) + var/nukecode = "[rand(10000, 99999)]" for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) if(bomb && bomb.r_code) if(is_station_level(bomb.z)) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 46b1972e565..34c717f11a8 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -7,6 +7,7 @@ /mob/living/simple_animal/hostile/blob icon = 'icons/mob/blob.dmi' pass_flags = PASSBLOB + status_flags = NONE //No throwing blobspores into deep space to despawn, or throwing blobbernaughts, which are bigger than you. faction = list(ROLE_BLOB) bubble_icon = "blob" atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) @@ -49,6 +50,7 @@ environment_smash = ENVIRONMENT_SMASH_STRUCTURES attacktext = "hits" attack_sound = 'sound/weapons/genhit1.ogg' + flying = TRUE speak_emote = list("pulses") var/obj/structure/blob/factory/factory = null var/list/human_overlays = list() diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index be794b9092b..dc8d0f5aba2 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -17,12 +17,12 @@ START_PROCESSING(SSobj, src) GLOB.poi_list |= src adjustcolors(color) //so it atleast appears - if(!overmind) - create_overmind(new_overmind) - if(overmind) - adjustcolors(overmind.blob_reagent_datum.color) if(offspring) is_offspring = 1 + if(overmind) + adjustcolors(overmind.blob_reagent_datum.color) + if(!overmind) + create_overmind(new_overmind) point_rate = new_rate ..(loc, h) @@ -104,10 +104,11 @@ var/mob/C = null var/list/candidates = list() if(!new_overmind) + // sendit if(is_offspring) - candidates = pollCandidates("Do you want to play as a blob offspring?", ROLE_BLOB, 1) + candidates = SSghost_spawns.poll_candidates("Do you want to play as a blob offspring?", ROLE_BLOB, TRUE, source = src) else - candidates = pollCandidates("Do you want to play as a blob?", ROLE_BLOB, 1) + candidates = SSghost_spawns.poll_candidates("Do you want to play as a blob?", ROLE_BLOB, TRUE, source = src) if(length(candidates)) C = pick(candidates) diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 6f2eed39499..350da7c7593 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -237,7 +237,7 @@ blobber.AIStatus = AI_OFF blobber.LoseTarget() spawn() - var/list/candidates = pollCandidates("Do you want to play as a blobbernaut?", ROLE_BLOB, 1, 100) + var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blobbernaut?", ROLE_BLOB, TRUE, 10 SECONDS, source = blobber) if(candidates.len) var/mob/C = pick(candidates) if(C) @@ -389,7 +389,7 @@ return split_used = TRUE - new /obj/structure/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, "offspring") + new /obj/structure/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, offspring = TRUE) qdel(N) if(SSticker && SSticker.mode.name == "blob") diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index 0e02df12d88..97192c86a0f 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -18,12 +18,15 @@ if((NOCLONE || SKELETON || HUSK) in target.mutations) to_chat(user, "DNA of [target] is ruined beyond usability!") return - if(!istype(target) || issmall(target) || (NO_DNA in target.dna.species.species_traits)) + if(!istype(target) || !target.mind || issmall(target) || (NO_DNA in target.dna.species.species_traits)) to_chat(user, "[target] is not compatible with this ability.") return if(target.mind.changeling) to_chat(user, "We are unable to swap forms with another changeling!") return + if(target.has_brain_worms() || user.has_brain_worms()) + to_chat(user, "A foreign presence repels us from this body!") + return return 1 /datum/action/changeling/swap_form/sting_action(var/mob/living/carbon/user) @@ -63,6 +66,8 @@ target.add_language("Changeling") user.remove_language("Changeling") user.regenerate_icons() + if(target.stat == DEAD && target.suiciding) //If Target committed suicide, unset flag for User + target.suiciding = 0 for(var/power in lingpowers) var/datum/action/changeling/S = power diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index bf5fbb70731..433fc5b526a 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -20,8 +20,8 @@ GLOBAL_LIST_EMPTY(all_cults) var/mob/living/carbon/human/H = mind.current if(ismindshielded(H)) //mindshield protects against conversions unless removed return FALSE -// if(mind.offstation_role) cant convert offstation roles such as ghost spawns -// return FALSE Commented out until we can figure out why offstation_role is getting set to TRUE on normal crew + if(mind.offstation_role) + return FALSE if(issilicon(mind.current)) return FALSE //can't convert machines, that's ratvar's thing if(isguardian(mind.current)) @@ -231,6 +231,8 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/cult/proc/get_unconvertables() var/list/ucs = list() for(var/mob/living/carbon/human/player in GLOB.player_list) + if(player.mind && player.mind.offstation_role) + continue if(!is_convertable_to_cult(player.mind)) ucs += player.mind return ucs diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 388b16d71af..f1f3bc1c72c 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -140,6 +140,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/tome,/obj/item/melee/cultblade) var/current_charges = 3 + var/shield_state = "shield-cult" hoodtype = /obj/item/clothing/head/hooded/cult_hoodie /obj/item/clothing/head/hooded/cult_hoodie @@ -164,13 +165,18 @@ if(current_charges) owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!") current_charges-- + playsound(loc, "sparks", 100, 1) new /obj/effect/temp_visual/cult/sparks(get_turf(owner)) if(!current_charges) owner.visible_message("The runed shield around [owner] suddenly disappears!") + shield_state = "broken" owner.update_inv_wear_suit() return 1 return 0 +/obj/item/clothing/suit/hooded/cultrobes/cult_shield/special_overlays() + return mutable_appearance('icons/effects/cult_effects.dmi', shield_state, MOB_LAYER + 0.01) + /obj/item/clothing/suit/hooded/cultrobes/berserker name = "flagellant's robes" desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage." diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 60d2a7ff73b..492d128e222 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -4,7 +4,7 @@ var/cultist_name = "talisman" var/cultist_desc = "A basic talisman. It serves no purpose." var/invocation = "Naise meam!" - info = "
" + info = "
" var/uses = 1 var/health_cost = 0 //The amount of health taken from the user when invoking the talisman diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 2d71df8c979..1e2dd3d554b 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -291,7 +291,8 @@ /////////////////////////////////// /datum/game_mode/proc/get_living_heads() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/player = thing var/list/real_command_positions = GLOB.command_positions.Copy() - "Nanotrasen Representative" if(player.stat != DEAD && player.mind && (player.mind.assigned_role in real_command_positions)) . |= player.mind @@ -312,7 +313,8 @@ ////////////////////////////////////////////// /datum/game_mode/proc/get_living_sec() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/player = thing if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions)) . |= player.mind @@ -321,7 +323,8 @@ //////////////////////////////////////// /datum/game_mode/proc/get_all_sec() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/player = thing if(player.mind && (player.mind.assigned_role in GLOB.security_positions)) . |= player.mind @@ -421,9 +424,9 @@ proc/display_roundstart_logout_report() return nukecode /datum/game_mode/proc/replace_jobbanned_player(mob/living/M, role_type) - var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a [role_type]?", role_type, 0, 100) + var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [role_type]?", role_type, FALSE, 10 SECONDS) var/mob/dead/observer/theghost = null - if(candidates.len) + if(length(candidates)) theghost = pick(candidates) to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbanned player.") diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index a4b8c594b89..526a2c01083 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -83,6 +83,36 @@ else add_ranged_ability(user, enable_text) +/datum/action/innate/ai/choose_modules + name = "Choose Modules" + desc = "Spend your processing time to gain a variety of different abilities." + button_icon_state = "choose_module" + auto_use_uses = FALSE // This is an infinite ability. + +/datum/action/innate/ai/choose_modules/Grant(mob/living/L) + . = ..() + owner_AI.malf_picker = new /datum/module_picker + +/datum/action/innate/ai/choose_modules/Trigger() + . = ..() + owner_AI.malf_picker.use(owner_AI) + +/datum/action/innate/ai/return_to_core + name = "Return to Main Core" + desc = "Leave the APC you are shunted to, and return to your core." + icon_icon = 'icons/obj/power.dmi' + button_icon_state = "apcemag" + auto_use_uses = FALSE // Here just to prevent the "You have X uses remaining" from popping up. + +/datum/action/innate/ai/return_to_core/Trigger() + . = ..() + var/obj/machinery/power/apc/apc = owner_AI.loc + if(!istype(apc)) // This shouldn't happen but here for safety. + to_chat(src, "You are already in your Main Core.") + return + apc.malfvacate() + qdel(src) + //The datum and interface for the malf unlock menu, which lets them choose actions to unlock. /datum/module_picker var/temp @@ -96,13 +126,7 @@ if((AM.power_type && AM.power_type != /datum/action/innate/ai) || AM.upgrade) possible_modules += AM -/datum/module_picker/proc/remove_malf_verbs(mob/living/silicon/ai/AI) //Removes all malfunction-related abilities from the target AI. - for(var/datum/AI_Module/AM in possible_modules) - for(var/datum/action/A in AI.actions) - if(istype(A, initial(AM.power_type))) - qdel(A) - -/datum/module_picker/proc/use(user as mob) +/datum/module_picker/proc/use(mob/user) var/dat dat += {"Select use of processing time: (currently #[processing_time] left.)
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index f99a00567ae..750473b1dfa 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -394,7 +394,7 @@ to_chat(src, " You are feeling far too docile to do that.") return - var content = "" + var/content = "" content += ""
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index f647ae5a6d1..fdf17f6ddda 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -15,7 +15,7 @@
a_intent = INTENT_HARM
can_change_intents = 0
stop_automated_movement = 1
- floating = 1
+ flying = TRUE
attack_sound = 'sound/weapons/punch1.ogg'
minbodytemp = 0
maxbodytemp = INFINITY
@@ -246,7 +246,7 @@
src.verbs -= /mob/living/proc/guardian_reset
for(var/mob/living/simple_animal/hostile/guardian/G in GLOB.mob_list)
if(G.summoner == src)
- var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [G.real_name]?", ROLE_GUARDIAN, 0, 100)
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as [G.real_name]?", ROLE_GUARDIAN, FALSE, 10 SECONDS, source = G)
var/mob/dead/observer/new_stand = null
if(candidates.len)
new_stand = pick(candidates)
@@ -312,7 +312,7 @@
used = FALSE
return
to_chat(user, "[use_message]")
- var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_GUARDIAN, 0, 100)
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_GUARDIAN, FALSE, 10 SECONDS, source = src)
var/mob/dead/observer/theghost = null
if(candidates.len)
diff --git a/code/game/gamemodes/miniantags/guardian/types/ranged.dm b/code/game/gamemodes/miniantags/guardian/types/ranged.dm
index 496e31d1bd3..dab7dfb1eca 100644
--- a/code/game/gamemodes/miniantags/guardian/types/ranged.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/ranged.dm
@@ -1,7 +1,7 @@
/obj/item/projectile/guardian
name = "crystal spray"
icon_state = "guardian"
- damage = 5
+ damage = 25
damage_type = BRUTE
armour_penetration = 100
@@ -11,7 +11,7 @@
melee_damage_upper = 10
damage_transfer = 0.9
projectiletype = /obj/item/projectile/guardian
- ranged_cooldown_time = 1 //fast!
+ ranged_cooldown_time = 5 //fast!
projectilesound = 'sound/effects/hit_on_shattered_glass.ogg'
ranged = 1
range = 13
diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm
index e9465492a27..7fc9e134195 100644
--- a/code/game/gamemodes/miniantags/morph/morph_event.dm
+++ b/code/game/gamemodes/miniantags/morph/morph_event.dm
@@ -3,7 +3,7 @@
/datum/event/spawn_morph/proc/get_morph()
spawn()
- var/list/candidates = pollCandidates("Do you want to play as a morph?", ROLE_MORPH, 1)
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a morph?", ROLE_MORPH, TRUE, source = /mob/living/simple_animal/hostile/morph)
if(!candidates.len)
key_of_morph = null
return kill()
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index f86f018757e..cba5ea62a2a 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -16,6 +16,7 @@
var/icon_stun = "revenant_stun"
var/icon_drain = "revenant_draining"
incorporeal_move = 3
+ see_invisible = INVISIBILITY_REVENANT
invisibility = INVISIBILITY_REVENANT
health = INFINITY //Revenants don't use health, they use essence instead
maxHealth = INFINITY
@@ -33,7 +34,7 @@
status_flags = 0
wander = 0
density = 0
- flying = 1
+ flying = TRUE
move_resist = INFINITY
mob_size = MOB_SIZE_TINY
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
@@ -140,7 +141,7 @@
giveObjectivesandGoals()
giveSpells()
else
- var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a revenant?", poll_time = 15 SECONDS)
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a revenant?", poll_time = 15 SECONDS, source = /mob/living/simple_animal/revenant)
var/mob/dead/observer/theghost = null
if(candidates.len)
theghost = pick(candidates)
@@ -396,7 +397,7 @@
spawn()
if(!key_of_revenant)
message_admins("The new revenant's old client either could not be found or is in a new, living mob - grabbing a random candidate instead...")
- var/list/candidates = pollCandidates("Do you want to play as a revenant?", ROLE_REVENANT, 1)
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a revenant?", ROLE_REVENANT, TRUE, source = /mob/living/simple_animal/revenant)
if(!candidates.len)
qdel(R)
message_admins("No candidates were found for the new revenant. Oh well!")
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm
index 5e5f0f87a79..aa76f3620ac 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm
@@ -13,7 +13,7 @@
return
spawn()
- var/list/candidates = pollCandidates("Do you want to play as a revenant?", ROLE_REVENANT, 1)
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a revenant?", ROLE_REVENANT, TRUE, source = /mob/living/simple_animal/revenant)
if(!candidates.len)
key_of_revenant = null
return kill()
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index d7e53bdae28..e58be201521 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -157,7 +157,7 @@
/mob/living/simple_animal/slaughter/cult/New()
..()
spawn(5)
- var/list/demon_candidates = pollCandidates("Do you want to play as a slaughter demon?", ROLE_DEMON, 1, 100)
+ var/list/demon_candidates = SSghost_spawns.poll_candidates("Do you want to play as a slaughter demon?", ROLE_DEMON, TRUE, 10 SECONDS, source = /mob/living/simple_animal/slaughter/cult)
if(!demon_candidates.len)
visible_message("[src] disappears in a flash of red light!")
qdel(src)
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 5fed8ae00f4..8316364781b 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -53,7 +53,6 @@ proc/issyndicate(mob/living/M as mob)
for(var/datum/mind/synd_mind in syndicates)
synd_mind.assigned_role = SPECIAL_ROLE_NUKEOPS //So they aren't chosen for other jobs.
synd_mind.special_role = SPECIAL_ROLE_NUKEOPS
- synd_mind.offstation_role = TRUE
return 1
@@ -113,7 +112,7 @@ proc/issyndicate(mob/living/M as mob)
if(spawnpos > synd_spawn.len)
spawnpos = 2
synd_mind.current.loc = synd_spawn[spawnpos]
-
+ synd_mind.offstation_role = TRUE
forge_syndicate_objectives(synd_mind)
create_syndicate(synd_mind)
greet_syndicate(synd_mind)
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index e8f4c22e377..f6e454bd737 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -357,7 +357,8 @@
var/list/name_counts = list()
var/list/names = list()
- for(var/mob/living/carbon/human/H in GLOB.mob_list)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/H = thing
if(!trackable(H))
continue
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index b09bb7a851f..213814d52e8 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -385,7 +385,8 @@
if(foecount == GLOB.score_arrested)
GLOB.score_allarrested = 1
- for(var/mob/living/carbon/human/player in GLOB.mob_living_list)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/player = thing
if(player.mind)
var/role = player.mind.assigned_role
if(role in list("Captain", "Head of Security", "Head of Personnel", "Chief Engineer", "Research Director"))
@@ -415,7 +416,8 @@
for(var/datum/mind/M in SSticker.mode:revolutionaries)
if(M.current && M.current.stat != DEAD)
revcount++
- for(var/mob/living/carbon/human/player in GLOB.mob_living_list)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/player = thing
if(player.mind)
var/role = player.mind.assigned_role
if(role in list("Captain", "Head of Security", "Head of Personnel", "Chief Engineer", "Research Director"))
diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm
index d9e59e9ded1..2e370db5f7a 100644
--- a/code/game/gamemodes/scoreboard.dm
+++ b/code/game/gamemodes/scoreboard.dm
@@ -41,7 +41,8 @@
GLOB.score_deadaipenalty++
GLOB.score_deadcrew++
- for(var/mob/living/carbon/human/I in GLOB.mob_list)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/I = thing
if(I.stat == DEAD && is_station_level(I.z))
GLOB.score_deadcrew++
@@ -60,7 +61,8 @@
var/dmg_score = 0
if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME)
- for(var/mob/living/carbon/human/E in GLOB.mob_list)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/E = thing
cash_score = 0
dmg_score = 0
var/turf/location = get_turf(E.loc)
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index b46bc3c6c51..b51810e4967 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -74,7 +74,7 @@ Made by Xhuis
required_enemies = 2
recommended_enemies = 2
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer")
/datum/game_mode/shadowling/announce()
to_chat(world, "The current game mode is - Shadowling!")
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index 7e0f00f8721..7906deeb718 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -145,7 +145,7 @@
/obj/effect/proc_holder/spell/vampire/self/rejuvenate
name = "Rejuvenate"
- desc= "Flush your system with spare blood to remove any incapacitating effects."
+ desc= "Use reserve blood to enliven your body, removing any incapacitating effects."
action_icon_state = "vampire_rejuvinate"
charge_max = 200
stat_allowed = 1
@@ -158,7 +158,7 @@
user.SetParalysis(0)
user.SetSleeping(0)
U.adjustStaminaLoss(-75)
- to_chat(user, "You flush your system with clean blood and remove any incapacitating effects.")
+ to_chat(user, "You instill your body with clean blood and remove any incapacitating effects.")
spawn(1)
if(usr.mind.vampire.get_ability(/datum/vampire_passive/regen))
for(var/i = 1 to 5)
@@ -354,10 +354,10 @@
var/datum/objective/protect/serve_objective = new
serve_objective.owner = user.mind
serve_objective.target = H.mind
- serve_objective.explanation_text = "You have been Enthralled by [user]. Follow [user.p_their()] every command."
+ serve_objective.explanation_text = "You have been Enthralled by [user.real_name]. Follow [user.p_their()] every command."
H.mind.objectives += serve_objective
- to_chat(H, "You have been Enthralled by [user]. Follow [user.p_their()] every command.")
+ to_chat(H, "You have been Enthralled by [user.real_name]. Follow [user.p_their()] every command.")
to_chat(user, "You have successfully Enthralled [H]. If [H.p_they()] refuse[H.p_s()] to do as you say just adminhelp.")
H.Stun(2)
add_attack_logs(user, H, "Vampire-thralled")
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 09b228bdd0c..44dec855f82 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -50,7 +50,8 @@
to_chat(H, "You already used this contract!")
return
used = 1
- var/list/candidates = pollCandidates("Do you want to play as the wizard apprentice of [H.real_name]?", ROLE_WIZARD, 1)
+ var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_wizard")
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as the wizard apprentice of [H.real_name]?", ROLE_WIZARD, TRUE, source = source)
if(candidates.len)
var/mob/C = pick(candidates)
new /obj/effect/particle_effect/smoke(H.loc)
@@ -307,7 +308,8 @@ GLOBAL_LIST_EMPTY(multiverse)
if(M.assigned == assigned)
M.cooldown = cooldown
- var/list/candidates = pollCandidates("Do you want to play as the wizard apprentice of [user.real_name]?", ROLE_WIZARD, 1, 100)
+ var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_wizard")
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as the wizard apprentice of [user.real_name]?", ROLE_WIZARD, TRUE, 10 SECONDS, source = source)
if(candidates.len)
var/mob/C = pick(candidates)
spawn_copy(C.client, get_turf(user.loc), user)
@@ -866,8 +868,9 @@ GLOBAL_LIST_EMPTY(multiverse)
possible = list()
if(!link)
return
- for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
- if(md5(H.dna.uni_identity) in link.fingerprints)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/H = thing
+ if(H.stat != DEAD && (md5(H.dna.uni_identity) in link.fingerprints))
possible |= H
/obj/item/voodoo/proc/GiveHint(mob/victim,force=0)
diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm
index cc52b431249..d51b16d2cd3 100644
--- a/code/game/gamemodes/wizard/raginmages.dm
+++ b/code/game/gamemodes/wizard/raginmages.dm
@@ -118,7 +118,8 @@
return FALSE
making_mage = TRUE
- var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a raging Space Wizard?", ROLE_WIZARD, TRUE, poll_time = 20 SECONDS)
+ var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_wizard")
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a raging Space Wizard?", ROLE_WIZARD, TRUE, poll_time = 20 SECONDS, source = source)
var/mob/dead/observer/harry = null
message_admins("SWF is still pissed, sending another wizard - [max_mages - mages_made] left.")
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 4bda254d930..aab4318c774 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -363,7 +363,7 @@
break
if(!chosen_ghost) //Failing that, we grab a ghost
- var/list/consenting_candidates = pollCandidates("Would you like to play as a Shade?", ROLE_CULTIST, FALSE, poll_time = 100)
+ var/list/consenting_candidates = SSghost_spawns.poll_candidates("Would you like to play as a Shade?", ROLE_CULTIST, FALSE, poll_time = 10 SECONDS, source = /mob/living/simple_animal/shade)
if(consenting_candidates.len)
chosen_ghost = pick(consenting_candidates)
if(!T)
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index b76b31255e9..d0773947c21 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -1,20 +1,16 @@
/datum/spellbook_entry
var/name = "Entry Name"
-
+ var/is_ragin_restricted = FALSE // FALSE if this is buyable on ragin mages, TRUE if it's not.
var/spell_type = null
var/desc = ""
var/category = "Offensive"
var/log_name = "XX" //What it shows up as in logs
var/cost = 2
var/refundable = TRUE
- var/surplus = -1 // -1 for infinite, not used by anything atm
var/obj/effect/proc_holder/spell/S = null //Since spellbooks can be used by only one person anyway we can track the actual spell
var/buy_word = "Learn"
var/limit //used to prevent a spellbook_entry from being bought more than X times with one wizard spellbook
-/datum/spellbook_entry/proc/IsSpellAvailable() // For config prefs / gamemode restrictions - these are round applied
- return TRUE
-
/datum/spellbook_entry/proc/CanBuy(mob/living/carbon/human/user, obj/item/spellbook/book) // Specific circumstances
if(book.uses < cost || limit == 0)
return FALSE
@@ -218,12 +214,7 @@
spell_type = /obj/effect/proc_holder/spell/targeted/lichdom
log_name = "LD"
category = "Defensive"
-
-/datum/spellbook_entry/lichdom/IsSpellAvailable()
- if(SSticker.mode.name == "ragin' mages")
- return FALSE
- else
- return TRUE
+ is_ragin_restricted = TRUE
/datum/spellbook_entry/magicm
name = "Magic Missile"
@@ -325,14 +316,7 @@
desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilities to frustrate you."
cost = 0
log_name = "SGH"
-
-/datum/spellbook_entry/summon/ghosts/IsSpellAvailable()
- if(!SSticker.mode) // In case spellbook is placed on map
- return FALSE
- if(SSticker.mode.name == "ragin' mages")
- return FALSE
- else
- return TRUE
+ is_ragin_restricted = TRUE
/datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
new /datum/event/wizard/ghost()
@@ -345,14 +329,7 @@
name = "Summon Guns"
desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. There is a good chance that they will shoot each other first."
log_name = "SG"
-
-/datum/spellbook_entry/summon/guns/IsSpellAvailable()
- if(!SSticker.mode) // In case spellbook is placed on map
- return FALSE
- if(SSticker.mode.name == "ragin' mages")
- return FALSE
- else
- return TRUE
+ is_ragin_restricted = TRUE
/datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
feedback_add_details("wizard_spell_learned", log_name)
@@ -366,14 +343,7 @@
name = "Summon Magic"
desc = "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time."
log_name = "SU"
-
-/datum/spellbook_entry/summon/magic/IsSpellAvailable()
- if(!SSticker.mode) // In case spellbook is placed on map
- return FALSE
- if(SSticker.mode.name == "ragin' mages")
- return FALSE
- else
- return TRUE
+ is_ragin_restricted = TRUE
/datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
feedback_add_details("wizard_spell_learned", log_name)
@@ -400,8 +370,6 @@
dat += "[name]"
dat += " Cost:[cost][dat]
"
- else
- dat = "No addresses in list."
- src << browse(dat,"window=ToRban_show")
- if("remove")
- var/savefile/F = new(TORFILE)
- var/choice = input(src,"Please select an IP address to remove from the ToR banlist:","Remove ToR ban",null) as null|anything in F.dir
- if(choice)
- F.dir.Remove(choice)
- to_chat(src, "Address removed")
- if("remove all")
- to_chat(src, "[TORFILE] was [fdel(TORFILE)?"":"not "]removed.")
- if("find")
- var/input = input(src,"Please input an IP address to search for:","Find ToR ban",null) as null|text
- if(input)
- if(ToRban_isbanned(input))
- to_chat(src, "Address is a known ToR address")
- else
- to_chat(src, "Address is not a known ToR address")
- return
-
-#undef TORFILE
-#undef TOR_UPDATE_INTERVAL
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 1eed8083a97..07dd4975ddb 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -69,7 +69,10 @@ GLOBAL_VAR_INIT(nologevent, 0)
body += "Options panel for [M]"
if(M.client)
body += " played by [M.client] "
- body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\] "
+ if(check_rights(R_PERMISSIONS, 0))
+ body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\] "
+ else
+ body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\] "
body += "\[" + M.client.get_exp_type(EXP_TYPE_CREW) + " as [EXP_TYPE_CREW]\]"
if(isnewplayer(M))
@@ -78,6 +81,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
body += " \[Heal\] "
body += "
\[ " + body += "LOGS - " body += "VV - " body += "[ADMIN_TP(M,"TP")] - " if(M.client) @@ -109,17 +113,18 @@ GLOBAL_VAR_INIT(nologevent, 0) else body += "Add to Watchlist " - if(M.client) body += "| Prison | " body += "\ Send back to Lobby | " + body += "\ Erase Flavor Text | " + body += "\ Use Random Name | " var/muted = M.client.prefs.muted body += {"
Mute: - \[IC | - OOC | - PRAY | - ADMINHELP | - DEADCHAT\] - (toggle all) + \[IC | + OOC | + PRAY | + ADMINHELP | + DEADCHAT\] + (toggle all) "} var/jumptoeye = "" @@ -280,7 +285,7 @@ GLOBAL_VAR_INIT(nologevent, 0) /datum/admins/proc/vpn_whitelist() set category = "Admin" set name = "VPN Ckey Whitelist" - if(!check_rights(R_ADMIN)) + if(!check_rights(R_BAN)) return var/key = stripped_input(usr, "Enter ckey to add/remove, or leave blank to cancel:", "VPN Whitelist add/remove", max_length=32) if(key) @@ -699,7 +704,7 @@ GLOBAL_VAR_INIT(nologevent, 0) var/msg = "" if(SSticker.current_state == GAME_STATE_STARTUP) msg = " (The server is still setting up, but the round will be started as soon as possible.)" - message_admins("[usr.key] has started the game.[msg]") + message_admins("[usr.key] has started the game.[msg]") feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return 1 else @@ -760,19 +765,6 @@ GLOBAL_VAR_INIT(nologevent, 0) world.update_status() feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/toggle_aliens() - set category = "Event" - set desc="Toggle alien mobs" - set name="Toggle Aliens" - - if(!check_rights(R_EVENT)) - return - - GLOB.aliens_allowed = !GLOB.aliens_allowed - log_admin("[key_name(usr)] toggled aliens to [GLOB.aliens_allowed].") - message_admins("[key_name_admin(usr)] toggled aliens [GLOB.aliens_allowed ? "on" : "off"].") - feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /datum/admins/proc/delay() set category = "Server" set desc="Delay the game start/end" diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 13b786c5174..527540e9490 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -11,10 +11,6 @@ /proc/investigate_subject2file(var/subject) return file("[INVESTIGATE_DIR][subject].html") -/hook/startup/proc/resetInvestigate() - investigate_reset() - return 1 - /proc/investigate_reset() if(fdel(INVESTIGATE_DIR)) return 1 return 0 @@ -37,7 +33,8 @@ /client/proc/investigate_show( subject in GLOB.investigate_log_subjects ) set name = "Investigate" set category = "Admin" - if(!holder) return + if(!check_rights(R_ADMIN)) + return switch(subject) if("notes") show_note() diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index afb4b19eee2..342ba454526 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -56,10 +56,6 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons testing(msg) #endif -/hook/startup/proc/loadAdmins() - load_admins() - return 1 - /proc/load_admins() if(IsAdminAdvancedProcCall()) to_chat(usr, "Admin reload blocked: Advanced ProcCall detected.") diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 80a60957c75..b3957a86b44 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -10,11 +10,8 @@ GLOBAL_LIST_INIT(admin_verbs_default, list( GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/check_antagonists, /*shows all antags*/ /datum/admins/proc/show_player_panel, - /client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/ /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ /client/proc/invisimin, /*allows our mob to go invisible/visible*/ - /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ - /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ /datum/admins/proc/announce, /*priority announce something to all clients.*/ /client/proc/colorooc, /*allows us to set a custom colour for everything we say in ooc*/ /client/proc/resetcolorooc, /*allows us to set a reset our ooc color*/ @@ -23,7 +20,6 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/cmd_admin_pm_by_key_panel, /*admin-pm list by key*/ - /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/cmd_admin_open_logging_view, @@ -37,6 +33,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ /client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/ /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcomm*/ + /client/proc/admin_deny_shuttle, /*toggles availability of shuttle calling*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ /client/proc/manage_silicon_laws, /* Allows viewing and editing silicon laws. */ /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ @@ -54,36 +51,30 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /datum/admins/proc/PlayerNotes, /client/proc/cmd_mentor_say, /datum/admins/proc/show_player_notes, - /datum/admins/proc/vpn_whitelist, /client/proc/free_slot, /*frees slot for chosen job*/ /client/proc/toggleattacklogs, /client/proc/toggleadminlogs, /client/proc/toggledebuglogs, /client/proc/update_mob_sprite, - /client/proc/toggledrones, /client/proc/man_up, /client/proc/global_man_up, /client/proc/delbook, /client/proc/view_flagged_books, + /client/proc/view_asays, /client/proc/empty_ai_core_toggle_latejoin, /client/proc/aooc, /client/proc/freeze, - /client/proc/alt_check, /client/proc/secrets, - /client/proc/change_human_appearance_admin, /* Allows an admin to change the basic appearance of human-based mobs */ - /client/proc/change_human_appearance_self, /* Allows the human-based mob itself to change its basic appearance */ /client/proc/debug_variables, /client/proc/reset_all_tcs, /*resets all telecomms scripts*/ /client/proc/toggle_mentor_chat, /client/proc/toggle_advanced_interaction, /*toggle admin ability to interact with not only machines, but also atoms such as buttons and doors*/ - /client/proc/list_ssds_afks, - /client/proc/cmd_admin_headset_message, - /client/proc/spawn_floor_cluwne + /client/proc/list_ssds_afks )) GLOBAL_LIST_INIT(admin_verbs_ban, list( - /client/proc/unban_panel, - /client/proc/jobbans, - /client/proc/stickybanpanel + /client/proc/ban_panel, + /client/proc/stickybanpanel, + /datum/admins/proc/vpn_whitelist )) GLOBAL_LIST_INIT(admin_verbs_sounds, list( /client/proc/play_local_sound, @@ -99,7 +90,6 @@ GLOBAL_LIST_INIT(admin_verbs_event, list( /client/proc/drop_bomb, /client/proc/cinematic, /client/proc/one_click_antag, - /datum/admins/proc/toggle_aliens, /client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_random_ai_law, /client/proc/make_sound, @@ -109,6 +99,7 @@ GLOBAL_LIST_INIT(admin_verbs_event, list( /client/proc/show_tip, /client/proc/cmd_admin_change_custom_event, /datum/admins/proc/access_news_network, /*allows access of newscasters*/ + /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/response_team, // Response Teams admin verb @@ -116,7 +107,10 @@ GLOBAL_LIST_INIT(admin_verbs_event, list( /client/proc/fax_panel, /client/proc/event_manager_panel, /client/proc/modify_goals, - /client/proc/outfit_manager + /client/proc/outfit_manager, + /client/proc/cmd_admin_headset_message, + /client/proc/change_human_appearance_admin, /* Allows an admin to change the basic appearance of human-based mobs */ + /client/proc/change_human_appearance_self /* Allows the human-based mob itself to change its basic appearance */ )) GLOBAL_LIST_INIT(admin_verbs_spawn, list( @@ -125,25 +119,27 @@ GLOBAL_LIST_INIT(admin_verbs_spawn, list( /client/proc/admin_deserialize )) GLOBAL_LIST_INIT(admin_verbs_server, list( - /client/proc/ToRban, + /client/proc/reload_admins, /client/proc/Set_Holiday, /datum/admins/proc/startnow, /datum/admins/proc/restart, /datum/admins/proc/delay, /datum/admins/proc/toggleaban, + /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ + /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ /client/proc/toggle_log_hrefs, /client/proc/everyone_random, /datum/admins/proc/toggleAI, /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ - /client/proc/cmd_debug_del_all, /client/proc/cmd_debug_del_sing, - /datum/admins/proc/toggle_aliens, /client/proc/delbook, /client/proc/view_flagged_books, + /client/proc/view_asays, /client/proc/toggle_antagHUD_use, /client/proc/toggle_antagHUD_restrictions, /client/proc/set_ooc, - /client/proc/reset_ooc + /client/proc/reset_ooc, + /client/proc/toggledrones )) GLOBAL_LIST_INIT(admin_verbs_debug, list( /client/proc/cmd_admin_list_open_jobs, @@ -152,9 +148,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug, list( /client/proc/debug_controller, /client/proc/cmd_debug_mob_lists, /client/proc/cmd_admin_delete, - /client/proc/cmd_debug_del_all, /client/proc/cmd_debug_del_sing, - /client/proc/reload_admins, /client/proc/restart_controller, /client/proc/enable_debug_verbs, /client/proc/toggledebuglogs, @@ -197,7 +191,7 @@ GLOBAL_LIST_INIT(admin_verbs_mod, list( /client/proc/player_panel_new, /client/proc/dsay, /datum/admins/proc/show_player_panel, - /client/proc/jobbans, + /client/proc/ban_panel, /client/proc/debug_variables /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ )) GLOBAL_LIST_INIT(admin_verbs_mentor, list( @@ -367,19 +361,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") mob.remove_from_all_data_huds() -/client/proc/player_panel() - set name = "Player Panel" - set category = "Admin" - - if(!check_rights(R_ADMIN)) - return - - holder.player_panel_old() - feedback_add_details("admin_verb","PP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - /client/proc/player_panel_new() - set name = "Player Panel New" + set name = "Player Panel" set category = "Admin" if(!check_rights(R_ADMIN|R_MOD)) @@ -401,22 +384,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( feedback_add_details("admin_verb","CHA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -/client/proc/jobbans() - set name = "Display Job bans" - set category = "Admin" - - if(!check_rights(R_ADMIN|R_MOD)) - return - - if(config.ban_legacy_system) - holder.Jobbans() - else - holder.DB_ban_panel() - feedback_add_details("admin_verb","VJB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - -/client/proc/unban_panel() - set name = "Unban Panel" +/client/proc/ban_panel() + set name = "Ban Panel" set category = "Admin" if(!check_rights(R_BAN)) @@ -809,7 +778,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( set desc = "Allows you to change the mob appearance" set category = null - if(!check_rights(R_ADMIN)) + if(!check_rights(R_EVENT)) return if(!istype(H)) @@ -826,7 +795,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( return if(holder) - admin_log_and_message_admins("is altering the appearance of [H].") + log_and_message_admins("is altering the appearance of [H].") H.change_appearance(APPEARANCE_ALL, usr, usr, check_species_whitelist = 0) feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -835,7 +804,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( set desc = "Allows the mob to change its appearance" set category = null - if(!check_rights(R_ADMIN)) + if(!check_rights(R_EVENT)) return if(!istype(H)) @@ -857,10 +826,10 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel")) if("Yes") - admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, without whitelisting of races.") + log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, without whitelisting of races.") H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0) if("No") - admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, with whitelisting of races.") + log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, with whitelisting of races.") H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1) feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -980,8 +949,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( else to_chat(usr, "You now won't get debug log messages") -/client/proc/man_up(mob/T as mob in GLOB.mob_list) - set category = "Admin" +/client/proc/man_up(mob/T as mob in GLOB.player_list) + set category = null set name = "Man Up" set desc = "Tells mob to man up and deal with it." diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 9efc4c9ce88..699eca075bb 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -42,24 +42,6 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## else return 0 -/* -DEBUG -/mob/verb/list_all_jobbans() - set name = "list all jobbans" - - for(var/s in jobban_keylist) - to_chat(world, s) - -/mob/verb/reload_jobbans() - set name = "reload jobbans" - - jobban_loadbanfile() -*/ - -/hook/startup/proc/loadJobBans() - jobban_loadbanfile() - return 1 - /proc/jobban_loadbanfile() if(config.ban_legacy_system) var/savefile/S=new("data/job_full.ban") diff --git a/code/modules/admin/machine_upgrade.dm b/code/modules/admin/machine_upgrade.dm index 1e569b51d2d..4f38f70613d 100644 --- a/code/modules/admin/machine_upgrade.dm +++ b/code/modules/admin/machine_upgrade.dm @@ -1,20 +1,20 @@ /proc/machine_upgrade(obj/machinery/M in world) set name = "Tweak Component Ratings" - set category = "Debug" + set category = null - if(!check_rights(R_DEBUG)) + if(!check_rights(R_DEBUG)) return - + if(!istype(M)) to_chat(usr, "This can only be used on subtypes of /obj/machinery.") return - + var/new_rating = input("Enter new rating:","Num") as num if(!isnull(new_rating) && M.component_parts) for(var/obj/item/stock_parts/P in M.component_parts) P.rating = new_rating M.RefreshParts() - + message_admins("[key_name_admin(usr)] has set the component rating of [M] to [new_rating]") log_admin("[key_name(usr)] has set the component rating of [M] to [new_rating]") diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index e89b829f421..c2248261baa 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -332,65 +332,6 @@ usr << browse(dat, "window=players;size=600x480") -//The old one -/datum/admins/proc/player_panel_old() - if(!usr.client.holder) - return - var/dat = "Player Menu "
- dat += "
"
-
- usr << browse(dat, "window=players;size=640x480")
-
-
/datum/admins/proc/check_antagonists_line(mob/M, caption = "", close = 1)
var/logout_status
@@ -404,7 +345,8 @@
PM [ADMIN_FLW(M, "FLW")] [close ? "" : ""]"}
/datum/admins/proc/check_antagonists()
- if(!check_rights(R_ADMIN)) return
+ if(!check_rights(R_ADMIN))
+ return
if(SSticker && SSticker.current_state >= GAME_STATE_PLAYING)
var/dat = "Round Status
" @@ -570,6 +512,15 @@ if(SSticker.mode.ert.len) dat += check_role_table("ERT", SSticker.mode.ert) + //list active security force count, so admins know how bad things are + var/list/sec_list = check_active_security_force() + dat += "
"
+
dat += ""
usr << browse(dat, "window=roundstatus;size=400x500")
else
diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm
index a438a43eaec..04e28737479 100644
--- a/code/modules/admin/sql_notes.dm
+++ b/code/modules/admin/sql_notes.dm
@@ -2,7 +2,8 @@
if(checkrights && !check_rights(R_ADMIN|R_MOD))
return
if(!GLOB.dbcon.IsConnected())
- to_chat(usr, "Failed to establish database connection.")
+ if(usr)
+ to_chat(usr, "Failed to establish database connection.")
return
if(!target_ckey)
@@ -19,7 +20,8 @@
log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n")
return
if(!query_find_ckey.NextRow())
- to_chat(usr, "[target_ckey] has not been seen before, you can only add notes to known players.")
+ if(usr)
+ to_chat(usr, "[target_ckey] has not been seen before, you can only add notes to known players.")
return
var/exp_data = query_find_ckey.item[2]
@@ -52,8 +54,8 @@
log_game("SQL ERROR adding new note to table. Error : \[[err]\]\n")
return
if(logged)
- log_admin("[key_name(usr)] has added a note to [target_ckey]: [notetext]")
- message_admins("[key_name_admin(usr)] has added a note to [target_ckey]:
[notetext]") + log_admin("[usr ? key_name(usr) : adminckey] has added a note to [target_ckey]: [notetext]") + message_admins("[usr ? key_name_admin(usr) : adminckey] has added a note to [target_ckey]:
[notetext]") show_note(target_ckey) /proc/remove_note(note_id) @@ -63,7 +65,8 @@ var/notetext var/adminckey if(!GLOB.dbcon.IsConnected()) - to_chat(usr, "Failed to establish database connection.") + if(usr) + to_chat(usr, "Failed to establish database connection.") return if(!note_id) return @@ -82,15 +85,16 @@ var/err = query_del_note.ErrorMsg() log_game("SQL ERROR removing note from table. Error : \[[err]\]\n") return - log_admin("[key_name(usr)] has removed a note made by [adminckey] from [ckey]: [notetext]") - message_admins("[key_name_admin(usr)] has removed a note made by [adminckey] from [ckey]:
[notetext]") + log_admin("[usr ? key_name(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]: [notetext]") + message_admins("[usr ? key_name_admin(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]:
[notetext]") show_note(ckey) /proc/edit_note(note_id) if(!check_rights(R_ADMIN|R_MOD)) return if(!GLOB.dbcon.IsConnected()) - to_chat(usr, "Failed to establish database connection.") + if(usr) + to_chat(usr, "Failed to establish database connection.") return if(!note_id) return @@ -117,8 +121,8 @@ var/err = query_update_note.ErrorMsg() log_game("SQL ERROR editing note. Error : \[[err]\]\n") return - log_admin("[key_name(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") - message_admins("[key_name_admin(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") + log_admin("[usr ? key_name(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") + message_admins("[usr ? key_name_admin(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") show_note(target_ckey) /proc/show_note(target_ckey, index, linkless = 0) diff --git a/code/modules/admin/tickets/adminticketsverbs.dm b/code/modules/admin/tickets/adminticketsverbs.dm index 406019745f8..4e8e79f2a26 100644 --- a/code/modules/admin/tickets/adminticketsverbs.dm +++ b/code/modules/admin/tickets/adminticketsverbs.dm @@ -5,7 +5,7 @@ set name = "Open Admin Ticket Interface" set category = "Admin" - if(!holder || !check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN)) return SStickets.showUI(usr) @@ -14,7 +14,7 @@ set name = "Resolve All Open Admin Tickets" set category = null - if(!holder || !check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN)) return if(alert("Are you sure you want to resolve ALL open admin tickets?","Resolve all open admin tickets?","Yes","No") != "Yes") diff --git a/code/modules/admin/tickets/mentorticketsverbs.dm b/code/modules/admin/tickets/mentorticketsverbs.dm index d65f4a30220..c7bec3e043d 100644 --- a/code/modules/admin/tickets/mentorticketsverbs.dm +++ b/code/modules/admin/tickets/mentorticketsverbs.dm @@ -5,7 +5,7 @@ set name = "Open Mentor Ticket Interface" set category = "Admin" - if(!holder || !check_rights(R_MENTOR|R_ADMIN)) + if(!check_rights(R_MENTOR|R_ADMIN)) return SSmentor_tickets.showUI(usr) @@ -14,7 +14,7 @@ set name = "Resolve All Open Mentor Tickets" set category = null - if(!holder || !check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN)) return if(alert("Are you sure you want to resolve ALL open mentor tickets?","Resolve all open mentor tickets?","Yes","No") != "Yes") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 50fa99778e7..2390394b280 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -14,7 +14,7 @@ if(!check_rights(R_ADMIN|R_MOD)) return var/client/C = locateUID(href_list["rejectadminhelp"]) - if(!C) + if(!isclient(C)) return C << 'sound/effects/adminhelp.ogg' @@ -114,39 +114,39 @@ switch(bantype) if(BANTYPE_PERMA) if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") + to_chat(usr, "Not enough parameters (Requires ckey and reason)") return banduration = null banjob = null if(BANTYPE_TEMP) if(!banckey || !banreason || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") return banjob = null if(BANTYPE_JOB_PERMA) if(!banckey || !banreason || !banjob) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") return banduration = null if(BANTYPE_JOB_TEMP) if(!banckey || !banreason || !banjob || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") return if(BANTYPE_APPEARANCE) if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") + to_chat(usr, "Not enough parameters (Requires ckey and reason)") return banduration = null banjob = null if(BANTYPE_ADMIN_PERMA) if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") + to_chat(usr, "Not enough parameters (Requires ckey and reason)") return banduration = null banjob = null if(BANTYPE_ADMIN_TEMP) if(!banckey || !banreason || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") return banjob = null @@ -324,8 +324,8 @@ if(!check_rights(R_SPAWN)) return var/mob/M = locateUID(href_list["mob"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return var/delmob = 0 @@ -436,18 +436,18 @@ if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["appearanceban"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") + to_chat(usr, "This mob has no ckey") return var/ban_ckey_param = href_list["dbbanaddckey"] var/banreason = appearance_isbanned(M) if(banreason) /* if(!config.ban_legacy_system) - to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") + to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") DB_ban_panel(M.ckey) return */ switch(alert("Reason: '[banreason]' Remove appearance ban?","Please Confirm","Yes","No")) @@ -458,7 +458,7 @@ DB_ban_unban(M.ckey, BANTYPE_APPEARANCE) appearance_unban(M) message_admins("[key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban", 1) - to_chat(M, "[usr.client.ckey] has removed your appearance ban.") + to_chat(M, "[usr.client.ckey] has removed your appearance ban.") else switch(alert("Appearance ban [M.ckey]?",,"Yes","No", "Cancel")) if("Yes") @@ -473,7 +473,7 @@ appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") add_note(M.ckey, "Appearance banned - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] appearance banned [key_name_admin(M)]", 1) - to_chat(M, "You have been appearance banned by [usr.client.ckey].") + to_chat(M, "You have been appearance banned by [usr.client.ckey].") to_chat(M, "The reason is: [reason]") to_chat(M, "Appearance ban can be lifted only upon request.") if(config.banappeals) @@ -487,15 +487,15 @@ // if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["jobban2"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") + to_chat(usr, "This mob has no ckey") return if(!SSjobs) - to_chat(usr, "SSjobs has not been setup!") + to_chat(usr, "SSjobs has not been setup!") return var/dat = "" @@ -735,8 +735,8 @@ if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["jobban4"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(M != usr) //we can jobban ourselves @@ -747,7 +747,7 @@ var/ban_ckey_param = href_list["dbbanaddckey"] if(!SSjobs) - to_chat(usr, "SSjobs has not been setup!") + to_chat(usr, "SSjobs has not been setup!") return //get jobs for department if specified, otherwise just returnt he one job in a list. @@ -840,7 +840,7 @@ msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1) - to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") + to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") to_chat(M, "The reason is: [reason]") to_chat(M, "This jobban will be lifted in [mins] minutes.") href_list["jobban2"] = 1 // lets it fall through and refresh @@ -861,7 +861,7 @@ else msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) - to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") + to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") to_chat(M, "The reason is: [reason]") to_chat(M, "Jobban can be lifted only upon request.") href_list["jobban2"] = 1 // lets it fall through and refresh @@ -873,7 +873,7 @@ //all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned) if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban. if(!config.ban_legacy_system) - to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") + to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") DB_ban_panel(M.ckey) return var/msg @@ -894,22 +894,33 @@ continue if(msg) message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1) - to_chat(M, "You have been un-jobbanned by [usr.client.ckey] from [msg].") + to_chat(M, "You have been un-jobbanned by [usr.client.ckey] from [msg].") href_list["jobban2"] = 1 // lets it fall through and refresh return 1 return 0 //we didn't do anything! else if(href_list["boot2"]) var/mob/M = locateUID(href_list["boot2"]) - if(ismob(M)) - if(M.client && M.client.holder && (M.client.holder.rights & R_BAN)) - to_chat(usr, "[key_name_admin(M)] cannot be kicked from the server.") + if(!ismob(M)) + return + var/client/C = M.client + if(C == null) + to_chat(usr, "Mob has no client to kick.") + return + if(alert("Kick [C.ckey]?",,"Yes","No") == "Yes") + if(C && C.holder && (C.holder.rights & R_BAN)) + to_chat(usr, "[key_name_admin(C)] cannot be kicked from the server.") return - to_chat(M, "You have been kicked from the server") - log_admin("[key_name(usr)] booted [key_name(M)].") - message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1) - //M.client = null - qdel(M.client) + to_chat(C, "You have been kicked from the server") + log_admin("[key_name(usr)] booted [key_name(C)].") + message_admins("[key_name_admin(usr)] booted [key_name_admin(C)].", 1) + //C = null + qdel(C) + + else if(href_list["open_logging_view"]) + var/mob/M = locateUID(href_list["open_logging_view"]) + if(ismob(M)) + usr.client.open_logging_view(list(M), TRUE) //Player Notes else if(href_list["addnote"]) @@ -981,7 +992,7 @@ if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["newban"]) - if(!ismob(M)) + if(!istype(M, /mob)) return var/ban_ckey_param = href_list["dbbanaddckey"] @@ -997,7 +1008,7 @@ M = admin_ban_mobsearch(M, ban_ckey_param, usr) AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") - to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") + to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) @@ -1017,7 +1028,7 @@ if(!reason) return AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP) - to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") + to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") to_chat(M, "This ban does not expire automatically and must be appealed.") if(M.client) M.client.link_forum_account(TRUE) @@ -1085,7 +1096,7 @@ return var/mob/M = locateUID(href_list["mute"]) - if(!ismob(M)) return + if(!istype(M, /mob)) return if(!M.client) return var/mute_type = href_list["mute_type"] @@ -1099,7 +1110,7 @@ if(SSticker && SSticker.mode) return alert(usr, "The game has already started.", null, null, null, null) - var/dat = {"What mode do you wish to play?
"} + var/dat = {"What mode do you wish to play?
"} for(var/mode in config.modes) dat += {"[config.mode_names[mode]]
"} dat += {"Secret
"} @@ -1114,7 +1125,7 @@ return alert(usr, "The game has already started.", null, null, null, null) if(GLOB.master_mode != "secret") return alert(usr, "The game mode has to be secret!", null, null, null, null) - var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} + var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} for(var/mode in config.modes) dat += {"[config.mode_names[mode]]
"} dat += {"Random (default)
"} @@ -1152,7 +1163,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["monkeyone"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make monkey?",, "Yes", "No") != "Yes") return @@ -1167,7 +1178,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["corgione"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make corgi?",, "Yes", "No") != "Yes") @@ -1182,7 +1193,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makePAI"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make pai?",, "Yes", "No") != "Yes") return @@ -1205,8 +1216,9 @@ if(!check_rights(R_SERVER|R_EVENT)) return var/mob/M = locateUID(href_list["forcespeech"]) - if(!ismob(M)) - to_chat(usr, "this can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins. if(!speech) return @@ -1222,11 +1234,11 @@ return var/mob/M = locateUID(href_list["sendtoprison"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return var/turf/prison_cell = pick(GLOB.prisonwarp) @@ -1285,6 +1297,71 @@ NP.ckey = M.ckey qdel(M) + else if(href_list["eraseflavortext"]) + if(!check_rights(R_ADMIN)) + return + + var/mob/M = locateUID(href_list["eraseflavortext"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + + if(!M.client) + to_chat(usr, "[M] doesn't seem to have an active client.") + return + + if(M.flavor_text == "" && M.client.prefs.flavor_text == "") + to_chat(usr, "[M] has no flavor text set.") + return + + if(alert(usr, "Erase [key_name(M)]'s flavor text?", "Message", "Yes", "No") != "Yes") + return + + log_admin("[key_name(usr)] has erased [key_name(M)]'s flavor text.") + message_admins("[key_name_admin(usr)] has erased [key_name_admin(M)]'s flavor text.") + + // Clears the mob's flavor text + M.flavor_text = "" + + // Clear and save the DB character's flavor text + M.client.prefs.flavor_text = "" + M.client.prefs.save_character(M.client) + + else if(href_list["userandomname"]) + if(!check_rights(R_ADMIN)) + return + + var/mob/M = locateUID(href_list["userandomname"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + + if(!M.client) + to_chat(usr, "[M] doesn't seem to have an active client.") + return + + if(alert(usr, "Force [key_name(M)] to use a random name?", "Message", "Yes", "No") != "Yes") + return + + log_admin("[key_name(usr)] has forced [key_name(M)] to use a random name.") + message_admins("[key_name_admin(usr)] has forced [key_name_admin(M)] to use a random name.") + + // Update the mob's name with a random one straight away + var/random_name = random_name(M.client.prefs.gender, M.client.prefs.species) + M.rename_character(M.real_name, random_name) + + // Save that random name for next rounds + M.client.prefs.real_name = random_name + M.client.prefs.save_character(M.client) + + else if(href_list["asays"]) + if(!check_rights(R_ADMIN)) + return + + usr.client.view_asays() + else if(href_list["tdome1"]) if(!check_rights(R_SERVER|R_EVENT)) return @@ -1292,11 +1369,11 @@ return var/mob/M = locateUID(href_list["tdome1"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return for(var/obj/item/I in M) @@ -1322,11 +1399,11 @@ return var/mob/M = locateUID(href_list["tdome2"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return for(var/obj/item/I in M) @@ -1352,11 +1429,11 @@ return var/mob/M = locateUID(href_list["tdomeadmin"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return M.Paralyse(5) @@ -1374,11 +1451,11 @@ return var/mob/M = locateUID(href_list["tdomeobserve"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return for(var/obj/item/I in M) @@ -1408,11 +1485,11 @@ return var/mob/M = locateUID(href_list["aroomwarp"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return M.Paralyse(5) @@ -1429,7 +1506,7 @@ var/mob/living/L = locateUID(href_list["revive"]) if(!istype(L)) - to_chat(usr, "This can only be used on instances of type /mob/living") + to_chat(usr, "This can only be used on instances of type /mob/living") return L.revive() @@ -1441,7 +1518,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makeai"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make ai?",, "Yes", "No") != "Yes") @@ -1457,7 +1534,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makealien"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make alien?",, "Yes", "No") != "Yes") return @@ -1469,7 +1546,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makeslime"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make slime?",, "Yes", "No") != "Yes") return @@ -1481,7 +1558,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makesuper"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make superhero?",, "Yes", "No") != "Yes") @@ -1494,7 +1571,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makerobot"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make robot?",, "Yes", "No") != "Yes") return @@ -1506,7 +1583,7 @@ var/mob/M = locateUID(href_list["makeanimal"]) if(isnewplayer(M)) - to_chat(usr, "This cannot be used on instances of type /mob/new_player") + to_chat(usr, "This cannot be used on instances of type /mob/new_player") return if(alert(usr, "Confirm make animal?",, "Yes", "No") != "Yes") return @@ -1519,10 +1596,14 @@ var/mob/dead/observer/G = locateUID(href_list["incarn_ghost"]) if(!istype(G)) - to_chat(usr, "This will only work on /mob/dead/observer") + to_chat(usr, "This will only work on /mob/dead/observer") + return var/posttransformoutfit = usr.client.robust_dress_shop() + if(!posttransformoutfit) + return + var/mob/living/carbon/human/H = G.incarnate_ghost() if(posttransformoutfit && istype(H)) @@ -1536,7 +1617,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["togmutate"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return var/block=text2num(href_list["block"]) //testing("togmutate([href_list["block"]] -> [block])") @@ -1546,6 +1627,11 @@ else if(href_list["adminplayeropts"]) var/mob/M = locateUID(href_list["adminplayeropts"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + show_player_panel(M) else if(href_list["adminplayerobservefollow"]) @@ -1555,6 +1641,11 @@ return C.admin_ghost() var/mob/M = locateUID(href_list["adminplayerobservefollow"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + var/mob/dead/observer/A = C.mob sleep(2) A.ManualFollow(M) @@ -1583,6 +1674,12 @@ return SStickets.autoRespond(index) + if(href_list["convert_ticket"]) + var/indexNum = text2num(href_list["convert_ticket"]) + if(href_list["is_mhelp"]) + SSmentor_tickets.convert_to_other_ticket(indexNum) + else + SStickets.convert_to_other_ticket(indexNum) else if(href_list["cult_nextobj"]) if(alert(usr, "Validate the current Cult objective and unlock the next one?", "Cult Cheat Code", "Yes", "No") != "Yes") return @@ -1603,10 +1700,10 @@ for(var/datum/mind/H in SSticker.mode.cult) if (H.current) - to_chat(H.current, "[SSticker.cultdat.entity_name] murmurs, [input]") + to_chat(H.current, "[SSticker.cultdat.entity_name] murmurs, [input]") for(var/mob/dead/observer/O in GLOB.player_list) - to_chat(O, "[SSticker.cultdat.entity_name] murmurs, [input]") + to_chat(O, "[SSticker.cultdat.entity_name] murmurs, [input]") message_admins("Admin [key_name_admin(usr)] has talked with the Voice of [SSticker.cultdat.entity_name].") log_admin("[key_name(usr)] Voice of [SSticker.cultdat.entity_name]: [input]") @@ -1628,6 +1725,11 @@ else if(href_list["adminmoreinfo"]) var/mob/M = locateUID(href_list["adminmoreinfo"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + admin_mob_info(M) else if(href_list["adminspawncookie"]) @@ -1635,7 +1737,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["adminspawncookie"]) if(!ishuman(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_l_hand ) @@ -1659,7 +1761,7 @@ var/mob/living/M = locateUID(href_list["BlueSpaceArtillery"]) if(!isliving(M)) - to_chat(usr, "This can only be used on instances of type /mob/living") + to_chat(usr, "This can only be used on instances of type /mob/living") return if(alert(owner, "Are you sure you wish to hit [key_name(M)] with Bluespace Artillery?", "Confirm Firing?" , "Yes" , "No") != "Yes") @@ -1697,6 +1799,11 @@ return var/mob/M = locateUID(href_list["CentcommReply"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + usr.client.admin_headset_message(M, "Centcomm") else if(href_list["SyndicateReply"]) @@ -1704,6 +1811,11 @@ return var/mob/M = locateUID(href_list["SyndicateReply"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + usr.client.admin_headset_message(M, "Syndicate") else if(href_list["HeadsetMessage"]) @@ -1711,6 +1823,11 @@ return var/mob/M = locateUID(href_list["HeadsetMessage"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + usr.client.admin_headset_message(M) else if(href_list["EvilFax"]) @@ -1718,7 +1835,7 @@ return var/mob/living/carbon/human/H = locateUID(href_list["EvilFax"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return var/etypes = list("Borgification", "Corgification", "Death By Fire", "Total Brain Death", "Honk Tumor", "Cluwne", "Demote", "Demote with Bot", "Revoke Fax Access", "Angry Fax Machine") var/eviltype = input(src.owner, "Which type of evil fax do you wish to send [H]?","Its good to be baaaad...", "") as null|anything in etypes @@ -1752,12 +1869,12 @@ P.ico = new P.ico += "paper_stamp-[stampvalue]" P.overlays += stampoverlay - P.stamps += "
"
+ P.stamps += "
"
P.update_icon()
P.faxmachineid = fax.UID()
P.loc = fax.loc // Do not use fax.receivefax(P) here, as it won't preserve the type. Physically teleporting the fax paper is required.
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
- to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
+ to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
to_chat(src.owner, "You sent a [eviltype] fax to [H]")
log_admin("[key_name(src.owner)] sent [key_name(H)] a [eviltype] fax")
message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a [eviltype] fax")
@@ -1766,7 +1883,7 @@
return
var/mob/living/M = locateUID(href_list["Bless"])
if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob/living")
+ to_chat(usr, "This can only be used on instances of type /mob/living")
return
var/btypes = list("To Arrivals", "Moderate Heal")
var/mob/living/carbon/human/H
@@ -1833,7 +1950,7 @@
var/petchoice = input("Select pet type", "Pets") as null|anything in pets
if(isnull(petchoice))
return
- var/list/mob/dead/observer/candidates = pollCandidates("Play as the special event pet [H]?", poll_time = 200, min_hours = 10)
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Play as the special event pet [H]?", poll_time = 20 SECONDS, min_hours = 10, source = petchoice)
var/mob/dead/observer/theghost = null
if(candidates.len)
var/mob/living/simple_animal/pet/P = new petchoice(H.loc)
@@ -1886,7 +2003,7 @@
var/mob/living/M = locateUID(href_list["Smite"])
var/mob/living/carbon/human/H
if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob/living")
+ to_chat(usr, "This can only be used on instances of type /mob/living")
return
var/ptypes = list("Lightning bolt", "Fire Death", "Gib")
if(ishuman(M))
@@ -1997,7 +2114,7 @@
var/datum/antagonist/traitor/T = new()
T.give_objectives = FALSE
to_chat(newtraitormind.current, "ATTENTION: It is time to pay your debt to the Syndicate...")
- to_chat(newtraitormind.current, "Goal: KILL [H.real_name], currently in [get_area(H.loc)]")
+ to_chat(newtraitormind.current, "Goal: KILL [H.real_name], currently in [get_area(H.loc)]")
newtraitormind.add_antag_datum(T)
else
to_chat(usr, "ERROR: Unable to find any valid candidate to send after [H].")
@@ -2026,10 +2143,10 @@
return
var/mob/living/carbon/human/H = locateUID(href_list["cryossd"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
if(!href_list["cryoafk"] && !isLivingSSD(H))
- to_chat(usr, "This can only be used on living, SSD players.")
+ to_chat(usr, "This can only be used on living, SSD players.")
return
if(istype(H.loc, /obj/machinery/cryopod))
var/obj/machinery/cryopod/P = H.loc
@@ -2049,28 +2166,28 @@
return
var/mob/living/carbon/human/H = locateUID(href_list["FaxReplyTemplate"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
var/obj/item/paper/P = new /obj/item/paper(null)
var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"])
P.name = "Central Command - paper"
var/stypes = list("Handle it yourselves!","Illegible fax","Fax not signed","Not Right Now","You are wasting our time", "Keep up the good work", "ERT Instructions")
var/stype = input(src.owner, "Which type of standard reply do you wish to send to [H]?","Choose your paperwork", "") as null|anything in stypes
- var/tmsg = "
Nanotrasen Science Station [GLOB.using_map.station_short]
NAS Trurl Communications Department Report
" + var/tmsg = "
Nanotrasen Science Station [GLOB.using_map.station_short]
NAS Trurl Communications Department Report
" if(stype == "Handle it yourselves!") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.
This is an automatic message." else if(stype == "Illegible fax") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax's grammar, syntax and/or typography are of a sub-par level and do not allow us to understand the contents of the message.
Please consult your nearest dictionary and/or thesaurus and try again.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax's grammar, syntax and/or typography are of a sub-par level and do not allow us to understand the contents of the message.
Please consult your nearest dictionary and/or thesaurus and try again.
This is an automatic message." else if(stype == "Fax not signed") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax has not been correctly signed and, as such, we cannot verify your identity.
Please sign your faxes before sending them so that we may verify your identity.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax has not been correctly signed and, as such, we cannot verify your identity.
Please sign your faxes before sending them so that we may verify your identity.
This is an automatic message." else if(stype == "Not Right Now") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Due to pressing concerns of a matter above your current paygrade, we are unable to provide assistance in whatever matter your fax referenced.
This can be either due to a power outage, bureaucratic audit, pest infestation, Ascendance Event, corgi outbreak, or any other situation that would affect the proper functioning of the NAS Trurl.
Please try again later.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Due to pressing concerns of a matter above your current paygrade, we are unable to provide assistance in whatever matter your fax referenced.
This can be either due to a power outage, bureaucratic audit, pest infestation, Ascendance Event, corgi outbreak, or any other situation that would affect the proper functioning of the NAS Trurl.
Please try again later.
This is an automatic message." else if(stype == "You are wasting our time") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
In the interest of preventing further mismanagement of company resources, please avoid wasting our time with such petty drivel.
Do kindly remember that we expect our workforce to maintain at least a semi-decent level of profesionalism. Do not test our patience.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
In the interest of preventing further mismanagement of company resources, please avoid wasting our time with such petty drivel.
Do kindly remember that we expect our workforce to maintain at least a semi-decent level of profesionalism. Do not test our patience.
This is an automatic message." else if(stype == "Keep up the good work") tmsg += "Greetings, esteemed crewmember. Your fax has been received successfully by NAS Trurl Fax Registration.
We at the NAS Trurl appreciate the good work that you have done here, and sincerely recommend that you continue such a display of dedication to the company.
This is absolutely not an automated message." else if(stype == "ERT Instructions") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please utilize the Card Swipers if you wish to call for an ERT.
This is an automated message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please utilize the Card Swipers if you wish to call for an ERT.
This is an automated message." else return tmsg += "" @@ -2091,11 +2208,11 @@ P.ico = new P.ico += "paper_stamp-[stampvalue]" P.overlays += stampoverlay - P.stamps += "
"
+ P.stamps += "
"
P.update_icon()
fax.receivefax(P)
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
- to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
+ to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
to_chat(src.owner, "You sent a standard '[stype]' fax to [H]")
log_admin("[key_name(src.owner)] sent [key_name(H)] a standard '[stype]' fax")
message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a standard '[stype]' fax")
@@ -2103,10 +2220,10 @@
else if(href_list["HONKReply"])
var/mob/living/carbon/human/H = locateUID(href_list["HONKReply"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
- to_chat(usr, "The person you are trying to contact is not wearing a headset")
+ to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from HONKplanet", "")
@@ -2123,13 +2240,13 @@
if(alert(src.owner, "Accept or Deny ERT request?", "CentComm Response", "Accept", "Deny") == "Deny")
var/mob/living/carbon/human/H = locateUID(href_list["ErtReply"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
if(H.stat != 0)
- to_chat(usr, "The person you are trying to contact is not conscious.")
+ to_chat(usr, "The person you are trying to contact is not conscious.")
return
if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
- to_chat(usr, "The person you are trying to contact is not wearing a headset")
+ to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "")
@@ -2137,7 +2254,7 @@
GLOB.ert_request_answered = TRUE
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].")
- to_chat(H, "Incoming priority transmission from Central Command. Message as follows, Your ERT request has been denied for the following reasons: [input].")
+ to_chat(H, "Incoming priority transmission from Central Command. Message as follows, Your ERT request has been denied for the following reasons: [input].")
else
src.owner.response_team()
@@ -2292,14 +2409,14 @@
P.stamped = new
P.stamped += /obj/item/stamp/centcom
P.overlays += stampoverlay
- P.stamps += "
"
+ P.stamps += "
"
else if(stamptype == "text")
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp
P.overlays += stampoverlay
- P.stamps += "
[stampvalue]" + P.stamps += "
[stampvalue]" if(destination != "All Departments") if(!fax.receivefax(P)) @@ -2329,7 +2446,7 @@ if(notify == "Yes") var/mob/living/carbon/human/H = sender if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset))) - to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.") + to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.") if(sender) log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]") message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)] (VIEW).", 1) @@ -2348,8 +2465,8 @@ if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["getplaytimewindow"]) - if(!M) - to_chat(usr, "ERROR: Mob not found.") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return cmd_mentor_show_exp_panel(M.client) @@ -2357,6 +2474,9 @@ if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["jumpto"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.jumptomob(M) else if(href_list["getmob"]) @@ -2364,24 +2484,37 @@ if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes") return var/mob/M = locateUID(href_list["getmob"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.Getmob(M) else if(href_list["sendmob"]) if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["sendmob"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.sendmob(M) else if(href_list["narrateto"]) if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["narrateto"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.cmd_admin_direct_narrate(M) else if(href_list["subtlemessage"]) - if(!check_rights(R_ADMIN)) return + if(!check_rights(R_EVENT)) + return var/mob/M = locateUID(href_list["subtlemessage"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.cmd_admin_subtle_message(M) else if(href_list["traitor"]) @@ -2392,8 +2525,8 @@ return var/mob/M = locateUID(href_list["traitor"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob.") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return show_traitor_panel(M) @@ -2462,7 +2595,7 @@ switch(where) if("inhand") if(!iscarbon(usr) && !isrobot(usr)) - to_chat(usr, "Can only spawn in hand when you're a carbon mob or cyborg.") + to_chat(usr, "Can only spawn in hand when you're a carbon mob or cyborg.") where = "onfloor" target = usr @@ -2474,10 +2607,10 @@ target = locate(loc.x + X,loc.y + Y,loc.z + Z) if("inmarked") if(!marked_datum) - to_chat(usr, "You don't have any object marked. Abandoning spawn.") + to_chat(usr, "You don't have any object marked. Abandoning spawn.") return else if(!istype(marked_datum,/atom)) - to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") + to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") return else target = marked_datum @@ -2542,7 +2675,7 @@ message_admins("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]") log_admin("[key_name(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]") else - to_chat(usr, "You may only use this when the game is running.") + to_chat(usr, "You may only use this when the game is running.") else if(href_list["memoeditlist"]) if(!check_rights(R_SERVER)) return @@ -2583,14 +2716,16 @@ if("monkey") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","M") - for(var/mob/living/carbon/human/H in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing spawn(0) H.monkeyize() ok = 1 if("corgi") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","M") - for(var/mob/living/carbon/human/H in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing spawn(0) H.corgize() ok = 1 @@ -2620,7 +2755,7 @@ feedback_add_details("admin_secrets_fun_used","TriAI") if("gravity") if(!(SSticker && SSticker.mode)) - to_chat(usr, "Please wait until the game starts! Not sure how it will work otherwise.") + to_chat(usr, "Please wait until the game starts! Not sure how it will work otherwise.") return GLOB.gravity_is_on = !GLOB.gravity_is_on for(var/area/A in world) @@ -2661,7 +2796,8 @@ feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","PW") message_admins("[key_name_admin(usr)] teleported all players to the prison station.", 1) - for(var/mob/living/carbon/human/H in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing var/turf/loc = find_loc(H) var/security = 0 if(!is_station_level(loc.z) || GLOB.prisonwarped.Find(H)) @@ -2956,7 +3092,7 @@ if(usr) log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") if(ok) - to_chat(world, text("A secret has been activated by []!", usr.key)) + to_chat(world, text("A secret has been activated by []!", usr.key)) else if(href_list["secretsadmin"]) if(!check_rights(R_ADMIN)) return @@ -2964,17 +3100,17 @@ var/ok = 0 switch(href_list["secretsadmin"]) if("list_signalers") - var/dat = "Showing last [length(GLOB.lastsignalers)] signalers.
" + var/dat = "Showing last [length(GLOB.lastsignalers)] signalers.
" for(var/sig in GLOB.lastsignalers) dat += "[sig]
" usr << browse(dat, "window=lastsignalers;size=800x500") if("list_lawchanges") - var/dat = "Showing last [length(GLOB.lawchanges)] law changes.
" + var/dat = "Showing last [length(GLOB.lawchanges)] law changes.
" for(var/sig in GLOB.lawchanges) dat += "[sig]
" usr << browse(dat, "window=lawchanges;size=800x500") if("list_job_debug") - var/dat = "Job Debug info.
" + var/dat = "Job Debug info.
" if(SSjobs) for(var/line in SSjobs.job_debug) dat += "[line]
" @@ -2992,9 +3128,10 @@ alert("The game mode is [SSticker.mode.name]") else alert("For some reason there's a ticker, but not a game mode") if("manifest") - var/dat = "Showing Crew Manifest.
" + var/dat = "Showing Crew Manifest.
" dat += "
"
@@ -3002,17 +3139,19 @@
if("check_antagonist")
check_antagonists()
if("DNA")
- var/dat = "Showing DNA from blood.
" + var/dat = "Showing DNA from blood.
" dat += "
"
usr << browse(dat, "window=DNA;size=440x410")
if("fingerprints")
- var/dat = "Showing Fingerprints.
" + var/dat = "Showing Fingerprints.
" dat += "
+ "})
+
+ // Header & body start
+ output += {"
+
+
"}
+
+ var/datum/browser/popup = new(src, "asays", "
"
msg += "
"
dat += "
"
dat += ""
dat += "
"
dat += "
"
- var/datum/browser/popup = new(user, "Log viewer", "Log viewer", 1400, 600)
- popup.set_content(dat)
+ var/datum/browser/popup = new(user, "Log Viewer", "Log Viewer", 1500, 600)
+ popup.set_content(dat.Join())
popup.open()
/datum/log_viewer/Topic(href, href_list)
@@ -188,6 +221,19 @@
return
if(href_list["search"])
search(usr)
+ var/records_len = length(log_records)
+ if(records_len > RECORD_WARN_LIMIT)
+ var/datum/log_record/last_record = log_records[RECORD_WARN_LIMIT]
+ var/last_time = gameTimestamp(wtime = last_record.raw_time - 9.99)
+ var/answer = alert(usr, "More than [RECORD_WARN_LIMIT] records were found. continuing will take a long time. This won't cause much lag for the server. Time at the [RECORD_WARN_LIMIT]th record '[last_time]'", "Warning", "Continue", "Limit to [RECORD_WARN_LIMIT]", "Cancel")
+ if(answer == "Limit to [RECORD_WARN_LIMIT]")
+ log_records.Cut(RECORD_WARN_LIMIT)
+ else if(answer == "Cancel")
+ log_records.Cut()
+ else
+ if(records_len > RECORD_HARD_LIMIT)
+ to_chat(usr, "Record limit reached. Limiting to [RECORD_HARD_LIMIT].")
+ log_records.Cut(RECORD_HARD_LIMIT)
show_ui(usr)
return
if(href_list["clear_all"])
@@ -198,17 +244,31 @@
selected_mobs.Cut()
show_ui(usr)
return
+ if(href_list["clear_ckeys"])
+ selected_ckeys.Cut()
+ selected_ckeys_mobs.Cut()
+ show_ui(usr)
+ return
if(href_list["add_mob"])
var/list/mobs = getpois(TRUE, TRUE)
var/datum/async_input/A = input_autocomplete_async(usr, "Please, select a mob: ", mobs)
A.on_close(CALLBACK(src, .proc/add_mob, usr))
return
+ if(href_list["add_ckey"])
+ var/list/ckeys = GLOB.logging.get_ckeys_logged()
+ var/datum/async_input/A = input_autocomplete_async(usr, "Please, select a ckey: ", ckeys)
+ A.on_close(CALLBACK(src, .proc/add_ckey, usr))
+ return
if(href_list["remove_mob"])
var/mob/M = locate(href_list["remove_mob"])
if(M)
selected_mobs -= M
show_ui(usr)
return
+ if(href_list["remove_ckey"])
+ selected_ckeys -= href_list["remove_ckey"]
+ show_ui(usr)
+ return
if(href_list["toggle_log_type"])
var/log_type = href_list["toggle_log_type"]
if(log_type in selected_log_types)
@@ -232,4 +292,28 @@
return "deepskyblue"
if(MISC_LOG)
return "gray"
+ if(DEADCHAT_LOG)
+ return "#cc00c6"
+ if(OOC_LOG)
+ return "#002eb8"
+ if(LOOC_LOG)
+ return "#6699CC"
return "slategray"
+
+/datum/log_viewer/proc/get_display_name(mob/M)
+ var/name = M.name
+ if(M.name != M.real_name)
+ name = "[name] ([M.real_name])"
+ if(isobserver(M))
+ name = "[name] (DEAD)"
+ return "\[[M.last_known_ckey]\] [name]"
+
+/datum/log_viewer/proc/get_ckey_name(ckey)
+ UPDATE_CKEY_MOB(ckey)
+ var/mob/M = selected_ckeys_mobs[ckey]
+
+ return get_display_name(M)
+
+#undef UPDATE_CKEY_MOB
+#undef RECORD_WARN_LIMIT
+#undef RECORD_HARD_LIMIT
diff --git a/code/datums/logging.dm b/code/datums/logging.dm
new file mode 100644
index 00000000000..bac26610e5e
--- /dev/null
+++ b/code/datums/logging.dm
@@ -0,0 +1,47 @@
+/datum/logging
+ var/list/datum/log_record/logs = list() // Assoc list of assoc lists (ckey, (log_type, list/logs))
+
+/datum/logging/proc/add_log(ckey, datum/log_record/log)
+ if(!ckey)
+ log_debug("GLOB.logging.add_log called with an invalid ckey")
+ return
+
+ if(!logs[ckey])
+ logs[ckey] = list()
+
+ var/list/log_types_list = logs[ckey]
+
+ if(!log_types_list[log.log_type])
+ log_types_list[log.log_type] = list()
+
+ var/list/datum/log_record/log_records = log_types_list[log.log_type]
+ log_records.Add(log)
+
+/datum/logging/proc/get_ckeys_logged()
+ var/list/ckeys = list()
+ for(var/ckey in logs)
+ ckeys.Add(ckey)
+ return ckeys
+
+/* Returns the logs of a given ckey and log_type
+ * If no logs exist it will return an empty list
+*/
+/datum/logging/proc/get_logs_by_type(ckey, log_type)
+ if(!ckey)
+ log_debug("GLOB.logging.get_logs_by_type called with an invalid ckey")
+ return
+ if(!log_type || !(log_type in ALL_LOGS))
+ log_debug("GLOB.logging.get_logs_by_type called with an invalid log_type '[log_type]'")
+ return
+
+ var/list/log_types_list = logs[ckey]
+ // Check if logs exist for the ckey
+ if(!length(log_types_list))
+ return list()
+
+ var/list/datum/log_record/log_records = log_types_list[log_type]
+
+ // Check if logs exist for this type
+ if(!log_records)
+ return list()
+ return log_records
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index cb1ee856b1c..0c992bbb32c 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -47,7 +47,6 @@
var/miming = 0 // Mime's vow of silence
var/list/antag_datums
- var/speech_span // What span any body this mind has talks in.
var/datum/changeling/changeling //changeling holder
var/linglink
var/datum/vampire/vampire //vampire holder
@@ -65,8 +64,6 @@
var/isblessed = FALSE // is this person blessed by a chaplain?
var/num_blessed = 0 // for prayers
- // the world.time since the mob has been brigged, or -1 if not at all
- var/brigged_since = -1
var/suicided = FALSE
//put this here for easier tracking ingame
@@ -103,14 +100,6 @@
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
- for(var/log_type in current.logs) // Copy the old logs
- var/list/logs = current.logs[log_type]
- if(new_character.logs[log_type])
- new_character.logs[log_type] += logs.Copy() // Append the old ones
- new_character.logs[log_type] = sortTim(new_character.logs[log_type], /proc/compare_log_record) // Sort them on time
- else
- new_character.logs[log_type] = logs.Copy() // Just copy them
-
SSnanoui.user_transferred(current, new_character)
if(new_character.mind) //remove any mind currently in our new body's mind variable
@@ -1422,9 +1411,10 @@
return A
/datum/mind/proc/announce_objectives()
- to_chat(current, "Your current objectives:")
- for(var/line in splittext(gen_objective_text(), "| When | Type | Who | What | Target | Where |
|---|---|---|---|---|---|
| [time] | [L.log_type] | \[L.who] | [L.what] | \ -[L.target] | [ADMIN_COORDJMP(L.where)] | [L.target] | [L.where] | " dat += "
")) - to_chat(current, line) + if(current) + to_chat(current, "Your current objectives:") + for(var/line in splittext(gen_objective_text(), "
")) + to_chat(current, line) /datum/mind/proc/find_syndicate_uplink() var/list/L = current.get_contents() @@ -1593,25 +1583,6 @@ L = agent_landmarks[team] H.forceMove(L.loc) - -// check whether this mind's mob has been brigged for the given duration -// have to call this periodically for the duration to work properly -/datum/mind/proc/is_brigged(duration) - var/turf/T = current.loc - if(!istype(T)) - brigged_since = -1 - return 0 - - var/is_currently_brigged = current.is_in_brig() - if(!is_currently_brigged) - brigged_since = -1 - return 0 - - if(brigged_since == -1) - brigged_since = world.time - - return (duration <= world.time - brigged_since) - /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S) spell_list += S S.action.Grant(current) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 14bc959fbb1..2b48d5da5f7 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -222,10 +222,10 @@ name = "NT Undercover Operative" // Disguised NT special forces, sent to quietly eliminate or keep tabs on people in high positions (e.g: captain) - uniform = /obj/item/clothing/under/color/black + uniform = /obj/item/clothing/under/color/random back = /obj/item/storage/backpack belt = /obj/item/storage/belt/utility/full/multitool - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/color/yellow shoes = /obj/item/clothing/shoes/chameleon/noslip l_ear = /obj/item/radio/headset/centcom id = /obj/item/card/id diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index b81587440d4..799a12f4db9 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -175,6 +175,7 @@ description = "The crew of a space station awaken one hundred years after a crisis. Awaking to a derelict space station on the verge of collapse, and a hostile force of invading \ hivebots. Can the surviving crew overcome the odds and survive and rebuild, or will the cold embrace of the stars become their new home?" cost = 2 + allow_duplicates = FALSE /datum/map_template/ruin/space/wizardcrash id = "wizardcrash" diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 53517d5dbc9..4d6310041e5 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -9,8 +9,9 @@ var/admin_notes /datum/map_template/shuttle/New() - shuttle_id = "[port_id]_[suffix]" - mappath = "[prefix][shuttle_id].dmm" + if(port_id && suffix) + shuttle_id = "[port_id]_[suffix]" + mappath = "[prefix][shuttle_id].dmm" . = ..() /datum/map_template/shuttle/emergency diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 3855dbcfac3..cb10700e5c6 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -444,6 +444,11 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) return +// Normally, AoE spells will generate an attack log for every turf they loop over, while searching for targets. +// With this override, all /aoe_turf type spells will only generate 1 log, saying that the user has cast the spell. +/obj/effect/proc_holder/spell/aoe_turf/perform(list/targets, recharge, mob/user, make_attack_logs) + add_attack_logs(user, null, "Cast the AoE spell [name]", ATKLOG_ALL) + return ..(targets, recharge, user, FALSE) /obj/effect/proc_holder/spell/targeted/proc/los_check(mob/A,mob/B) //Checks for obstacles from A to B diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm index 88f5eec9474..e4c652ae1d3 100644 --- a/code/datums/spells/knock.dm +++ b/code/datums/spells/knock.dm @@ -13,11 +13,6 @@ action_icon_state = "knock" sound = 'sound/magic/knock.ogg' -// Knock doesn't need to generate an attack log for every turf, set `make_attack_logs` to FALSE and just create a custom one. -/obj/effect/proc_holder/spell/aoe_turf/knock/perform(list/targets, recharge, mob/user) - add_attack_logs(user, user, "cast the spell [name]", ATKLOG_ALL) - return ..(targets, recharge, user, make_attack_logs = FALSE) - /obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets, mob/user = usr) for(var/turf/T in targets) for(var/obj/machinery/door/door in T.contents) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index a18a9d74f28..c8f2b6bb99b 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -633,7 +633,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY contains = list(/obj/machinery/power/emitter, /obj/machinery/power/emitter) cost = 10 - containertype = /obj/structure/closet/crate/secure containername = "emitter crate" access = ACCESS_CE containertype = /obj/structure/closet/crate/secure/engineering @@ -717,7 +716,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY name = "Supermatter Shard Crate" contains = list(/obj/machinery/power/supermatter_shard) cost = 50 //So cargo thinks twice before killing themselves with it - containertype = /obj/structure/closet/crate/secure + containertype = /obj/structure/closet/crate/secure/engineering containername = "supermatter shard crate" access = ACCESS_CE @@ -728,7 +727,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/pipe/circulator, /obj/item/pipe/circulator) cost = 25 - containertype = /obj/structure/closet/crate/secure + containertype = /obj/structure/closet/crate/secure/engineering containername = "thermo-electric generator crate" access = ACCESS_CE announce_beacons = list("Engineering" = list("Chief Engineer's Desk", "Atmospherics")) @@ -1174,11 +1173,10 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY containername = "fox crate" /datum/supply_packs/organic/butterfly - name = "Butterflies Crate" + name = "Butterfly Crate" cost = 50 containertype = /obj/structure/closet/critter/butterfly - containername = "butterflies crate" - contraband = 1 + containername = "butterfly crate" /datum/supply_packs/organic/deer name = "Deer Crate" @@ -1767,6 +1765,16 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY cost = 20 containername = "polo supply crate" +/datum/supply_packs/misc/boxing //For non log spamming cargo brawls! + name = "Boxing Supply Crate" + // 4 boxing gloves + contains = list(/obj/item/clothing/gloves/boxing/blue, + /obj/item/clothing/gloves/boxing/green, + /obj/item/clothing/gloves/boxing/yellow, + /obj/item/clothing/gloves/boxing) + cost = 15 + containername = "boxing supply crate" + ///////////// Station Goals /datum/supply_packs/misc/station_goal diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm index 9f98a481dbf..0233e0aee71 100644 --- a/code/datums/weather/weather_types/floor_is_lava.dm +++ b/code/datums/weather/weather_types/floor_is_lava.dm @@ -35,6 +35,8 @@ return if(!L.client) //Only sentient people are going along with it! return + if(L.flying) + return L.adjustFireLoss(3) /datum/weather/floor_is_lava/fake diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 789a0472869..04a9509cfe2 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -15,16 +15,16 @@ switch(index) if(BORG_WIRE_MAIN_POWER) return "Main Power" - + if(BORG_WIRE_LOCKED_DOWN) return "Lockdown" - + if(BORG_WIRE_CAMERA) return "Camera" - + if(BORG_WIRE_AI_CONTROL) return "AI Control" - + if(BORG_WIRE_LAWCHECK) return "Law Check" @@ -52,7 +52,7 @@ if(BORG_WIRE_AI_CONTROL) //Cut the AI wire to reset AI control if(!mended) if(R.connected_ai) - R.connected_ai = null + R.disconnect_from_ai() if(BORG_WIRE_CAMERA) if(!isnull(R.camera) && !R.scrambledcodes) @@ -74,8 +74,7 @@ switch(index) if(BORG_WIRE_AI_CONTROL) //pulse the AI wire to make the borg reselect an AI if(!R.emagged) - R.connected_ai = select_active_ai() - R.notify_ai(1) + R.connect_to_ai(select_active_ai()) if(BORG_WIRE_CAMERA) if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 09c874ce8a8..40aeda21b58 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -194,7 +194,7 @@ GLOBAL_LIST_INIT(wireColours, list("red", "blue", "green", "black", "orange", "b return 1 /datum/wires/CanUseTopic(mob/user, datum/topic_state/state) - if(!CanUse(user)) + if(!holder || !CanUse(user)) return STATUS_CLOSE return ..() diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 1f8c83f5f04..1d6fa5619e2 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -29,15 +29,15 @@ Actual Adjacent procs : ////////////////////// //A* nodes variables -/PathNode +/datum/pathnode var/turf/source //turf associated with the PathNode - var/PathNode/prevNode //link to the parent PathNode + var/datum/pathnode/prevNode //link to the parent PathNode var/f //A* Node weight (f = g + h) var/g //A* movement cost variable var/h //A* heuristic variable var/nt //count the number of Nodes traversed -/PathNode/New(s,p,pg,ph,pnt) +/datum/pathnode/New(s,p,pg,ph,pnt) source = s prevNode = p g = pg @@ -46,7 +46,7 @@ Actual Adjacent procs : source.PNode = src nt = pnt -/PathNode/proc/calc_f() +/datum/pathnode/proc/calc_f() f = g + h ////////////////////// @@ -54,11 +54,11 @@ Actual Adjacent procs : ////////////////////// //the weighting function, used in the A* algorithm -/proc/PathWeightCompare(PathNode/a, PathNode/b) +/proc/PathWeightCompare(datum/pathnode/a, datum/pathnode/b) return a.f - b.f //reversed so that the Heap is a MinHeap rather than a MaxHeap -/proc/HeapPathWeightCompare(PathNode/a, PathNode/b) +/proc/HeapPathWeightCompare(datum/pathnode/a, datum/pathnode/b) return b.f - a.f //wrapper that returns an empty list if A* failed to find a path @@ -82,13 +82,13 @@ Actual Adjacent procs : return 0 maxnodedepth = maxnodes //no need to consider path longer than maxnodes - var/Heap/open = new /Heap(/proc/HeapPathWeightCompare) //the open list + var/datum/heap/open = new /datum/heap(/proc/HeapPathWeightCompare) //the open list var/list/closed = new() //the closed list var/list/path = null //the returned path, if any - var/PathNode/cur //current processed turf + var/datum/pathnode/cur //current processed turf //initialization - open.Insert(new /PathNode(start,null,0,call(start,dist)(end),0)) + open.Insert(new /datum/pathnode(start,null,0,call(start,dist)(end),0)) //then run the main loop while(!open.IsEmpty() && !path) @@ -125,7 +125,7 @@ Actual Adjacent procs : var/newg = cur.g + call(cur.source,dist)(T) if(!T.PNode) //is not already in open list, so add it - open.Insert(new /PathNode(T,cur,newg,call(T,dist)(end),cur.nt+1)) + open.Insert(new /datum/pathnode(T,cur,newg,call(T,dist)(end),cur.nt+1)) else //is already in open list, check if it's a better way from the current turf if(newg < T.PNode.g) T.PNode.prevNode = cur @@ -137,7 +137,7 @@ Actual Adjacent procs : } //cleaning after us - for(var/PathNode/PN in open.L) + for(var/datum/pathnode/PN in open.L) PN.source.PNode = null for(var/turf/T in closed) T.PNode = null diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm index fb8ca665906..23b485ad252 100644 --- a/code/defines/procs/admin.dm +++ b/code/defines/procs/admin.dm @@ -83,10 +83,6 @@ var/message = "[key_name(whom, 0)][isAntag(whom) ? "(ANTAG)" : ""][isLivingSSD(whom) ? "(SSD!)": ""]" return message -/proc/log_and_message_admins(var/message as text) +/proc/log_and_message_admins(message) log_admin("[key_name(usr)] " + message) message_admins("[key_name_admin(usr)] " + message) - -/proc/admin_log_and_message_admins(var/message as text) - log_admin("[key_name(usr)] " + message) - message_admins("[key_name_admin(usr)] " + message, 1) diff --git a/code/defines/vox_sounds.dm b/code/defines/vox_sounds.dm index 1d7bb9753a0..5b44f80895b 100644 --- a/code/defines/vox_sounds.dm +++ b/code/defines/vox_sounds.dm @@ -1,7 +1,16 @@ // List is required to compile the resources into the game when it loads. // Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable. -GLOBAL_LIST_INIT(vox_sounds, list("," = 'sound/vox_fem/,.ogg', +GLOBAL_LIST_INIT(vox_alerts, list( +"bizwarn" = 'sound/vox_fem/bizwarn.ogg', +"bloop" = 'sound/vox_fem/bloop.ogg', +"buzwarn" = 'sound/vox_fem/buzwarn.ogg', +"dadeda" = 'sound/vox_fem/dadeda.ogg', +"deeoo" = 'sound/vox_fem/deeoo.ogg' +)) + +GLOBAL_LIST_INIT(vox_sounds, list( +"," = 'sound/vox_fem/,.ogg', "." = 'sound/vox_fem/..ogg', "a" = 'sound/vox_fem/a.ogg', "abortions" = 'sound/vox_fem/abortions.ogg', diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index c7936f2a91b..c33e7609685 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -13,35 +13,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station */ -/*Adding a wizard area teleport list because motherfucking lag -- Urist*/ -/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/ -GLOBAL_LIST_EMPTY(teleportlocs) -/hook/startup/proc/process_teleport_locs() - for(var/area/AR in world) - if(AR.no_teleportlocs) continue - if(GLOB.teleportlocs.Find(AR.name)) continue - var/turf/picked = safepick(get_area_turfs(AR.type)) - if(picked && is_station_level(picked.z)) - GLOB.teleportlocs += AR.name - GLOB.teleportlocs[AR.name] = AR - - GLOB.teleportlocs = sortAssoc(GLOB.teleportlocs) - - return 1 - -GLOBAL_LIST_EMPTY(ghostteleportlocs) -/hook/startup/proc/process_ghost_teleport_locs() - for(var/area/AR in world) - if(GLOB.ghostteleportlocs.Find(AR.name)) continue - var/list/turfs = get_area_turfs(AR.type) - if(turfs.len) - GLOB.ghostteleportlocs += AR.name - GLOB.ghostteleportlocs[AR.name] = AR - - GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs) - - return 1 - /*-----------------------------------------------------------------------------*/ diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index ab5ff19462a..d463c85eaf6 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -61,7 +61,7 @@ /atom/movable/proc/get_cell() return -/atom/movable/proc/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE) +/atom/movable/proc/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE) if(QDELETED(AM)) return FALSE if(!(AM.can_be_pulled(src, state, force))) @@ -87,7 +87,7 @@ if(ismob(AM)) var/mob/M = AM add_attack_logs(src, M, "passively grabbed", ATKLOG_ALMOSTALL) - if(!supress_message) + if(show_message) visible_message("[src] has grabbed [M] passively!") return TRUE @@ -120,12 +120,18 @@ if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1) //separated from our puller and not in the middle of a diagonal move. pulledby.stop_pulling() -/atom/movable/proc/can_be_pulled(user, grab_state, force) +/atom/movable/proc/can_be_pulled(user, grab_state, force, show_message = FALSE) if(src == user || !isturf(loc)) return FALSE - if(anchored || throwing) + if(anchored || move_resist == INFINITY) + if(show_message) + to_chat(user, "[src] appears to be anchored to the ground!") + return FALSE + if(throwing) return FALSE if(force < (move_resist * MOVE_FORCE_PULL_RATIO)) + if(show_message) + to_chat(user, "[src] is too heavy to pull!") return FALSE return TRUE @@ -506,6 +512,7 @@ return //don't do an animation if attacking self var/pixel_x_diff = 0 var/pixel_y_diff = 0 + var/direction = get_dir(src, A) if(direction & NORTH) pixel_y_diff = 8 @@ -525,7 +532,8 @@ if(visual_effect_icon) I = image('icons/effects/effects.dmi', A, visual_effect_icon, A.layer + 0.1) else if(used_item) - I = image(used_item.icon, A, used_item.icon_state, A.layer + 0.1) + I = image(icon = used_item, loc = A, layer = A.layer + 0.1) + I.plane = GAME_PLANE // Scale the icon. I.transform *= 0.75 @@ -567,3 +575,6 @@ /atom/movable/proc/portal_destroyed(obj/effect/portal/P) return + +/atom/movable/proc/decompile_act(obj/item/matter_decompiler/C, mob/user) // For drones to decompile mobs and objs. See drone for an example. + return FALSE diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index fb0ccff32cb..d887153c6d5 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -282,6 +282,9 @@ occupant = null icon_state = "scanner_open" +/obj/machinery/dna_scannernew/force_eject_occupant() + go_out(null, TRUE) + /obj/machinery/dna_scannernew/ex_act(severity) if(occupant) occupant.ex_act(severity) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 9c7fb99fe81..8f6ba965222 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -18,7 +18,7 @@ intercepttext += "
Note in the event of a quarantine breach or uncontrolled spread of the biohazard, the directive 7-10 may be upgraded to a directive 7-12.
" intercepttext += "Message ends." if(2) - var/nukecode = rand(10000, 99999) + var/nukecode = "[rand(10000, 99999)]" for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) if(bomb && bomb.r_code) if(is_station_level(bomb.z)) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 46b1972e565..34c717f11a8 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -7,6 +7,7 @@ /mob/living/simple_animal/hostile/blob icon = 'icons/mob/blob.dmi' pass_flags = PASSBLOB + status_flags = NONE //No throwing blobspores into deep space to despawn, or throwing blobbernaughts, which are bigger than you. faction = list(ROLE_BLOB) bubble_icon = "blob" atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) @@ -49,6 +50,7 @@ environment_smash = ENVIRONMENT_SMASH_STRUCTURES attacktext = "hits" attack_sound = 'sound/weapons/genhit1.ogg' + flying = TRUE speak_emote = list("pulses") var/obj/structure/blob/factory/factory = null var/list/human_overlays = list() diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index be794b9092b..dc8d0f5aba2 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -17,12 +17,12 @@ START_PROCESSING(SSobj, src) GLOB.poi_list |= src adjustcolors(color) //so it atleast appears - if(!overmind) - create_overmind(new_overmind) - if(overmind) - adjustcolors(overmind.blob_reagent_datum.color) if(offspring) is_offspring = 1 + if(overmind) + adjustcolors(overmind.blob_reagent_datum.color) + if(!overmind) + create_overmind(new_overmind) point_rate = new_rate ..(loc, h) @@ -104,10 +104,11 @@ var/mob/C = null var/list/candidates = list() if(!new_overmind) + // sendit if(is_offspring) - candidates = pollCandidates("Do you want to play as a blob offspring?", ROLE_BLOB, 1) + candidates = SSghost_spawns.poll_candidates("Do you want to play as a blob offspring?", ROLE_BLOB, TRUE, source = src) else - candidates = pollCandidates("Do you want to play as a blob?", ROLE_BLOB, 1) + candidates = SSghost_spawns.poll_candidates("Do you want to play as a blob?", ROLE_BLOB, TRUE, source = src) if(length(candidates)) C = pick(candidates) diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 6f2eed39499..350da7c7593 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -237,7 +237,7 @@ blobber.AIStatus = AI_OFF blobber.LoseTarget() spawn() - var/list/candidates = pollCandidates("Do you want to play as a blobbernaut?", ROLE_BLOB, 1, 100) + var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blobbernaut?", ROLE_BLOB, TRUE, 10 SECONDS, source = blobber) if(candidates.len) var/mob/C = pick(candidates) if(C) @@ -389,7 +389,7 @@ return split_used = TRUE - new /obj/structure/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, "offspring") + new /obj/structure/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, offspring = TRUE) qdel(N) if(SSticker && SSticker.mode.name == "blob") diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index 0e02df12d88..97192c86a0f 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -18,12 +18,15 @@ if((NOCLONE || SKELETON || HUSK) in target.mutations) to_chat(user, "DNA of [target] is ruined beyond usability!") return - if(!istype(target) || issmall(target) || (NO_DNA in target.dna.species.species_traits)) + if(!istype(target) || !target.mind || issmall(target) || (NO_DNA in target.dna.species.species_traits)) to_chat(user, "[target] is not compatible with this ability.") return if(target.mind.changeling) to_chat(user, "We are unable to swap forms with another changeling!") return + if(target.has_brain_worms() || user.has_brain_worms()) + to_chat(user, "A foreign presence repels us from this body!") + return return 1 /datum/action/changeling/swap_form/sting_action(var/mob/living/carbon/user) @@ -63,6 +66,8 @@ target.add_language("Changeling") user.remove_language("Changeling") user.regenerate_icons() + if(target.stat == DEAD && target.suiciding) //If Target committed suicide, unset flag for User + target.suiciding = 0 for(var/power in lingpowers) var/datum/action/changeling/S = power diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index bf5fbb70731..433fc5b526a 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -20,8 +20,8 @@ GLOBAL_LIST_EMPTY(all_cults) var/mob/living/carbon/human/H = mind.current if(ismindshielded(H)) //mindshield protects against conversions unless removed return FALSE -// if(mind.offstation_role) cant convert offstation roles such as ghost spawns -// return FALSE Commented out until we can figure out why offstation_role is getting set to TRUE on normal crew + if(mind.offstation_role) + return FALSE if(issilicon(mind.current)) return FALSE //can't convert machines, that's ratvar's thing if(isguardian(mind.current)) @@ -231,6 +231,8 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/cult/proc/get_unconvertables() var/list/ucs = list() for(var/mob/living/carbon/human/player in GLOB.player_list) + if(player.mind && player.mind.offstation_role) + continue if(!is_convertable_to_cult(player.mind)) ucs += player.mind return ucs diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 388b16d71af..f1f3bc1c72c 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -140,6 +140,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/tome,/obj/item/melee/cultblade) var/current_charges = 3 + var/shield_state = "shield-cult" hoodtype = /obj/item/clothing/head/hooded/cult_hoodie /obj/item/clothing/head/hooded/cult_hoodie @@ -164,13 +165,18 @@ if(current_charges) owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!") current_charges-- + playsound(loc, "sparks", 100, 1) new /obj/effect/temp_visual/cult/sparks(get_turf(owner)) if(!current_charges) owner.visible_message("The runed shield around [owner] suddenly disappears!") + shield_state = "broken" owner.update_inv_wear_suit() return 1 return 0 +/obj/item/clothing/suit/hooded/cultrobes/cult_shield/special_overlays() + return mutable_appearance('icons/effects/cult_effects.dmi', shield_state, MOB_LAYER + 0.01) + /obj/item/clothing/suit/hooded/cultrobes/berserker name = "flagellant's robes" desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage." diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 60d2a7ff73b..492d128e222 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -4,7 +4,7 @@ var/cultist_name = "talisman" var/cultist_desc = "A basic talisman. It serves no purpose." var/invocation = "Naise meam!" - info = "
" + info = "
" var/uses = 1 var/health_cost = 0 //The amount of health taken from the user when invoking the talisman diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 2d71df8c979..1e2dd3d554b 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -291,7 +291,8 @@ /////////////////////////////////// /datum/game_mode/proc/get_living_heads() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/player = thing var/list/real_command_positions = GLOB.command_positions.Copy() - "Nanotrasen Representative" if(player.stat != DEAD && player.mind && (player.mind.assigned_role in real_command_positions)) . |= player.mind @@ -312,7 +313,8 @@ ////////////////////////////////////////////// /datum/game_mode/proc/get_living_sec() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/player = thing if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions)) . |= player.mind @@ -321,7 +323,8 @@ //////////////////////////////////////// /datum/game_mode/proc/get_all_sec() . = list() - for(var/mob/living/carbon/human/player in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/player = thing if(player.mind && (player.mind.assigned_role in GLOB.security_positions)) . |= player.mind @@ -421,9 +424,9 @@ proc/display_roundstart_logout_report() return nukecode /datum/game_mode/proc/replace_jobbanned_player(mob/living/M, role_type) - var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a [role_type]?", role_type, 0, 100) + var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [role_type]?", role_type, FALSE, 10 SECONDS) var/mob/dead/observer/theghost = null - if(candidates.len) + if(length(candidates)) theghost = pick(candidates) to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbanned player.") diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index a4b8c594b89..526a2c01083 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -83,6 +83,36 @@ else add_ranged_ability(user, enable_text) +/datum/action/innate/ai/choose_modules + name = "Choose Modules" + desc = "Spend your processing time to gain a variety of different abilities." + button_icon_state = "choose_module" + auto_use_uses = FALSE // This is an infinite ability. + +/datum/action/innate/ai/choose_modules/Grant(mob/living/L) + . = ..() + owner_AI.malf_picker = new /datum/module_picker + +/datum/action/innate/ai/choose_modules/Trigger() + . = ..() + owner_AI.malf_picker.use(owner_AI) + +/datum/action/innate/ai/return_to_core + name = "Return to Main Core" + desc = "Leave the APC you are shunted to, and return to your core." + icon_icon = 'icons/obj/power.dmi' + button_icon_state = "apcemag" + auto_use_uses = FALSE // Here just to prevent the "You have X uses remaining" from popping up. + +/datum/action/innate/ai/return_to_core/Trigger() + . = ..() + var/obj/machinery/power/apc/apc = owner_AI.loc + if(!istype(apc)) // This shouldn't happen but here for safety. + to_chat(src, "You are already in your Main Core.") + return + apc.malfvacate() + qdel(src) + //The datum and interface for the malf unlock menu, which lets them choose actions to unlock. /datum/module_picker var/temp @@ -96,13 +126,7 @@ if((AM.power_type && AM.power_type != /datum/action/innate/ai) || AM.upgrade) possible_modules += AM -/datum/module_picker/proc/remove_malf_verbs(mob/living/silicon/ai/AI) //Removes all malfunction-related abilities from the target AI. - for(var/datum/AI_Module/AM in possible_modules) - for(var/datum/action/A in AI.actions) - if(istype(A, initial(AM.power_type))) - qdel(A) - -/datum/module_picker/proc/use(user as mob) +/datum/module_picker/proc/use(mob/user) var/dat dat += {"Select use of processing time: (currently #[processing_time] left.)
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index f99a00567ae..750473b1dfa 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -394,7 +394,7 @@ to_chat(src, " You are feeling far too docile to do that.") return - var content = "" + var/content = "" content += "
| #[i] | [F.dir[i]] |
\[ " + body += "LOGS - " body += "VV - " body += "[ADMIN_TP(M,"TP")] - " if(M.client) @@ -109,17 +113,18 @@ GLOBAL_VAR_INIT(nologevent, 0) else body += "Add to Watchlist " - if(M.client) body += "| Prison | " body += "\ Send back to Lobby | " + body += "\ Erase Flavor Text | " + body += "\ Use Random Name | " var/muted = M.client.prefs.muted body += {"
Mute: - \[IC | - OOC | - PRAY | - ADMINHELP | - DEADCHAT\] - (toggle all) + \[IC | + OOC | + PRAY | + ADMINHELP | + DEADCHAT\] + (toggle all) "} var/jumptoeye = "" @@ -280,7 +285,7 @@ GLOBAL_VAR_INIT(nologevent, 0) /datum/admins/proc/vpn_whitelist() set category = "Admin" set name = "VPN Ckey Whitelist" - if(!check_rights(R_ADMIN)) + if(!check_rights(R_BAN)) return var/key = stripped_input(usr, "Enter ckey to add/remove, or leave blank to cancel:", "VPN Whitelist add/remove", max_length=32) if(key) @@ -699,7 +704,7 @@ GLOBAL_VAR_INIT(nologevent, 0) var/msg = "" if(SSticker.current_state == GAME_STATE_STARTUP) msg = " (The server is still setting up, but the round will be started as soon as possible.)" - message_admins("[usr.key] has started the game.[msg]") + message_admins("[usr.key] has started the game.[msg]") feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return 1 else @@ -760,19 +765,6 @@ GLOBAL_VAR_INIT(nologevent, 0) world.update_status() feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/toggle_aliens() - set category = "Event" - set desc="Toggle alien mobs" - set name="Toggle Aliens" - - if(!check_rights(R_EVENT)) - return - - GLOB.aliens_allowed = !GLOB.aliens_allowed - log_admin("[key_name(usr)] toggled aliens to [GLOB.aliens_allowed].") - message_admins("[key_name_admin(usr)] toggled aliens [GLOB.aliens_allowed ? "on" : "off"].") - feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /datum/admins/proc/delay() set category = "Server" set desc="Delay the game start/end" diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 13b786c5174..527540e9490 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -11,10 +11,6 @@ /proc/investigate_subject2file(var/subject) return file("[INVESTIGATE_DIR][subject].html") -/hook/startup/proc/resetInvestigate() - investigate_reset() - return 1 - /proc/investigate_reset() if(fdel(INVESTIGATE_DIR)) return 1 return 0 @@ -37,7 +33,8 @@ /client/proc/investigate_show( subject in GLOB.investigate_log_subjects ) set name = "Investigate" set category = "Admin" - if(!holder) return + if(!check_rights(R_ADMIN)) + return switch(subject) if("notes") show_note() diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index afb4b19eee2..342ba454526 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -56,10 +56,6 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons testing(msg) #endif -/hook/startup/proc/loadAdmins() - load_admins() - return 1 - /proc/load_admins() if(IsAdminAdvancedProcCall()) to_chat(usr, "Admin reload blocked: Advanced ProcCall detected.") diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 80a60957c75..b3957a86b44 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -10,11 +10,8 @@ GLOBAL_LIST_INIT(admin_verbs_default, list( GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/check_antagonists, /*shows all antags*/ /datum/admins/proc/show_player_panel, - /client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/ /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ /client/proc/invisimin, /*allows our mob to go invisible/visible*/ - /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ - /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ /datum/admins/proc/announce, /*priority announce something to all clients.*/ /client/proc/colorooc, /*allows us to set a custom colour for everything we say in ooc*/ /client/proc/resetcolorooc, /*allows us to set a reset our ooc color*/ @@ -23,7 +20,6 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/cmd_admin_pm_by_key_panel, /*admin-pm list by key*/ - /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/cmd_admin_open_logging_view, @@ -37,6 +33,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ /client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/ /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcomm*/ + /client/proc/admin_deny_shuttle, /*toggles availability of shuttle calling*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ /client/proc/manage_silicon_laws, /* Allows viewing and editing silicon laws. */ /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ @@ -54,36 +51,30 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /datum/admins/proc/PlayerNotes, /client/proc/cmd_mentor_say, /datum/admins/proc/show_player_notes, - /datum/admins/proc/vpn_whitelist, /client/proc/free_slot, /*frees slot for chosen job*/ /client/proc/toggleattacklogs, /client/proc/toggleadminlogs, /client/proc/toggledebuglogs, /client/proc/update_mob_sprite, - /client/proc/toggledrones, /client/proc/man_up, /client/proc/global_man_up, /client/proc/delbook, /client/proc/view_flagged_books, + /client/proc/view_asays, /client/proc/empty_ai_core_toggle_latejoin, /client/proc/aooc, /client/proc/freeze, - /client/proc/alt_check, /client/proc/secrets, - /client/proc/change_human_appearance_admin, /* Allows an admin to change the basic appearance of human-based mobs */ - /client/proc/change_human_appearance_self, /* Allows the human-based mob itself to change its basic appearance */ /client/proc/debug_variables, /client/proc/reset_all_tcs, /*resets all telecomms scripts*/ /client/proc/toggle_mentor_chat, /client/proc/toggle_advanced_interaction, /*toggle admin ability to interact with not only machines, but also atoms such as buttons and doors*/ - /client/proc/list_ssds_afks, - /client/proc/cmd_admin_headset_message, - /client/proc/spawn_floor_cluwne + /client/proc/list_ssds_afks )) GLOBAL_LIST_INIT(admin_verbs_ban, list( - /client/proc/unban_panel, - /client/proc/jobbans, - /client/proc/stickybanpanel + /client/proc/ban_panel, + /client/proc/stickybanpanel, + /datum/admins/proc/vpn_whitelist )) GLOBAL_LIST_INIT(admin_verbs_sounds, list( /client/proc/play_local_sound, @@ -99,7 +90,6 @@ GLOBAL_LIST_INIT(admin_verbs_event, list( /client/proc/drop_bomb, /client/proc/cinematic, /client/proc/one_click_antag, - /datum/admins/proc/toggle_aliens, /client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_random_ai_law, /client/proc/make_sound, @@ -109,6 +99,7 @@ GLOBAL_LIST_INIT(admin_verbs_event, list( /client/proc/show_tip, /client/proc/cmd_admin_change_custom_event, /datum/admins/proc/access_news_network, /*allows access of newscasters*/ + /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/response_team, // Response Teams admin verb @@ -116,7 +107,10 @@ GLOBAL_LIST_INIT(admin_verbs_event, list( /client/proc/fax_panel, /client/proc/event_manager_panel, /client/proc/modify_goals, - /client/proc/outfit_manager + /client/proc/outfit_manager, + /client/proc/cmd_admin_headset_message, + /client/proc/change_human_appearance_admin, /* Allows an admin to change the basic appearance of human-based mobs */ + /client/proc/change_human_appearance_self /* Allows the human-based mob itself to change its basic appearance */ )) GLOBAL_LIST_INIT(admin_verbs_spawn, list( @@ -125,25 +119,27 @@ GLOBAL_LIST_INIT(admin_verbs_spawn, list( /client/proc/admin_deserialize )) GLOBAL_LIST_INIT(admin_verbs_server, list( - /client/proc/ToRban, + /client/proc/reload_admins, /client/proc/Set_Holiday, /datum/admins/proc/startnow, /datum/admins/proc/restart, /datum/admins/proc/delay, /datum/admins/proc/toggleaban, + /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ + /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ /client/proc/toggle_log_hrefs, /client/proc/everyone_random, /datum/admins/proc/toggleAI, /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ - /client/proc/cmd_debug_del_all, /client/proc/cmd_debug_del_sing, - /datum/admins/proc/toggle_aliens, /client/proc/delbook, /client/proc/view_flagged_books, + /client/proc/view_asays, /client/proc/toggle_antagHUD_use, /client/proc/toggle_antagHUD_restrictions, /client/proc/set_ooc, - /client/proc/reset_ooc + /client/proc/reset_ooc, + /client/proc/toggledrones )) GLOBAL_LIST_INIT(admin_verbs_debug, list( /client/proc/cmd_admin_list_open_jobs, @@ -152,9 +148,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug, list( /client/proc/debug_controller, /client/proc/cmd_debug_mob_lists, /client/proc/cmd_admin_delete, - /client/proc/cmd_debug_del_all, /client/proc/cmd_debug_del_sing, - /client/proc/reload_admins, /client/proc/restart_controller, /client/proc/enable_debug_verbs, /client/proc/toggledebuglogs, @@ -197,7 +191,7 @@ GLOBAL_LIST_INIT(admin_verbs_mod, list( /client/proc/player_panel_new, /client/proc/dsay, /datum/admins/proc/show_player_panel, - /client/proc/jobbans, + /client/proc/ban_panel, /client/proc/debug_variables /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ )) GLOBAL_LIST_INIT(admin_verbs_mentor, list( @@ -367,19 +361,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") mob.remove_from_all_data_huds() -/client/proc/player_panel() - set name = "Player Panel" - set category = "Admin" - - if(!check_rights(R_ADMIN)) - return - - holder.player_panel_old() - feedback_add_details("admin_verb","PP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - /client/proc/player_panel_new() - set name = "Player Panel New" + set name = "Player Panel" set category = "Admin" if(!check_rights(R_ADMIN|R_MOD)) @@ -401,22 +384,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( feedback_add_details("admin_verb","CHA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -/client/proc/jobbans() - set name = "Display Job bans" - set category = "Admin" - - if(!check_rights(R_ADMIN|R_MOD)) - return - - if(config.ban_legacy_system) - holder.Jobbans() - else - holder.DB_ban_panel() - feedback_add_details("admin_verb","VJB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - -/client/proc/unban_panel() - set name = "Unban Panel" +/client/proc/ban_panel() + set name = "Ban Panel" set category = "Admin" if(!check_rights(R_BAN)) @@ -809,7 +778,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( set desc = "Allows you to change the mob appearance" set category = null - if(!check_rights(R_ADMIN)) + if(!check_rights(R_EVENT)) return if(!istype(H)) @@ -826,7 +795,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( return if(holder) - admin_log_and_message_admins("is altering the appearance of [H].") + log_and_message_admins("is altering the appearance of [H].") H.change_appearance(APPEARANCE_ALL, usr, usr, check_species_whitelist = 0) feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -835,7 +804,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( set desc = "Allows the mob to change its appearance" set category = null - if(!check_rights(R_ADMIN)) + if(!check_rights(R_EVENT)) return if(!istype(H)) @@ -857,10 +826,10 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel")) if("Yes") - admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, without whitelisting of races.") + log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, without whitelisting of races.") H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0) if("No") - admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, with whitelisting of races.") + log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, with whitelisting of races.") H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1) feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -980,8 +949,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( else to_chat(usr, "You now won't get debug log messages") -/client/proc/man_up(mob/T as mob in GLOB.mob_list) - set category = "Admin" +/client/proc/man_up(mob/T as mob in GLOB.player_list) + set category = null set name = "Man Up" set desc = "Tells mob to man up and deal with it." diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 9efc4c9ce88..699eca075bb 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -42,24 +42,6 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## else return 0 -/* -DEBUG -/mob/verb/list_all_jobbans() - set name = "list all jobbans" - - for(var/s in jobban_keylist) - to_chat(world, s) - -/mob/verb/reload_jobbans() - set name = "reload jobbans" - - jobban_loadbanfile() -*/ - -/hook/startup/proc/loadJobBans() - jobban_loadbanfile() - return 1 - /proc/jobban_loadbanfile() if(config.ban_legacy_system) var/savefile/S=new("data/job_full.ban") diff --git a/code/modules/admin/machine_upgrade.dm b/code/modules/admin/machine_upgrade.dm index 1e569b51d2d..4f38f70613d 100644 --- a/code/modules/admin/machine_upgrade.dm +++ b/code/modules/admin/machine_upgrade.dm @@ -1,20 +1,20 @@ /proc/machine_upgrade(obj/machinery/M in world) set name = "Tweak Component Ratings" - set category = "Debug" + set category = null - if(!check_rights(R_DEBUG)) + if(!check_rights(R_DEBUG)) return - + if(!istype(M)) to_chat(usr, "This can only be used on subtypes of /obj/machinery.") return - + var/new_rating = input("Enter new rating:","Num") as num if(!isnull(new_rating) && M.component_parts) for(var/obj/item/stock_parts/P in M.component_parts) P.rating = new_rating M.RefreshParts() - + message_admins("[key_name_admin(usr)] has set the component rating of [M] to [new_rating]") log_admin("[key_name(usr)] has set the component rating of [M] to [new_rating]") diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index e89b829f421..c2248261baa 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -332,65 +332,6 @@ usr << browse(dat, "window=players;size=600x480") -//The old one -/datum/admins/proc/player_panel_old() - if(!usr.client.holder) - return - var/dat = "
| Name | Real Name | Assigned Job | Key | Options | PM | Traitor? | IP: | to this if wanting to add back in IP checking - //add(IP: [M.lastKnownIP]) | if you want to know their ip to the lists below - var/list/mobs = sortmobs() - - for(var/mob/M in mobs) - if(!M.ckey) continue - - dat += "|||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| [M.name] | " - if(isAI(M)) - dat += "AI | " - else if(isrobot(M)) - dat += "Cyborg | " - else if(issmall(M)) - dat += "Monkey | " - else if(ishuman(M)) - dat += "[M.real_name] | " - else if(istype(M, /mob/living/silicon/pai)) - dat += "pAI | " - else if(isnewplayer(M)) - dat += "New Player | " - else if(isobserver(M)) - dat += "Ghost | " - else if(isalien(M)) - dat += "Alien | " - else - dat += "Unknown | " - - - if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.mind && H.mind.assigned_role) - dat += "[H.mind.assigned_role] | " - else - dat += "NA | " - - - dat += {"[(M.client ? "[M.client]" : "No client")] | -X | -PM | - "} - switch(is_special_character(M)) - if(0) - dat += {"Traitor? | "} - if(1) - dat += {"Traitor? | "} - if(2) - dat += {"Traitor? | "} - - dat += "
Round Status
" dat += "Current Game Mode: [SSticker.mode.name]" @@ -570,6 +512,15 @@ if(SSticker.mode.ert.len) dat += check_role_table("ERT", SSticker.mode.ert) + //list active security force count, so admins know how bad things are + var/list/sec_list = check_active_security_force() + dat += "
| Security | |
| Total: | [sec_list[1]] | " + dat += "
| Active: | [sec_list[2]] | " + dat += "
| Dead: | [sec_list[3]] | " + dat += "
| Antag: | [sec_list[4]] | " + dat += "
[notetext]") + log_admin("[usr ? key_name(usr) : adminckey] has added a note to [target_ckey]: [notetext]") + message_admins("[usr ? key_name_admin(usr) : adminckey] has added a note to [target_ckey]:
[notetext]") show_note(target_ckey) /proc/remove_note(note_id) @@ -63,7 +65,8 @@ var/notetext var/adminckey if(!GLOB.dbcon.IsConnected()) - to_chat(usr, "Failed to establish database connection.") + if(usr) + to_chat(usr, "Failed to establish database connection.") return if(!note_id) return @@ -82,15 +85,16 @@ var/err = query_del_note.ErrorMsg() log_game("SQL ERROR removing note from table. Error : \[[err]\]\n") return - log_admin("[key_name(usr)] has removed a note made by [adminckey] from [ckey]: [notetext]") - message_admins("[key_name_admin(usr)] has removed a note made by [adminckey] from [ckey]:
[notetext]") + log_admin("[usr ? key_name(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]: [notetext]") + message_admins("[usr ? key_name_admin(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]:
[notetext]") show_note(ckey) /proc/edit_note(note_id) if(!check_rights(R_ADMIN|R_MOD)) return if(!GLOB.dbcon.IsConnected()) - to_chat(usr, "Failed to establish database connection.") + if(usr) + to_chat(usr, "Failed to establish database connection.") return if(!note_id) return @@ -117,8 +121,8 @@ var/err = query_update_note.ErrorMsg() log_game("SQL ERROR editing note. Error : \[[err]\]\n") return - log_admin("[key_name(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") - message_admins("[key_name_admin(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") + log_admin("[usr ? key_name(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") + message_admins("[usr ? key_name_admin(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"") show_note(target_ckey) /proc/show_note(target_ckey, index, linkless = 0) diff --git a/code/modules/admin/tickets/adminticketsverbs.dm b/code/modules/admin/tickets/adminticketsverbs.dm index 406019745f8..4e8e79f2a26 100644 --- a/code/modules/admin/tickets/adminticketsverbs.dm +++ b/code/modules/admin/tickets/adminticketsverbs.dm @@ -5,7 +5,7 @@ set name = "Open Admin Ticket Interface" set category = "Admin" - if(!holder || !check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN)) return SStickets.showUI(usr) @@ -14,7 +14,7 @@ set name = "Resolve All Open Admin Tickets" set category = null - if(!holder || !check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN)) return if(alert("Are you sure you want to resolve ALL open admin tickets?","Resolve all open admin tickets?","Yes","No") != "Yes") diff --git a/code/modules/admin/tickets/mentorticketsverbs.dm b/code/modules/admin/tickets/mentorticketsverbs.dm index d65f4a30220..c7bec3e043d 100644 --- a/code/modules/admin/tickets/mentorticketsverbs.dm +++ b/code/modules/admin/tickets/mentorticketsverbs.dm @@ -5,7 +5,7 @@ set name = "Open Mentor Ticket Interface" set category = "Admin" - if(!holder || !check_rights(R_MENTOR|R_ADMIN)) + if(!check_rights(R_MENTOR|R_ADMIN)) return SSmentor_tickets.showUI(usr) @@ -14,7 +14,7 @@ set name = "Resolve All Open Mentor Tickets" set category = null - if(!holder || !check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN)) return if(alert("Are you sure you want to resolve ALL open mentor tickets?","Resolve all open mentor tickets?","Yes","No") != "Yes") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 50fa99778e7..2390394b280 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -14,7 +14,7 @@ if(!check_rights(R_ADMIN|R_MOD)) return var/client/C = locateUID(href_list["rejectadminhelp"]) - if(!C) + if(!isclient(C)) return C << 'sound/effects/adminhelp.ogg' @@ -114,39 +114,39 @@ switch(bantype) if(BANTYPE_PERMA) if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") + to_chat(usr, "Not enough parameters (Requires ckey and reason)") return banduration = null banjob = null if(BANTYPE_TEMP) if(!banckey || !banreason || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") return banjob = null if(BANTYPE_JOB_PERMA) if(!banckey || !banreason || !banjob) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") return banduration = null if(BANTYPE_JOB_TEMP) if(!banckey || !banreason || !banjob || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") return if(BANTYPE_APPEARANCE) if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") + to_chat(usr, "Not enough parameters (Requires ckey and reason)") return banduration = null banjob = null if(BANTYPE_ADMIN_PERMA) if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") + to_chat(usr, "Not enough parameters (Requires ckey and reason)") return banduration = null banjob = null if(BANTYPE_ADMIN_TEMP) if(!banckey || !banreason || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") return banjob = null @@ -324,8 +324,8 @@ if(!check_rights(R_SPAWN)) return var/mob/M = locateUID(href_list["mob"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return var/delmob = 0 @@ -436,18 +436,18 @@ if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["appearanceban"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") + to_chat(usr, "This mob has no ckey") return var/ban_ckey_param = href_list["dbbanaddckey"] var/banreason = appearance_isbanned(M) if(banreason) /* if(!config.ban_legacy_system) - to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") + to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") DB_ban_panel(M.ckey) return */ switch(alert("Reason: '[banreason]' Remove appearance ban?","Please Confirm","Yes","No")) @@ -458,7 +458,7 @@ DB_ban_unban(M.ckey, BANTYPE_APPEARANCE) appearance_unban(M) message_admins("[key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban", 1) - to_chat(M, "[usr.client.ckey] has removed your appearance ban.") + to_chat(M, "[usr.client.ckey] has removed your appearance ban.") else switch(alert("Appearance ban [M.ckey]?",,"Yes","No", "Cancel")) if("Yes") @@ -473,7 +473,7 @@ appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") add_note(M.ckey, "Appearance banned - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] appearance banned [key_name_admin(M)]", 1) - to_chat(M, "You have been appearance banned by [usr.client.ckey].") + to_chat(M, "You have been appearance banned by [usr.client.ckey].") to_chat(M, "The reason is: [reason]") to_chat(M, "Appearance ban can be lifted only upon request.") if(config.banappeals) @@ -487,15 +487,15 @@ // if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["jobban2"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") + to_chat(usr, "This mob has no ckey") return if(!SSjobs) - to_chat(usr, "SSjobs has not been setup!") + to_chat(usr, "SSjobs has not been setup!") return var/dat = "" @@ -735,8 +735,8 @@ if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["jobban4"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(M != usr) //we can jobban ourselves @@ -747,7 +747,7 @@ var/ban_ckey_param = href_list["dbbanaddckey"] if(!SSjobs) - to_chat(usr, "SSjobs has not been setup!") + to_chat(usr, "SSjobs has not been setup!") return //get jobs for department if specified, otherwise just returnt he one job in a list. @@ -840,7 +840,7 @@ msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1) - to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") + to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") to_chat(M, "The reason is: [reason]") to_chat(M, "This jobban will be lifted in [mins] minutes.") href_list["jobban2"] = 1 // lets it fall through and refresh @@ -861,7 +861,7 @@ else msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr.ckey, 0) message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) - to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") + to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") to_chat(M, "The reason is: [reason]") to_chat(M, "Jobban can be lifted only upon request.") href_list["jobban2"] = 1 // lets it fall through and refresh @@ -873,7 +873,7 @@ //all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned) if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban. if(!config.ban_legacy_system) - to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") + to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") DB_ban_panel(M.ckey) return var/msg @@ -894,22 +894,33 @@ continue if(msg) message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1) - to_chat(M, "You have been un-jobbanned by [usr.client.ckey] from [msg].") + to_chat(M, "You have been un-jobbanned by [usr.client.ckey] from [msg].") href_list["jobban2"] = 1 // lets it fall through and refresh return 1 return 0 //we didn't do anything! else if(href_list["boot2"]) var/mob/M = locateUID(href_list["boot2"]) - if(ismob(M)) - if(M.client && M.client.holder && (M.client.holder.rights & R_BAN)) - to_chat(usr, "[key_name_admin(M)] cannot be kicked from the server.") + if(!ismob(M)) + return + var/client/C = M.client + if(C == null) + to_chat(usr, "Mob has no client to kick.") + return + if(alert("Kick [C.ckey]?",,"Yes","No") == "Yes") + if(C && C.holder && (C.holder.rights & R_BAN)) + to_chat(usr, "[key_name_admin(C)] cannot be kicked from the server.") return - to_chat(M, "You have been kicked from the server") - log_admin("[key_name(usr)] booted [key_name(M)].") - message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1) - //M.client = null - qdel(M.client) + to_chat(C, "You have been kicked from the server") + log_admin("[key_name(usr)] booted [key_name(C)].") + message_admins("[key_name_admin(usr)] booted [key_name_admin(C)].", 1) + //C = null + qdel(C) + + else if(href_list["open_logging_view"]) + var/mob/M = locateUID(href_list["open_logging_view"]) + if(ismob(M)) + usr.client.open_logging_view(list(M), TRUE) //Player Notes else if(href_list["addnote"]) @@ -981,7 +992,7 @@ if(!check_rights(R_BAN)) return var/mob/M = locateUID(href_list["newban"]) - if(!ismob(M)) + if(!istype(M, /mob)) return var/ban_ckey_param = href_list["dbbanaddckey"] @@ -997,7 +1008,7 @@ M = admin_ban_mobsearch(M, ban_ckey_param, usr) AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") - to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") + to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) @@ -1017,7 +1028,7 @@ if(!reason) return AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP) - to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") + to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") to_chat(M, "This ban does not expire automatically and must be appealed.") if(M.client) M.client.link_forum_account(TRUE) @@ -1085,7 +1096,7 @@ return var/mob/M = locateUID(href_list["mute"]) - if(!ismob(M)) return + if(!istype(M, /mob)) return if(!M.client) return var/mute_type = href_list["mute_type"] @@ -1099,7 +1110,7 @@ if(SSticker && SSticker.mode) return alert(usr, "The game has already started.", null, null, null, null) - var/dat = {"What mode do you wish to play?
"} + var/dat = {"What mode do you wish to play?
"} for(var/mode in config.modes) dat += {"[config.mode_names[mode]]
"} dat += {"Secret
"} @@ -1114,7 +1125,7 @@ return alert(usr, "The game has already started.", null, null, null, null) if(GLOB.master_mode != "secret") return alert(usr, "The game mode has to be secret!", null, null, null, null) - var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} + var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} for(var/mode in config.modes) dat += {"[config.mode_names[mode]]
"} dat += {"Random (default)
"} @@ -1152,7 +1163,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["monkeyone"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make monkey?",, "Yes", "No") != "Yes") return @@ -1167,7 +1178,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["corgione"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make corgi?",, "Yes", "No") != "Yes") @@ -1182,7 +1193,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makePAI"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make pai?",, "Yes", "No") != "Yes") return @@ -1205,8 +1216,9 @@ if(!check_rights(R_SERVER|R_EVENT)) return var/mob/M = locateUID(href_list["forcespeech"]) - if(!ismob(M)) - to_chat(usr, "this can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins. if(!speech) return @@ -1222,11 +1234,11 @@ return var/mob/M = locateUID(href_list["sendtoprison"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return var/turf/prison_cell = pick(GLOB.prisonwarp) @@ -1285,6 +1297,71 @@ NP.ckey = M.ckey qdel(M) + else if(href_list["eraseflavortext"]) + if(!check_rights(R_ADMIN)) + return + + var/mob/M = locateUID(href_list["eraseflavortext"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + + if(!M.client) + to_chat(usr, "[M] doesn't seem to have an active client.") + return + + if(M.flavor_text == "" && M.client.prefs.flavor_text == "") + to_chat(usr, "[M] has no flavor text set.") + return + + if(alert(usr, "Erase [key_name(M)]'s flavor text?", "Message", "Yes", "No") != "Yes") + return + + log_admin("[key_name(usr)] has erased [key_name(M)]'s flavor text.") + message_admins("[key_name_admin(usr)] has erased [key_name_admin(M)]'s flavor text.") + + // Clears the mob's flavor text + M.flavor_text = "" + + // Clear and save the DB character's flavor text + M.client.prefs.flavor_text = "" + M.client.prefs.save_character(M.client) + + else if(href_list["userandomname"]) + if(!check_rights(R_ADMIN)) + return + + var/mob/M = locateUID(href_list["userandomname"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + + if(!M.client) + to_chat(usr, "[M] doesn't seem to have an active client.") + return + + if(alert(usr, "Force [key_name(M)] to use a random name?", "Message", "Yes", "No") != "Yes") + return + + log_admin("[key_name(usr)] has forced [key_name(M)] to use a random name.") + message_admins("[key_name_admin(usr)] has forced [key_name_admin(M)] to use a random name.") + + // Update the mob's name with a random one straight away + var/random_name = random_name(M.client.prefs.gender, M.client.prefs.species) + M.rename_character(M.real_name, random_name) + + // Save that random name for next rounds + M.client.prefs.real_name = random_name + M.client.prefs.save_character(M.client) + + else if(href_list["asays"]) + if(!check_rights(R_ADMIN)) + return + + usr.client.view_asays() + else if(href_list["tdome1"]) if(!check_rights(R_SERVER|R_EVENT)) return @@ -1292,11 +1369,11 @@ return var/mob/M = locateUID(href_list["tdome1"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return for(var/obj/item/I in M) @@ -1322,11 +1399,11 @@ return var/mob/M = locateUID(href_list["tdome2"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return for(var/obj/item/I in M) @@ -1352,11 +1429,11 @@ return var/mob/M = locateUID(href_list["tdomeadmin"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return M.Paralyse(5) @@ -1374,11 +1451,11 @@ return var/mob/M = locateUID(href_list["tdomeobserve"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return for(var/obj/item/I in M) @@ -1408,11 +1485,11 @@ return var/mob/M = locateUID(href_list["aroomwarp"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") return M.Paralyse(5) @@ -1429,7 +1506,7 @@ var/mob/living/L = locateUID(href_list["revive"]) if(!istype(L)) - to_chat(usr, "This can only be used on instances of type /mob/living") + to_chat(usr, "This can only be used on instances of type /mob/living") return L.revive() @@ -1441,7 +1518,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makeai"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make ai?",, "Yes", "No") != "Yes") @@ -1457,7 +1534,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makealien"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make alien?",, "Yes", "No") != "Yes") return @@ -1469,7 +1546,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makeslime"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make slime?",, "Yes", "No") != "Yes") return @@ -1481,7 +1558,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makesuper"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make superhero?",, "Yes", "No") != "Yes") @@ -1494,7 +1571,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["makerobot"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return if(alert(usr, "Confirm make robot?",, "Yes", "No") != "Yes") return @@ -1506,7 +1583,7 @@ var/mob/M = locateUID(href_list["makeanimal"]) if(isnewplayer(M)) - to_chat(usr, "This cannot be used on instances of type /mob/new_player") + to_chat(usr, "This cannot be used on instances of type /mob/new_player") return if(alert(usr, "Confirm make animal?",, "Yes", "No") != "Yes") return @@ -1519,10 +1596,14 @@ var/mob/dead/observer/G = locateUID(href_list["incarn_ghost"]) if(!istype(G)) - to_chat(usr, "This will only work on /mob/dead/observer") + to_chat(usr, "This will only work on /mob/dead/observer") + return var/posttransformoutfit = usr.client.robust_dress_shop() + if(!posttransformoutfit) + return + var/mob/living/carbon/human/H = G.incarnate_ghost() if(posttransformoutfit && istype(H)) @@ -1536,7 +1617,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["togmutate"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return var/block=text2num(href_list["block"]) //testing("togmutate([href_list["block"]] -> [block])") @@ -1546,6 +1627,11 @@ else if(href_list["adminplayeropts"]) var/mob/M = locateUID(href_list["adminplayeropts"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + show_player_panel(M) else if(href_list["adminplayerobservefollow"]) @@ -1555,6 +1641,11 @@ return C.admin_ghost() var/mob/M = locateUID(href_list["adminplayerobservefollow"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + var/mob/dead/observer/A = C.mob sleep(2) A.ManualFollow(M) @@ -1583,6 +1674,12 @@ return SStickets.autoRespond(index) + if(href_list["convert_ticket"]) + var/indexNum = text2num(href_list["convert_ticket"]) + if(href_list["is_mhelp"]) + SSmentor_tickets.convert_to_other_ticket(indexNum) + else + SStickets.convert_to_other_ticket(indexNum) else if(href_list["cult_nextobj"]) if(alert(usr, "Validate the current Cult objective and unlock the next one?", "Cult Cheat Code", "Yes", "No") != "Yes") return @@ -1603,10 +1700,10 @@ for(var/datum/mind/H in SSticker.mode.cult) if (H.current) - to_chat(H.current, "[SSticker.cultdat.entity_name] murmurs, [input]") + to_chat(H.current, "[SSticker.cultdat.entity_name] murmurs, [input]") for(var/mob/dead/observer/O in GLOB.player_list) - to_chat(O, "[SSticker.cultdat.entity_name] murmurs, [input]") + to_chat(O, "[SSticker.cultdat.entity_name] murmurs, [input]") message_admins("Admin [key_name_admin(usr)] has talked with the Voice of [SSticker.cultdat.entity_name].") log_admin("[key_name(usr)] Voice of [SSticker.cultdat.entity_name]: [input]") @@ -1628,6 +1725,11 @@ else if(href_list["adminmoreinfo"]) var/mob/M = locateUID(href_list["adminmoreinfo"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + admin_mob_info(M) else if(href_list["adminspawncookie"]) @@ -1635,7 +1737,7 @@ var/mob/living/carbon/human/H = locateUID(href_list["adminspawncookie"]) if(!ishuman(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_l_hand ) @@ -1659,7 +1761,7 @@ var/mob/living/M = locateUID(href_list["BlueSpaceArtillery"]) if(!isliving(M)) - to_chat(usr, "This can only be used on instances of type /mob/living") + to_chat(usr, "This can only be used on instances of type /mob/living") return if(alert(owner, "Are you sure you wish to hit [key_name(M)] with Bluespace Artillery?", "Confirm Firing?" , "Yes" , "No") != "Yes") @@ -1697,6 +1799,11 @@ return var/mob/M = locateUID(href_list["CentcommReply"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + usr.client.admin_headset_message(M, "Centcomm") else if(href_list["SyndicateReply"]) @@ -1704,6 +1811,11 @@ return var/mob/M = locateUID(href_list["SyndicateReply"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + usr.client.admin_headset_message(M, "Syndicate") else if(href_list["HeadsetMessage"]) @@ -1711,6 +1823,11 @@ return var/mob/M = locateUID(href_list["HeadsetMessage"]) + + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return + usr.client.admin_headset_message(M) else if(href_list["EvilFax"]) @@ -1718,7 +1835,7 @@ return var/mob/living/carbon/human/H = locateUID(href_list["EvilFax"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return var/etypes = list("Borgification", "Corgification", "Death By Fire", "Total Brain Death", "Honk Tumor", "Cluwne", "Demote", "Demote with Bot", "Revoke Fax Access", "Angry Fax Machine") var/eviltype = input(src.owner, "Which type of evil fax do you wish to send [H]?","Its good to be baaaad...", "") as null|anything in etypes @@ -1752,12 +1869,12 @@ P.ico = new P.ico += "paper_stamp-[stampvalue]" P.overlays += stampoverlay - P.stamps += "
"
+ P.stamps += ""
P.update_icon()
P.faxmachineid = fax.UID()
P.loc = fax.loc // Do not use fax.receivefax(P) here, as it won't preserve the type. Physically teleporting the fax paper is required.
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
- to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
+ to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
to_chat(src.owner, "You sent a [eviltype] fax to [H]")
log_admin("[key_name(src.owner)] sent [key_name(H)] a [eviltype] fax")
message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a [eviltype] fax")
@@ -1766,7 +1883,7 @@
return
var/mob/living/M = locateUID(href_list["Bless"])
if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob/living")
+ to_chat(usr, "This can only be used on instances of type /mob/living")
return
var/btypes = list("To Arrivals", "Moderate Heal")
var/mob/living/carbon/human/H
@@ -1833,7 +1950,7 @@
var/petchoice = input("Select pet type", "Pets") as null|anything in pets
if(isnull(petchoice))
return
- var/list/mob/dead/observer/candidates = pollCandidates("Play as the special event pet [H]?", poll_time = 200, min_hours = 10)
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Play as the special event pet [H]?", poll_time = 20 SECONDS, min_hours = 10, source = petchoice)
var/mob/dead/observer/theghost = null
if(candidates.len)
var/mob/living/simple_animal/pet/P = new petchoice(H.loc)
@@ -1886,7 +2003,7 @@
var/mob/living/M = locateUID(href_list["Smite"])
var/mob/living/carbon/human/H
if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob/living")
+ to_chat(usr, "This can only be used on instances of type /mob/living")
return
var/ptypes = list("Lightning bolt", "Fire Death", "Gib")
if(ishuman(M))
@@ -1997,7 +2114,7 @@
var/datum/antagonist/traitor/T = new()
T.give_objectives = FALSE
to_chat(newtraitormind.current, "ATTENTION: It is time to pay your debt to the Syndicate...")
- to_chat(newtraitormind.current, "Goal: KILL [H.real_name], currently in [get_area(H.loc)]")
+ to_chat(newtraitormind.current, "Goal: KILL [H.real_name], currently in [get_area(H.loc)]")
newtraitormind.add_antag_datum(T)
else
to_chat(usr, "ERROR: Unable to find any valid candidate to send after [H].")
@@ -2026,10 +2143,10 @@
return
var/mob/living/carbon/human/H = locateUID(href_list["cryossd"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
if(!href_list["cryoafk"] && !isLivingSSD(H))
- to_chat(usr, "This can only be used on living, SSD players.")
+ to_chat(usr, "This can only be used on living, SSD players.")
return
if(istype(H.loc, /obj/machinery/cryopod))
var/obj/machinery/cryopod/P = H.loc
@@ -2049,28 +2166,28 @@
return
var/mob/living/carbon/human/H = locateUID(href_list["FaxReplyTemplate"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
var/obj/item/paper/P = new /obj/item/paper(null)
var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"])
P.name = "Central Command - paper"
var/stypes = list("Handle it yourselves!","Illegible fax","Fax not signed","Not Right Now","You are wasting our time", "Keep up the good work", "ERT Instructions")
var/stype = input(src.owner, "Which type of standard reply do you wish to send to [H]?","Choose your paperwork", "") as null|anything in stypes
- var/tmsg = "Nanotrasen Science Station [GLOB.using_map.station_short]
NAS Trurl Communications Department Report
" + var/tmsg = "
Nanotrasen Science Station [GLOB.using_map.station_short]
NAS Trurl Communications Department Report
" if(stype == "Handle it yourselves!") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.
This is an automatic message." else if(stype == "Illegible fax") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax's grammar, syntax and/or typography are of a sub-par level and do not allow us to understand the contents of the message.
Please consult your nearest dictionary and/or thesaurus and try again.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax's grammar, syntax and/or typography are of a sub-par level and do not allow us to understand the contents of the message.
Please consult your nearest dictionary and/or thesaurus and try again.
This is an automatic message." else if(stype == "Fax not signed") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax has not been correctly signed and, as such, we cannot verify your identity.
Please sign your faxes before sending them so that we may verify your identity.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Your fax has not been correctly signed and, as such, we cannot verify your identity.
Please sign your faxes before sending them so that we may verify your identity.
This is an automatic message." else if(stype == "Not Right Now") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Due to pressing concerns of a matter above your current paygrade, we are unable to provide assistance in whatever matter your fax referenced.
This can be either due to a power outage, bureaucratic audit, pest infestation, Ascendance Event, corgi outbreak, or any other situation that would affect the proper functioning of the NAS Trurl.
Please try again later.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Due to pressing concerns of a matter above your current paygrade, we are unable to provide assistance in whatever matter your fax referenced.
This can be either due to a power outage, bureaucratic audit, pest infestation, Ascendance Event, corgi outbreak, or any other situation that would affect the proper functioning of the NAS Trurl.
Please try again later.
This is an automatic message." else if(stype == "You are wasting our time") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
In the interest of preventing further mismanagement of company resources, please avoid wasting our time with such petty drivel.
Do kindly remember that we expect our workforce to maintain at least a semi-decent level of profesionalism. Do not test our patience.
This is an automatic message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
In the interest of preventing further mismanagement of company resources, please avoid wasting our time with such petty drivel.
Do kindly remember that we expect our workforce to maintain at least a semi-decent level of profesionalism. Do not test our patience.
This is an automatic message." else if(stype == "Keep up the good work") tmsg += "Greetings, esteemed crewmember. Your fax has been received successfully by NAS Trurl Fax Registration.
We at the NAS Trurl appreciate the good work that you have done here, and sincerely recommend that you continue such a display of dedication to the company.
This is absolutely not an automated message." else if(stype == "ERT Instructions") - tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please utilize the Card Swipers if you wish to call for an ERT.
This is an automated message." + tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.
Please utilize the Card Swipers if you wish to call for an ERT.
This is an automated message." else return tmsg += "" @@ -2091,11 +2208,11 @@ P.ico = new P.ico += "paper_stamp-[stampvalue]" P.overlays += stampoverlay - P.stamps += "
"
+ P.stamps += ""
P.update_icon()
fax.receivefax(P)
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
- to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
+ to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
to_chat(src.owner, "You sent a standard '[stype]' fax to [H]")
log_admin("[key_name(src.owner)] sent [key_name(H)] a standard '[stype]' fax")
message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a standard '[stype]' fax")
@@ -2103,10 +2220,10 @@
else if(href_list["HONKReply"])
var/mob/living/carbon/human/H = locateUID(href_list["HONKReply"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
- to_chat(usr, "The person you are trying to contact is not wearing a headset")
+ to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from HONKplanet", "")
@@ -2123,13 +2240,13 @@
if(alert(src.owner, "Accept or Deny ERT request?", "CentComm Response", "Accept", "Deny") == "Deny")
var/mob/living/carbon/human/H = locateUID(href_list["ErtReply"])
if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
if(H.stat != 0)
- to_chat(usr, "The person you are trying to contact is not conscious.")
+ to_chat(usr, "The person you are trying to contact is not conscious.")
return
if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
- to_chat(usr, "The person you are trying to contact is not wearing a headset")
+ to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "")
@@ -2137,7 +2254,7 @@
GLOB.ert_request_answered = TRUE
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].")
- to_chat(H, "Incoming priority transmission from Central Command. Message as follows, Your ERT request has been denied for the following reasons: [input].")
+ to_chat(H, "Incoming priority transmission from Central Command. Message as follows, Your ERT request has been denied for the following reasons: [input].")
else
src.owner.response_team()
@@ -2292,14 +2409,14 @@
P.stamped = new
P.stamped += /obj/item/stamp/centcom
P.overlays += stampoverlay
- P.stamps += ""
+ P.stamps += ""
else if(stamptype == "text")
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp
P.overlays += stampoverlay
- P.stamps += "[stampvalue]" + P.stamps += "
[stampvalue]" if(destination != "All Departments") if(!fax.receivefax(P)) @@ -2329,7 +2446,7 @@ if(notify == "Yes") var/mob/living/carbon/human/H = sender if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset))) - to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.") + to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.") if(sender) log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]") message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)] (VIEW).", 1) @@ -2348,8 +2465,8 @@ if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["getplaytimewindow"]) - if(!M) - to_chat(usr, "ERROR: Mob not found.") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return cmd_mentor_show_exp_panel(M.client) @@ -2357,6 +2474,9 @@ if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["jumpto"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.jumptomob(M) else if(href_list["getmob"]) @@ -2364,24 +2484,37 @@ if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes") return var/mob/M = locateUID(href_list["getmob"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.Getmob(M) else if(href_list["sendmob"]) if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["sendmob"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.sendmob(M) else if(href_list["narrateto"]) if(!check_rights(R_ADMIN)) return var/mob/M = locateUID(href_list["narrateto"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.cmd_admin_direct_narrate(M) else if(href_list["subtlemessage"]) - if(!check_rights(R_ADMIN)) return + if(!check_rights(R_EVENT)) + return var/mob/M = locateUID(href_list["subtlemessage"]) + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") + return usr.client.cmd_admin_subtle_message(M) else if(href_list["traitor"]) @@ -2392,8 +2525,8 @@ return var/mob/M = locateUID(href_list["traitor"]) - if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob.") + if(!istype(M, /mob)) + to_chat(usr, "This can only be used on instances of type /mob") return show_traitor_panel(M) @@ -2462,7 +2595,7 @@ switch(where) if("inhand") if(!iscarbon(usr) && !isrobot(usr)) - to_chat(usr, "Can only spawn in hand when you're a carbon mob or cyborg.") + to_chat(usr, "Can only spawn in hand when you're a carbon mob or cyborg.") where = "onfloor" target = usr @@ -2474,10 +2607,10 @@ target = locate(loc.x + X,loc.y + Y,loc.z + Z) if("inmarked") if(!marked_datum) - to_chat(usr, "You don't have any object marked. Abandoning spawn.") + to_chat(usr, "You don't have any object marked. Abandoning spawn.") return else if(!istype(marked_datum,/atom)) - to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") + to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") return else target = marked_datum @@ -2542,7 +2675,7 @@ message_admins("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]") log_admin("[key_name(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]") else - to_chat(usr, "You may only use this when the game is running.") + to_chat(usr, "You may only use this when the game is running.") else if(href_list["memoeditlist"]) if(!check_rights(R_SERVER)) return @@ -2583,14 +2716,16 @@ if("monkey") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","M") - for(var/mob/living/carbon/human/H in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing spawn(0) H.monkeyize() ok = 1 if("corgi") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","M") - for(var/mob/living/carbon/human/H in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing spawn(0) H.corgize() ok = 1 @@ -2620,7 +2755,7 @@ feedback_add_details("admin_secrets_fun_used","TriAI") if("gravity") if(!(SSticker && SSticker.mode)) - to_chat(usr, "Please wait until the game starts! Not sure how it will work otherwise.") + to_chat(usr, "Please wait until the game starts! Not sure how it will work otherwise.") return GLOB.gravity_is_on = !GLOB.gravity_is_on for(var/area/A in world) @@ -2661,7 +2796,8 @@ feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","PW") message_admins("[key_name_admin(usr)] teleported all players to the prison station.", 1) - for(var/mob/living/carbon/human/H in GLOB.mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing var/turf/loc = find_loc(H) var/security = 0 if(!is_station_level(loc.z) || GLOB.prisonwarped.Find(H)) @@ -2956,7 +3092,7 @@ if(usr) log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") if(ok) - to_chat(world, text("A secret has been activated by []!", usr.key)) + to_chat(world, text("A secret has been activated by []!", usr.key)) else if(href_list["secretsadmin"]) if(!check_rights(R_ADMIN)) return @@ -2964,17 +3100,17 @@ var/ok = 0 switch(href_list["secretsadmin"]) if("list_signalers") - var/dat = "Showing last [length(GLOB.lastsignalers)] signalers.
" + var/dat = "Showing last [length(GLOB.lastsignalers)] signalers.
" for(var/sig in GLOB.lastsignalers) dat += "[sig]
" usr << browse(dat, "window=lastsignalers;size=800x500") if("list_lawchanges") - var/dat = "Showing last [length(GLOB.lawchanges)] law changes.
" + var/dat = "Showing last [length(GLOB.lawchanges)] law changes.
" for(var/sig in GLOB.lawchanges) dat += "[sig]
" usr << browse(dat, "window=lawchanges;size=800x500") if("list_job_debug") - var/dat = "Job Debug info.
" + var/dat = "Job Debug info.
" if(SSjobs) for(var/line in SSjobs.job_debug) dat += "[line]
" @@ -2992,9 +3128,10 @@ alert("The game mode is [SSticker.mode.name]") else alert("For some reason there's a ticker, but not a game mode") if("manifest") - var/dat = "Showing Crew Manifest.
" + var/dat = "Showing Crew Manifest.
" dat += "
| Name | Position |
|---|---|
| [] | [] |
" + var/dat = "Showing DNA from blood.
" dat += "
| Name | DNA | Blood Type |
|---|---|---|
| [H] | [H.dna.unique_enzymes] | [H.dna.blood_type] |
" + var/dat = "Showing Fingerprints.
" dat += "
| Name | Fingerprints | ||||||
|---|---|---|---|---|---|---|---|
| [H] | [md5(H.dna.uni_identity)] |
| Time | +Ckey | +Message | +
|---|---|---|
| [timestr] | +[A.ckey] ([A.rank]) | +[A.message] | +
Current Round Asays
", 1200, 825)
+ popup.set_content(output.Join())
+ popup.open(0)
diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm
index b3d1543aedc..1284f9e0faf 100644
--- a/code/modules/admin/verbs/custom_event.dm
+++ b/code/modules/admin/verbs/custom_event.dm
@@ -3,8 +3,7 @@
set category = "Event"
set name = "Change Custom Event"
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
+ if(!check_rights(R_EVENT))
return
var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", GLOB.custom_event_msg) as message|null
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 424e3c91f57..d2c05ff4f6c 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -168,7 +168,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
#endif
/client/proc/callproc_datum(var/A as null|area|mob|obj|turf)
- set category = "Debug"
+ set category = null
set name = "Atom ProcCall"
if(!check_rights(R_PROCCALL))
@@ -418,25 +418,6 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
else
alert("Invalid mob")
-//TODO: merge the vievars version into this or something maybe mayhaps
-/client/proc/cmd_debug_del_all()
- set category = "Debug"
- set name = "Del-All"
-
- if(!check_rights(R_DEBUG))
- return
-
- // to prevent REALLY stupid deletions
- var/blocked = list(/mob/living, /mob/living/carbon, /mob/living/carbon/human, /mob/dead, /mob/dead/observer, /mob/living/silicon, /mob/living/silicon/robot, /mob/living/silicon/ai)
- var/hsbitem = input(usr, "Choose an object to delete.", "Delete:") as null|anything in subtypesof(/obj) + subtypesof(/mob) - blocked
- if(hsbitem)
- for(var/atom/O in world)
- if(istype(O, hsbitem))
- qdel(O)
- log_admin("[key_name(src)] has deleted all instances of [hsbitem].")
- message_admins("[key_name_admin(src)] has deleted all instances of [hsbitem].", 0)
- feedback_add_details("admin_verb","DELA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
/client/proc/cmd_debug_del_sing()
set category = "Debug"
set name = "Del Singulo / Tesla"
@@ -643,7 +624,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
for(var/areatype in areas_without_camera)
to_chat(world, "* [areatype]")
-/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in GLOB.mob_list)
+/client/proc/cmd_admin_dress(mob/living/carbon/human/M in GLOB.human_list)
set category = "Event"
set name = "Select equipment"
@@ -917,6 +898,9 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(istype(landmark))
var/datum/map_template/ruin/template = landmark.ruin_template
+ if(isobj(usr.loc))
+ var/obj/O = usr.loc
+ O.force_eject_occupant()
admin_forcemove(usr, get_turf(landmark))
to_chat(usr, "[template.name]")
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 78f2647e429..2ffb4659486 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -108,7 +108,7 @@
/client/proc/reload_admins()
set name = "Reload Admins"
- set category = "Debug"
+ set category = "Server"
if(!check_rights(R_SERVER))
return
diff --git a/code/modules/admin/verbs/gimmick_team.dm b/code/modules/admin/verbs/gimmick_team.dm
index 37afe35ef6a..3403a4417cf 100644
--- a/code/modules/admin/verbs/gimmick_team.dm
+++ b/code/modules/admin/verbs/gimmick_team.dm
@@ -39,6 +39,7 @@
if(alert("Do you want these characters automatically classified as antagonists?",,"Yes","No")=="Yes")
is_syndicate = 1
+ var/datum/outfit/O = outfit_list[dresscode]
var/list/players_to_spawn = list()
if(pick_manually)
var/list/possible_ghosts = list()
@@ -52,14 +53,12 @@
players_to_spawn += candidate
else
to_chat(src, "Polling candidates...")
- players_to_spawn = pollCandidates("Do you want to play as an event character?")
+ players_to_spawn = SSghost_spawns.poll_candidates("Do you want to play as \a [O.name]?")
if(!players_to_spawn.len)
to_chat(src, "Nobody volunteered.")
return 0
- var/datum/outfit/O = outfit_list[dresscode]
-
var/players_spawned = 0
for(var/mob/thisplayer in players_to_spawn)
var/mob/living/carbon/human/H = new /mob/living/carbon/human(T)
diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
index 54ddf85045e..d4ea1a0dd2e 100644
--- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm
+++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
@@ -55,7 +55,8 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
infiltrators += candidate
else
to_chat(src, "Polling candidates...")
- infiltrators = pollCandidates("Do you want to play as a SYNDICATE INFILTRATOR?", ROLE_TRAITOR, 1)
+ var/mutable_appearance/ma = new('icons/mob/simple_human.dmi', "syndicate")
+ infiltrators = SSghost_spawns.poll_candidates("Do you want to play as a SYNDICATE INFILTRATOR?", ROLE_TRAITOR, TRUE, source = ma)
if(!infiltrators.len)
to_chat(src, "Nobody volunteered.")
diff --git a/code/modules/admin/verbs/logging_view.dm b/code/modules/admin/verbs/logging_view.dm
index 903926f4923..cafaab8f1d7 100644
--- a/code/modules/admin/verbs/logging_view.dm
+++ b/code/modules/admin/verbs/logging_view.dm
@@ -2,10 +2,20 @@ GLOBAL_LIST_INIT(open_logging_views, list())
/client/proc/cmd_admin_open_logging_view()
set category = "Admin"
- set name = "Open Logging View"
+ set name = "Logging View"
set desc = "Opens the detailed logging viewer"
+ open_logging_view()
- if(!GLOB.open_logging_views[usr.client.ckey])
- GLOB.open_logging_views[usr.client.ckey] = new /datum/log_viewer()
- var/datum/log_viewer/LV = GLOB.open_logging_views[usr.client.ckey]
- LV.show_ui(usr)
+/client/proc/open_logging_view(list/mob/mobs_to_add = null, clear_view = FALSE)
+ var/datum/log_viewer/cur_view = GLOB.open_logging_views[usr.client.ckey]
+ if(!cur_view)
+ cur_view = new /datum/log_viewer()
+ GLOB.open_logging_views[usr.client.ckey] = cur_view
+ else if(clear_view)
+ cur_view.clear_all()
+
+ if(mobs_to_add?.len)
+ cur_view.add_mobs(mobs_to_add)
+
+ cur_view.show_ui(usr)
+
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index edbca5a842f..0dc3dfc1791 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -2,8 +2,9 @@
set category = "Debug"
set name = "Map template - Place"
- if(!holder)
+ if(!check_rights(R_DEBUG))
return
+
var/datum/map_template/template
var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in GLOB.map_templates
@@ -36,6 +37,9 @@
set category = "Debug"
set name = "Map Template - Upload"
+ if(!check_rights(R_DEBUG))
+ return
+
var/map = input(usr, "Choose a Map Template to upload to template storage","Upload Map Template") as null|file
if(!map)
return
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 3e89a6ac18d..5d9d218c90e 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -137,7 +137,8 @@ client/proc/one_click_antag()
var/confirm = alert("Are you sure?", "Confirm creation", "Yes", "No")
if(confirm != "Yes")
return 0
- var/list/candidates = pollCandidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", "wizard")
+ var/mutable_appearance/ma = new('icons/mob/simple_human.dmi', "wizard")
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", "wizard", source = ma)
log_admin("[key_name(owner)] tried making a Wizard with One-Click-Antag")
message_admins("[key_name_admin(owner)] tried making a Wizard with One-Click-Antag")
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index e51f6da991a..9f2579ad162 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -84,7 +84,7 @@
var/obj/item/slot_item_hand = H.get_item_by_slot(slot_r_hand)
H.unEquip(slot_item_hand)
- var /obj/item/multisword/pure_evil/multi = new(H)
+ var/obj/item/multisword/pure_evil/multi = new(H)
H.equip_to_slot_or_del(multi, slot_r_hand)
var/obj/item/card/id/W = new(H)
diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index 5cf4c34ffe2..3c1d0820dd7 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -2,6 +2,9 @@
set name = "Possess Obj"
set category = null
+ if(!check_rights(R_POSSESS))
+ return
+
if(istype(O,/obj/singularity))
if(config.forbid_singulo_possession)
to_chat(usr, "It is forbidden to possess singularities.")
@@ -35,6 +38,9 @@
set category = null
//usr.loc = get_turf(usr)
+ if(!check_rights(R_POSSESS))
+ return
+
if(usr.control_object && usr.name_archive) //if you have a name archived and if you are actually relassing an object
usr.real_name = usr.name_archive
usr.name = usr.real_name
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 03315243602..3864f573597 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -51,7 +51,7 @@
if(!ismob(M))
return
- if(!check_rights(R_SERVER|R_EVENT))
+ if(!check_rights(R_EVENT))
return
var/msg = clean_input("Message:", text("Subtle PM to [M.key]"))
@@ -123,7 +123,7 @@
feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_direct_narrate(var/mob/M) // Targetted narrate -- TLE
- set category = "Event"
+ set category = null
set name = "Direct Narrate"
if(!check_rights(R_SERVER|R_EVENT))
@@ -158,7 +158,7 @@
/client/proc/admin_headset_message(mob/M in GLOB.mob_list, sender = null)
var/mob/living/carbon/human/H = M
- if(!check_rights(R_ADMIN))
+ if(!check_rights(R_EVENT))
return
if(!istype(H))
@@ -572,7 +572,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in GLOB.mob_list)
- set category = "Event"
+ set category = null
set name = "Rejuvenate"
if(!check_rights(R_REJUVINATE))
@@ -638,7 +638,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_delete(atom/A as obj|mob|turf in view())
- set category = "Admin"
+ set category = null
set name = "Delete"
if(!check_rights(R_ADMIN))
@@ -826,7 +826,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
SSshuttle.emergency.canRecall = FALSE
- SSshuttle.emergency.request()
+ if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED)
+ SSshuttle.emergency.request(coefficient = 0.5, redAlert = TRUE)
+ else
+ SSshuttle.emergency.request()
feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-called the emergency shuttle.")
@@ -874,6 +877,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(SSshuttle)
SSshuttle.emergencyNoEscape = !SSshuttle.emergencyNoEscape
+ feedback_add_details("admin_verb", "DENYSHUT")
log_admin("[key_name(src)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
message_admins("[key_name_admin(usr)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
@@ -979,7 +983,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/role_string
var/obj_count = 0
var/obj_string = ""
- for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+ for(var/thing in GLOB.human_list)
+ var/mob/living/carbon/human/H = thing
if(!isLivingSSD(H))
continue
mins_ssd = round((world.time - H.last_logout) / 600)
@@ -1016,7 +1021,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
msg += "AFK Players:| Key | Real Name | Job | Mins AFK | Special Role | Area | PPN | Cryo | "
dat += " " dat += "Load slot - " dat += "Save slot - " dat += "Reload slot" + if(saved) + dat += " - Clear slot" dat += " |
"
@@ -2078,6 +2081,11 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
load_preferences(user)
load_character(user)
+ if("clear")
+ if(!saved || real_name != input("This will clear the current slot permanently. Please enter the character's full name to confirm."))
+ return FALSE
+ clear_character_slot(user)
+
if("open_load_dialog")
if(!IsGuestKey(user.key))
open_load_dialog(user)
diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
index 4219935c766..e889ec5a181 100644
--- a/code/modules/client/preference/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -121,6 +121,7 @@
return 1
/datum/preferences/proc/load_character(client/C,slot)
+ saved = FALSE
if(!slot) slot = default_slot
slot = sanitize_integer(slot, 1, max_save_slots, initial(default_slot))
@@ -262,6 +263,8 @@
loadout_gear = params2list(query.item[51])
autohiss_mode = text2num(query.item[52])
+ saved = TRUE
+
//Sanitize
var/datum/species/SP = GLOB.all_species[species]
metadata = sanitize_text(metadata, initial(metadata))
@@ -474,6 +477,8 @@
log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
message_admins("SQL ERROR during character slot saving. Error : \[[err]\]\n")
return
+
+ saved = TRUE
return 1
/datum/preferences/proc/load_random_character_slot(client/C)
@@ -495,3 +500,20 @@
load_character(C,pick(saves))
return 1
+/datum/preferences/proc/clear_character_slot(client/C)
+ . = FALSE
+ // Is there a character in that slot?
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT slot FROM [format_table_name("characters")] WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
+ query.Execute()
+ if(!query.RowCount())
+ return
+
+ var/DBQuery/query2 = GLOB.dbcon.NewQuery("DELETE FROM [format_table_name("characters")] WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
+ if(!query2.Execute())
+ var/err = query2.ErrorMsg()
+ log_game("SQL ERROR during character slot clearing. Error : \[[err]\]\n")
+ message_admins("SQL ERROR during character slot clearing. Error : \[[err]\]\n")
+ return
+
+ saved = FALSE
+ return TRUE
diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
index 5534e18e253..0f4317e3ce2 100644
--- a/code/modules/client/preference/preferences_toggles.dm
+++ b/code/modules/client/preference/preferences_toggles.dm
@@ -30,7 +30,8 @@
set name = "Show/Hide RadioChatter"
set category = "Preferences"
set desc = "Toggle seeing radiochatter from radios and speakers"
- if(!holder) return
+ if(!check_rights(R_ADMIN))
+ return
prefs.toggles ^= CHAT_RADIO
prefs.save_preferences(src)
to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers")
@@ -49,7 +50,8 @@
set name = "Hear/Silence Admin Bwoinks"
set category = "Preferences"
set desc = "Toggle hearing a notification when admin PMs are recieved"
- if(!holder) return
+ if(!check_rights(R_ADMIN))
+ return
prefs.sound ^= SOUND_ADMINHELP
prefs.save_preferences(src)
to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.")
@@ -59,7 +61,7 @@
set name = "Hear/Silence Mentorhelp Bwoinks"
set category = "Preferences"
set desc = "Toggle hearing a notification when mentorhelps are recieved"
- if(!holder)
+ if(!check_rights(R_ADMIN|R_MENTOR))
return
prefs.sound ^= SOUND_MENTORHELP
prefs.save_preferences(src)
@@ -296,7 +298,7 @@
to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTPDA) ? "see all PDA messages" : "no longer see PDA messages"].")
prefs.save_preferences(src)
feedback_add_details("admin_verb","TGP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
+
/client/verb/silence_current_midi()
set name = "Silence Current Midi"
set category = "Preferences"
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index bfa43b92fa3..b1efd1f0b78 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -32,6 +32,7 @@
var/cooldown = 0
var/species_disguise = null
var/magical = FALSE
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/proc/weldingvisortoggle(mob/user) //proc to toggle welding visors on helmets, masks, goggles, etc.
if(!can_use(user))
@@ -590,6 +591,7 @@ BLIND // can't see anything
name = "Space helmet"
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
+ w_class = WEIGHT_CLASS_NORMAL
flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
item_state = "s_helmet"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 2a9abf461c9..05bd3d6f48d 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -2,6 +2,7 @@
name = "helmet"
desc = "Standard Security gear. Protects the head from impacts."
icon_state = "helmetmaterials"
+ w_class = WEIGHT_CLASS_NORMAL
flags = HEADBANGPROTECT
flags_cover = HEADCOVERSEYES
item_state = "helmetmaterials"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 962cfed80c5..1f8cb7aaed1 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -6,6 +6,7 @@
/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses
name = "combat boots"
desc = "High speed, low drag combat boots."
+ w_class = WEIGHT_CLASS_NORMAL
can_cut_open = 1
icon_state = "jackboots"
item_state = "jackboots"
diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
deleted file mode 100644
index 6b9d07a332d..00000000000
--- a/code/modules/clothing/spacesuits/rig/modules/combat.dm
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Contains
- * /obj/item/rig_module/grenade_launcher
- * /obj/item/rig_module/mounted
- * /obj/item/rig_module/mounted/taser
- * /obj/item/rig_module/shield
- * /obj/item/rig_module/fabricator
- * /obj/item/rig_module/device/flash
- */
-
-/obj/item/rig_module/device/flash
- name = "mounted flash"
- desc = "You are the law."
- icon_state = "flash"
- interface_name = "mounted flash"
- interface_desc = "Stuns your target by blinding them with a bright light."
- device_type = /obj/item/flash
-
-/obj/item/rig_module/grenade_launcher
-
- name = "mounted grenade launcher"
- desc = "A shoulder-mounted micro-explosive dispenser."
- selectable = 1
- icon_state = "grenade"
-
- interface_name = "integrated grenade launcher"
- interface_desc = "Discharges loaded grenades against the wearer's location."
-
- var/fire_force = 30
- var/fire_distance = 10
-
- charges = list(
- list("flashbang", "flashbang", /obj/item/grenade/flashbang, 3),
- list("smoke bomb", "smoke bomb", /obj/item/grenade/smokebomb, 3),
- list("EMP grenade", "EMP grenade", /obj/item/grenade/empgrenade, 3),
- )
-
-/obj/item/rig_module/grenade_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user)
-
- if(!istype(input_device) || !istype(user))
- return 0
-
- var/datum/rig_charge/accepted_item
- for(var/charge in charges)
- var/datum/rig_charge/charge_datum = charges[charge]
- if(input_device.type == charge_datum.product_type)
- accepted_item = charge_datum
- break
-
- if(!accepted_item)
- return 0
-
- if(accepted_item.charges >= 5)
- to_chat(user, "Another grenade of that type will not fit into the module.")
- return 0
-
- to_chat(user, "You slot \the [input_device] into the suit module.")
- user.unEquip(input_device)
- qdel(input_device)
- accepted_item.charges++
- return 1
-
-/obj/item/rig_module/grenade_launcher/engage(atom/target)
-
- if(!..())
- return 0
-
- if(!target)
- return 0
-
- var/mob/living/carbon/human/H = holder.wearer
-
- if(!charge_selected)
- to_chat(H, "You have not selected a grenade type.")
- return 0
-
- var/datum/rig_charge/charge = charges[charge_selected]
-
- if(!charge)
- return 0
-
- if(charge.charges <= 0)
- to_chat(H, "Insufficient grenades!")
- return 0
-
- charge.charges--
- var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H))
- H.visible_message("[H] launches \a [new_grenade]!")
- new_grenade.throw_at(target,fire_force,fire_distance)
- new_grenade.prime()
-
-/obj/item/rig_module/mounted
-
- name = "mounted laser cannon"
- desc = "A shoulder-mounted battery-powered laser cannon mount."
- selectable = 1
- usable = 1
- module_cooldown = 0
- icon_state = "lcannon"
-
- engage_string = "Configure"
-
- interface_name = "mounted laser cannon"
- interface_desc = "A shoulder-mounted cell-powered laser cannon."
-
- var/gun_type = /obj/item/gun/energy/lasercannon/mounted
- var/obj/item/gun/gun
-
-/obj/item/rig_module/mounted/New()
- ..()
- gun = new gun_type(src)
-
-/obj/item/rig_module/mounted/engage(atom/target)
-
- if(!..())
- return 0
-
- if(!target)
- gun.attack_self(holder.wearer)
- return 1
-
- gun.afterattack(target,holder.wearer)
- return 1
-
-/obj/item/rig_module/mounted/egun
-
- name = "mounted energy gun"
- desc = "A forearm-mounted energy projector."
- icon_state = "egun"
-
- interface_name = "mounted energy gun"
- interface_desc = "A forearm-mounted suit-powered energy gun."
-
- gun_type = /obj/item/gun/energy/gun/mounted
-
-/obj/item/rig_module/mounted/taser
-
- name = "mounted taser"
- desc = "A palm-mounted nonlethal energy projector."
- icon_state = "taser"
-
- usable = 0
-
- suit_overlay_active = "mounted-taser"
- suit_overlay_inactive = "mounted-taser"
-
- interface_name = "mounted energy gun"
- interface_desc = "A shoulder-mounted cell-powered energy gun."
-
- gun_type = /obj/item/gun/energy/taser/mounted
-
-/obj/item/rig_module/mounted/energy_blade
-
- name = "energy blade projector"
- desc = "A powerful cutting beam projector."
- icon_state = "eblade"
-
- activate_string = "Project Blade"
- deactivate_string = "Cancel Blade"
-
- interface_name = "spider fang blade"
- interface_desc = "A lethal energy projector that can shape a blade projected from the hand of the wearer or launch radioactive darts."
-
- usable = 0
- selectable = 1
- toggleable = 1
- use_power_cost = 50
- active_power_cost = 10
- passive_power_cost = 0
-
- gun_type = /obj/item/gun/energy/kinetic_accelerator/crossbow/ninja
-
-/obj/item/rig_module/mounted/energy_blade/process()
-
- if(holder && holder.wearer)
- if(!(locate(/obj/item/melee/energy/blade) in holder.wearer))
- deactivate()
- return 0
-
- return ..()
-
-/obj/item/rig_module/mounted/energy_blade/activate()
-
- ..()
-
- var/mob/living/M = holder.wearer
-
- if(M.l_hand && M.r_hand)
- to_chat(M, "Your hands are full.")
- deactivate()
- return
-
- var/obj/item/melee/energy/blade/blade = new(M)
- M.put_in_hands(blade)
-
-/obj/item/rig_module/mounted/energy_blade/deactivate()
-
- ..()
-
- var/mob/living/M = holder.wearer
-
- if(!M)
- return
-
- for(var/obj/item/melee/energy/blade/blade in M.contents)
- M.unEquip(blade)
- qdel(blade)
-
-/obj/item/rig_module/fabricator
-
- name = "matter fabricator"
- desc = "A self-contained microfactory system for hardsuit integration."
- selectable = 1
- usable = 1
- use_power_cost = 15
- icon_state = "enet"
-
- engage_string = "Fabricate Tile"
-
- interface_name = "death blossom launcher"
- interface_desc = "An integrated microfactory that produces floor tiles from thin air and electricity."
-
- var/fabrication_type = /obj/item/stack/tile/plasteel
- var/fire_force = 30
- var/fire_distance = 10
-
-/obj/item/rig_module/fabricator/engage(atom/target)
-
- if(!..())
- return 0
-
- var/mob/living/H = holder.wearer
-
- if(target)
- var/obj/item/firing = new fabrication_type()
- firing.forceMove(get_turf(src))
- H.visible_message("[H] launches \a [firing]!")
- firing.throw_at(target,fire_force,fire_distance)
- else
- if(H.l_hand && H.r_hand)
- to_chat(H, "Your hands are full.")
- else
- var/obj/item/new_weapon = new fabrication_type()
- new_weapon.forceMove(H)
- to_chat(H, "You quickly fabricate \a [new_weapon].")
- H.put_in_hands(new_weapon)
-
- return 1
diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm
deleted file mode 100644
index 749e12e8053..00000000000
--- a/code/modules/clothing/spacesuits/rig/modules/computer.dm
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Contains
- * /obj/item/rig_module/ai_container
- * /obj/item/rig_module/datajack
- * /obj/item/rig_module/power_sink
- * /obj/item/rig_module/electrowarfare_suite
- */
-
-/obj/item/ai_verbs
- name = "AI verb holder"
-
-/obj/item/ai_verbs/verb/hardsuit_interface()
- set category = "Hardsuit"
- set name = "Open Hardsuit Interface"
- set src in usr
-
- if(!usr.loc || !usr.loc.loc || !istype(usr.loc.loc, /obj/item/rig_module))
- to_chat(usr, "You are not loaded into a hardsuit.")
- return
-
- var/obj/item/rig_module/module = usr.loc.loc
- if(!module.holder)
- to_chat(usr, "Your module is not installed in a hardsuit.")
- return
-
- module.holder.ui_interact(usr, state = GLOB.contained_state)
-
-/obj/item/rig_module/ai_container
-
- name = "IIS module"
- desc = "An integrated intelligence system module suitable for most hardsuits."
- icon_state = "IIS"
- toggleable = 1
- usable = 1
- disruptive = 0
- activates_on_touch = 1
-
- engage_string = "Eject AI"
- activate_string = "Enable Dataspike"
- deactivate_string = "Disable Dataspike"
-
- interface_name = "integrated intelligence system"
- interface_desc = "A socket that supports a range of artificial intelligence systems."
-
- var/mob/integrated_ai // Direct reference to the actual mob held in the suit.
- var/obj/item/ai_card // Reference to the MMI, posibrain, intellicard or pAI card previously holding the AI.
- var/obj/item/ai_verbs/verb_holder
-
-/mob
- var/get_rig_stats = 0
-
-/obj/item/rig_module/ai_container/process()
- if(integrated_ai)
- var/obj/item/rig/rig = get_rig()
- if(rig && rig.ai_override_enabled)
- integrated_ai.get_rig_stats = 1
- else
- integrated_ai.get_rig_stats = 0
-
-/obj/item/rig_module/ai_container/proc/update_verb_holder()
- if(!verb_holder)
- verb_holder = new(src)
- if(integrated_ai)
- verb_holder.forceMove(integrated_ai)
- else
- verb_holder.forceMove(src)
-
-/obj/item/rig_module/ai_container/accepts_item(var/obj/item/input_device, var/mob/living/user)
-
- // Check if there's actually an AI to deal with.
- var/mob/living/silicon/ai/target_ai
- if(istype(input_device, /mob/living/silicon/ai))
- target_ai = input_device
- else
- target_ai = locate(/mob/living/silicon/ai) in input_device.contents
-
- var/obj/item/aicard/card = ai_card
-
- // Downloading from/loading to a terminal.
- if(istype(input_device,/obj/machinery/computer/aifixer) || istype(input_device,/mob/living/silicon/ai) || istype(input_device,/obj/structure/AIcore/deactivated))
-
- // If we're stealing an AI, make sure we have a card for it.
- if(!card)
- card = new /obj/item/aicard(src)
-
- // Terminal interaction only works with an intellicarded AI.
- if(!istype(card))
- return 0
-
- // Since we've explicitly checked for three types, this should be safe.
- card.afterattack(input_device, user, 1)
-
- // If the transfer failed we can delete the card.
- if(locate(/mob/living/silicon/ai) in card)
- ai_card = card
- integrated_ai = locate(/mob/living/silicon/ai) in card
- else
- eject_ai()
- update_verb_holder()
- return 1
-
- if(istype(input_device,/obj/item/aicard))
- // We are carding the AI in our suit.
- if(integrated_ai)
- var/obj/item/aicard/ext_card = input_device
- ext_card.afterattack(integrated_ai, user, 1)
- // If the transfer was successful, we can clear out our vars.
- if(integrated_ai.loc != src)
- integrated_ai = null
- eject_ai()
- else
- // You're using an empty card on an empty suit, idiot.
- if(!target_ai)
- return 0
- integrate_ai(input_device,user)
- return 1
-
- // Okay, it wasn't a terminal being touched, check for all the simple insertions.
- if(input_device.type in list(/obj/item/paicard, /obj/item/mmi, /obj/item/mmi/robotic_brain))
- if(integrated_ai)
- integrated_ai.attackby(input_device,user)
- // If the transfer was successful, we can clear out our vars.
- if(integrated_ai.loc != src)
- integrated_ai = null
- eject_ai()
- else
- integrate_ai(input_device,user)
- return 1
-
- return 0
-
-/obj/item/rig_module/ai_container/engage(atom/target)
-
- if(!..())
- return 0
-
- var/mob/living/carbon/human/H = holder.wearer
-
- if(!target)
- if(ai_card)
- if(istype(ai_card,/obj/item/aicard))
- ai_card.ui_interact(H, state = GLOB.deep_inventory_state)
- else
- eject_ai(H)
- update_verb_holder()
- return 1
-
- if(accepts_item(target,H))
- return 1
-
- return 0
-
-/obj/item/rig_module/ai_container/removed()
- eject_ai()
- ..()
-
-/obj/item/rig_module/ai_container/proc/eject_ai(var/mob/user)
-
- if(ai_card)
- if(istype(ai_card, /obj/item/aicard))
- if(integrated_ai && !integrated_ai.stat)
- if(user)
- to_chat(user, "You cannot eject your currently stored AI. Purge it manually.")
- return 0
- to_chat(user, "You purge the remaining scraps of data from your previous AI, freeing it for use.")
- QDEL_NULL(integrated_ai)
- QDEL_NULL(ai_card)
- else if(user)
- user.put_in_hands(ai_card)
- else
- ai_card.forceMove(get_turf(src))
- ai_card = null
- integrated_ai = null
- update_verb_holder()
-
-
-
-/obj/item/rig_module/ai_container/proc/integrate_ai(var/obj/item/ai,var/mob/user)
- if(!ai) return
-
- // The ONLY THING all the different AI systems have in common is that they all store the mob inside an item.
- var/mob/living/ai_mob = locate(/mob/living) in ai.contents
- if(ai_mob)
- if(ai_mob.key && ai_mob.client)
- if(istype(ai, /obj/item/aicard))
- var/mob/living/silicon/ai/ROBUTT = ai_mob
- if(istype(ROBUTT))
- if(!ai_card)
- ai_card = new /obj/item/aicard(src)
-
- var/obj/item/aicard/source_card = ai
- var/obj/item/aicard/target_card = ai_card
- if(istype(source_card) && istype(target_card))
- ROBUTT.forceMove(target_card)
- ROBUTT.aiRestorePowerRoutine = 0//So the AI initially has power.
- ROBUTT.control_disabled = 1//Can't control things remotely if you're stuck in a card!
- ROBUTT.aiRadio.disabledAi = 1 //No talking on the built-in radio for you either!
- source_card.update_state()
- target_card.update_state()
- else
- return 0
-
- else
- user.unEquip(ai)
- ai.forceMove(src)
- ai_card = ai
- to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].")
- to_chat(user, "You load [ai_mob] into \the [holder]'s [src].")
-
- integrated_ai = ai_mob
-
- if(!(locate(integrated_ai) in ai_card))
- integrated_ai = null
- eject_ai()
- else
- to_chat(user, "There is no active AI within \the [ai].")
- else
- to_chat(user, "There is no active AI within \the [ai].")
- update_verb_holder()
-
-/obj/item/rig_module/datajack
-
- name = "datajack module"
- desc = "A simple induction datalink module."
- icon_state = "datajack"
- toggleable = 1
- activates_on_touch = 1
- usable = 0
-
- activate_string = "Enable Datajack"
- deactivate_string = "Disable Datajack"
-
- interface_name = "contact datajack"
- interface_desc = "An induction-powered high-throughput datalink suitable for hacking encrypted networks."
- var/list/stored_research
-
-/obj/item/rig_module/datajack/New()
- ..()
- stored_research = list()
-
-/obj/item/rig_module/datajack/engage(atom/target)
-
- if(!..())
- return 0
-
- if(target)
- var/mob/living/carbon/human/H = holder.wearer
- if(!accepts_item(target,H))
- return 0
- return 1
-
-/obj/item/rig_module/datajack/accepts_item(var/obj/item/input_device, var/mob/living/user)
-
- if(istype(input_device,/obj/item/disk/tech_disk))
- to_chat(user, "You slot the disk into [src].")
- var/obj/item/disk/tech_disk/disk = input_device
- if(disk.stored)
- if(load_data(disk.stored))
- to_chat(user, "Download successful; disk erased.")
- disk.stored = null
- else
- to_chat(user, "The disk is corrupt. It is useless to you.")
- else
- to_chat(user, "The disk is blank. It is useless to you.")
- return 1
-
- // I fucking hate R&D code. This typecheck spam would be totally unnecessary in a sane setup.
- else if(istype(input_device,/obj/machinery))
- var/datum/research/incoming_files
- if(istype(input_device,/obj/machinery/computer/rdconsole))
- var/obj/machinery/computer/rdconsole/input_machine = input_device
- incoming_files = input_machine.files
- else if(istype(input_device,/obj/machinery/r_n_d/server))
- var/obj/machinery/r_n_d/server/input_machine = input_device
- incoming_files = input_machine.files
- else if(istype(input_device,/obj/machinery/mecha_part_fabricator))
- var/obj/machinery/mecha_part_fabricator/input_machine = input_device
- incoming_files = input_machine.files
-
- if(!incoming_files || !incoming_files.known_tech || !incoming_files.known_tech.len)
- to_chat(user, "Memory failure. There is nothing accessible stored on this terminal.")
- else
- // Maybe consider a way to drop all your data into a target repo in the future.
- if(load_data(incoming_files.known_tech))
- to_chat(user, "Download successful; local and remote repositories synchronized.")
- else
- to_chat(user, "Scan complete. There is nothing useful stored on this terminal.")
- return 1
- return 0
-
-/obj/item/rig_module/datajack/proc/load_data(var/incoming_data)
-
- if(islist(incoming_data))
- for(var/entry in incoming_data)
- load_data(entry)
- return 1
-
- if(istype(incoming_data, /datum/tech))
- var/data_found
- var/datum/tech/new_data = incoming_data
- for(var/datum/tech/current_data in stored_research)
- if(current_data.id == new_data.id)
- data_found = 1
- if(current_data.level < new_data.level)
- current_data.level = new_data.level
- break
- if(!data_found)
- stored_research += incoming_data
- return 1
- return 0
-
-/obj/item/rig_module/electrowarfare_suite
-
- name = "electrowarfare module"
- desc = "A bewilderingly complex bundle of fiber optics and chips."
- icon_state = "ewar"
- toggleable = 1
- usable = 0
-
- activate_string = "Enable Countermeasures"
- deactivate_string = "Disable Countermeasures"
-
- interface_name = "electrowarfare system"
- interface_desc = "An active counter-electronic warfare suite that disrupts AI tracking."
-
-/obj/item/rig_module/electrowarfare_suite/activate()
-
- if(!..())
- return
-
- // This is not the best way to handle this, but I don't want it to mess with ling camo
- var/mob/living/M = holder.wearer
- M.digitalcamo++
-
-/obj/item/rig_module/electrowarfare_suite/deactivate()
-
- if(!..())
- return
-
- var/mob/living/M = holder.wearer
- M.digitalcamo = max(0,(M.digitalcamo-1))
-
-/* //Not easily compatible with our current powernet, and is
-/obj/item/rig_module/power_sink // quite stupid anyways, iyam
-
- name = "hardsuit power sink"
- desc = "An heavy-duty power sink."
- icon_state = "powersink"
- toggleable = 1
- activates_on_touch = 1
- disruptive = 0
-
- activate_string = "Enable Power Sink"
- deactivate_string = "Disable Power Sink"
-
- interface_name = "niling d-sink"
- interface_desc = "Colloquially known as a power siphon, this module drains power through the suit hands into the suit battery."
-
- var/atom/interfaced_with // Currently draining power from this device.
- var/total_power_drained = 0
- var/drain_loc
-
-/obj/item/rig_module/power_sink/deactivate()
-
- if(interfaced_with)
- if(holder && holder.wearer)
- to_chat(holder.wearer, "Your power sink retracts as the module deactivates.")
- drain_complete()
- interfaced_with = null
- total_power_drained = 0
- return ..()
-
-/obj/item/rig_module/power_sink/activate()
- interfaced_with = null
- total_power_drained = 0
- return ..()
-
-/obj/item/rig_module/power_sink/engage(atom/target)
-
- if(!..())
- return 0
-
- //Target wasn't supplied or we're already draining.
- if(interfaced_with)
- return 0
-
- if(!target)
- return 1
-
- // Are we close enough?
- var/mob/living/carbon/human/H = holder.wearer
- if(!target.Adjacent(H))
- return 0
-
- // Is it a valid power source?
- if(target.drain_power(1) <= 0)
- return 0
-
- to_chat(H, "You begin draining power from [target]!")
- interfaced_with = target
- drain_loc = interfaced_with.loc
-
- holder.spark_system.start()
- playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1)
-
- return 1
-
-/obj/item/rig_module/power_sink/accepts_item(var/obj/item/input_device, var/mob/living/user)
- var/can_drain = input_device.drain_power(1)
- if(can_drain > 0)
- engage(input_device)
- return 1
- return 0
-
-/obj/item/rig_module/power_sink/process()
-
- if(!interfaced_with)
- return ..()
-
- var/mob/living/carbon/human/H
- if(holder && holder.wearer)
- H = holder.wearer
-
- if(!H || !istype(H))
- return 0
-
- holder.spark_system.start()
- playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1)
-
- if(!holder.cell)
- to_chat(H, "Your power sink flashes an error; there is no cell in your rig.")
- drain_complete(H)
- return
-
- if(!interfaced_with || !interfaced_with.Adjacent(H) || !(interfaced_with.loc == drain_loc))
- to_chat(H, "Your power sink retracts into its casing.")
- drain_complete(H)
- return
-
- if(holder.cell.fully_charged())
- to_chat(H, "Your power sink flashes an amber light; your rig cell is full.")
- drain_complete(H)
- return
-
- // Attempts to drain up to 40kW, determines this value from remaining cell capacity to ensure we don't drain too much..
- var/to_drain = min(40000, ((holder.cell.maxcharge - holder.cell.charge) / CELLRATE))
- var/target_drained = interfaced_with.drain_power(0,0,to_drain)
- if(target_drained <= 0)
- to_chat(H, "Your power sink flashes a red light; there is no power left in [interfaced_with].")
- drain_complete(H)
- return
-
- holder.cell.give(target_drained * CELLRATE)
- total_power_drained += target_drained
-
- return 1
-
-/obj/item/rig_module/power_sink/proc/drain_complete(var/mob/living/M)
-
- if(!interfaced_with)
- to_chat(if(M) M, "Total power drained: [round(total_power_drained/1000)]kJ.")
- else
- to_chat(if(M) M, "Total power drained from [interfaced_with]: [round(total_power_drained/1000)]kJ.")
- interfaced_with.drain_power(0,1,0) // Damage the victim.
-
- drain_loc = null
- interfaced_with = null
- total_power_drained = 0*/
-
-/*
-//Maybe make this use power when active or something
-/obj/item/rig_module/emp_shielding
- name = "\improper EMP dissipation module"
- desc = "A bewilderingly complex bundle of fiber optics and chips."
- toggleable = 1
- usable = 0
-
- activate_string = "Enable active EMP shielding"
- deactivate_string = "Disable active EMP shielding"
-
- interface_name = "active EMP shielding system"
- interface_desc = "A highly experimental system that augments the hardsuit's existing EM shielding."
- var/protection_amount = 20
-
-/obj/item/rig_module/emp_shielding/activate()
- if(!..())
- return
-
- holder.emp_protection += protection_amount
-
-/obj/item/rig_module/emp_shielding/deactivate()
- if(!..())
- return
-
- holder.emp_protection = max(0,(holder.emp_protection - protection_amount))
-*/
diff --git a/code/modules/clothing/spacesuits/rig/modules/handheld.dm b/code/modules/clothing/spacesuits/rig/modules/handheld.dm
deleted file mode 100644
index 31f9400afc2..00000000000
--- a/code/modules/clothing/spacesuits/rig/modules/handheld.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-
-/obj/item/rig_module/handheld
- name = "mounted device"
- desc = "Some kind of hardsuit extension."
- usable = 0
- selectable = 0
- toggleable = 1
- disruptive = 0
- activate_string = "Deploy"
- deactivate_string = "Retract"
-
- var/device_type
- var/obj/item
-
-/obj/item/rig_module/handheld/activate()
- if(!..())
- return
-
- if(!holder.wearer.put_in_hands(device))
- to_chat(holder.wearer, "You need a free hand to hold \the [device].")
- active = 0
- return
-
- to_chat(holder.wearer, "You deploy \the [device].")
-
-
-/obj/item/rig_module/handheld/deactivate()
- if(!..())
- return
- if(ismob(device.loc)) //Better check for the holder, instead of assuming the rigwearer has it.
- var/mob/M = device.loc //Helps in case the code fails to keep the module in one place, this should still return it.
- M.unEquip(device, 1)
-
- device.loc = src
- to_chat(holder.wearer, "You retract \the [device].")
-
-/obj/item/rig_module/handheld/New()
- ..()
- if(device_type)
- device = new device_type(src)
- device.flags |= NODROP //We don't want to drop it while it's active/inhand.
- activate_string += " [device]"
- deactivate_string += " [device]"
-
-/obj/item/rig_module/handheld/horn
- name = "mounted bikehorn"
- desc = "For tactical honking"
- interface_name = "mounted bikehorn"
- interface_desc = "Honks"
- device_type = /obj/item/bikehorn
diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm
deleted file mode 100644
index 53330341bfe..00000000000
--- a/code/modules/clothing/spacesuits/rig/modules/modules.dm
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Rigsuit upgrades/abilities.
- */
-
-/datum/rig_charge
- var/short_name = "undef"
- var/display_name = "undefined"
- var/product_type = "undefined"
- var/charges = 0
-
-/obj/item/rig_module
- name = "hardsuit upgrade"
- desc = "It looks pretty sciency."
- icon = 'icons/obj/rig_modules.dmi'
- icon_state = "module"
-
- toolspeed = 1
-
- var/damage = 0
- var/obj/item/rig/holder
-
- var/module_cooldown = 10
- var/next_use = 0
-
- var/toggleable // Set to 1 for the device to show up as an active effect.
- var/usable // Set to 1 for the device to have an on-use effect.
- var/selectable // Set to 1 to be able to assign the device as primary system.
- var/redundant // Set to 1 to ignore duplicate module checking when installing.
- var/permanent // If set, the module can't be removed.
- var/disruptive = 1 // Can disrupt by other effects.
- var/activates_on_touch // If set, unarmed attacks will call engage() on the target.
-
- var/active // Basic module status
- var/disruptable // Will deactivate if some other powers are used.
-
- var/use_power_cost = 0 // Power used when single-use ability called.
- var/active_power_cost = 0 // Power used when turned on.
- var/passive_power_cost = 0 // Power used when turned off.
-
- var/list/charges // Associative list of charge types and remaining numbers.
- var/charge_selected // Currently selected option used for charge dispensing.
-
- // Icons.
- var/suit_overlay
- var/suit_overlay_active // If set, drawn over icon and mob when effect is active.
- var/suit_overlay_inactive // As above, inactive.
- var/suit_overlay_used // As above, when engaged.
-
- //Display fluff
- var/interface_name = "hardsuit upgrade"
- var/interface_desc = "A generic hardsuit upgrade."
- var/engage_string = "Engage"
- var/activate_string = "Activate"
- var/deactivate_string = "Deactivate"
-
- var/list/stat_rig_module/stat_modules = new()
-
-/obj/item/rig_module/examine(mob/user)
- . = ..()
- switch(damage)
- if(0)
- . += "It is undamaged."
- if(1)
- . += "It is badly damaged."
- if(2)
- . += "It is almost completely destroyed."
-
-/obj/item/rig_module/attackby(obj/item/W as obj, mob/user as mob)
-
- if(istype(W,/obj/item/stack/nanopaste))
-
- if(damage == 0)
- to_chat(user, "There is no damage to mend.")
- return
-
- to_chat(user, "You start mending the damaged portions of \the [src]...")
-
- if(!do_after(user, 30 * W.toolspeed, target = src) || !W || !src)
- return
-
- var/obj/item/stack/nanopaste/paste = W
- damage = 0
- to_chat(user, "You mend the damage to [src] with [W].")
- paste.use(1)
- return
-
- else if(istype(W,/obj/item/stack/cable_coil))
-
- switch(damage)
- if(0)
- to_chat(user, "There is no damage to mend.")
- return
- if(2)
- to_chat(user, "There is no damage that you are capable of mending with such crude tools.")
- return
-
- var/obj/item/stack/cable_coil/cable = W
- if(!cable.amount >= 5)
- to_chat(user, "You need five units of cable to repair \the [src].")
- return
-
- to_chat(user, "You start mending the damaged portions of \the [src]...")
- if(!do_after(user, 30 * W.toolspeed, target = src) || !W || !src)
- return
-
- damage = 1
- to_chat(user, "You mend some of damage to [src] with [W], but you will need more advanced tools to fix it completely.")
- cable.use(5)
- return
- ..()
-
-/obj/item/rig_module/New()
- ..()
- if(suit_overlay_inactive)
- suit_overlay = suit_overlay_inactive
-
- if(charges && charges.len)
- var/list/processed_charges = list()
- for(var/list/charge in charges)
- var/datum/rig_charge/charge_dat = new
-
- charge_dat.short_name = charge[1]
- charge_dat.display_name = charge[2]
- charge_dat.product_type = charge[3]
- charge_dat.charges = charge[4]
-
- if(!charge_selected) charge_selected = charge_dat.short_name
- processed_charges[charge_dat.short_name] = charge_dat
-
- charges = processed_charges
-
- stat_modules += new/stat_rig_module/activate(src)
- stat_modules += new/stat_rig_module/deactivate(src)
- stat_modules += new/stat_rig_module/engage(src)
- stat_modules += new/stat_rig_module/select(src)
- stat_modules += new/stat_rig_module/charge(src)
-
-// Called when the module is installed into a suit.
-/obj/item/rig_module/proc/installed(var/obj/item/rig/new_holder)
- holder = new_holder
- return
-
-//Proc for one-use abilities like teleport.
-/obj/item/rig_module/proc/engage()
-
- if(damage >= 2)
- to_chat(usr, "The [interface_name] is damaged beyond use!")
- return 0
-
- if(world.time < next_use)
- to_chat(usr, "You cannot use the [interface_name] again so soon.")
- return 0
-
- if(!holder || (!(holder.flags & NODROP)))
- to_chat(usr, "The suit is not initialized.")
- return 0
-
- if(usr.lying || usr.stat || usr.stunned || usr.paralysis || usr.IsWeakened())
- to_chat(usr, "You cannot use the suit in this state.")
- return 0
-
- if(holder.wearer && holder.wearer.lying)
- to_chat(usr, "The suit cannot function while the wearer is prone.")
- return 0
-
- if(holder.security_check_enabled && !holder.check_suit_access(usr))
- to_chat(usr, "Access denied.")
- return 0
-
- if(!holder.check_power_cost(usr, use_power_cost, 0, src, (istype(usr,/mob/living/silicon ? 1 : 0) ) ) )
- return 0
-
- next_use = world.time + module_cooldown
-
- return 1
-
-// Proc for toggling on active abilities.
-/obj/item/rig_module/proc/activate()
-
- if(active || !engage())
- return 0
-
- active = 1
-
- spawn(1)
- if(suit_overlay_active)
- suit_overlay = suit_overlay_active
- else
- suit_overlay = null
- holder.update_icon()
-
- return 1
-
-// Proc for toggling off active abilities.
-/obj/item/rig_module/proc/deactivate()
-
- if(!active)
- return 0
-
- active = 0
-
- spawn(1)
- if(suit_overlay_inactive)
- suit_overlay = suit_overlay_inactive
- else
- suit_overlay = null
- if(holder)
- holder.update_icon()
-
- return 1
-
-// Called when the module is uninstalled from a suit.
-/obj/item/rig_module/proc/removed()
- deactivate()
- holder = null
- return
-
-// Called by the hardsuit each rig process tick.
-/obj/item/rig_module/process()
- if(active)
- return active_power_cost
- else
- return passive_power_cost
-
-// Called by holder rigsuit attackby()
-// Checks if an item is usable with this module and handles it if it is
-/obj/item/rig_module/proc/accepts_item(var/obj/item/input_device)
- return 0
-
-/mob/proc/SetupStat(var/obj/item/rig/R)
- if(R && (R.flags & NODROP) && R.installed_modules.len && statpanel("Hardsuit Modules"))
- var/cell_status = R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "ERROR"
- stat("Suit charge", cell_status)
- for(var/obj/item/rig_module/module in R.installed_modules)
- {
- for(var/stat_rig_module/SRM in module.stat_modules)
- if(SRM.CanUse())
- stat(SRM.module.interface_name,SRM)
- }
-
-/stat_rig_module
- parent_type = /atom/movable
- var/module_mode = ""
- var/obj/item/rig_module/module
-
-/stat_rig_module/New(var/obj/item/rig_module/module)
- ..()
- src.module = module
-
-/stat_rig_module/proc/AddHref(var/list/href_list)
- return
-
-/stat_rig_module/proc/CanUse()
- return 0
-
-/stat_rig_module/Click()
- if(CanUse())
- var/list/href_list = list(
- "interact_module" = module.holder.installed_modules.Find(module),
- "module_mode" = module_mode
- )
- AddHref(href_list)
- module.holder.Topic(usr, href_list)
-
-/stat_rig_module/DblClick()
- return Click()
-
-/stat_rig_module/activate/New(var/obj/item/rig_module/module)
- ..()
- name = module.activate_string
- if(module.active_power_cost)
- name += " ([module.active_power_cost*10]A)"
- module_mode = "activate"
-
-/stat_rig_module/activate/CanUse()
- return module.toggleable && !module.active
-
-/stat_rig_module/deactivate/New(var/obj/item/rig_module/module)
- ..()
- name = module.deactivate_string
- // Show cost despite being 0, if it means changing from an active cost.
- if(module.active_power_cost || module.passive_power_cost)
- name += " ([module.passive_power_cost*10]P)"
-
- module_mode = "deactivate"
-
-/stat_rig_module/deactivate/CanUse()
- return module.toggleable && module.active
-
-/stat_rig_module/engage/New(var/obj/item/rig_module/module)
- ..()
- name = module.engage_string
- if(module.use_power_cost)
- name += " ([module.use_power_cost*10]E)"
- module_mode = "engage"
-
-/stat_rig_module/engage/CanUse()
- return module.usable
-
-/stat_rig_module/select/New()
- ..()
- name = "Select"
- module_mode = "select"
-
-/stat_rig_module/select/CanUse()
- if(module.selectable)
- name = module.holder.selected_module == module ? "Selected" : "Select"
- return 1
- return 0
-
-/stat_rig_module/charge/New()
- ..()
- name = "Change Charge"
- module_mode = "select_charge_type"
-
-/stat_rig_module/charge/AddHref(var/list/href_list)
- var/charge_index = module.charges.Find(module.charge_selected)
- if(!charge_index)
- charge_index = 0
- else
- charge_index = charge_index == module.charges.len ? 1 : charge_index+1
-
- href_list["charge_type"] = module.charges[charge_index]
-
-/stat_rig_module/charge/CanUse()
- if(module.charges && module.charges.len)
- var/datum/rig_charge/charge = module.charges[module.charge_selected]
- name = "[charge.display_name] ([charge.charges]C) - Change"
- return 1
- return 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
deleted file mode 100644
index 6e4b588ac24..00000000000
--- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Contains
- * /obj/item/rig_module/stealth_field
- * /obj/item/rig_module/teleporter
- * /obj/item/rig_module/fabricator/energy_net
- * /obj/item/rig_module/self_destruct
- */
-
-/obj/item/rig_module/stealth_field
-
- name = "active camouflage module"
- desc = "A robust hardsuit-integrated stealth module."
- icon_state = "cloak"
-
- toggleable = 1
- disruptable = 1
- disruptive = 0
-
- use_power_cost = 50
- active_power_cost = 10
- passive_power_cost = 0
- module_cooldown = 30
-
- activate_string = "Enable Cloak"
- deactivate_string = "Disable Cloak"
-
- interface_name = "integrated stealth system"
- interface_desc = "An integrated active camouflage system."
-
- suit_overlay_active = "stealth_active"
- suit_overlay_inactive = "stealth_inactive"
-
-/obj/item/rig_module/stealth_field/activate()
-
- if(!..())
- return 0
-
- var/mob/living/carbon/human/H = holder.wearer
-
- to_chat(H, "You are now invisible to normal detection.")
- H.invisibility = INVISIBILITY_LEVEL_TWO
-
- H.visible_message("[H.name] vanishes into thin air!",1)
-
-/obj/item/rig_module/stealth_field/deactivate()
-
- if(!..())
- return 0
-
- var/mob/living/carbon/human/H = holder.wearer
-
- to_chat(H, "You are now visible.")
- H.invisibility = 0
-
- new /obj/effect/temp_visual/dir_setting/ninja(get_turf(H), H.dir)
-
- for(var/mob/O in oviewers(H))
- O.show_message("[H.name] appears from thin air!",1)
- playsound(get_turf(H), 'sound/effects/stealthoff.ogg', 75, 1)
-
-
-/obj/item/rig_module/teleporter
-
- name = "teleportation module"
- desc = "A complex, sleek-looking, hardsuit-integrated teleportation module."
- icon_state = "teleporter"
- use_power_cost = 40
- redundant = 1
- usable = 1
- selectable = 1
-
- engage_string = "Emergency Leap"
-
- interface_name = "VOID-shift phase projector"
- interface_desc = "An advanced teleportation system. It is capable of pinpoint precision or random leaps forward."
-
-/obj/item/rig_module/teleporter/proc/phase_in(var/mob/M,var/turf/T)
-
- if(!M || !T)
- return
-
- holder.spark_system.start()
- playsound(T, 'sound/effects/phasein.ogg', 25, 1)
- playsound(T, 'sound/effects/sparks2.ogg', 50, 1)
- new /obj/effect/temp_visual/dir_setting/ninja/phase(T, M.dir)
-
-/obj/item/rig_module/teleporter/proc/phase_out(var/mob/M,var/turf/T)
-
- if(!M || !T)
- return
-
- playsound(T, "sparks", 50, 1)
- new /obj/effect/temp_visual/dir_setting/ninja/phase/out(T, M.dir)
-
-/obj/item/rig_module/teleporter/engage(var/atom/target, var/notify_ai)
-
- if(!..()) return 0
-
- var/mob/living/carbon/human/H = holder.wearer
-
- if(!istype(H.loc, /turf))
- to_chat(H, "You cannot teleport out of your current location.")
- return 0
-
- var/turf/T
- if(target)
- T = get_turf(target)
- else
- T = get_teleport_loc(get_turf(H), H, rand(5, 9))
-
- /*if(!T || T.density)
- to_chat(H, "You cannot teleport into solid walls.")
- return 0*///Who the fuck cares? Ninjas in walls are cool.
-
- if(!is_teleport_allowed(T.z))
- to_chat(H, "You cannot use your teleporter on this Z-level.")
- return 0
-
- phase_out(H,get_turf(H))
- H.forceMove(T)
- phase_in(H,get_turf(H))
-
- for(var/obj/item/grab/G in H.contents)
- if(G.affecting)
- phase_out(G.affecting,get_turf(G.affecting))
- G.affecting.forceMove(locate(T.x+rand(-1,1),T.y+rand(-1,1),T.z))
- phase_in(G.affecting,get_turf(G.affecting))
-
- return 1
-
-/*
-/obj/item/rig_module/fabricator/energy_net
-
- name = "net projector"
- desc = "Some kind of complex energy projector with a hardsuit mount."
- icon_state = "enet"
-
- interface_name = "energy net launcher"
- interface_desc = "An advanced energy-patterning projector used to capture targets."
-
- engage_string = "Fabricate Net"
-
- fabrication_type = /obj/item/energy_net
- use_power_cost = 70
-
-/obj/item/rig_module/fabricator/energy_net/engage(atom/target)
-
- if(holder && holder.wearer)
- if(..(target) && target)
- holder.wearer.Beam(target,"n_beam",,10)
- return 1
- return 0*/
-
-/obj/item/rig_module/self_destruct
-
- name = "self-destruct module"
- desc = "Oh my God, Captain. A bomb."
- icon_state = "deadman"
- usable = 1
- active = 1
- permanent = 1
-
- engage_string = "Detonate"
-
- interface_name = "dead man's switch"
- interface_desc = "An integrated self-destruct module. When the wearer dies, so does the surrounding area. Do not press this button."
-
-/obj/item/rig_module/self_destruct/activate()
- return
-
-/obj/item/rig_module/self_destruct/deactivate()
- return
-
-/obj/item/rig_module/self_destruct/process()
-
- // Not being worn, leave it alone.
- if(!holder || !holder.wearer || !holder.wearer.wear_suit == holder)
- return 0
-
- //OH SHIT.
- if(holder.wearer.stat == 2)
- engage()
-
-/obj/item/rig_module/self_destruct/engage()
- explosion(get_turf(src), 1, 2, 4, 5)
- if(holder && holder.wearer)
- holder.wearer.unEquip(src)
- qdel(holder)
- qdel(src)
-
-/obj/item/rig_module/self_destruct/small/engage()
- explosion(get_turf(src), 0, 0, 3, 4)
- if(holder && holder.wearer)
- holder.wearer.unEquip(src)
- qdel(holder)
- qdel(src)
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
deleted file mode 100644
index 4b19d2a7753..00000000000
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ /dev/null
@@ -1,476 +0,0 @@
-/* Contains:
- * /obj/item/rig_module/device
- * /obj/item/rig_module/device/plasmacutter
- * /obj/item/rig_module/device/healthscanner
- * /obj/item/rig_module/device/drill
- * /obj/item/rig_module/device/orescanner
- * /obj/item/rig_module/device/rcd
- * /obj/item/rig_module/device/anomaly_scanner
- * /obj/item/rig_module/maneuvering_jets
- * /obj/item/rig_module/foam_sprayer
- * /obj/item/rig_module/device/broadcaster
- * /obj/item/rig_module/chem_dispenser
- * /obj/item/rig_module/chem_dispenser/injector
- * /obj/item/rig_module/voice
- * /obj/item/rig_module/device/paperdispenser
- * /obj/item/rig_module/device/pen
- * /obj/item/rig_module/device/stamp
- */
-
-/obj/item/rig_module/device
- name = "mounted device"
- desc = "Some kind of hardsuit mount."
- usable = 0
- selectable = 1
- toggleable = 0
- disruptive = 0
-
- var/device_type
- var/obj/item/device
-
-/obj/item/rig_module/device/plasmacutter
- name = "hardsuit plasma cutter"
- desc = "A lethal-looking industrial cutter."
- icon_state = "plasmacutter"
- interface_name = "plasma cutter"
- interface_desc = "A self-sustaining plasma arc capable of cutting through walls."
- suit_overlay_active = "plasmacutter"
- suit_overlay_inactive = "plasmacutter"
-
- device_type = /obj/item/gun/energy/plasmacutter
-
-/obj/item/rig_module/device/healthscanner
- name = "health scanner module"
- desc = "A hardsuit-mounted health scanner."
- icon_state = "scanner"
- interface_name = "health scanner"
- interface_desc = "Shows an informative health readout when used on a subject."
-
- device_type = /obj/item/healthanalyzer
-
-/obj/item/rig_module/device/drill
- name = "hardsuit drill mount"
- desc = "A very heavy diamond-tipped drill."
- icon_state = "drill"
- interface_name = "mounted drill"
- interface_desc = "A diamond-tipped industrial drill."
- suit_overlay_active = "mounted-drill"
- suit_overlay_inactive = "mounted-drill"
- device_type = /obj/item/pickaxe/drill/diamonddrill
-
-/obj/item/rig_module/device/orescanner
- name = "ore scanner module"
- desc = "A clunky old ore scanner."
- icon_state = "scanner"
- interface_name = "ore detector"
- interface_desc = "A sonar system for detecting large masses of ore."
- engage_string = "Begin Scan"
- usable = 1
- selectable = 0
- device_type = /obj/item/mining_scanner
-/*
-/obj/item/rig_module/device/rcd
- name = "RCD mount"
- desc = "A cell-powered rapid construction device for a hardsuit."
- icon_state = "rcd"
- interface_name = "mounted RCD"
- interface_desc = "A device for building or removing walls. Cell-powered."
- usable = 1
- engage_string = "Configure RCD"
-
- device_type = /obj/item/rcd/mounted
-*/
-/obj/item/rig_module/device/New()
- ..()
- if(device_type)
- device = new device_type(src)
- device.flags |= ABSTRACT //Abstract in the sense that it's not an item that stands alone, but rather is just there to let the module act like it.
-
-/obj/item/rig_module/device/engage(atom/target)
- if(!..() || !device)
- return 0
-
- if(!target)
- device.attack_self(holder.wearer)
- return 1
-
- var/turf/T = get_turf(target)
- if(istype(T) && !T.Adjacent(get_turf(src)))
- return 0
-
- var/resolved = target.attackby(device,holder.wearer)
- if(!resolved && device && target)
- device.afterattack(target,holder.wearer,1)
- return 1
-
-
-
-/obj/item/rig_module/chem_dispenser
- name = "mounted chemical dispenser"
- desc = "A complex web of tubing and needles suitable for hardsuit use."
- icon_state = "injector"
- usable = 1
- selectable = 0
- toggleable = 0
- disruptive = 0
-
- engage_string = "Inject"
-
- interface_name = "integrated chemical dispenser"
- interface_desc = "Dispenses loaded chemicals directly into the wearer's bloodstream."
-
- charges = list(
- list("saline-glucose", "salglu_solution", 0, 80),
- list("salicylic acid", "sal_acid", 0, 80),
- list("salbutamol", "salbutamol", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("charcoal", "charcoal", 0, 80),
- list("nutrients", "nutriment", 0, 80),
- list("potasssium iodide","potass_iodide", 0, 80),
- list("radium", "radium", 0, 80)
- )
-
- var/max_reagent_volume = 80 //Used when refilling.
-
-/obj/item/rig_module/chem_dispenser/ninja
- interface_desc = "Dispenses loaded chemicals directly into the wearer's bloodstream. This variant is made to be extremely light and flexible."
-
- //just over a syringe worth of each. Want more? Go refill. Gives the ninja another reason to have to show their face.
- charges = list(
- list("saline-glucose", "salglu_solution", 0, 20),
- list("salicylic acid", "sal_acid", 0, 20),
- list("salbutamol", "salbutamol", 0, 20),
- list("antibiotics", "spaceacillin", 0, 20),
- list("charcoal", "charcoal", 0, 20),
- list("nutrients", "nutriment", 0, 80),
- list("potasssium iodide","potass_iodide", 0, 20),
- list("radium", "radium", 0, 20)
- )
-
-
-/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
-
- if(!input_item.is_open_container())
- return 0
-
- if(!input_item.reagents || !input_item.reagents.total_volume)
- to_chat(user, "\The [input_item] is empty.")
- return 0
-
- // Magical chemical filtration system, do not question it.
- var/total_transferred = 0
- for(var/datum/reagent/R in input_item.reagents.reagent_list)
- for(var/chargetype in charges)
- var/datum/rig_charge/charge = charges[chargetype]
- if(charge.display_name == R.id)
-
- var/chems_to_transfer = R.volume
-
- if((charge.charges + chems_to_transfer) > max_reagent_volume)
- chems_to_transfer = max_reagent_volume - charge.charges
-
- charge.charges += chems_to_transfer
- input_item.reagents.remove_reagent(R.id, chems_to_transfer)
- total_transferred += chems_to_transfer
-
- break
-
- if(total_transferred)
- to_chat(user, "You transfer [total_transferred] units into the suit reservoir.")
- else
- to_chat(user, "None of the reagents seem suitable.")
- return 1
-
-/obj/item/rig_module/chem_dispenser/engage(atom/target)
-
- if(!..())
- return 0
-
- var/mob/living/carbon/human/H = holder.wearer
-
- if(!charge_selected)
- to_chat(H, "You have not selected a chemical type.")
- return 0
-
- var/datum/rig_charge/charge = charges[charge_selected]
-
- if(!charge)
- return 0
-
- var/chems_to_use = 10
- if(charge.charges <= 0)
- to_chat(H, "Insufficient chems!")
- return 0
- else if(charge.charges < chems_to_use)
- chems_to_use = charge.charges
-
- var/mob/living/carbon/target_mob
- if(target)
- if(istype(target,/mob/living/carbon))
- target_mob = target
- else
- return 0
- else
- target_mob = H
-
- if(target_mob != H)
- to_chat(H, "You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name].")
- to_chat(target_mob, "You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected.")
- target_mob.reagents.add_reagent(charge.display_name, chems_to_use)
-
- charge.charges -= chems_to_use
- if(charge.charges < 0) charge.charges = 0
-
- return 1
-
-/obj/item/rig_module/chem_dispenser/combat
-
- name = "combat chemical injector"
- desc = "A complex web of tubing and needles suitable for hardsuit use."
-
- charges = list(
- list("synaptizine", "synaptizine", 0, 30),
- list("hydrocodone", "hydrocodone", 0, 30),
- list("nutrients", "nutriment", 0, 80),
- )
-
- interface_name = "combat chem dispenser"
- interface_desc = "Dispenses loaded chemicals directly into the bloodstream."
-
-
-/obj/item/rig_module/chem_dispenser/injector
-
- name = "mounted chemical injector"
- desc = "A complex web of tubing and a large needle suitable for hardsuit use."
- usable = 0
- selectable = 1
- disruptive = 1
-
- interface_name = "mounted chem injector"
- interface_desc = "Dispenses loaded chemicals via an arm-mounted injector."
-
-/obj/item/rig_module/voice
-
- name = "hardsuit voice synthesiser"
- desc = "A speaker box and sound processor."
- icon_state = "megaphone"
- usable = 1
- selectable = 0
- toggleable = 0
- disruptive = 0
-
- engage_string = "Configure Synthesiser"
-
- interface_name = "voice synthesiser"
- interface_desc = "A flexible and powerful voice modulator system."
-
- var/obj/item/voice_changer/voice_holder
-
-/obj/item/rig_module/voice/New()
- ..()
- voice_holder = new(src)
- voice_holder.active = FALSE
-
-/obj/item/rig_module/voice/installed()
- ..()
- holder.speech = src
-
-/obj/item/rig_module/voice/engage()
- if(!..())
- return 0
-
- var/choice= input("Would you like to toggle the synthesiser or set the name?") as null|anything in list("Enable","Disable","Set Name")
-
- if(!choice)
- return 0
-
- switch(choice)
- if("Enable")
- active = TRUE
- voice_holder.active = TRUE
- to_chat(usr, "You enable the speech synthesiser.")
- if("Disable")
- active = FALSE
- voice_holder.active = FALSE
- to_chat(usr, "You disable the speech synthesiser.")
- if("Set Name")
- var/raw_choice = sanitize(input(usr, "Please enter a new name.") as text|null, MAX_NAME_LEN)
- if(!raw_choice)
- return FALSE
- voice_holder.voice = raw_choice
- to_chat(usr, "You are now mimicking [voice_holder.voice].")
- return 1
-
-/obj/item/rig_module/maneuvering_jets
-
- name = "hardsuit maneuvering jets"
- desc = "A compact gas thruster system for a hardsuit."
- icon_state = "thrusters"
- usable = 1
- toggleable = 1
- selectable = 0
- disruptive = 0
-
- suit_overlay_active = "maneuvering_active"
- suit_overlay_inactive = null //"maneuvering_inactive"
-
- engage_string = "Toggle Stabilizers"
- activate_string = "Activate Thrusters"
- deactivate_string = "Deactivate Thrusters"
-
- interface_name = "maneuvering jets"
- interface_desc = "An inbuilt EVA maneuvering system that runs off the rig air supply."
-
- var/obj/item/tank/jetpack/rig/jets
-
-/obj/item/rig_module/maneuvering_jets/engage()
- if(!..())
- return 0
- jets.toggle_stabilization(usr)
- return 1
-
-/obj/item/rig_module/maneuvering_jets/activate()
-
- if(active)
- return 0
-
- active = 1
-
- spawn(1)
- if(suit_overlay_active)
- suit_overlay = suit_overlay_active
- else
- suit_overlay = null
- holder.update_icon()
-
- jets.turn_on()
- return 1
-
-/obj/item/rig_module/maneuvering_jets/deactivate()
- if(!..())
- return 0
- jets.turn_off()
- return 1
-
-/obj/item/rig_module/maneuvering_jets/New()
- ..()
- jets = new(src)
-
-/obj/item/rig_module/maneuvering_jets/installed()
- ..()
- jets.holder = holder
- jets.ion_trail.set_up(holder)
-
-/obj/item/rig_module/maneuvering_jets/removed()
- ..()
- jets.holder = null
- jets.ion_trail.set_up(jets)
-
-/obj/item/rig_module/foam_sprayer
-
-/obj/item/rig_module/device/paperdispenser
- name = "hardsuit paper dispenser"
- desc = "Crisp sheets."
- icon_state = "paper"
- interface_name = "paper dispenser"
- interface_desc = "Dispenses warm, clean, and crisp sheets of paper."
- engage_string = "Dispense"
- usable = 1
- selectable = 0
- device_type = /obj/item/paper_bin
-
-/obj/item/rig_module/device/paperdispenser/engage(atom/target)
-
- if(!..() || !device)
- return 0
-
- if(!target)
- device.attack_hand(holder.wearer)
- return 1
-
-/obj/item/rig_module/device/pen
- name = "mounted pen"
- desc = "For mecha John Hancocks."
- icon_state = "pen"
- interface_name = "mounted pen"
- interface_desc = "Signatures with style(tm)."
- engage_string = "Change color"
- usable = 1
- device_type = /obj/item/pen/multi
-
-/obj/item/rig_module/device/stamp
- name = "mounted internal affairs stamp"
- desc = "DENIED."
- icon_state = "stamp"
- interface_name = "mounted stamp"
- interface_desc = "Leave your mark."
- engage_string = "Toggle stamp type"
- usable = 1
- var/obj/iastamp //Theese were just vars, but any device would need to be an object
- var/obj/deniedstamp //Stops assigning non-objects to theese vars, which probably would break quite a bit.
-
-/obj/item/rig_module/device/stamp/New()
- ..()
- iastamp = new /obj/item/stamp/law(src)
- deniedstamp = new /obj/item/stamp/denied(src)
- iastamp.flags |= ABSTRACT
- deniedstamp.flags |= ABSTRACT
- device = iastamp
-
-/obj/item/rig_module/device/stamp/engage(atom/target)
- if(!..() || !device)
- return 0
-
- if(!target)
- if(device == iastamp)
- device = deniedstamp
- to_chat(holder.wearer, "Switched to denied stamp.")
- else if(device == deniedstamp)
- device = iastamp
- to_chat(holder.wearer, "Switched to internal affairs stamp.")
- return 1
-
-/obj/item/rig_module/welding_tank
- name = "welding fuel tank"
- desc = "A bluespace welding fuel storage tank for a rigsuit."
- icon_state = "welding_tank"
- interface_name = "mounted welding fuel tank"
- interface_desc = "A minitaure fuel tank used for storage of welding fuel, built into a hardsuit."
- engage_string = "Dispense fuel"
- usable = 1
-
- var/max_fuel = 300
-
-/obj/item/rig_module/welding_tank/New()
- ..()
-
- create_reagents(max_fuel)
- reagents.add_reagent("fuel", max_fuel)
-
-/obj/item/rig_module/welding_tank/engage(atom/target)
- if(!..() || !reagents)
- return 0
-
- if(!target)
- if(get_fuel() >= 0)
- var/obj/item/weldingtool/W = holder.wearer.get_active_hand()
- if(istype(W))
- fill_welder(W)
- else
- W = holder.wearer.get_inactive_hand()
- if(istype(W))
- fill_welder(W)
- else
- to_chat(holder.wearer, "Your welding tank is out of fuel!")
- else
- to_chat(holder.wearer, "You need to have a welding tool in one of your hands to dispense fuel.")
-
-/obj/item/rig_module/welding_tank/proc/fill_welder(obj/item/weldingtool/W)
- if(!istype(W))
- return
- W.refill(holder.wearer, src, W.maximum_fuel)
- if(!reagents.get_reagent_amount("fuel"))
- to_chat(holder.wearer, "You hear a faint dripping as your hardsuit welding tank completely empties.")
-
-/obj/item/rig_module/welding_tank/proc/get_fuel()
- return reagents.get_reagent_amount("fuel")
diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm
deleted file mode 100644
index 33ae007ceee..00000000000
--- a/code/modules/clothing/spacesuits/rig/modules/vision.dm
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Contains
- * /obj/item/rig_module/vision
- * /obj/item/rig_module/vision/multi
- * /obj/item/rig_module/vision/meson
- * /obj/item/rig_module/vision/thermal
- * /obj/item/rig_module/vision/nvg
- * /obj/item/rig_module/vision/medhud
- * /obj/item/rig_module/vision/sechud
- */
-
-/datum/rig_vision
- var/mode
- var/obj/item/clothing/glasses/glasses
-
-/datum/rig_vision/nvg
- mode = "night vision"
-/datum/rig_vision/nvg/New()
- glasses = new /obj/item/clothing/glasses/night
-
-/datum/rig_vision/thermal
- mode = "thermal scanner"
-/datum/rig_vision/thermal/New()
- glasses = new /obj/item/clothing/glasses/thermal
-
-/datum/rig_vision/meson
- mode = "meson scanner"
-/datum/rig_vision/meson/New()
- glasses = new /obj/item/clothing/glasses/meson
-
-/datum/rig_vision/sechud
- mode = "security HUD"
-/datum/rig_vision/sechud/New()
- glasses = new /obj/item/clothing/glasses/hud/security
-
-/datum/rig_vision/medhud
- mode = "medical HUD"
-/datum/rig_vision/medhud/New()
- glasses = new /obj/item/clothing/glasses/hud/health
-
-/obj/item/rig_module/vision
-
- name = "hardsuit visor"
- desc = "A layered, translucent visor system for a hardsuit."
- icon_state = "optics"
-
- interface_name = "optical scanners"
- interface_desc = "An integrated multi-mode vision system."
-
- usable = 1
- toggleable = 1
- disruptive = 0
-
- engage_string = "Cycle Visor Mode"
- activate_string = "Enable Visor"
- deactivate_string = "Disable Visor"
-
- var/datum/rig_vision/vision
- var/list/vision_modes = list(
- /datum/rig_vision/nvg,
- /datum/rig_vision/thermal,
- /datum/rig_vision/meson
- )
-
- var/vision_index
-
-/obj/item/rig_module/vision/multi
-
- name = "hardsuit optical package"
- desc = "A complete visor system of optical scanners and vision modes."
- icon_state = "fulloptics"
-
-
- interface_name = "multi optical visor"
- interface_desc = "An integrated multi-mode vision system."
-
- vision_modes = list(/datum/rig_vision/meson,
- /datum/rig_vision/nvg,
- /datum/rig_vision/thermal,
- /datum/rig_vision/sechud,
- /datum/rig_vision/medhud)
-
-/obj/item/rig_module/vision/meson
-
- name = "hardsuit meson scanner"
- desc = "A layered, translucent visor system for a hardsuit."
- icon_state = "meson"
-
- usable = 0
-
- interface_name = "meson scanner"
- interface_desc = "An integrated meson scanner."
-
- vision_modes = list(/datum/rig_vision/meson)
-
-/obj/item/rig_module/vision/thermal
-
- name = "hardsuit thermal scanner"
- desc = "A layered, translucent visor system for a hardsuit."
- icon_state = "thermal"
-
- usable = 0
-
- interface_name = "thermal scanner"
- interface_desc = "An integrated thermal scanner."
-
- vision_modes = list(/datum/rig_vision/thermal)
-
-/obj/item/rig_module/vision/nvg
-
- name = "hardsuit night vision interface"
- desc = "A multi input night vision system for a hardsuit."
- icon_state = "night"
-
- usable = 0
-
- interface_name = "night vision interface"
- interface_desc = "An integrated night vision system."
-
- vision_modes = list(/datum/rig_vision/nvg)
-
-/obj/item/rig_module/vision/sechud
-
- name = "hardsuit security hud"
- desc = "A simple tactical information system for a hardsuit."
- icon_state = "securityhud"
-
- usable = 0
-
- interface_name = "security HUD"
- interface_desc = "An integrated security heads up display."
-
- vision_modes = list(/datum/rig_vision/sechud)
-
-/obj/item/rig_module/vision/medhud
-
- name = "hardsuit medical hud"
- desc = "A simple medical status indicator for a hardsuit."
- icon_state = "healthhud"
-
- usable = 0
-
- interface_name = "medical HUD"
- interface_desc = "An integrated medical heads up display."
-
- vision_modes = list(/datum/rig_vision/medhud)
-
-
-// There should only ever be one vision module installed in a suit.
-/obj/item/rig_module/vision/installed()
- ..()
- holder.visor = src
-
-/obj/item/rig_module/vision/engage()
-
- var/starting_up = !active
-
- if(!..() || !vision_modes)
- return 0
-
- // Don't cycle if this engage() is being called by activate().
- if(starting_up)
- to_chat(holder.wearer, "You activate your visual sensors.")
- return 1
-
- if(vision_modes.len > 1)
- vision_index++
- if(vision_index > vision_modes.len)
- vision_index = 1
- vision = vision_modes[vision_index]
-
- to_chat(holder.wearer, "You cycle your sensors to [vision.mode] mode.")
- else
- to_chat(holder.wearer, "Your sensors only have one mode.")
- return 1
-
-/obj/item/rig_module/vision/New()
- ..()
-
- if(!vision_modes)
- return
-
- vision_index = 1
- var/list/processed_vision = list()
-
- for(var/vision_mode in vision_modes)
- var/datum/rig_vision/vision_datum = new vision_mode
- if(!vision) vision = vision_datum
- processed_vision += vision_datum
-
- vision_modes = processed_vision
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
deleted file mode 100644
index 0d106a874a7..00000000000
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ /dev/null
@@ -1,1059 +0,0 @@
-#define ONLY_DEPLOY 1
-#define ONLY_RETRACT 2
-#define SEAL_DELAY 30
-
-/*
- * Defines the behavior of hardsuits/rigs/power armour.
- */
-
-/obj/item/rig
-
- name = "hardsuit control module"
- icon = 'icons/obj/rig_modules.dmi'
- desc = "A back-mounted hardsuit deployment and control mechanism."
- slot_flags = SLOT_BACK
- req_one_access = list()
- req_access = list()
- w_class = WEIGHT_CLASS_BULKY
-
- // These values are passed on to all component pieces.
- armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
- siemens_coefficient = 0.2
- permeability_coefficient = 0.1
-
- var/interface_path = "hardsuit.tmpl"
- var/ai_interface_path = "hardsuit.tmpl"
- var/interface_title = "Hardsuit Controller"
- var/wearer_move_delay //Used for AI moving.
- var/ai_controlled_move_delay = 10
-
- // Keeps track of what this rig should spawn with.
- var/suit_type = "hardsuit"
- var/list/initial_modules
- var/chest_type = /obj/item/clothing/suit/space/new_rig
- var/helm_type = /obj/item/clothing/head/helmet/space/new_rig
- var/boot_type = /obj/item/clothing/shoes/magboots/rig
- var/glove_type = /obj/item/clothing/gloves/rig
- var/cell_type = /obj/item/stock_parts/cell/high
- var/air_type = /obj/item/tank/oxygen
-
- //Component/device holders.
- var/obj/item/tank/air_supply // Air tank, if any.
- var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any.
- var/obj/item/clothing/shoes/under_boots = null //Boots that are between the feet and the rig boots, if any.
- var/obj/item/clothing/suit/space/new_rig/chest // Deployable chestpiece, if any.
- var/obj/item/clothing/head/helmet/space/new_rig/helmet = null // Deployable helmet, if any.
- var/obj/item/clothing/gloves/rig/gloves = null // Deployable gauntlets, if any.
- var/obj/item/stock_parts/cell/cell // Power supply, if any.
- var/obj/item/rig_module/selected_module = null // Primary system (used with middle-click)
- var/obj/item/rig_module/vision/visor // Kinda shitty to have a var for a module, but saves time.
- var/obj/item/rig_module/voice/speech // As above.
- var/mob/living/carbon/human/wearer // The person currently wearing the rig.
- var/image/mob_icon // Holder for on-mob icon.
- var/list/installed_modules = list() // Power consumption/use bookkeeping.
-
- // Rig status vars.
- var/open = 0 // Access panel status.
- var/locked = 1 // Lock status.
- var/subverted = 0
- var/interface_locked = 0
- var/control_overridden = 0
- var/ai_override_enabled = 0
- var/security_check_enabled = 1
- var/malfunctioning = 0
- var/malfunction_delay = 0
- var/electrified = 0
- var/locked_down = 0
-
- var/seal_delay = SEAL_DELAY
- var/sealing // Keeps track of seal status independantly of NODROP.
- var/offline = 1 // Should we be applying suit maluses?
- var/offline_slowdown = 3 // If the suit is deployed and unpowered, it sets slowdown to this.
- var/active_slowdown = 3 // How much the deployed suit slows down if powered.
- var/vision_restriction
- var/offline_vision_restriction = 1 // 0 - none, 1 - welder vision, 2 - blind. Maybe move this to helmets.
- var/airtight = 1 //If set, will adjust AIRTIGHT and STOPSPRESSUREDMAGE flags on components. Otherwise it should leave them untouched.
-
- var/emp_protection = 0
- var/has_emergency_release = 1 //Allows suit to be removed from outside.
-
- // Wiring! How exciting.
- var/datum/wires/rig/wires
- var/datum/effect_system/spark_spread/spark_system
-
-/obj/item/rig/examine(mob/user)
- . = list("This is [src].")
- . += "[desc]"
- if(wearer)
- for(var/obj/item/piece in list(helmet,gloves,chest,boots))
- if(!piece || piece.loc != wearer)
- continue
- . += "[bicon(piece)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
-
- if(loc == usr)
- . += "The maintenance panel is [open ? "open" : "closed"]."
- . += "Hardsuit systems are [offline ? "offline" : "online"]."
-
-/obj/item/rig/get_cell()
- return cell
-
-/obj/item/rig/New()
- ..()
-
- item_state = icon_state
- wires = new(src)
-
- if((!req_access || !req_access.len) && (!req_one_access || !req_one_access.len))
- locked = 0
-
- spark_system = new()
- spark_system.set_up(5, 0, src)
- spark_system.attach(src)
-
- START_PROCESSING(SSobj, src)
-
- if(initial_modules && initial_modules.len)
- for(var/path in initial_modules)
- var/obj/item/rig_module/module = new path(src)
- installed_modules += module
- module.installed(src)
-
- // Create and initialize our various segments.
- if(cell_type)
- cell = new cell_type(src)
- if(air_type)
- air_supply = new air_type(src)
- if(glove_type)
- gloves = new glove_type(src)
- verbs |= /obj/item/rig/proc/toggle_gauntlets
- if(helm_type)
- helmet = new helm_type(src)
- verbs |= /obj/item/rig/proc/toggle_helmet
- helmet.item_color="[initial(icon_state)]_sealed" //For the lightswitching to know the correct string to manipulate
- if(boot_type)
- boots = new boot_type(src)
- verbs |= /obj/item/rig/proc/toggle_boots
- boots.magboot_state="[initial(icon_state)]_sealed" //For the magboot (de)activation to know the correct string to manipulate
- if(chest_type)
- chest = new chest_type(src)
- if(allowed)
- chest.allowed = allowed
- chest.slowdown = offline_slowdown
- chest.holder = src
- verbs |= /obj/item/rig/proc/toggle_chest
-
- for(var/obj/item/piece in list(gloves,helmet,boots,chest))
- if(!istype(piece))
- continue
- piece.name = "[suit_type] [initial(piece.name)]"
- piece.desc = "It seems to be part of a [src.name]."
- piece.icon_state = "[initial(icon_state)]"
- piece.min_cold_protection_temperature = min_cold_protection_temperature
- piece.max_heat_protection_temperature = max_heat_protection_temperature
- if(piece.siemens_coefficient > siemens_coefficient) //So that insulated gloves keep their insulation.
- piece.siemens_coefficient = siemens_coefficient
- piece.permeability_coefficient = permeability_coefficient
- if(armor)
- piece.armor = armor
-
- update_icon(1)
-
-/obj/item/rig/Destroy()
- for(var/obj/item/piece in list(gloves,boots,helmet,chest))
- var/mob/living/M = piece.loc
- if(istype(M))
- M.unEquip(piece)
- qdel(piece)
- STOP_PROCESSING(SSobj, src)
- QDEL_NULL(wires)
- QDEL_NULL(spark_system)
- return ..()
-
-/obj/item/rig/proc/suit_is_deployed()
- if(!istype(wearer) || src.loc != wearer || wearer.back != src)
- return 0
- if(helm_type && !(helmet && wearer.head == helmet))
- return 0
- if(glove_type && !(gloves && wearer.gloves == gloves))
- return 0
- if(boot_type && !(boots && wearer.shoes == boots))
- return 0
- if(chest_type && !(chest && wearer.wear_suit == chest))
- return 0
- return 1
-
-/obj/item/rig/proc/reset()
- offline = 2
- flags &= ~NODROP
- if(helmet && helmet.on)
- helmet.toggle_light(wearer)
- if(boots && boots.magpulse)
- boots.attack_self(wearer)
- for(var/obj/item/piece in list(helmet,boots,gloves,chest))
- if(!piece) continue
- piece.icon_state = "[initial(icon_state)]"
- if(airtight)
- piece.flags &= ~(STOPSPRESSUREDMAGE | AIRTIGHT)
- update_icon(1)
-
-/obj/item/rig/proc/seal(mob/living/user)
- if(sealing)
- return 0
-
- if(!wearer || !user)
- return
-
- var/sealed = (flags & NODROP)
- if(sealed)
- to_chat(user, "\The [src] is already sealed!")
- return 0
-
- if(!check_power_cost(user, 1)) //need power to seal the suit
- return 0
-
- var/failed_to_seal = FALSE
-
- if(!suit_is_deployed())
- to_chat(user, "\The [src] cannot seal, as it is not fully deployed!")
- return 0
-
- flags |= NODROP
- sealing = TRUE
-
- to_chat(user, "\The [src] begins to tighten it's seals.")
- wearer.visible_message("\The [wearer]'s suit emits a quiet hum as it begins to tighten it's seals.",
- "With a quiet hum, your suit begins to seal.")
-
- if(seal_delay && !do_after(user, seal_delay, target = wearer))
- to_chat(user, "You must remain still to seal \the [src]!")
- failed_to_seal = TRUE
-
- if(!failed_to_seal)
- deploy(user)
-
- var/list/pieces_data = list(list(wearer.shoes, boots, "boots", boot_type),
- list(wearer.gloves, gloves, "gloves", glove_type),
- list(wearer.head, helmet, "helmet", helm_type),
- list(wearer.wear_suit, chest, "chest", chest_type))
-
- for(var/list/piece_data in pieces_data)
- var/obj/item/user_piece = piece_data[1]
- var/obj/item/correct_piece = piece_data[2]
- var/msg_type = piece_data[3]
- var/piece_type = piece_data[4]
-
- if(!user_piece || !piece_type)
- continue
-
- if(user_piece != correct_piece)
- to_chat(user, "\The [user_piece] is blocking \the [src] from deploying.")
- failed_to_seal = TRUE
-
- if(seal_delay && !do_after(user, seal_delay, needhand = 0, target = wearer))
- to_chat(user, "You must remain still to seal \the [src]!")
- failed_to_seal = TRUE
-
- if(failed_to_seal)
- break
-
- correct_piece.icon_state = "[initial(icon_state)]_sealed"
- switch(msg_type)
- if("boots")
- to_chat(wearer, "\The [correct_piece] seal around your feet.")
- correct_piece.icon_state = "[initial(icon_state)]_sealed0" //Solution to not need a sprite for off, on, and unused magboots.
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been sealed.")
- wearer.update_inv_shoes()
- if("gloves")
- to_chat(wearer, "\The [correct_piece] tighten around your fingers and wrists.")
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been sealed.")
- wearer.update_inv_gloves()
- if("chest")
- to_chat(wearer, "\The [correct_piece] cinches tight again your chest.")
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been sealed.")
- wearer.update_inv_wear_suit()
- if("helmet")
- to_chat(wearer, "\The [correct_piece] hisses closed.")
- correct_piece.icon_state = "[initial(icon_state)]_sealed0" //Solution to not need a sprite for off, on, and unused helmet light.
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been sealed.")
- wearer.update_inv_head()
- if(helmet)
- helmet.update_light(wearer)
-
- correct_piece.armor = correct_piece.armor.setRating(bio_value = 100)
-
- sealing = FALSE
-
- if(failed_to_seal)
- for(var/obj/item/piece in list(helmet, boots, gloves, chest))
- if(!piece)
- continue
- piece.icon_state = "[initial(icon_state)]"
- flags &= ~NODROP
- if(airtight)
- update_component_sealed()
- update_icon(1)
- return 0
-
- if(user != wearer)
- to_chat(user, "\The [src] has been loosened.")
- to_chat(wearer, "Your entire suit tightens around you as the components lock into place.")
- if(airtight)
- update_component_sealed()
- update_icon(1)
-
-/obj/item/rig/proc/unseal(mob/living/user)
- if(sealing)
- return 0
-
- if(!wearer || !user)
- return
-
- var/sealed = (flags & NODROP)
- if(!sealed)
- to_chat(user, "\The [src] is already unsealed!")
- return 0
-
- sealing = TRUE
-
- var/failed_to_seal = FALSE
-
- if(!suit_is_deployed())
- to_chat(user, "\The [src] cannot unseal, as it is not fully deployed!")
- failed_to_seal = TRUE
-
- if(!failed_to_seal)
- if(user != wearer)
- to_chat(user, "\The [src] begins to loosen it's seals.")
- wearer.visible_message("\The [wearer]'s suit emits a quiet hum as it begins to loosen it's seals.",
- "With a quiet hum, your suit begins to unseal.")
-
- if(seal_delay && !do_after(user, seal_delay, target = wearer))
- to_chat(user, "You must remain still to unseal \the [src]!")
- failed_to_seal = TRUE
-
- if(!failed_to_seal)
- var/list/pieces_data = list(list(wearer.shoes, boots, "boots", boot_type),
- list(wearer.gloves, gloves, "gloves", glove_type),
- list(wearer.head, helmet, "helmet", helm_type),
- list(wearer.wear_suit, chest, "chest", chest_type))
-
- for(var/list/piece_data in pieces_data)
- var/obj/item/user_piece = piece_data[1]
- var/obj/item/correct_piece = piece_data[2]
- var/msg_type = piece_data[3]
- var/piece_type = piece_data[4]
-
- if(!correct_piece || !piece_type)
- continue
-
- if(user_piece != correct_piece)
- to_chat(user, "\The [user_piece] is blocking \the [src] from deploying.")
- failed_to_seal = TRUE
-
- if(seal_delay && !do_after(user, seal_delay, needhand = 0, target = wearer))
- to_chat(user, "You must remain still to unseal \the [src]!")
- failed_to_seal = TRUE
-
- if(failed_to_seal)
- break
-
- correct_piece.icon_state = "[initial(icon_state)]"
- switch(msg_type)
- if("boots")
- to_chat(wearer, "\The [correct_piece] relax [correct_piece.p_their()] grip on your legs.")
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been unsealed.")
- wearer.update_inv_shoes()
- if("gloves")
- to_chat(wearer, "\The [correct_piece] become loose around your fingers.")
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been unsealed.")
- wearer.update_inv_gloves()
- if("chest")
- to_chat(wearer, "\The [correct_piece] releases your chest.")
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been unsealed.")
- wearer.update_inv_wear_suit()
- if("helmet")
- to_chat(wearer, "\The [correct_piece] hisses open.")
- if(user != wearer)
- to_chat(user, "\The [correct_piece] has been unsealed.")
- wearer.update_inv_head()
- if(helmet)
- helmet.update_light(wearer)
-
- correct_piece.armor = correct_piece.armor.setRating(bio_value = armor.getRating("bio"))
-
- sealing = FALSE
-
- if(failed_to_seal)
- for(var/obj/item/piece in list(gloves, chest))
- if(!piece)
- continue
- piece.icon_state = "[initial(icon_state)]_sealed"
- if(helmet)
- helmet.icon_state = "[initial(icon_state)]_sealed[helmet.on]"
- if(boots)
- boots.icon_state = "[initial(icon_state)]_sealed[boots.magpulse]"
- if(airtight)
- update_component_sealed()
- update_icon(1)
- return 0
-
- if(user != wearer)
- to_chat(user, "\The [src] has been unsealed.")
- to_chat(wearer, "Your entire suit loosens as the components relax.")
-
- flags &= ~NODROP
-
- for(var/obj/item/rig_module/module in installed_modules)
- module.deactivate()
-
- if(airtight)
- update_component_sealed()
- update_icon(1)
-
-/obj/item/rig/proc/update_component_sealed()
- if(istype(boots) && !(flags & NODROP) && boots.magpulse) //If we have (active) boots and unsealed the suit, we deactivate the magboots.
- boots.attack_self(wearer)
- if(istype(helmet) && !(flags & NODROP) && helmet.on) //If we have an (active) headlamp and unsealed the suit, we deactivate the headlamp.
- helmet.toggle_light(wearer)
- for(var/obj/item/piece in list(helmet,boots,gloves,chest))
- if(!(flags & NODROP))
- piece.flags &= ~(STOPSPRESSUREDMAGE | AIRTIGHT)
- else
- piece.flags |= STOPSPRESSUREDMAGE | AIRTIGHT
-
-/obj/item/rig/process()
- // If we've lost any parts, grab them back.
- var/mob/living/M
- for(var/obj/item/piece in list(gloves,boots,helmet,chest))
- if(piece.loc != src && !(wearer && piece.loc == wearer))
- if(istype(piece.loc, /mob/living))
- M = piece.loc
- M.unEquip(piece)
- piece.forceMove(src)
-
- if(cell && cell.charge > 0 && electrified > 0)
- electrified--
-
- if(malfunction_delay > 0)
- malfunction_delay--
- else if(malfunctioning)
- malfunctioning--
- malfunction()
-
- if(!istype(wearer) || loc != wearer || wearer.back != src || !(flags & NODROP) || !cell || cell.charge <= 0)
- if(!cell || cell.charge <= 0)
- if(electrified > 0)
- electrified = 0
- if(!offline)
- if(istype(wearer))
- if(flags & NODROP)
- if(offline_slowdown < 3)
- to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.")
- else
- to_chat(wearer, "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.")
- if(offline_vision_restriction == 1)
- to_chat(wearer, "The suit optics flicker and die, leaving you with restricted vision.")
- else if(offline_vision_restriction == 2)
- to_chat(wearer, "The suit optics drop out completely, drowning you in darkness.")
- if(!offline)
- offline = 1
- if(istype(wearer) && wearer.wearing_rig)
- wearer.wearing_rig = null
- else
- if(offline)
- offline = 0
- if(istype(wearer) && !wearer.wearing_rig)
- wearer.wearing_rig = src
- chest.slowdown = active_slowdown
-
- if(offline)
- if(offline == 1)
- for(var/obj/item/rig_module/module in installed_modules)
- module.deactivate()
- offline = 2
- chest.slowdown = offline_slowdown
- return
-
-
- for(var/obj/item/rig_module/module in installed_modules)
- cell.use(module.process()*10)
-
-/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai)
- if(!istype(user))
- return 0
-
- var/fail_msg
-
- if(!user_is_ai)
- var/mob/living/carbon/human/H = user
- if(istype(H) && H.back != src)
- fail_msg = "You must be wearing \the [src] to do this."
- else if(user.incorporeal_move)
- fail_msg = "You must be solid to do this."
- if(sealing)
- fail_msg = "The hardsuit is in the process of adjusting seals and cannot be activated."
- else if(!fail_msg && ((use_unconcious && user.stat > 1) || (!use_unconcious && user.stat)))
- fail_msg = "You are in no fit state to do that."
- else if(!cell)
- fail_msg = "There is no cell installed in the suit."
- else if(cost && cell.charge < cost * 10) //TODO: Cellrate?
- fail_msg = "Not enough stored power."
-
- if(fail_msg)
- to_chat(user, "[fail_msg]")
- return 0
-
- // This is largely for cancelling stealth and whatever.
- if(mod && mod.disruptive)
- for(var/obj/item/rig_module/module in (installed_modules - mod))
- if(module.active && module.disruptable)
- module.deactivate()
-
- cell.use(cost*10)
- return 1
-
-/obj/item/rig/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
- if(!user)
- return
-
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, ((src.loc != user) ? ai_interface_path : interface_path), interface_title, 480, 550, state = state)
- ui.open()
- ui.set_auto_update(1)
-
-/obj/item/rig/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
- var/data[0]
-
- data["primarysystem"] = null
- if(selected_module)
- data["primarysystem"] = "[selected_module.interface_name]"
-
- data["ai"] = 0
- if(src.loc != user)
- data["ai"] = 1
-
- var/is_sealed = (flags & NODROP) //1 if NODROP, 0 if no-nodrop
- data["seals"] = "[!is_sealed]" //1 if not NODROP (unsealed), 0 if NODROP (sealed)
- data["sealing"] = "[src.sealing]"
- data["helmet"] = (helmet ? "[helmet.name]" : "None.")
- data["gauntlets"] = (gloves ? "[gloves.name]" : "None.")
- data["boots"] = (boots ? "[boots.name]" : "None.")
- data["chest"] = (chest ? "[chest.name]" : "None.")
-
- data["charge"] = cell ? round(cell.charge,1) : 0
- data["maxcharge"] = cell ? cell.maxcharge : 0
- data["chargestatus"] = cell ? FLOOR((cell.charge/cell.maxcharge)*50, 1) : 0
-
- data["emagged"] = subverted
- data["coverlock"] = locked
- data["interfacelock"] = interface_locked
- data["aicontrol"] = control_overridden
- data["aioverride"] = ai_override_enabled
- data["securitycheck"] = security_check_enabled
- data["malf"] = malfunction_delay
-
-
- var/list/module_list = list()
- var/i = 1
- for(var/obj/item/rig_module/module in installed_modules)
- var/list/module_data = list(
- "index" = i,
- "name" = "[module.interface_name]",
- "desc" = "[module.interface_desc]",
- "can_use" = "[module.usable]",
- "can_select" = "[module.selectable]",
- "can_toggle" = "[module.toggleable]",
- "is_active" = "[module.active]",
- "engagecost" = module.use_power_cost*10,
- "activecost" = module.active_power_cost*10,
- "passivecost" = module.passive_power_cost*10,
- "engagestring" = module.engage_string,
- "activatestring" = module.activate_string,
- "deactivatestring" = module.deactivate_string,
- "damage" = module.damage
- )
-
- if(module.charges && module.charges.len)
-
- module_data["charges"] = list()
- var/datum/rig_charge/selected = module.charges[module.charge_selected]
- module_data["chargetype"] = selected ? "[selected.display_name]" : "none"
-
- for(var/chargetype in module.charges)
- var/datum/rig_charge/charge = module.charges[chargetype]
- module_data["charges"] += list(list("caption" = "[chargetype] ([charge.charges])", "index" = "[chargetype]"))
-
- module_list += list(module_data)
- i++
-
- if(module_list.len)
- data["modules"] = module_list
-
- return data
-
-/obj/item/rig/update_icon(var/update_mob_icon)
-
- //TODO: Maybe consider a cache for this (use mob_icon as blank canvas, use suit icon overlay).
- overlays.Cut()
- if(!mob_icon || update_mob_icon)
- var/species_icon = 'icons/mob/rig_back.dmi'
- // Since setting mob_icon will override the species checks in
- // update_inv_wear_suit(), handle species checks here.
- if(wearer && sprite_sheets && sprite_sheets[wearer.dna.species.name])
- species_icon = sprite_sheets[wearer.dna.species.name]
- mob_icon = image("icon" = species_icon, "icon_state" = "[icon_state]")
-
- if(installed_modules.len)
- for(var/obj/item/rig_module/module in installed_modules)
- if(module.suit_overlay)
- chest.overlays += image("icon" = 'icons/mob/rig_modules.dmi', "icon_state" = "[module.suit_overlay]", "dir" = SOUTH)
-
- if(wearer)
- wearer.update_inv_shoes()
- wearer.update_inv_gloves()
- wearer.update_inv_head()
- wearer.update_inv_wear_suit()
- wearer.update_inv_back()
- return
-
-/obj/item/rig/proc/check_suit_access(var/mob/living/carbon/human/user)
-
- if(!security_check_enabled)
- return 1
-
- if(istype(user))
- if(malfunction_check(user))
- return 0
- if(user.back != src)
- return 0
- else if(!src.allowed(user))
- to_chat(user, "Unauthorized user. Access denied.")
- return 0
-
- else if(!ai_override_enabled)
- to_chat(user, "Synthetic access disabled. Please consult hardware provider.")
- return 0
-
- return 1
-
-/obj/item/rig/Topic(href,href_list)
- if(!check_suit_access(usr))
- return 0
-
- if(href_list["toggle_piece"])
- if(ishuman(usr) && (usr.stat || usr.stunned || usr.lying))
- return 0
- toggle_piece(href_list["toggle_piece"], usr)
- else if(href_list["toggle_seals"])
- if(flags & NODROP)
- unseal(usr)
- else
- seal(usr)
- else if(href_list["interact_module"])
- var/module_index = text2num(href_list["interact_module"])
-
- if(module_index > 0 && module_index <= installed_modules.len)
- var/obj/item/rig_module/module = installed_modules[module_index]
- switch(href_list["module_mode"])
- if("activate")
- module.activate()
- if("deactivate")
- module.deactivate()
- if("engage")
- module.engage()
- if("select")
- selected_module = module
- if("select_charge_type")
- module.charge_selected = href_list["charge_type"]
- else if(href_list["toggle_ai_control"])
- ai_override_enabled = !ai_override_enabled
- notify_ai("Synthetic suit control has been [ai_override_enabled ? "enabled" : "disabled"].")
- else if(href_list["toggle_suit_lock"])
- locked = !locked
-
- usr.set_machine(src)
- add_fingerprint(usr)
- return 0
-
-/obj/item/rig/proc/notify_ai(var/message)
- if(!message || !installed_modules || !installed_modules.len)
- return
- for(var/obj/item/rig_module/module in installed_modules)
- for(var/mob/living/silicon/ai/ai in module.contents)
- if(ai && ai.client && !ai.stat)
- to_chat(ai, "[message]")
-
-/obj/item/rig/equipped(mob/living/carbon/human/M, slot)
- ..()
- if(!istype(M) || slot != slot_back)
- return //we don't care about picking up/nonhumans
-
- spawn(1) //equipped() is called BEFORE the item is actually set as the slot
-
- if(seal_delay > 0 && istype(M) && M.back == src)
- M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...")
- if(!do_after(M, seal_delay, target = M))
- if(M && M.back == src)
- M.unEquip(src)
- M.put_in_hands(src)
- return
-
- if(istype(M) && M.back == src)
- M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].")
- wearer = M
- wearer.wearing_rig = src
- if(has_emergency_release)
- M.verbs |= /obj/item/rig/proc/emergency_release
- update_icon()
-
-/obj/item/rig/proc/toggle_piece(var/piece, var/mob/living/user, var/deploy_mode, var/force)
- if(!istype(wearer) || wearer.back != src)
- if(force) //can only force retracting sorry
- for(var/obj/item/uneq_piece in list(helmet, gloves, boots, chest))
- if(uneq_piece)
- if(isliving(uneq_piece.loc))
- var/mob/living/L = uneq_piece.loc
- L.unEquip(uneq_piece, 1)
- if(uneq_piece == boots)
- if(under_boots)
- if(L.equip_to_slot_if_possible(under_boots, slot_shoes))
- under_boots = null
- else
- to_chat(user, "Somehow, your [under_boots] got stuck to the [boots], and were retracted with them. ((This shouldn't happen, bug report this.))")
- uneq_piece.forceMove(src)
- return 0
-
- if(sealing || !cell || !cell.charge)
- return 0
-
- if(!(deploy_mode == ONLY_RETRACT && force)) //This should be the case while stripping, stripping does trigger the if statement below.
- if(user == wearer && user.incapacitated()) // If the user isn't wearing the suit it's probably an AI.
- return 0
-
- var/obj/item/check_slot
- var/equip_to
- var/obj/item/use_obj
-
- switch(piece)
- if("helmet")
- equip_to = slot_head
- use_obj = helmet
- check_slot = wearer.head
- if("gauntlets")
- equip_to = slot_gloves
- use_obj = gloves
- check_slot = wearer.gloves
- if("boots")
- equip_to = slot_shoes
- use_obj = boots
- check_slot = wearer.shoes
- if("chest")
- equip_to = slot_wear_suit
- use_obj = chest
- check_slot = wearer.wear_suit
-
- if(use_obj)
- if(check_slot == use_obj && deploy_mode != ONLY_DEPLOY) //user is wearing it, retract it if not forced to deploy
- if((flags & NODROP) && equip_to != slot_head && !force) //you can only retract the helmet if the suit isn't unsealed
- to_chat(user, "You can't retract \the [use_obj] while the suit is sealed!")
- return
-
- var/mob/living/to_strip
- if(wearer)
- to_strip = wearer
- else if(isliving(use_obj.loc))
- to_strip = use_obj.loc
-
- if(to_strip)
- to_strip.unEquip(use_obj, 1)
- if(use_obj == boots)
- if(under_boots)
- if(to_strip.equip_to_slot_if_possible(under_boots, slot_shoes))
- under_boots = null
- else
- to_chat(user, "Somehow, your [under_boots] got stuck to the [boots], and were retracted with them. ((This shouldn't happen, bug report this.))")
- use_obj.forceMove(src)
- if(wearer)
- to_chat(wearer, "Your [use_obj] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.")
-
- else if(deploy_mode != ONLY_RETRACT)
- if(check_slot)
- if(check_slot != use_obj) //If use_obj is already in check_slot, silently bail. Otherwise, tell the user why the part didn't deploy.
- if(use_obj == boots)
- under_boots = check_slot
- wearer.unEquip(under_boots)
- under_boots.forceMove(src)
- else
- to_chat(wearer, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.")
- return
- use_obj.forceMove(wearer)
- if(!wearer.equip_to_slot_if_possible(use_obj, equip_to, FALSE, TRUE))
- use_obj.forceMove(src)
- else
- if(wearer)
- to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.")
-
- if(piece == "helmet" && helmet)
- helmet.update_light(wearer)
-
-/obj/item/rig/proc/deploy(mob/user)
- if(!wearer || !user)
- return 0
-
- if(flags & NODROP) //We need to check if we have the part, the person is wearing something in the parts slot, and if yes, are they the same.
- if(helmet && wearer.head && wearer.head != helmet)
- to_chat(user, "\The [wearer.head] is blocking \the [src] from deploying!")
- return 0
- if(gloves && wearer.gloves && wearer.gloves != gloves)
- to_chat(user, "\The [wearer.gloves] is preventing \the [src] from deploying!")
- return 0
- /*if(boots && wearer.shoes && wearer.shoes != boots)
- to_chat(user, "\The [wearer.shoes] is preventing \the [src] from deploying!")
- return 0*/
- if(chest && wearer.wear_suit && wearer.wear_suit != chest)
- to_chat(user, "\The [wearer.wear_suit] is preventing \the [src] from deploying!")
- return 0
-
-
- for(var/piece in list("helmet", "gauntlets", "chest", "boots"))
- toggle_piece(piece, user, ONLY_DEPLOY)
-
-/obj/item/rig/dropped(var/mob/user)
- ..()
- user.verbs -= /obj/item/rig/proc/emergency_release
- for(var/piece in list("helmet","gauntlets","chest","boots"))
- toggle_piece(piece, user, ONLY_RETRACT, 1)
- if(wearer)
- wearer.wearing_rig = null
- wearer = null
-
-//Todo
-/obj/item/rig/proc/malfunction()
- return 0
-
-/obj/item/rig/emp_act(severity_class)
- //set malfunctioning
- if(emp_protection < 30) //for ninjas, really.
- malfunctioning += 10
- if(malfunction_delay <= 0)
- malfunction_delay = max(malfunction_delay, round(30/severity_class))
-
- //drain some charge
- if(cell) cell.emp_act(severity_class + 15)
-
- //possibly damage some modules
- take_hit((100/severity_class), "electrical pulse", 1)
-
-/obj/item/rig/proc/shock(mob/user)
- if(get_dist(src, user) <= 1) //Needs to be adjecant to the rig to get shocked.
- if(electrocute_mob(user, cell, src)) //electrocute_mob() handles removing charge from the cell, no need to do that here.
- spark_system.start()
- if(user.stunned)
- return 1
- return 0
-
-/obj/item/rig/proc/take_hit(damage, source, is_emp=0)
-
- if(!installed_modules.len)
- return
-
- var/chance
- if(!is_emp)
- chance = 2*max(0, damage - (chest? chest.breach_threshold : 0))
- else
- //Want this to be roughly independant of the number of modules, meaning that X emp hits will disable Y% of the suit's modules on average.
- //that way people designing hardsuits don't have to worry (as much) about how adding that extra module will affect emp resiliance by 'soaking' hits for other modules
- chance = 2*max(0, damage - emp_protection)*min(installed_modules.len/15, 1)
-
- if(!prob(chance))
- return
-
- //deal addition damage to already damaged module first.
- //This way the chances of a module being disabled aren't so remote.
- var/list/valid_modules = list()
- var/list/damaged_modules = list()
- for(var/obj/item/rig_module/module in installed_modules)
- if(module.damage < 2)
- valid_modules |= module
- if(module.damage > 0)
- damaged_modules |= module
-
- var/obj/item/rig_module/dam_module = null
- if(damaged_modules.len)
- dam_module = pick(damaged_modules)
- else if(valid_modules.len)
- dam_module = pick(valid_modules)
-
- if(!dam_module) return
-
- dam_module.damage++
-
- if(!source)
- source = "hit"
-
- if(wearer)
- if(dam_module.damage >= 2)
- to_chat(wearer, "The [source] has disabled your [dam_module.interface_name]!")
- else
- to_chat(wearer, "The [source] has damaged your [dam_module.interface_name]!")
- dam_module.deactivate()
-
-/obj/item/rig/proc/malfunction_check(var/mob/living/carbon/human/user)
- if(malfunction_delay)
- if(offline)
- to_chat(user, "The suit is completely unresponsive.")
- else
- to_chat(user, "ERROR: Hardware fault. Rebooting interface...")
- return 1
- return 0
-
-/obj/item/rig/proc/ai_can_move_suit(var/mob/user, var/check_user_module = 0, var/check_for_ai = 0)
-
- if(check_for_ai)
- if(!(locate(/obj/item/rig_module/ai_container) in contents))
- return 0
- var/found_ai
- for(var/obj/item/rig_module/ai_container/module in contents)
- if(module.damage >= 2)
- continue
- if(module.integrated_ai && module.integrated_ai.client && !module.integrated_ai.stat)
- found_ai = 1
- break
- if(!found_ai)
- return 0
-
- if(check_user_module)
- if(!user || !user.loc || !user.loc.loc)
- return 0
- var/obj/item/rig_module/ai_container/module = user.loc.loc
- if(!istype(module) || module.damage >= 2)
- to_chat(user, "Your host module is unable to interface with the suit.")
- return 0
-
- if(offline || !cell || !cell.charge || locked_down)
- if(user)
- to_chat(user, "Your host rig is unpowered and unresponsive.")
- return 0
- if(!wearer || wearer.back != src)
- if(user)
- to_chat(user, "Your host rig is not being worn.")
- return 0
- if(!wearer.stat && !control_overridden && !ai_override_enabled)
- if(user)
- to_chat(user, "You are locked out of the suit servo controller.")
- return 0
- return 1
-
-/obj/item/rig/proc/force_rest(var/mob/user)
- if(!ai_can_move_suit(user, check_user_module = 1))
- return
- wearer.lay_down()
- to_chat(user, "\The [wearer] is now [wearer.resting ? "resting" : "getting up"].")
-
-/obj/item/rig/proc/forced_move(var/direction, var/mob/user)
-
- // Why is all this shit in client/Move()? Who knows?
- if(world.time < wearer_move_delay)
- return
-
- if(!wearer || !wearer.loc || !ai_can_move_suit(user, check_user_module = 1))
- return
-
- //This is sota the goto stop mobs from moving var
- if(wearer.notransform || !wearer.canmove)
- return
-
- if(!wearer.lastarea)
- wearer.lastarea = get_area(wearer.loc)
-
- if((istype(wearer.loc, /turf/space)) || (wearer.lastarea.has_gravity == 0))
- if(!wearer.Process_Spacemove(0))
- return 0
-
- if(malfunctioning)
- direction = pick(GLOB.cardinal)
-
- // Inside an object, tell it we moved.
- if(isobj(wearer.loc) || ismob(wearer.loc))
- var/atom/O = wearer.loc
- return O.relaymove(wearer, direction)
-
- if(isturf(wearer.loc))
- if(wearer.restrained())//Why being pulled while cuffed prevents you from moving
- for(var/mob/M in range(wearer, 1))
- if(M.pulling == wearer)
- if(!M.restrained() && M.stat == 0 && M.canmove && wearer.Adjacent(M))
- to_chat(user, "Your host is restrained! They can't move!")
- return 0
- else
- M.stop_pulling()
-
- // AIs are a bit slower than regular and ignore move intent.
- wearer_move_delay = world.time + ai_controlled_move_delay
-
- if(wearer.buckled) //if we're buckled to something, tell it we moved.
- return wearer.buckled.relaymove(wearer, direction)
-
- if(cell.use(200)) //Arbitrary, TODO
- wearer.Move(get_step(get_turf(wearer),direction),direction)
-
-// This returns the rig if you are contained inside one, but not if you are wearing it
-/atom/proc/get_rig()
- if(loc)
- return loc.get_rig()
- return null
-
-/obj/item/rig/get_rig()
- return src
-
-/mob/living/carbon/human/get_rig()
- if(istype(back,/obj/item/rig))
- return back
- else
- return null
-
-/obj/item/rig/proc/emergency_release()
- set name = "Suit Emergency Release"
- set desc = "Activate the suits emergency release system."
- set category = "Object"
- set src in oview(1)
- var/obj/item/rig/T = get_rig()
- return T.do_emergency_release(usr)
-
-/obj/item/rig/proc/do_emergency_release(var/mob/living/user)
- if(!can_touch(user, wearer) || !has_emergency_release)
- return can_touch(user,wearer)
- usr.visible_message("[user] starts activating \the [src] emergency seals release!")
- if(!do_after(user, 240, target = wearer))
- to_chat(user, "You need to focus on activating the emergency release.")
- return 0
- usr.visible_message("[user] activated \the [src] emergency seals release!")
- malfunctioning += 1
- malfunction_delay = 30
- unseal(user)
- return 1
-
-/obj/item/rig/proc/can_touch(var/mob/user, var/mob/wearer)
- if(!user)
- return 0
- if(!wearer.Adjacent(user))
- return 0
- if(user.restrained())
- to_chat(user, "You need your hands free for this.")
- return 0
- if(user.stat || user.paralysis || user.sleeping || user.lying || user.IsWeakened())
- return 0
- return 1
-#undef ONLY_DEPLOY
-#undef ONLY_RETRACT
-#undef SEAL_DELAY
diff --git a/code/modules/clothing/spacesuits/rig/rig_armormod.dm b/code/modules/clothing/spacesuits/rig/rig_armormod.dm
deleted file mode 100644
index c04270aa97b..00000000000
--- a/code/modules/clothing/spacesuits/rig/rig_armormod.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-/obj/item/clothing/suit/space/new_rig/calc_breach_damage()
- ..()
- holder.update_armor() //New dammage, new armormultiplikator.
- return damage
-
-/obj/item/rig/proc/update_armor()
- var/multi = 1 //Multiplicative modification to the armor, maybe add an additive later on
- if(chest)
- multi *= (100 - chest.damage) / 100 //If we have some breaches, lower the armor value.
-
- //TODO check for other armor mods, likely modules, which need to be coded.
- if(!armor) //Did we even give them some armor, if this is the case, the list should be initialized from New()
- return
-
- var/datum/armor/A = armor
- for(var/obj/item/piece in list(gloves, helmet, boots, chest))
- if(!istype(piece)) //Do we have the piece
- continue
-
- piece.armor = piece.armor.setRating(melee_value = A.getRating("melee") * multi,
- bullet_value = A.getRating("bullet") * multi,
- laser_value = A.getRating("laser") * multi,
- energy_value = A.getRating("energy") * multi,
- bomb_value = A.getRating("bomb") * multi,
- bio_value = A.getRating("bio") * multi,
- rad_value = A.getRating("rad") * multi,
- fire_value = A.getRating("fire") * multi,
- acid_value = A.getRating("acidd") * multi)
-
-//Perfect place to also add something like shield modules, or any other hit_reaction modules check.
diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm
deleted file mode 100644
index b48e17b2c41..00000000000
--- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm
+++ /dev/null
@@ -1,196 +0,0 @@
-/obj/item/rig/attackby(obj/item/W as obj, mob/user as mob)
-
- if(!istype(user,/mob/living)) return 0
-
- if(electrified != 0)
- if(shock(user)) //Handles removing charge from the cell, as well. No need to do that here.
- return
-
- // Pass repair items on to the chestpiece.
- if(chest && (istype(W,/obj/item/stack) || istype(W, /obj/item/weldingtool)))
- return chest.attackby(W,user)
-
- // Lock or unlock the access panel.
- if(W.GetID())
- if(subverted)
- locked = 0
- to_chat(user, "It looks like the locking system has been shorted out.")
- return
-
- if((!req_access || !req_access.len) && (!req_one_access || !req_one_access.len))
- locked = 0
- to_chat(user, "\The [src] doesn't seem to have a locking mechanism.")
- return
-
- if(security_check_enabled && !src.allowed(user))
- to_chat(user, "Access denied.")
- return
-
- locked = !locked
- to_chat(user, "You [locked ? "lock" : "unlock"] \the [src] access panel.")
- return
-
- else if(istype(W,/obj/item/crowbar))
-
- if(!open && locked)
- to_chat(user, "The access panel is locked shut.")
- return
-
- open = !open
- to_chat(user, "You [open ? "open" : "close"] the access panel.")
- return
-
- if(open)
-
- // Hacking.
- if(istype(W,/obj/item/wirecutters) || istype(W,/obj/item/multitool))
- if(open)
- wires.Interact(user)
- else
- to_chat(user, "You can't reach the wiring.")
- return
- // Air tank.
- if(istype(W,/obj/item/tank)) //Todo, some kind of check for suits without integrated air supplies.
-
- if(air_supply)
- to_chat(user, "\The [src] already has a tank installed.")
- return
-
- user.unEquip(W)
- air_supply = W
- W.forceMove(src)
- to_chat(user, "You slot [W] into [src] and tighten the connecting valve.")
- return
-
- // Check if this is a hardsuit upgrade or a modification.
- else if(istype(W,/obj/item/rig_module))
-
- if(istype(src.loc,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = src.loc
- if(H.back == src)
- to_chat(user, "You can't install a hardsuit module while the suit is being worn.")
- return 1
-
- if(!installed_modules) installed_modules = list()
- if(installed_modules.len)
- for(var/obj/item/rig_module/installed_mod in installed_modules)
- if(!installed_mod.redundant && istype(installed_mod,W))
- to_chat(user, "The hardsuit already has a module of that class installed.")
- return 1
-
- var/obj/item/rig_module/mod = W
- to_chat(user, "You begin installing \the [mod] into \the [src].")
- if(!do_after(user, 40 * W.toolspeed, target = src))
- return
- if(!user || !W)
- return
- to_chat(user, "You install \the [mod] into \the [src].")
- user.unEquip(mod)
- installed_modules |= mod
- mod.forceMove(src)
- mod.installed(src)
- update_icon()
- return 1
-
- else if(!cell && istype(W,/obj/item/stock_parts/cell))
-
- to_chat(user, "You jack \the [W] into \the [src]'s battery mount.")
- user.unEquip(W)
- W.forceMove(src)
- src.cell = W
- return
-
- else if(istype(W,/obj/item/wrench))
-
- if(!air_supply)
- to_chat(user, "There is not tank to remove.")
- return
-
- if(user.r_hand && user.l_hand)
- air_supply.forceMove(get_turf(user))
- else
- user.put_in_hands(air_supply)
- to_chat(user, "You detach and remove \the [air_supply].")
- air_supply = null
- return
-
- else if(istype(W,/obj/item/screwdriver))
-
- var/list/current_mounts = list()
- if(cell) current_mounts += "cell"
- if(installed_modules && installed_modules.len) current_mounts += "system module"
-
- var/to_remove = input("Which would you like to modify?") as null|anything in current_mounts
- if(!to_remove)
- return
-
- if(istype(src.loc,/mob/living/carbon/human) && to_remove != "cell")
- var/mob/living/carbon/human/H = src.loc
- if(H.back == src)
- to_chat(user, "You can't remove an installed device while the hardsuit is being worn.")
- return
-
- switch(to_remove)
-
- if("cell")
-
- if(cell)
- to_chat(user, "You detatch \the [cell] from \the [src]'s battery mount.")
- for(var/obj/item/rig_module/module in installed_modules)
- module.deactivate()
- if(user.r_hand && user.l_hand)
- cell.forceMove(get_turf(user))
- else
- user.put_in_hands(cell)
- cell = null
- else
- to_chat(user, "There is nothing loaded in that mount.")
-
- if("system module")
-
- var/list/possible_removals = list()
- for(var/obj/item/rig_module/module in installed_modules)
- if(module.permanent)
- continue
- possible_removals[module.name] = module
-
- if(!possible_removals.len)
- to_chat(user, "There are no installed modules to remove.")
- return
-
- var/removal_choice = input("Which module would you like to remove?") as null|anything in possible_removals
- if(!removal_choice)
- return
-
- var/obj/item/rig_module/removed = possible_removals[removal_choice]
- to_chat(user, "You detatch \the [removed] from \the [src].")
- removed.forceMove(get_turf(src))
- removed.removed()
- installed_modules -= removed
- update_icon()
-
- return
-
- // If we've gotten this far, all we have left to do before we pass off to root procs
- // is check if any of the loaded modules want to use the item we've been given.
- for(var/obj/item/rig_module/module in installed_modules)
- if(module.accepts_item(W,user)) //Item is handled in this proc
- return
- ..()
-
-
-/obj/item/rig/attack_hand(var/mob/user)
-
- if(electrified != 0)
- if(shock(user)) //Handles removing charge from the cell, as well. No need to do that here.
- return
- ..()
-
-/obj/item/rig/emag_act(var/remaining_charges, var/mob/user)
- if(!subverted)
- req_access.Cut()
- req_one_access.Cut()
- locked = 0
- subverted = 1
- to_chat(user, "You short out the access protocol for the suit.")
- return 1
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
deleted file mode 100644
index 246e3beb10f..00000000000
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Defines the helmets, gloves and shoes for rigs.
- */
-
-/obj/item/clothing/head/helmet/space/new_rig
- name = "helmet"
- flags = BLOCKHAIR | THICKMATERIAL | NODROP
- flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK
- body_parts_covered = HEAD
- heat_protection = HEAD
- cold_protection = HEAD
- var/brightness_on = 4
- var/on = 0
- sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
- "Skrell" = 'icons/mob/species/skrell/helmet.dmi',
- "Unathi" = 'icons/mob/species/unathi/helmet.dmi'
- )
- species_restricted = null
- actions_types = list(/datum/action/item_action/toggle_helmet_light)
-
- flash_protect = 2
-
-/obj/item/clothing/head/helmet/space/new_rig/attack_self(mob/user)
- if(!isturf(user.loc))
- to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities.
-
- return
- toggle_light(user)
-
-/obj/item/clothing/head/helmet/space/new_rig/proc/toggle_light(mob/user)
- if(flags & AIRTIGHT) //Could also check for STOPSPRESSUREDMAGE, but one is enough, both get toggled when the seal gets toggled.
-
- on = !on
- icon_state = "[item_color][on]"
-
- if(on)
- set_light(brightness_on)
- else
- set_light(0)
- else
- to_chat(user, "You cannot turn the light on while the suit isn't sealed.")
-
- if(istype(user,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = user
- H.update_inv_head()
-
-/obj/item/clothing/gloves/rig
- name = "gauntlets"
- flags = THICKMATERIAL | NODROP
- body_parts_covered = HANDS
- heat_protection = HANDS
- cold_protection = HANDS
- species_restricted = null
- gender = PLURAL
-
-/obj/item/clothing/shoes/magboots/rig
- name = "boots"
- flags = NODROP
- body_parts_covered = FEET
- cold_protection = FEET
- heat_protection = FEET
- species_restricted = null
- gender = PLURAL
-
-/obj/item/clothing/shoes/magboots/rig/attack_self(mob/user)
- if(flags & AIRTIGHT) //Could also check for STOPSPRESSUREDMAGE, but one is enough, both get toggled when the seal gets toggled.
- ..(user)
- else
- to_chat(user, "You cannot activate mag-pulse traction system while the suit is not sealed.")
-
-/obj/item/clothing/suit/space/new_rig
- name = "chestpiece"
- allowed = list(/obj/item/flashlight,/obj/item/tank)
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT|HIDETAIL
- flags = STOPSPRESSUREDMAGE | THICKMATERIAL | AIRTIGHT | NODROP
- slowdown = 0
- breach_threshold = 20
- resilience = 0.2
- can_breach = 1
- var/obj/item/rig/holder
- sprite_sheets = list(
- "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/species/unathi/suit.dmi'
- )
-
-//TODO: move this to modules
-/obj/item/clothing/head/helmet/space/new_rig/proc/prevent_track()
- return 0
-
-/obj/item/clothing/gloves/rig/Touch(var/atom/A, var/proximity)
-
- if(!A || !proximity)
- return 0
-
- var/mob/living/carbon/human/H = loc
- if(!istype(H) || !H.back)
- return 0
-
- var/obj/item/rig/suit = H.back
- if(!suit || !istype(suit) || !suit.installed_modules.len)
- return 0
-
- for(var/obj/item/rig_module/module in suit.installed_modules)
- if(module.active && module.activates_on_touch)
- if(module.engage(A))
- return 1
-
- return 0
-
-//Rig pieces for non-spacesuit based rigs
-
-/obj/item/clothing/head/lightrig
- name = "mask"
- body_parts_covered = HEAD
- heat_protection = HEAD
- cold_protection = HEAD
- flags = THICKMATERIAL|AIRTIGHT
-
-/obj/item/clothing/suit/lightrig
- name = "suit"
- allowed = list(/obj/item/flashlight)
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
- flags = THICKMATERIAL
-
-/obj/item/clothing/shoes/lightrig
- name = "boots"
- body_parts_covered = FEET
- cold_protection = FEET
- heat_protection = FEET
- species_restricted = null
- gender = PLURAL
-
-/obj/item/clothing/gloves/lightrig
- name = "gloves"
- flags = THICKMATERIAL
- body_parts_covered = HANDS
- heat_protection = HANDS
- cold_protection = HANDS
- species_restricted = null
- gender = PLURAL
diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm
deleted file mode 100644
index 4a71f6c67bc..00000000000
--- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm
+++ /dev/null
@@ -1,335 +0,0 @@
-// Interface for humans.
-/obj/item/rig/verb/hardsuit_interface()
- set name = "Open Hardsuit Interface"
- set desc = "Open the hardsuit system interface."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(wearer && wearer.back == src)
- ui_interact(usr)
-
-/obj/item/rig/verb/toggle_vision()
- set name = "Toggle Visor"
- set desc = "Turns your rig visor off or on."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!check_power_cost(usr))
- return
-
- if(!(flags & NODROP))
- to_chat(usr, "The suit is not active.")
- return
-
- if(!check_suit_access(usr))
- return
-
- if(!visor)
- to_chat(usr, "The hardsuit does not have a configurable visor.")
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- if(!visor.active)
- visor.activate()
- else
- visor.deactivate()
-
-/obj/item/rig/proc/toggle_helmet()
- set name = "Toggle Helmet"
- set desc = "Deploys or retracts your helmet."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!check_suit_access(usr))
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- toggle_piece("helmet", usr)
-
-/obj/item/rig/proc/toggle_chest()
- set name = "Toggle Chestpiece"
- set desc = "Deploys or retracts your chestpiece."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(!check_suit_access(usr))
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- toggle_piece("chest", usr)
-
-/obj/item/rig/proc/toggle_gauntlets()
- set name = "Toggle Gauntlets"
- set desc = "Deploys or retracts your gauntlets."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!check_suit_access(usr))
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- toggle_piece("gauntlets", usr)
-
-/obj/item/rig/proc/toggle_boots()
- set name = "Toggle Boots"
- set desc = "Deploys or retracts your boots."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!check_suit_access(usr))
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- toggle_piece("boots", usr)
-
-/obj/item/rig/verb/deploy_suit()
- set name = "Deploy Hardsuit"
- set desc = "Deploys helmet, gloves and boots all at once."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!check_suit_access(usr))
- return
-
- if(!check_power_cost(usr))
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- deploy(wearer, usr)
-
-/obj/item/rig/verb/toggle_seals_verb()
- set name = "Toggle Hardsuit Seals"
- set desc = "Seals or unseals your rig."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!check_suit_access(usr))
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- if(flags & NODROP)
- unseal(usr)
- else
- seal(usr)
-
-/obj/item/rig/verb/switch_vision_mode()
- set name = "Switch Vision Mode"
- set desc = "Switches between available vision modes."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(malfunction_check(usr))
- return
-
- if(!check_power_cost(usr, 0, 0, 0, 0))
- return
-
- if(!(flags & NODROP))
- to_chat(usr, "The suit is not active.")
- return
-
- if(!visor)
- to_chat(usr, "The hardsuit does not have a configurable visor.")
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- if(!visor.active)
- visor.activate()
-
- if(!visor.active)
- to_chat(usr, "The visor is suffering a hardware fault and cannot be configured.")
- return
-
- visor.engage()
-
-/obj/item/rig/verb/alter_voice()
- set name = "Configure Voice Synthesiser"
- set desc = "Toggles or configures your voice synthesizer."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(malfunction_check(usr))
- return
-
- if(!(flags & NODROP))
- to_chat(usr, "The suit is not active.")
- return
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!speech)
- to_chat(usr, "The hardsuit does not have a speech synthesiser.")
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- speech.engage()
-
-/obj/item/rig/verb/select_module()
- set name = "Select Module"
- set desc = "Selects a module as your primary system."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(malfunction_check(usr))
- return
-
- if(!check_power_cost(usr, 0, 0, 0, 0))
- return
-
- if(!(flags & NODROP))
- to_chat(usr, "The suit is not active.")
- return
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- var/list/selectable = list()
- for(var/obj/item/rig_module/module in installed_modules)
- if(module.selectable)
- selectable |= module
-
- var/obj/item/rig_module/module = input("Which module do you wish to select?") as null|anything in selectable
-
- if(!istype(module))
- selected_module = null
- to_chat(usr, "Primary system is now: deselected.")
- return
-
- selected_module = module
- to_chat(usr, "Primary system is now: [selected_module.interface_name].")
-
-/obj/item/rig/verb/toggle_module()
- set name = "Toggle Module"
- set desc = "Toggle a system module."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(malfunction_check(usr))
- return
-
- if(!check_power_cost(usr, 0, 0, 0, 0))
- return
-
- if(!(flags & NODROP))
- to_chat(usr, "The suit is not active.")
- return
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- var/list/selectable = list()
- for(var/obj/item/rig_module/module in installed_modules)
- if(module.toggleable)
- selectable |= module
-
- var/obj/item/rig_module/module = input("Which module do you wish to toggle?") as null|anything in selectable
-
- if(!istype(module))
- return
-
- if(module.active)
- to_chat(usr, "You attempt to deactivate \the [module.interface_name].")
- module.deactivate()
- else
- to_chat(usr, "You attempt to activate \the [module.interface_name].")
- module.activate()
-
-/obj/item/rig/verb/engage_module()
- set name = "Engage Module"
- set desc = "Engages a system module."
- set category = "Hardsuit"
- set src = usr.contents
-
- if(malfunction_check(usr))
- return
-
- if(!(flags & NODROP))
- to_chat(usr, "The suit is not active.")
- return
-
- if(!istype(wearer) || !wearer.back == src)
- to_chat(usr, "The hardsuit is not being worn.")
- return
-
- if(!check_power_cost(usr, 0, 0, 0, 0))
- return
-
- var/mob/M = usr
- if(M.incapacitated())
- return
-
- var/list/selectable = list()
- for(var/obj/item/rig_module/module in installed_modules)
- if(module.usable)
- selectable |= module
-
- var/obj/item/rig_module/module = input("Which module do you wish to engage?") as null|anything in selectable
-
- if(!istype(module))
- return
-
- to_chat(usr, "You attempt to engage the [module.interface_name].")
- module.engage()
diff --git a/code/modules/clothing/spacesuits/rig/rig_wiring.dm b/code/modules/clothing/spacesuits/rig/rig_wiring.dm
deleted file mode 100644
index 9d3108ac016..00000000000
--- a/code/modules/clothing/spacesuits/rig/rig_wiring.dm
+++ /dev/null
@@ -1,70 +0,0 @@
-/datum/wires/rig
- random = 1
- holder_type = /obj/item/rig
- wire_count = 5
-
-#define RIG_SECURITY 1
-#define RIG_AI_OVERRIDE 2
-#define RIG_SYSTEM_CONTROL 4
-#define RIG_INTERFACE_LOCK 8
-#define RIG_INTERFACE_SHOCK 16
-/*
- * Rig security can be snipped to disable ID access checks on rig.
- * Rig AI override can be pulsed to toggle whether or not the AI can take control of the suit.
- * System control can be pulsed to toggle some malfunctions.
- * Interface lock can be pulsed to toggle whether or not the interface can be accessed.
- */
-
-/datum/wires/rig/UpdateCut(var/index, var/mended)
-
- var/obj/item/rig/rig = holder
- switch(index)
- if(RIG_SECURITY)
- if(mended)
- rig.req_access = initial(rig.req_access)
- rig.req_one_access = initial(rig.req_one_access)
- if(RIG_INTERFACE_SHOCK)
- rig.electrified = mended ? 0 : -1
- rig.shock(usr,100)
-
-/datum/wires/rig/UpdatePulsed(var/index)
-
- var/obj/item/rig/rig = holder
- switch(index)
- if(RIG_SECURITY)
- rig.security_check_enabled = !rig.security_check_enabled
- rig.visible_message("\The [rig] twitches as several suit locks [rig.security_check_enabled?"close":"open"].")
- if(RIG_AI_OVERRIDE)
- rig.ai_override_enabled = !rig.ai_override_enabled
- rig.visible_message("A small red light on [rig] [rig.ai_override_enabled?"goes dead":"flickers on"].")
- if(RIG_SYSTEM_CONTROL)
- rig.malfunctioning += 10
- if(rig.malfunction_delay <= 0)
- rig.malfunction_delay = 20
- rig.shock(usr,100)
- if(RIG_INTERFACE_LOCK)
- rig.interface_locked = !rig.interface_locked
- rig.visible_message("\The [rig] clicks audibly as the software interface [rig.interface_locked?"darkens":"brightens"].")
- if(RIG_INTERFACE_SHOCK)
- if(rig.electrified != -1)
- rig.electrified = 30
- rig.shock(usr,100)
-
-/datum/wires/rig/GetWireName(index)
- switch(index)
- if(RIG_SECURITY)
- return "ID check"
- if(RIG_AI_OVERRIDE)
- return "AI control"
- if(RIG_SYSTEM_CONTROL)
- return "System control"
- if(RIG_INTERFACE_LOCK)
- return "Interface lock"
- if(RIG_INTERFACE_SHOCK)
- return "Electrification"
-
-/datum/wires/rig/CanUse(var/mob/living/L)
- var/obj/item/rig/rig = holder
- if(rig.open)
- return 1
- return 0
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
deleted file mode 100644
index 25c784ba7dd..00000000000
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ /dev/null
@@ -1,46 +0,0 @@
-/obj/item/rig/unathi
- name = "NT breacher chassis control module"
- desc = "A cheap NT knock-off of an Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow."
- suit_type = "NT breacher"
- icon_state = "breacher_rig_cheap"
- armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 45, bio = 100, rad = 50)
- emp_protection = -20
- active_slowdown = 6
- offline_slowdown = 10
- vision_restriction = 1
- offline_vision_restriction = 2
-
- chest_type = /obj/item/clothing/suit/space/new_rig/unathi
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/unathi
- glove_type = /obj/item/clothing/gloves/rig/unathi
- boot_type = /obj/item/clothing/shoes/magboots/rig/unathi
-
-/obj/item/rig/unathi/fancy
- name = "breacher chassis control module"
- desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank."
- suit_type = "breacher chassis"
- icon_state = "breacher_rig"
- armor = list(melee = 45, bullet = 45, laser = 45, energy = 45, bomb = 45, bio = 100, rad = 75) //Takes TEN TIMES as much damage to stop someone in a breacher. In exchange, it's slow. //Whoever made this was on meth
- vision_restriction = 0
-
-/obj/item/clothing/head/helmet/space/new_rig/unathi
- icon = 'icons/obj/clothing/species/unathi/hats.dmi'
- species_restricted = list("Unathi")
-
-/obj/item/clothing/suit/space/new_rig/unathi
- icon = 'icons/obj/clothing/species/unathi/suits.dmi'
- species_restricted = list("Unathi")
-
-/obj/item/clothing/gloves/rig/unathi
- icon = 'icons/obj/clothing/species/unathi/gloves.dmi'
- species_restricted = list("Unathi")
- sprite_sheets = list(
- "Unathi" = 'icons/mob/species/unathi/gloves.dmi'
- )
-
-/obj/item/clothing/shoes/magboots/rig/unathi
- icon = 'icons/obj/clothing/species/unathi/shoes.dmi'
- species_restricted = list("Unathi")
- sprite_sheets = list(
- "Unathi" = 'icons/mob/species/unathi/feet.dmi'
- )
diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm
deleted file mode 100644
index cc05c8af2f7..00000000000
--- a/code/modules/clothing/spacesuits/rig/suits/combat.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/obj/item/clothing/head/helmet/space/new_rig/combat
-
-/obj/item/rig/combat
- name = "combat hardsuit control module"
- desc = "A sleek and dangerous hardsuit for active combat."
- icon_state = "security_rig"
- suit_type = "combat hardsuit"
- armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
- active_slowdown = 1
- offline_slowdown = 3
- offline_vision_restriction = 1
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/combat
- allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/baton)
-
-
-/obj/item/rig/combat/equipped
-
-
- initial_modules = list(
- /obj/item/rig_module/mounted,
- /obj/item/rig_module/vision/thermal,
- /obj/item/rig_module/grenade_launcher,
- /obj/item/rig_module/ai_container,
- // /obj/item/rig_module/power_sink,
- /obj/item/rig_module/electrowarfare_suite,
- /obj/item/rig_module/chem_dispenser/combat
- )
diff --git a/code/modules/clothing/spacesuits/rig/suits/ert_suits.dm b/code/modules/clothing/spacesuits/rig/suits/ert_suits.dm
deleted file mode 100644
index 5485e1fe882..00000000000
--- a/code/modules/clothing/spacesuits/rig/suits/ert_suits.dm
+++ /dev/null
@@ -1,81 +0,0 @@
-/obj/item/clothing/head/helmet/space/new_rig/ert
-
-/obj/item/rig/ert
- name = "ERT-C hardsuit control module"
- desc = "A suit worn by the commander of an Emergency Response Team. Has blue highlights. Armoured and space ready."
- suit_type = "ERT commander"
- icon_state = "ert_commander_rig"
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/ert
-
- req_access = list(ACCESS_CENT_SPECOPS)
-
- armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
- allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
- /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
- /obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \
- /obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller)
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/datajack,
- )
-
-/obj/item/rig/ert/engineer
- name = "ERT-E suit control module"
- desc = "A suit worn by the engineering division of an Emergency Response Team. Has orange highlights. Armoured and space ready."
- suit_type = "ERT engineer"
- icon_state = "ert_engineer_rig"
- siemens_coefficient = 0
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/device/plasmacutter,
- // /obj/item/rig_module/device/rcd
- )
-
-/obj/item/rig/ert/medical
- name = "ERT-M suit control module"
- desc = "A suit worn by the medical division of an Emergency Response Team. Has white highlights. Armoured and space ready."
- suit_type = "ERT medic"
- icon_state = "ert_medical_rig"
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/device/healthscanner,
- /obj/item/rig_module/chem_dispenser/injector
- )
-
-/obj/item/rig/ert/security
- name = "ERT-S suit control module"
- desc = "A suit worn by the security division of an Emergency Response Team. Has red highlights. Armoured and space ready."
- suit_type = "ERT security"
- icon_state = "ert_security_rig"
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/grenade_launcher,
- /obj/item/rig_module/mounted/egun,
- )
-
-/obj/item/rig/ert/assetprotection
- name = "Heavy Asset Protection suit control module"
- desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armoured and space ready."
- suit_type = "heavy asset protection"
- icon_state = "asset_protection_rig"
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/grenade_launcher,
- /obj/item/rig_module/vision/multi,
- /obj/item/rig_module/mounted/egun,
- /obj/item/rig_module/chem_dispenser/injector,
- /obj/item/rig_module/device/plasmacutter,
- // /obj/item/rig_module/device/rcd,
- /obj/item/rig_module/datajack
- )
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
deleted file mode 100644
index d76691daf57..00000000000
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ /dev/null
@@ -1,120 +0,0 @@
-// Light rigs are not space-capable, but don't suffer excessive slowdown or sight issues when depowered.
-/obj/item/rig/light
- name = "light suit control module"
- desc = "A lighter, less armoured rig suit."
- icon_state = "ninja_rig"
- suit_type = "light suit"
- allowed = list(/obj/item/gun,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank,/obj/item/stock_parts/cell)
- emp_protection = 10
- active_slowdown = 0
- flags = STOPSPRESSUREDMAGE | THICKMATERIAL
- offline_slowdown = 0
- offline_vision_restriction = 0
-
- chest_type = /obj/item/clothing/suit/space/new_rig/light
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/light
- boot_type = /obj/item/clothing/shoes/magboots/rig/light
- glove_type = /obj/item/clothing/gloves/rig/light
-
-/obj/item/clothing/suit/space/new_rig/light
- name = "suit"
- breach_threshold = 18 //comparable to voidsuits
-
-/obj/item/clothing/gloves/rig/light
- name = "gloves"
-
-/obj/item/clothing/shoes/magboots/rig/light
- name = "shoes"
-
-/obj/item/clothing/head/helmet/space/new_rig/light
- name = "hood"
-
-/obj/item/rig/light/hacker
- name = "cybersuit control module"
- suit_type = "cyber"
- desc = "An advanced powered armour suit with many cyberwarfare enhancements. Comes with built-in insulated gloves for safely tampering with electronics."
- icon_state = "hacker_rig"
-
- req_access = list(ACCESS_SYNDICATE)
-
- airtight = 0
- seal_delay = 5 //not being vaccum-proof has an upside I guess
-
- helm_type = /obj/item/clothing/head/lightrig/hacker
- chest_type = /obj/item/clothing/suit/lightrig/hacker
- glove_type = /obj/item/clothing/gloves/lightrig/hacker
- boot_type = /obj/item/clothing/shoes/lightrig/hacker
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- // /obj/item/rig_module/power_sink,
- /obj/item/rig_module/datajack,
- /obj/item/rig_module/electrowarfare_suite,
- /obj/item/rig_module/voice,
- /obj/item/rig_module/vision,
- )
-
-//The cybersuit is not space-proof. It does however, have good siemens_coefficient values
-/obj/item/clothing/head/lightrig/hacker
- name = "HUD"
- siemens_coefficient = 0.4
- flags = 0
-
-/obj/item/clothing/suit/lightrig/hacker
- siemens_coefficient = 0.4
-
-/obj/item/clothing/shoes/lightrig/hacker
- siemens_coefficient = 0.4
- flags = NOSLIP //All the other rigs have magboots anyways, hopefully gives the hacker suit something more going for it.
-
-/obj/item/clothing/gloves/lightrig/hacker
- siemens_coefficient = 0
-
-/obj/item/rig/light/ninja
- name = "ominous suit control module"
- suit_type = "ominous"
- desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
- icon_state = "ninja_rig"
- armor = list(melee = 50, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 30)
- emp_protection = 40 //change this to 30 if too high.
- active_slowdown = 0
-
- chest_type = /obj/item/clothing/suit/space/new_rig/light/ninja
- glove_type = /obj/item/clothing/gloves/rig/light/ninja
-
- req_access = list(ACCESS_SYNDICATE)
-
- initial_modules = list(
- /obj/item/rig_module/teleporter,
- /obj/item/rig_module/stealth_field,
- /obj/item/rig_module/mounted/energy_blade,
- /obj/item/rig_module/vision,
- /obj/item/rig_module/voice,
- /obj/item/rig_module/chem_dispenser,
- /obj/item/rig_module/grenade_launcher,
- /obj/item/rig_module/fabricator,
- /obj/item/rig_module/ai_container,
- // /obj/item/rig_module/power_sink,
- /obj/item/rig_module/datajack,
- /obj/item/rig_module/self_destruct
- )
-
-/obj/item/clothing/gloves/rig/light/ninja
- name = "insulated gloves"
- siemens_coefficient = 0
-
-/obj/item/clothing/suit/space/new_rig/light/ninja
- breach_threshold = 38 //comparable to regular hardsuits
-
-/obj/item/rig/light/stealth
- name = "stealth suit control module"
- suit_type = "stealth"
- desc = "A highly advanced and expensive suit designed for covert operations."
- icon_state = "ninja_rig" //supposed to be "stealth_rig", but as it currently only has a semi-copied ninja rig sprite, we can just use them directly.
-
- req_access = list(ACCESS_SYNDICATE)
-
- initial_modules = list(
- /obj/item/rig_module/stealth_field,
- /obj/item/rig_module/vision
- )
diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm
deleted file mode 100644
index 95abba52df9..00000000000
--- a/code/modules/clothing/spacesuits/rig/suits/merc.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/obj/item/clothing/head/helmet/space/new_rig/merc
-
-/obj/item/rig/merc
- name = "crimson hardsuit control module"
- desc = "A blood-red hardsuit featuring some fairly illegal technology."
- icon_state = "merc_rig"
- suit_type = "crimson hardsuit"
- armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
- active_slowdown = 1
- offline_slowdown = 3
- offline_vision_restriction = 1
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/merc
- allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/restraints/handcuffs)
-
- initial_modules = list(
- /obj/item/rig_module/mounted,
- /obj/item/rig_module/vision/thermal,
- /obj/item/rig_module/grenade_launcher,
- /obj/item/rig_module/ai_container,
- // /obj/item/rig_module/power_sink,
- /obj/item/rig_module/electrowarfare_suite,
- /obj/item/rig_module/chem_dispenser/combat,
- // /obj/item/rig_module/fabricator/energy_net
- )
-
-//Has most of the modules removed
-/obj/item/rig/merc/empty
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/electrowarfare_suite, //might as well
- )
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
deleted file mode 100644
index c4bbd059fae..00000000000
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ /dev/null
@@ -1,223 +0,0 @@
-/obj/item/clothing/head/helmet/space/new_rig/industrial
-
-/obj/item/clothing/head/helmet/space/new_rig/ce
-
-/obj/item/clothing/head/helmet/space/new_rig/eva
-
-/obj/item/clothing/head/helmet/space/new_rig/hazmat
-
-/obj/item/clothing/head/helmet/space/new_rig/medical
-
-/obj/item/clothing/head/helmet/space/new_rig/hazard
-
-/obj/item/rig/internalaffairs
- name = "augmented tie"
- suit_type = "augmented suit"
- desc = "Prepare for paperwork."
- icon_state = "internalaffairs_rig"
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
- siemens_coefficient = 0.9
- active_slowdown = 0
- offline_slowdown = 0
- offline_vision_restriction = 0
-
- allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/briefcase,/obj/item/storage/secure/briefcase)
-
- req_access = list()
- req_one_access = list()
-
- glove_type = null
- helm_type = null
- boot_type = null
-
-/obj/item/rig/internalaffairs/equipped
-
- req_access = list(ACCESS_LAWYER)
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/device/flash,
- /obj/item/rig_module/device/paperdispenser,
- /obj/item/rig_module/device/pen,
- /obj/item/rig_module/device/stamp
- )
-
- glove_type = null
- helm_type = null
- boot_type = null
-
-/obj/item/rig/industrial
- name = "industrial suit control module"
- suit_type = "industrial hardsuit"
- desc = "A heavy, powerful rig used by construction crews and mining corporations."
- icon_state = "engineering_rig"
- armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
- active_slowdown = 3
- offline_slowdown = 10
- offline_vision_restriction = 2
- emp_protection = -20
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/industrial
-
- allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd)
-
- req_access = list()
- req_one_access = list()
-
-
-/obj/item/rig/industrial/equipped
-
- initial_modules = list(
- /obj/item/rig_module/device/plasmacutter,
- /obj/item/rig_module/device/drill,
- /obj/item/rig_module/device/orescanner,
- // /obj/item/rig_module/device/rcd,
- /obj/item/rig_module/vision/meson
- )
-
-/obj/item/rig/eva
- name = "EVA suit control module"
- suit_type = "EVA hardsuit"
- desc = "A light rig for repairs and maintenance to the outside of habitats and vessels."
- icon_state = "eva_rig"
- active_slowdown = 0
- offline_slowdown = 1
- offline_vision_restriction = 1
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/eva
-
- allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/t_scanner,/obj/item/rcd)
-
- req_access = list()
- req_one_access = list()
-
-/obj/item/rig/eva/equipped
-
- initial_modules = list(
- /obj/item/rig_module/device/plasmacutter,
- /obj/item/rig_module/maneuvering_jets,
- // /obj/item/rig_module/device/rcd,
- /obj/item/rig_module/vision/meson
- )
-
-//Chief Engineer's rig. This is sort of a halfway point between the old hardsuits (voidsuits) and the rig class.
-/obj/item/rig/ce
-
- name = "advanced voidsuit control module"
- suit_type = "advanced voidsuit"
- desc = "An advanced voidsuit that protects against hazardous, low pressure environments. Shines with a high polish."
- icon_state = "ce_rig"
- armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 90)
- active_slowdown = 0
- offline_slowdown = 0
- offline_vision_restriction = 0
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/ce
-
- allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd)
-
-
- req_access = list()
- req_one_access = list()
-
- boot_type = null
- glove_type = null
-
-/obj/item/rig/ce/equipped
-
- req_access = list(ACCESS_CE)
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/device/plasmacutter,
- // /obj/item/rig_module/device/rcd,
- /obj/item/rig_module/vision/meson
- )
-
- chest_type = /obj/item/clothing/suit/space/new_rig/ce
- boot_type = null
- glove_type = null
-
-/obj/item/clothing/suit/space/new_rig/ce
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-
-/obj/item/rig/hazmat
-
- name = "AMI control module"
- suit_type = "hazmat hardsuit"
- desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
- icon_state = "science_rig"
- active_slowdown = 1
- offline_vision_restriction = 1
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/hazmat
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/ert
-
- allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/pickaxe,/obj/item/healthanalyzer,/obj/item/gps,/obj/item/radio/beacon)
-
- req_access = list()
- req_one_access = list()
-
-/obj/item/rig/hazmat/equipped
-
- req_access = list(ACCESS_RD)
-
- initial_modules = list(
- /obj/item/rig_module/ai_container,
- /obj/item/rig_module/maneuvering_jets)
-
-/obj/item/rig/medical
-
- name = "rescue suit control module"
- suit_type = "rescue hardsuit"
- desc = "A durable suit designed for medical rescue in high risk areas."
- icon_state = "medical_rig"
- armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50)
- active_slowdown = 1
- offline_vision_restriction = 1
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/medical
-
- allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/roller )
-
- req_access = list()
- req_one_access = list()
-
-/obj/item/rig/medical/equipped
-
- initial_modules = list(
- /obj/item/rig_module/chem_dispenser/injector,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/device/healthscanner,
- /obj/item/rig_module/vision/medhud
- )
-
-/obj/item/rig/hazard
- name = "hazard hardsuit control module"
- suit_type = "hazard hardsuit"
- desc = "A Security hardsuit designed for prolonged EVA in dangerous environments."
- icon_state = "hazard_rig"
- armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50)
- active_slowdown = 1
- offline_slowdown = 3
- offline_vision_restriction = 1
-
- helm_type = /obj/item/clothing/head/helmet/space/new_rig/hazard
-
- allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/baton)
-
- req_access = list()
- req_one_access = list()
-
-
-/obj/item/rig/hazard/equipped
-
- initial_modules = list(
- /obj/item/rig_module/vision/sechud,
- /obj/item/rig_module/maneuvering_jets,
- /obj/item/rig_module/grenade_launcher,
- /obj/item/rig_module/mounted/taser
- )
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 6c4ace8c993..24bef5398a8 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -13,6 +13,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
+ w_class = WEIGHT_CLASS_NORMAL
/obj/item/clothing/suit/armor/vest
name = "armor"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 7e9e698d185..63f5cf8dca3 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -12,6 +12,7 @@
/obj/item/clothing/suit/bluetag
name = "blue laser tag armour"
desc = "Blue Pride, Station Wide."
+ w_class = WEIGHT_CLASS_NORMAL
icon_state = "bluetag"
item_state = "bluetag"
blood_overlay_type = "armor"
@@ -26,6 +27,7 @@
/obj/item/clothing/suit/redtag
name = "red laser tag armour"
desc = "Pew pew pew."
+ w_class = WEIGHT_CLASS_NORMAL
icon_state = "redtag"
item_state = "redtag"
blood_overlay_type = "armor"
@@ -71,6 +73,7 @@
/obj/item/clothing/suit/cyborg_suit
name = "cyborg suit"
desc = "Suit for a cyborg costume."
+ w_class = WEIGHT_CLASS_NORMAL
icon_state = "death"
item_state = "death"
flags = CONDUCT
@@ -371,6 +374,7 @@
/obj/item/clothing/suit/hooded/wintercoat/captain
name = "captain's winter coat"
icon_state = "wintercoat_captain"
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "coatcaptain"
armor = list("melee" = 25, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
@@ -382,6 +386,7 @@
/obj/item/clothing/suit/hooded/wintercoat/security
name = "security winter coat"
icon_state = "wintercoat_sec"
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "coatsecurity"
armor = list("melee" = 15, "bullet" = 10, "laser" = 15, "energy" = 5, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
@@ -393,6 +398,7 @@
/obj/item/clothing/suit/hooded/wintercoat/medical
name = "medical winter coat"
icon_state = "wintercoat_med"
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "coatmedical"
allowed = list(/obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator,/obj/item/healthanalyzer,/obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 45)
@@ -404,6 +410,7 @@
/obj/item/clothing/suit/hooded/wintercoat/science
name = "science winter coat"
icon_state = "wintercoat_sci"
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "coatscience"
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator,/obj/item/healthanalyzer,/obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 0, acid = 0)
@@ -415,6 +422,7 @@
/obj/item/clothing/suit/hooded/wintercoat/engineering
name = "engineering winter coat"
icon_state = "wintercoat_engi"
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "coatengineer"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd)
@@ -454,6 +462,7 @@
/obj/item/clothing/suit/hooded/wintercoat/miner
name = "mining winter coat"
icon_state = "wintercoat_miner"
+ w_class = WEIGHT_CLASS_NORMAL
item_state = "coatminer"
allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -767,6 +776,7 @@
/obj/item/clothing/suit/jacket/pilot
name = "security bomber jacket"
desc = "A stylish and worn-in armoured black bomber jacket emblazoned with the NT Security crest on the left breast. Looks rugged."
+ w_class = WEIGHT_CLASS_NORMAL
icon_state = "bombersec"
item_state = "bombersec"
ignore_suitadjust = 0
@@ -825,6 +835,7 @@
/obj/item/clothing/suit/toggle/owlwings
name = "owl cloak"
desc = "A soft brown cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive the ladies mad."
+ w_class = WEIGHT_CLASS_NORMAL
icon_state = "owl_wings"
item_state = "owl_wings"
body_parts_covered = ARMS
@@ -871,6 +882,7 @@
/obj/item/clothing/suit/advanced_protective_suit
name = "Advanced Protective Suit"
desc = "An incredibly advanced and complex suit; it has so many buttons and dials as to be incomprehensible."
+ w_class = WEIGHT_CLASS_BULKY
icon_state = "bomb"
item_state = "bomb"
actions_types = list(/datum/action/item_action/toggle)
@@ -924,6 +936,7 @@
//Syndicate Chaplain Robe (WOLOLO!)
/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe
description_antag = "This robe is made of reinforced fibers, granting it superior protection. The robes also wirelessly generate power for the neurotransmitter in the linked missionary staff while being worn."
+ w_class = WEIGHT_CLASS_NORMAL
armor = list(melee = 10, bullet = 10, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 15, fire = 30, acid = 30)
var/obj/item/nullrod/missionary_staff/linked_staff = null
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index 9a675742b5e..1da4138fe77 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -1,5 +1,6 @@
/obj/item/clothing/suit/storage
var/obj/item/storage/internal/pockets
+ w_class = WEIGHT_CLASS_NORMAL //we don't want these to be able to fit in their own pockets.
/obj/item/clothing/suit/storage/New()
..()
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 308380e4c55..e77bcb7478a 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -64,6 +64,7 @@
/obj/item/clothing/head/bomb_hood
name = "bomb hood"
desc = "Use in case of bomb."
+ w_class = WEIGHT_CLASS_NORMAL
icon_state = "bombsuit"
flags = BLOCKHAIR | THICKMATERIAL
armor = list("melee" = 20, "bullet" = 0, "laser" = 20,"energy" = 10, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index a9b4eab329e..9a2afbc8a60 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -838,3 +838,10 @@
icon_state = "cuban_suit"
item_state = "cuban_suit"
item_color = "cuban_suit"
+
+/obj/item/clothing/under/tourist_suit
+ name = "tourist outfit"
+ desc = "A light blue shirt with brown shorts. Feels oddly spooky."
+ icon_state = "tourist"
+ icon_state = "tourist"
+ item_color = "tourist"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 1a5da52ffce..530b9095f75 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -349,7 +349,7 @@
to_chat(user, "You modify the appearance of [target].")
var/obj/item/clothing/mask/gas/M = target
M.name = "Prescription Gas Mask"
- M.desc = "It looks heavily modified, but otherwise functions as a gas mask. The words “Property of Yon-Dale†can be seen on the inner band."
+ M.desc = "It looks heavily modified, but otherwise functions as a gas mask. The words \"Property of Yon-Dale\" can be seen on the inner band."
M.icon = 'icons/obj/custom_items.dmi'
M.icon_state = "gas_tariq"
M.sprite_sheets = list(
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index 7fe60e8b77f..4ad8fb4eb90 100644
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -9,7 +9,7 @@
makeAbductorTeam()
/datum/event/abductor/proc/makeAbductorTeam()
- var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for an Abductor Team?", ROLE_ABDUCTOR, 1)
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you wish to be considered for an Abductor Team?", ROLE_ABDUCTOR, TRUE)
if(candidates.len >= 2)
//Oh god why we can't have static functions
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index 8c01d5c7cc2..23e4e266819 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -23,7 +23,7 @@
vents += temp_vent
spawn()
- var/list/candidates = pollCandidates("Do you want to play as an alien?", ROLE_ALIEN, 1)
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as an alien?", ROLE_ALIEN, TRUE, source = /mob/living/carbon/alien/larva)
while(spawncount > 0 && vents.len && candidates.len)
var/obj/vent = pick_n_take(vents)
diff --git a/code/modules/events/apc_short.dm b/code/modules/events/apc_short.dm
index d2fe04dcc5d..c19b6cbe8b7 100644
--- a/code/modules/events/apc_short.dm
+++ b/code/modules/events/apc_short.dm
@@ -59,7 +59,17 @@
log_and_message_admins("APC Short event shorted out [affected_apc_count] APCs.")
/proc/power_restore(announce=TRUE)
- power_restore_quick(announce)
+ if(announce)
+ GLOB.event_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
+
+ // recharge the APCs
+ for(var/thing in GLOB.apcs)
+ var/obj/machinery/power/apc/A = thing
+ if(!is_station_level(A.z))
+ continue
+ var/obj/item/stock_parts/cell/C = A.get_cell()
+ if(C)
+ C.give(C.maxcharge)
/proc/power_restore_quick(announce=TRUE)
if(announce)
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index caec11de9f2..de2da9fbf64 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -12,14 +12,14 @@
if(!T)
return kill()
- var/list/candidates = pollCandidates("Do you want to play as a blob infested mouse?", ROLE_BLOB, 1)
- if(!candidates.len)
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blob infested mouse?", ROLE_BLOB, TRUE, source = /mob/living/simple_animal/mouse/blobinfected)
+ if(!length(candidates))
return kill()
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in GLOB.all_vent_pumps)
if(is_station_level(temp_vent.loc.z) && !temp_vent.welded)
- if(temp_vent.parent.other_atmosmch.len > 50)
+ if(length(temp_vent.parent.other_atmosmch) > 50)
vents += temp_vent
var/obj/vent = pick(vents)
diff --git a/code/modules/events/event_procs.dm b/code/modules/events/event_procs.dm
index c5b7c893c26..cc00f05723f 100644
--- a/code/modules/events/event_procs.dm
+++ b/code/modules/events/event_procs.dm
@@ -1,9 +1,9 @@
/client/proc/forceEvent(var/type in SSevents.allEvents)
- set name = "Trigger Event (Debug Only)"
+ set name = "Trigger Event"
set category = "Debug"
- if(!holder)
+ if(!check_rights(R_EVENT))
return
if(ispath(type))
diff --git a/code/modules/events/holidays/AprilFools.dm b/code/modules/events/holidays/AprilFools.dm
deleted file mode 100644
index 562e6b98e0d..00000000000
--- a/code/modules/events/holidays/AprilFools.dm
+++ /dev/null
@@ -1 +0,0 @@
-//placeholder for holiday stuff
diff --git a/code/modules/events/holidays/Christmas.dm b/code/modules/events/holidays/Christmas.dm
deleted file mode 100644
index e04471482a5..00000000000
--- a/code/modules/events/holidays/Christmas.dm
+++ /dev/null
@@ -1,61 +0,0 @@
-/proc/Christmas_Game_Start()
- for(var/obj/structure/flora/tree/pine/xmas in world)
- if(!is_station_level(xmas.z)) continue
- for(var/turf/simulated/floor/T in orange(1,xmas))
- for(var/i=1,i<=rand(1,5),i++)
- new /obj/item/a_gift(T)
- for(var/mob/living/simple_animal/corgi/Ian/Ian in GLOB.mob_list)
- Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
-
-/proc/ChristmasEvent()
- for(var/obj/structure/flora/tree/pine/xmas in world)
- var/mob/living/simple_animal/hostile/tree/evil_tree = new /mob/living/simple_animal/hostile/tree(xmas.loc)
- evil_tree.icon_state = xmas.icon_state
- evil_tree.icon_living = evil_tree.icon_state
- evil_tree.icon_dead = evil_tree.icon_state
- evil_tree.icon_gib = evil_tree.icon_state
- qdel(xmas)
-
-/obj/item/toy/xmas_cracker
- name = "xmas cracker"
- icon = 'icons/obj/christmas.dmi'
- icon_state = "cracker"
- desc = "Directions for use: Requires two people, one to pull each end."
- var/cracked = 0
-
-/obj/item/toy/xmas_cracker/New()
- ..()
-
-/obj/item/toy/xmas_cracker/attack(mob/target, mob/user)
- if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
- target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.")
- var/obj/item/paper/Joke = new /obj/item/paper(user.loc)
- Joke.name = "[pick("awful","terrible","unfunny")] joke"
- Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'",
- "Why couldn't the snowman get laid?\n\nHe was frigid!",
- "Where are santa's helpers educated?\n\nNowhere, they're ELF-taught.",
- "What happened to the man who stole advent calanders?\n\nHe got 25 days.",
- "What does Santa get when he gets stuck in a chimney?\n\nClaus-trophobia.",
- "Where do you find chili beans?\n\nThe north pole.",
- "What do you get from eating tree decorations?\n\nTinsilitis!",
- "What do snowmen wear on their heads?\n\nIce caps!",
- "Why is Christmas just like life on ss13?\n\nYou do all the work and the fat guy gets all the credit.",
- "Why doesn�t Santa have any children?\n\nBecause he only comes down the chimney.")
- new /obj/item/clothing/head/festive(target.loc)
- user.update_icons()
- cracked = 1
- icon_state = "cracker1"
- var/obj/item/toy/xmas_cracker/other_half = new /obj/item/toy/xmas_cracker(target)
- other_half.cracked = 1
- other_half.icon_state = "cracker2"
- target.put_in_active_hand(other_half)
- playsound(user, 'sound/effects/snap.ogg', 50, 1)
- return 1
- return ..()
-
-/obj/item/clothing/head/festive
- name = "festive paper hat"
- icon_state = "xmashat"
- desc = "A crappy paper hat that you are REQUIRED to wear."
- flags_inv = 0
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
diff --git a/code/modules/events/holidays/Easter.dm b/code/modules/events/holidays/Easter.dm
deleted file mode 100644
index 562e6b98e0d..00000000000
--- a/code/modules/events/holidays/Easter.dm
+++ /dev/null
@@ -1 +0,0 @@
-//placeholder for holiday stuff
diff --git a/code/modules/events/holidays/Holidays.dm b/code/modules/events/holidays/Holidays.dm
deleted file mode 100644
index 5bc49001e3a..00000000000
--- a/code/modules/events/holidays/Holidays.dm
+++ /dev/null
@@ -1,183 +0,0 @@
-//Uncommenting ALLOW_HOLIDAYS in config.txt will enable Holidays
-GLOBAL_VAR_INIT(Holiday) // I didnt update the rest of this code because this file hasnt been ticked in years, and holiday code got overhauled
- // If it really needs fixing, yell at me, -aa
-
-//Just thinking ahead! Here's the foundations to a more robust Holiday event system.
-//It's easy as hell to add stuff. Just set Holiday to something using the switch(or something else)
-//then use if(Holiday == "MyHoliday") to make stuff happen on that specific day only
-//Please, Don't spam stuff up with easter eggs, I'd rather somebody just delete this than people cause
-//the game to lag even more in the name of one-day content.
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-//ALSO, MOST IMPORTANTLY: Don't add stupid stuff! Discuss bonus content with Project-Heads first please!//
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-// ~Carn
-
-/hook/startup/proc/updateHoliday()
- Get_Holiday()
- return 1
-
-//sets up the Holiday global variable. Shouldbe called on game configuration or something.
-/proc/Get_Holiday()
- if(!Holiday) return // Holiday stuff was not enabled in the config!
-
- Holiday = null // reset our switch now so we can recycle it as our Holiday name
-
- var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year
- var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month
- var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day
-
- //Main switch. If any of these are too dumb/inappropriate, or you have better ones, feel free to change whatever
- switch(MM)
- if(1) //Jan
- switch(DD)
- if(1) Holiday = "New Year's Day"
-
- if(2) //Feb
- switch(DD)
- if(2) Holiday = "Groundhog Day"
- if(14) Holiday = "Valentine's Day"
- if(17) Holiday = "Random Acts of Kindness Day"
-
- if(3) //Mar
- switch(DD)
- if(14) Holiday = "Pi Day"
- if(17) Holiday = "St. Patrick's Day"
- if(27)
- if(YY == 16)
- Holiday = "Easter"
- if(31)
- if(YY == 13)
- Holiday = "Easter"
-
- if(4) //Apr
- switch(DD)
- if(1)
- Holiday = "April Fool's Day"
- if(YY == 18 && prob(50)) Holiday = "Easter"
- if(5)
- if(YY == 15) Holiday = "Easter"
- if(16)
- if(YY == 17) Holiday = "Easter"
- if(20)
- Holiday = "Four-Twenty"
- if(YY == 14 && prob(50)) Holiday = "Easter"
- if(22) Holiday = "Earth Day"
-
- if(5) //May
- switch(DD)
- if(1) Holiday = "Labour Day"
- if(4) Holiday = "FireFighter's Day"
- if(12) Holiday = "Owl and Pussycat Day" //what a dumb day of observence...but we -do- have costumes already :3
-
- if(6) //Jun
-
- if(7) //Jul
- switch(DD)
- if(1) Holiday = "Doctor's Day"
- if(2) Holiday = "UFO Day"
- if(8) Holiday = "Writer's Day"
- if(30) Holiday = "Friendship Day"
-
- if(8) //Aug
- switch(DD)
- if(5) Holiday = "Beer Day"
-
- if(9) //Sep
- switch(DD)
- if(19) Holiday = "Talk-Like-a-Pirate Day"
- if(28) Holiday = "Stupid-Questions Day"
-
- if(10) //Oct
- switch(DD)
- if(4) Holiday = "Animal's Day"
- if(7) Holiday = "Smiling Day"
- if(16) Holiday = "Boss' Day"
- if(31) Holiday = "Halloween"
-
- if(11) //Nov
- switch(DD)
- if(1) Holiday = "Vegan Day"
- if(13) Holiday = "Kindness Day"
- if(19) Holiday = "Flowers Day"
- if(21) Holiday = "Saying-'Hello' Day"
-
- if(12) //Dec
- switch(DD)
- if(10) Holiday = "Human-Rights Day"
- if(14) Holiday = "Monkey Day"
- if(21) if(YY==12) Holiday = "End of the World"
- if(22) Holiday = "Orgasming Day" //lol. These all actually exist
- if(24) Holiday = "Christmas Eve"
- if(25) Holiday = "Christmas"
- if(26) Holiday = "Boxing Day"
- if(31) Holiday = "New Year's Eve"
-
- if(!Holiday)
- //Friday the 13th
- if(DD == 13)
- if(time2text(world.timeofday, "DDD") == "Fri")
- Holiday = "Friday the 13th"
-
-//Allows GA and GM to set the Holiday variable
-/client/proc/Set_Holiday(T as text|null)
- set name = ".Set Holiday"
- set category = "Event"
- set desc = "Force-set the Holiday variable to make the game think it's a certain day."
- if(!check_rights(R_SERVER)) return
-
- Holiday = T
- //get a new station name
- station_name = null
- station_name()
- //update our hub status
- world.update_status()
- Holiday_Game_Start()
-
- message_admins("ADMIN: Event: [key_name_admin(src)] force-set Holiday to \"[Holiday]\"")
- log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"")
-
-
-//Run at the start of a round
-/proc/Holiday_Game_Start()
- if(Holiday)
- to_chat(world, "and...")
- to_chat(world, "Happy [Holiday] Everybody!") - switch(Holiday) //special holidays - if("Easter") - //do easter stuff - if("Christmas Eve","Christmas") - Christmas_Game_Start() - - return - -//Nested in the random events loop. Will be triggered every 2 minutes -/proc/Holiday_Random_Event() - switch(Holiday) //special holidays - - if("",null) //no Holiday today! Back to work! - return - - if("Easter") //I'll make this into some helper procs at some point -/* var/list/turf/simulated/floor/Floorlist = list() - for(var/turf/simulated/floor/T) - if(T.contents) - Floorlist += T - var/turf/simulated/floor/F = Floorlist[rand(1,Floorlist.len)] - Floorlist = null - var/obj/structure/closet/C = locate(/obj/structure/closet) in F - var/obj/item/reagent_containers/food/snacks/chocolateegg/wrapped/Egg - if( C ) Egg = new(C) - else Egg = new(F) -*/ -/* var/list/obj/containers = list() - for(var/obj/item/storage/S in world) - if(!is_station_level(S.z)) continue - containers += S - - message_admins("DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/ - if("End of the World") - if(prob(eventchance)) GameOver() - - if("Christmas","Christmas Eve") - if(prob(eventchance)) ChristmasEvent() diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm index 196642ce39c..b8f45023a27 100644 --- a/code/modules/events/mass_hallucination.dm +++ b/code/modules/events/mass_hallucination.dm @@ -2,7 +2,13 @@ announceWhen = rand(0, 20) /datum/event/mass_hallucination/start() - for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing + if(H.stat == DEAD) + continue + var/turf/T = get_turf(H) + if(!is_station_level(T.z)) + continue var/armor = H.getarmor(type = "rad") if((RADIMMUNE in H.dna.species.species_traits) || armor >= 75) // Leave radiation-immune species/rad armored players completely unaffected continue diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 918746f4595..7007a99f0ec 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -3,14 +3,13 @@ /datum/event/sentience/start() processing = FALSE //so it won't fire again in next tick - var/ghostmsg = "Do you want to awaken as a sentient being?" - var/list/candidates = pollCandidates(ghostmsg, ROLE_SENTIENT, 1) + var/list/candidates = SSghost_spawns.poll_candidates("Do you want to awaken as a sentient being?", ROLE_SENTIENT, TRUE) var/list/potential = list() var/sentience_type = SENTIENCE_ORGANIC for(var/mob/living/simple_animal/L in GLOB.alive_mob_list) var/turf/T = get_turf(L) - if (T.z != 1) + if (!is_station_level(T.z)) continue if(!(L in GLOB.player_list) && !L.mind && (L.sentience_type == sentience_type)) potential += L diff --git a/code/modules/events/slaughterevent.dm b/code/modules/events/slaughterevent.dm index ac265adb420..85f0f8aa555 100644 --- a/code/modules/events/slaughterevent.dm +++ b/code/modules/events/slaughterevent.dm @@ -3,7 +3,7 @@ /datum/event/spawn_slaughter/proc/get_slaughter(var/end_if_fail = 0) spawn() - var/list/candidates = pollCandidates("Do you want to play as a slaughter demon?", ROLE_DEMON, 1) + var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a slaughter demon?", ROLE_DEMON, TRUE, source = /mob/living/simple_animal/slaughter) if(!candidates.len) key_of_slaughter = null return kill() @@ -33,7 +33,7 @@ spawn_locs += get_turf(player_mind.current) if(!spawn_locs) //If we can't find THAT, then just retry return kill() - var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs)) + var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs)) var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder) S.holder = holder player_mind.transfer_to(S) diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm index 75b86d20cb0..79acc49fe73 100644 --- a/code/modules/events/spider_terror.dm +++ b/code/modules/events/spider_terror.dm @@ -1,3 +1,4 @@ +#define TS_HIGHPOP_TRIGGER 80 /datum/event/spider_terror announceWhen = 240 @@ -22,23 +23,32 @@ if(temp_vent.parent.other_atmosmch.len > 50) vents += temp_vent var/spider_type - var/infestation_type = pick(1, 2, 3, 4, 5) + var/infestation_type + if((length(GLOB.clients)) < TS_HIGHPOP_TRIGGER) + infestation_type = pick(1, 2, 3, 4) + else + infestation_type = pick(2, 3, 4, 5) switch(infestation_type) if(1) + // Weakest, only used during lowpop. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/green spawncount = 5 if(2) - spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/white - spawncount = 2 - if(3) + // Fairly weak. Dangerous in single combat but has little staying power. Always gets whittled down. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/prince spawncount = 1 + if(3) + // Variable. Depends how many they infect. + spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/white + spawncount = 2 if(4) - spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen - spawncount = 1 - if(5) + // Pretty strong. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/princess spawncount = 2 + if(5) + // Strongest, only used during highpop. + spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen + spawncount = 1 while(spawncount >= 1 && vents.len) var/obj/machinery/atmospherics/unary/vent_pump/vent = pick(vents) @@ -60,3 +70,6 @@ new spider_type(vent.loc) spawncount-- + +#undef TS_HIGHPOP_TRIGGER + diff --git a/code/modules/events/traders.dm b/code/modules/events/traders.dm index 0beeb3691e2..d4ae1de3b9c 100644 --- a/code/modules/events/traders.dm +++ b/code/modules/events/traders.dm @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(unused_trade_stations, list("sol")) trader_objectives = forge_trader_objectives() spawn() - var/list/candidates = pollCandidates("Do you want to play as a trader?", ROLE_TRADER, 1) + var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a Sol Trader?", ROLE_TRADER, TRUE) var/index = 1 while(spawn_count > 0 && candidates.len > 0) if(index > spawnlocs.len) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index d4c06fdc3a3..a24b73ae56c 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -19,7 +19,7 @@ var/list/newlist = dreamlist.Copy() for(var/i in 1 to newlist.len) newlist[i] = replacetext(newlist[i], "\[DREAMER\]", "[user.name]") - return dreamlist + return newlist //NIGHTMARES diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 51ac13d4e13..21b99acb910 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -149,10 +149,12 @@ Gunshots/explosions/opening doors/less rare audio (done) /obj/effect/hallucination/fake_flood/process() if(!target) qdel(src) + return if(next_expand <= world.time) radius++ if(radius > FAKE_FLOOD_MAX_RADIUS) qdel(src) + return Expand() if((get_turf(target) in flood_turfs) && !target.internal) target.hallucinate("fake_alert", "too_much_tox") @@ -460,8 +462,9 @@ Gunshots/explosions/opening doors/less rare audio (done) target = T var/image/A = null var/kind = force_kind ? force_kind : pick("clown", "corgi", "carp", "skeleton", "demon","zombie") - for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) - if(H == target) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing + if(H.stat == DEAD || H == target) continue if(skip_nearby && (H in view(target))) continue @@ -539,7 +542,8 @@ Gunshots/explosions/opening doors/less rare audio (done) var/mob/living/carbon/human/clone = null var/clone_weapon = null - for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing if(H.stat || H.lying) continue clone = H @@ -751,8 +755,10 @@ GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/gun/projectile, /obj/ite target.client.images.Remove(speech_overlay) else // Radio talk var/list/humans = list() - for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) - humans += H + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing + if(H.stat != DEAD) + humans += H person = pick(humans) target.hear_radio(message_to_multilingual(pick(radio_messages), pick(person.languages)), speaker = person, part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " |