")
text = replacetext(text, "\[logo\]", "")
text = replacetext(text, "\[time\]", "[station_time_timestamp()]") // TO DO
+ text = replacetext(text, "\[date\]", "[GLOB.current_date_string]")
+ text = replacetext(text, "\[station\]", "[SSmapping.map_datum.fluff_name]")
if(!no_font)
if(P)
text = "[text]"
@@ -651,3 +653,79 @@
// return the split html object to the caller
return s
+
+//Used for applying byonds text macros to strings that are loaded at runtime
+/proc/apply_text_macros(string)
+ var/next_backslash = findtext(string, "\\")
+ if(!next_backslash)
+ return string
+
+ var/leng = length(string)
+
+ var/next_space = findtext(string, " ", next_backslash + length(string[next_backslash]))
+ if(!next_space)
+ next_space = leng - next_backslash
+
+ if(!next_space) //trailing bs
+ return string
+
+ var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash)
+ var/macro = lowertext(copytext(string, next_backslash + length(string[next_backslash]), next_space))
+ var/rest = next_backslash > leng ? "" : copytext(string, next_space + length(string[next_space]))
+
+ //See https://secure.byond.com/docs/ref/info.html#/DM/text/macros
+ switch(macro)
+ //prefixes/agnostic
+ if("the")
+ rest = text("\the []", rest)
+ if("a")
+ rest = text("\a []", rest)
+ if("an")
+ rest = text("\an []", rest)
+ if("proper")
+ rest = text("\proper []", rest)
+ if("improper")
+ rest = text("\improper []", rest)
+ if("roman")
+ rest = text("\roman []", rest)
+ //postfixes
+ if("th")
+ base = text("[]\th", rest)
+ if("s")
+ base = text("[]\s", rest)
+ if("he")
+ base = text("[]\he", rest)
+ if("she")
+ base = text("[]\she", rest)
+ if("his")
+ base = text("[]\his", rest)
+ if("himself")
+ base = text("[]\himself", rest)
+ if("herself")
+ base = text("[]\herself", rest)
+ if("hers")
+ base = text("[]\hers", rest)
+
+ . = base
+ if(rest)
+ . += .(rest)
+
+/**
+ * Proc to generate a "rank colour" from a client
+ *
+ * This takes the client and looks at various factors in order, such as patreon status, staff rank, and more
+ * Arguments:
+ * * C - The client were looking up
+ */
+/proc/client2rankcolour(client/C)
+ // First check if end user is an admin
+ if(C.holder)
+ if(C.holder.rank in GLOB.rank_colour_map)
+ // Return their rank colour if they are in here
+ return GLOB.rank_colour_map[C.holder.rank]
+
+ // If they arent an admin, see if they are a patreon. Just accept any level
+ if(C.donator_level)
+ return "#e67e22" // Patreon orange
+ return null
+
diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm
index 74760fd22b4..7b49249690d 100644
--- a/code/__HELPERS/traits.dm
+++ b/code/__HELPERS/traits.dm
@@ -99,7 +99,7 @@
Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
*/
-//mob traits
+//***** MOB TRAITS *****//
#define TRAIT_BLIND "blind"
#define TRAIT_MUTE "mute"
#define TRAIT_DEAF "deaf"
@@ -155,6 +155,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Blowing kisses actually does damage to the victim
#define TRAIT_KISS_OF_DEATH "kiss_of_death"
+//***** ITEM TRAITS *****//
+/// Show what machine/door wires do when held.
+#define TRAIT_SHOW_WIRE_INFO "show_wire_info"
+
//
// common trait sources
#define TRAIT_GENERIC "generic"
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 35388b7b824..5f95d44efc4 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -2072,7 +2072,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return _list
/// Waits at a line of code until X is true
-#define UNTIL(X) while(!(X)) stoplag()
+#define UNTIL(X) while(!(X)) sleep(world.tick_lag)
// Check if the source atom contains another atom
/atom/proc/contains(atom/location)
@@ -2116,6 +2116,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return "White Noise"
if(CHANNEL_AMBIENCE)
return "Ambience"
+ if(CHANNEL_ENGINE)
+ return "Engine Ambience"
/proc/slot_bitfield_to_slot(input_slot_flags) // Kill off this garbage ASAP; slot flags and clothing flags should be IDENTICAL. GOSH DARN IT. Doesn't work with ears or pockets, either.
switch(input_slot_flags)
diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm
index ebdf2017900..b5fd84ef6d6 100644
--- a/code/_globalvars/lists/misc.dm
+++ b/code/_globalvars/lists/misc.dm
@@ -54,4 +54,7 @@ GLOBAL_LIST_INIT(cooking_recipes, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN =
GLOBAL_LIST_INIT(cooking_ingredients, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list()))
GLOBAL_LIST_INIT(cooking_reagents, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list()))
+/// Associative list of admin rank to colour. Set in config/rank_colours.txt
+GLOBAL_LIST_EMPTY(rank_colour_map)
+
#define EGG_LAYING_MESSAGES list("lays an egg.", "squats down and croons.", "begins making a huge racket.", "begins clucking raucously.")
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index ab3bfa85451..4c22d37dc32 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(cell_logs, list())
GLOBAL_LIST_INIT(navigation_computers, list())
GLOBAL_LIST_INIT(all_areas, list())
+GLOBAL_LIST_INIT(all_unique_areas, list()) // List of all unique areas. AKA areas with there_can_be_many = FALSE
GLOBAL_LIST_INIT(machines, list())
GLOBAL_LIST_INIT(rcd_list, list()) //list of Rapid Construction Devices.
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index 1e0a82c1c28..cb953a2a503 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -11,8 +11,6 @@ GLOBAL_VAR(world_qdel_log)
GLOBAL_PROTECT(world_qdel_log)
GLOBAL_VAR(world_href_log)
GLOBAL_PROTECT(world_href_log)
-GLOBAL_VAR(world_asset_log)
-GLOBAL_PROTECT(world_asset_log)
GLOBAL_VAR(runtime_summary_log)
GLOBAL_PROTECT(runtime_summary_log)
GLOBAL_VAR(tgui_log)
diff --git a/code/_globalvars/mapping.dm b/code/_globalvars/mapping.dm
index 2b435e0bede..caf4a2a58bb 100644
--- a/code/_globalvars/mapping.dm
+++ b/code/_globalvars/mapping.dm
@@ -8,9 +8,6 @@ GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, S
GLOBAL_LIST_INIT(alldirs2, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTH, SOUTH, EAST, WEST))
GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
-// This must exist early on or shit breaks bad
-GLOBAL_DATUM_INIT(using_map, /datum/map, new USING_MAP_DATUM)
-
GLOBAL_LIST(global_map) // This is the array of zlevels | list(list(1,5),list(4,3)) | becomes a 2D array of zlevels
//Resulting sector map looks like
//|_1_|_4_|
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index cb8920f30ed..554fa2581a4 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -86,13 +86,9 @@ GLOBAL_VAR_INIT(copier_items_printed, 0)
GLOBAL_VAR_INIT(copier_max_items, 300)
GLOBAL_VAR_INIT(copier_items_printed_logged, FALSE)
-
-GLOBAL_VAR(map_name) // Self explanatory
-
GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) // Station datacore, manifest, etc
GLOBAL_VAR_INIT(panic_bunker_enabled, FALSE) // Is the panic bunker enabled
-GLOBAL_VAR_INIT(pending_server_update, FALSE)
GLOBAL_LIST_EMPTY(ability_verbs) // Create-level abilities
GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE))
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 382303c1212..3d783ece42c 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -57,7 +57,12 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NOGERMS" = TRAIT_NOGERMS,
"TRAIT_NODECAY" = TRAIT_NODECAY,
"TRAIT_NOEXAMINE" = TRAIT_NOEXAMINE,
- "TRAIT_NOPAIN" = TRAIT_NOPAIN)))
+ "TRAIT_NOPAIN" = TRAIT_NOPAIN
+ ),
+ /obj/item = list(
+ "TRAIT_SHOW_WIRE_INFO" = TRAIT_SHOW_WIRE_INFO
+ )
+))
/// value -> trait name, generated on use from trait_by_type global
GLOBAL_LIST(trait_name_map)
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 35c250abc32..180e5a55e64 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -122,12 +122,12 @@
icon_state = "too_much_oxy"
/obj/screen/alert/not_enough_nitro
- name = "Choking (No N)"
+ name = "Choking (No N2)"
desc = "You're not getting enough nitrogen. Find some good air before you pass out!"
icon_state = "not_enough_nitro"
/obj/screen/alert/too_much_nitro
- name = "Choking (N)"
+ name = "Choking (N2)"
desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_nitro"
diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
index 01940be1d8b..c408c1cd7b6 100644
--- a/code/_onclick/hud/blob_overmind.dm
+++ b/code/_onclick/hud/blob_overmind.dm
@@ -132,6 +132,8 @@
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.split_consciousness()
+ if(B.split_used) // Destroys split proc if the split is succesfully used
+ qdel(src)
/datum/hud/blob_overmind/New(mob/user)
..()
@@ -194,6 +196,8 @@
using.screen_loc = ui_storage2
static_inventory += using
- using = new /obj/screen/blob/Split()
- using.screen_loc = ui_acti
- static_inventory += using
+ var/mob/camera/blob/B = user
+ if(!B.is_offspring) // Checks if the blob is an offspring, to not create split button if it is
+ using = new /obj/screen/blob/Split()
+ using.screen_loc = ui_acti
+ static_inventory += using
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index bd1c5210826..c476232387d 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -78,15 +78,6 @@
var/mob/living/silicon/robot/R = usr
R.toggle_ionpulse()
-/obj/screen/robot/panel
- name = "installed modules"
- icon_state = "panel"
-
-/obj/screen/robot/panel/Click()
- if(issilicon(usr))
- var/mob/living/silicon/robot/R = usr
- R.installed_modules()
-
/obj/screen/robot/mov_intent
name = "fast/slow toggle"
icon_state = "running"
@@ -224,16 +215,6 @@
var/x = -4 //Start at CENTER-4,SOUTH+1
var/y = 1
- //Unfortunately adding the emag module to the list of modules has to be here. This is because a borg can
- //be emagged before they actually select a module. - or some situation can cause them to get a new module
- // - or some situation might cause them to get de-emagged or something.
- if(R.emagged || R.weapons_unlock)
- if(!(R.module.emag in R.module.modules))
- R.module.modules.Add(R.module.emag)
- else
- if(R.module.emag in R.module.modules)
- R.module.modules.Remove(R.module.emag)
-
for(var/atom/movable/A in R.module.modules)
if( (A != R.module_state_1) && (A != R.module_state_2) && (A != R.module_state_3) )
//Module is not currently active
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index aa43133d111..2c3d3202a31 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -275,6 +275,12 @@
/// Enable auto profiler of rounds
var/auto_profile = FALSE
+ // Enable map voting
+ var/map_voting_enabled = FALSE
+
+ // 2FA auth host
+ var/_2fa_auth_host = null
+
/datum/configuration/New()
for(var/T in subtypesof(/datum/game_mode))
var/datum/game_mode/M = T
@@ -770,6 +776,10 @@
max_client_cid_history = text2num(value)
if("enable_auto_profiler")
auto_profile = TRUE
+ if("enable_map_voting")
+ map_voting_enabled = TRUE
+ if("2fa_host")
+ _2fa_auth_host = value
else
log_config("Unknown setting in configuration: '[name]'")
@@ -925,3 +935,34 @@
runnable_modes[M] = probabilities[M.config_tag]
// to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]")
return runnable_modes
+
+/datum/configuration/proc/load_rank_colour_map()
+ var/list/lines = file2list("config/rank_colours.txt")
+
+ for(var/line in lines)
+ // Skip newlines
+ if(!length(line))
+ continue
+ // Skip comments
+ if(line[1] == "#")
+ continue
+
+ //Split the line at every " - "
+ var/list/split_holder = splittext(line, " - ")
+ if(!length(split_holder))
+ continue
+
+ // Rank is before the " - "
+ var/rank = split_holder[1]
+ if(!rank)
+ continue
+
+ // Color is after the " - "
+ var/colour = ""
+ if(length(split_holder) >= 2)
+ colour = split_holder[2]
+
+ if(rank && colour)
+ GLOB.rank_colour_map[rank] = colour
+ else
+ stack_trace("Invalid colour for rank '[rank]' in config/rank_colours.txt")
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 1512d8e6e70..acfb7444323 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(blackbox)
sqlversion = versions[FV.key]
var/datum/db_query/query_feedback_save = SSdbcore.NewQuery({"
- INSERT DELAYED IGNORE INTO [format_table_name("feedback")] (datetime, round_id, key_name, key_type, version, json)
+ INSERT IGNORE INTO [format_table_name("feedback")] (datetime, round_id, key_name, key_type, version, json)
VALUES (NOW(), :rid, :keyname, :keytype, :version, :json)"}, list(
"rid" = text2num(GLOB.round_id),
"keyname" = FV.key,
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index 81aab3b0759..4cfe06083e3 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -193,7 +193,7 @@ SUBSYSTEM_DEF(dbcore)
if(!IsConnected())
return
var/datum/db_query/query_round_end = SSdbcore.NewQuery(
- "UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = :game_mode_result, station_name = :station_name WHERE id = :round_id",
+ "UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = :game_mode_result WHERE id = :round_id",
list("game_mode_result" = SSticker.mode_result, "station_name" = station_name(), "round_id" = GLOB.round_id)
)
query_round_end.Execute()
diff --git a/code/controllers/subsystem/http.dm b/code/controllers/subsystem/http.dm
index ad5407bfdca..6c7178a69fa 100644
--- a/code/controllers/subsystem/http.dm
+++ b/code/controllers/subsystem/http.dm
@@ -12,8 +12,11 @@ SUBSYSTEM_DEF(http)
/// Total requests the SS has processed in a round
var/total_requests
-/datum/controller/subsystem/http/Initialize(start_timeofday)
+/datum/controller/subsystem/http/PreInit()
+ . = ..()
rustg_create_async_http_client() // Open the door
+
+/datum/controller/subsystem/http/Initialize(start_timeofday)
active_async_requests = list()
return ..()
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index ac8165aca7a..87846d051f0 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -1,31 +1,51 @@
SUBSYSTEM_DEF(mapping)
- name = "Mapping"
- init_order = INIT_ORDER_MAPPING // 9
- flags = SS_NO_FIRE
+ name = "Mapping"
+ init_order = INIT_ORDER_MAPPING // 9
+ flags = SS_NO_FIRE
+ /// What map datum are we using
+ var/datum/map/map_datum
+ /// What map will be used next round
+ var/datum/map/next_map
+
+// This has to be here because world/New() uses [station_name()], which looks this datum up
+/datum/controller/subsystem/mapping/PreInit()
+ . = ..()
+ if(map_datum) // Dont do this again if we are recovering
+ return
+ if(fexists("data/next_map.txt"))
+ var/list/lines = file2list("data/next_map.txt")
+ // Check its valid
+ try
+ map_datum = text2path(lines[1])
+ map_datum = new map_datum
+ catch
+ map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+ fdel("data/next_map.txt") // Remove to avoid the same map existing forever
+ else
+ map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+
+/datum/controller/subsystem/mapping/Shutdown()
+ if(next_map) // Save map for next round
+ var/F = file("data/next_map.txt")
+ F << next_map.type
/datum/controller/subsystem/mapping/Initialize(timeofday)
// Load all Z level templates
preloadTemplates()
+
+ // Load the station
+ loadStation()
+
+ // Load lavaland
+ loadLavaland()
+
// Pick a random away mission.
if(!config.disable_away_missions)
load_away_mission()
+
// Seed space ruins
if(!config.disable_space_ruins)
- // load in extra levels of space ruins
- var/load_zlevels_timer = start_watch()
- log_startup_progress("Creating random space levels...")
- var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
- for(var/i = 1, i <= num_extra_space, i++)
- GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE, SPAWN_RUINS))
- log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
-
- // Now spawn ruins, random budget between 20 and 30 for all zlevels combined.
- // While this may seem like a high number, the amount of ruin Z levels can be anywhere between 3 and 7.
- // Note that this budget is not split evenly accross all zlevels
- log_startup_progress("Seeding ruins...")
- var/seed_ruins_timer = start_watch()
- seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
- log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
+ handleRuins()
// Makes a blank space level for the sake of randomness
GLOB.space_manager.add_new_zlevel("Empty Area", linkage = CROSSLINKED, traits = list(REACHABLE))
@@ -63,12 +83,6 @@ SUBSYSTEM_DEF(mapping)
GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs)
- // Map name. Break these down into SSmapping controller vars instaed of GLOBs at some point
- if(GLOB.using_map && GLOB.using_map.name)
- GLOB.map_name = "[GLOB.using_map.name]"
- else
- GLOB.map_name = "Unknown"
-
// World name
if(config && config.server_name)
world.name = "[config.server_name]: [station_name()]"
@@ -77,6 +91,56 @@ SUBSYSTEM_DEF(mapping)
return ..()
+// Do not confuse with seedRuins()
+/datum/controller/subsystem/mapping/proc/handleRuins()
+ // load in extra levels of space ruins
+ var/load_zlevels_timer = start_watch()
+ log_startup_progress("Creating random space levels...")
+ var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
+ for(var/i in 1 to num_extra_space)
+ GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE, SPAWN_RUINS))
+ log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
+
+ // Now spawn ruins, random budget between 20 and 30 for all zlevels combined.
+ // While this may seem like a high number, the amount of ruin Z levels can be anywhere between 3 and 7.
+ // Note that this budget is not split evenly accross all zlevels
+ log_startup_progress("Seeding ruins...")
+ var/seed_ruins_timer = start_watch()
+ seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
+ log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
+
+// Loads in the station
+/datum/controller/subsystem/mapping/proc/loadStation()
+ ASSERT(map_datum.map_path)
+ if(!fexists(map_datum.map_path))
+ // Make a VERY OBVIOUS error
+ to_chat(world, "ERROR: The path specified for the map to load is invalid. No station has been loaded!")
+ return
+
+ var/watch = start_watch()
+ log_startup_progress("Loading [map_datum.fluff_name]...")
+ // This should always be Z2, but you never know
+ var/map_z_level = GLOB.space_manager.add_new_zlevel(MAIN_STATION, linkage = CROSSLINKED, traits = list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK))
+ GLOB.maploader.load_map(file(map_datum.map_path), z_offset = map_z_level)
+ log_startup_progress("Loaded [map_datum.fluff_name] in [stop_watch(watch)]s")
+
+ // Save station name in the DB
+ if(!SSdbcore.IsConnected())
+ return
+ var/datum/db_query/query_set_map = SSdbcore.NewQuery(
+ "UPDATE [format_table_name("round")] SET start_datetime=NOW(), map_name=:mapname, station_name=:stationname WHERE id=:round_id",
+ list("mapname" = map_datum.technical_name, "stationname" = map_datum.fluff_name, "round_id" = GLOB.round_id)
+ )
+ query_set_map.Execute(async = FALSE) // This happens during a time of intense server lag, so should be non-async
+ qdel(query_set_map)
+
+// Loads in lavaland
+/datum/controller/subsystem/mapping/proc/loadLavaland()
+ var/watch = start_watch()
+ log_startup_progress("Loading Lavaland...")
+ var/lavaland_z_level = GLOB.space_manager.add_new_zlevel(MINING, linkage = SELFLOOPING, traits = list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK))
+ GLOB.maploader.load_map(file("_maps/map_files/generic/Lavaland.dmm"), z_offset = lavaland_z_level)
+ log_startup_progress("Loaded Lavaland in [stop_watch(watch)]s")
/datum/controller/subsystem/mapping/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins)
if(!z_levels || !z_levels.len)
diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm
index c86f988bcd4..4eb3adc62da 100644
--- a/code/controllers/subsystem/shuttles.dm
+++ b/code/controllers/subsystem/shuttles.dm
@@ -135,8 +135,6 @@ SUBSYSTEM_DEF(shuttle)
to_chat(user, "The emergency shuttle has been disabled by Centcom.")
return
- call_reason = trim(html_encode(call_reason))
-
if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH)
to_chat(user, "Reason is too short. [CALL_SHUTTLE_REASON_LENGTH] character minimum.")
return
diff --git a/code/controllers/subsystem/titlescreen.dm b/code/controllers/subsystem/titlescreen.dm
index 7fe59ec9093..90ea775885e 100644
--- a/code/controllers/subsystem/titlescreen.dm
+++ b/code/controllers/subsystem/titlescreen.dm
@@ -16,8 +16,6 @@ SUBSYSTEM_DEF(title)
else if(L.len > 1)
if(use_rare_screens && lowertext(L[1]) == "rare")
title_screens += S
- else if(GLOB.using_map && (lowertext(L[1]) == lowertext(GLOB.using_map.name)))
- title_screens += S
if(!isemptylist(title_screens))
if(length(title_screens) > 1)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 346297d900f..743d14a3962 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -177,6 +177,16 @@ SUBSYSTEM_DEF(vote)
if("crew_transfer")
if(. == "Initiate Crew Transfer")
init_shift_change(null, 1)
+ if("map")
+ // Find target map.
+ var/datum/map/top_voted_map
+ for(var/x in subtypesof(/datum/map))
+ var/datum/map/M = x
+ // Set top voted map
+ if(. == "[initial(M.fluff_name)] ([initial(M.technical_name)])")
+ top_voted_map = M
+ to_chat(world, "Map for next round: [initial(top_voted_map.fluff_name)] ([initial(top_voted_map.technical_name)])")
+ SSmapping.next_map = new top_voted_map
if(restart)
@@ -197,7 +207,7 @@ SUBSYSTEM_DEF(vote)
return vote
return 0
-/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key)
+/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, code_invoked = FALSE)
if(!mode)
if(started_time != null && !check_rights(R_ADMIN))
var/next_allowed_time = (started_time + config.vote_delay)
@@ -223,6 +233,14 @@ SUBSYSTEM_DEF(vote)
return 0
question = "End the shift?"
choices.Add("Initiate Crew Transfer", "Continue The Round")
+ if("map")
+ if(!(check_rights(R_SERVER) || code_invoked))
+ return FALSE
+ question = "Map for next round"
+ for(var/x in subtypesof(/datum/map))
+ var/datum/map/M = x
+ choices.Add("[initial(M.fluff_name)] ([initial(M.technical_name)])")
+
if("custom")
question = html_encode(input(usr,"What is the vote for?") as text|null)
if(!question) return 0
@@ -248,11 +266,7 @@ SUBSYSTEM_DEF(vote)
Click here or type vote to place your vote.
You have [config.vote_period/10] seconds to vote."})
switch(vote_type)
- if("crew_transfer")
- SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
- if("gamemode")
- SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
- if("custom")
+ if("crew_transfer", "gamemode", "custom", "map")
SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
if(mode == "gamemode" && SSticker.ticker_going)
SSticker.ticker_going = FALSE
@@ -321,6 +335,12 @@ SUBSYSTEM_DEF(vote)
if(admin)
dat += "\t([config.allow_vote_mode?"Allowed":"Disallowed"])"
+ dat += "
"
+ if(admin)
+ dat += "Map"
+ else
+ dat += "Map (Disallowed)"
+
dat += "
"
//custom
if(admin)
@@ -381,6 +401,9 @@ SUBSYSTEM_DEF(vote)
if("gamemode")
if(config.allow_vote_mode || admin)
initiate_vote("gamemode",usr.key)
+ if("map")
+ if(admin)
+ initiate_vote("map", usr.key)
if("crew_transfer")
if(config.allow_vote_restart || admin)
initiate_vote("crew_transfer",usr.key)
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 79dbd4bd2cf..91a8f072ab7 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -383,6 +383,9 @@
/datum/action/item_action/hands_free/activate
name = "Activate"
+/datum/action/item_action/hands_free/activate/always
+ check_flags = null
+
/datum/action/item_action/toggle_research_scanner
name = "Toggle Research Scanner"
button_icon_state = "scan_mode"
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index 38ee8ed6042..f4b8e84204f 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -130,13 +130,13 @@
/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt, multiplier = 1)
if(isnull(amt))
- amt = S.amount
+ amt = S.get_amount()
if(amt <= 0)
return FALSE
- if(amt > S.amount)
- amt = S.amount
+ if(amt > S.get_amount())
+ amt = S.get_amount()
var/material_amt = get_item_material_amount(S)
if(!material_amt)
diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index 6c43f7c9ead..af1e3376687 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -124,6 +124,10 @@
name = "Pyromancer REAL_NAME"
speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "ONI SOMA!")
+/datum/dog_fashion/head/black_wizard
+ name = "Necromancer REAL_NAME"
+ speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
+
/datum/dog_fashion/head/cardborg
name = "Borgi"
speak = list("Ping!","Beep!","Woof!")
@@ -148,6 +152,8 @@
name = "Corgi Tech REAL_NAME"
desc = "The reason your yellow gloves have chew-marks."
+/datum/dog_fashion/head/softcap
+
/datum/dog_fashion/head/reindeer
name = "REAL_NAME the red-nosed Corgi"
emote_hear = list("lights the way!", "illuminates.", "yaps!")
@@ -208,3 +214,38 @@
/datum/dog_fashion/head/fried_vox_empty
name = "Colonel REAL_NAME"
desc = "Keep away from live vox."
+
+/datum/dog_fashion/head/HoS
+ name = "Head of Security REAL_NAME"
+ desc = "Probably better than the last HoS."
+
+/datum/dog_fashion/head/beret/sec
+ name = "Officer REAL_NAME"
+ desc = "Ever-loyal, ever-vigilant."
+
+/datum/dog_fashion/head/bowlerhat
+ name = "REAL_NAME"
+ desc = "A sophisticated city gent."
+
+/datum/dog_fashion/head/surgery
+ name = "Nurse-in-Training REAL_NAME"
+ desc = "The most adorable bed-side manner ever."
+
+/datum/dog_fashion/head/bucket
+ name = "REAL_NAME"
+ desc = "A janitor's best friend."
+
+/datum/dog_fashion/head/justice_wig
+ name = "Arbiter REAL_NAME"
+ desc = "Head of the High Court of Cute."
+
+/datum/dog_fashion/head/wizard/magus
+ name = "Battlemage REAL_NAME"
+
+/datum/dog_fashion/head/wizard/marisa
+ name = "Witch REAL_NAME"
+ desc = "Flying broom not included."
+
+/datum/dog_fashion/head/roman
+ name = "Imperator REAL_NAME"
+ desc = "For the Senate and the people of Rome!"
diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm
index 155bbaed8dc..7c05f7806f9 100644
--- a/code/datums/helper_datums/construction_datum.dm
+++ b/code/datums/helper_datums/construction_datum.dm
@@ -47,7 +47,7 @@
/datum/construction/proc/custom_action(step, used_atom, user)
if(istype(used_atom, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = used_atom
- if(C.amount<4)
+ if(C.get_amount() < 4)
to_chat(user, ("There's not enough cable to finish the task."))
return 0
else
@@ -55,7 +55,7 @@
playsound(holder, C.usesound, 50, 1)
else if(istype(used_atom, /obj/item/stack))
var/obj/item/stack/S = used_atom
- if(S.amount < 5)
+ if(S.get_amount() < 5)
to_chat(user, ("There's not enough material in this stack."))
return 0
else
@@ -113,7 +113,7 @@
// STACKS
if(istype(used_atom,/obj/item/stack))
var/obj/item/stack/stack=used_atom
- if(stack.amount < amount)
+ if(stack.get_amount() < amount)
to_chat(user, "You don't have enough [stack]! You need at least [amount].")
return 0
stack.use(amount)
diff --git a/code/datums/looping_sounds/looping_sound.dm b/code/datums/looping_sounds/looping_sound.dm
index 5e019439bc4..33fb5595c24 100644
--- a/code/datums/looping_sounds/looping_sound.dm
+++ b/code/datums/looping_sounds/looping_sound.dm
@@ -31,6 +31,8 @@
var/falloff_exponent
var/muted = TRUE
var/falloff_distance
+ /// Channel of the audio, random otherwise
+ var/channel
/datum/looping_sound/New(list/_output_atoms = list(), start_immediately = FALSE, _direct = FALSE)
if(!mid_sounds)
@@ -75,14 +77,16 @@
var/list/atoms_cache = output_atoms
var/sound/S = sound(soundfile)
if(direct)
- S.channel = SSsounds.random_available_channel()
- S.volume = volume
+ S.channel = channel || SSsounds.random_available_channel()
for(var/i in 1 to atoms_cache.len)
var/atom/thing = atoms_cache[i]
if(direct)
+ if(ismob(thing))
+ var/mob/M = thing
+ S.volume = volume * (USER_VOLUME(M, channel) || 1)
SEND_SOUND(thing, S)
else
- playsound(thing, S, volume, vary, extra_range, falloff_exponent = falloff_exponent, falloff_distance = falloff_distance)
+ playsound(thing, S, volume, vary, extra_range, falloff_exponent = falloff_exponent, falloff_distance = falloff_distance, channel = channel)
/datum/looping_sound/proc/get_sound(looped, _mid_sounds)
if(!_mid_sounds)
diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm
index 280aa5fab60..432e2709335 100644
--- a/code/datums/looping_sounds/machinery_sounds.dm
+++ b/code/datums/looping_sounds/machinery_sounds.dm
@@ -16,3 +16,4 @@
falloff_exponent = 10
falloff_distance = 5
vary = TRUE
+ channel = CHANNEL_ENGINE
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 35e0053822d..29a1b29de97 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1375,46 +1375,20 @@
switch(href_list["silicon"])
if("unemag")
var/mob/living/silicon/robot/R = current
- if(istype(R))
- R.emagged = 0
- if(R.module)
- if(R.activated(R.module.emag))
- R.module_active = null
- if(R.module_state_1 == R.module.emag)
- R.module_state_1 = null
- R.contents -= R.module.emag
- else if(R.module_state_2 == R.module.emag)
- R.module_state_2 = null
- R.contents -= R.module.emag
- else if(R.module_state_3 == R.module.emag)
- R.module_state_3 = null
- R.contents -= R.module.emag
- R.clear_supplied_laws()
- R.laws = new /datum/ai_laws/crewsimov
- log_admin("[key_name(usr)] has un-emagged [key_name(current)]")
- message_admins("[key_name_admin(usr)] has un-emagged [key_name_admin(current)]")
+ if(!istype(R))
+ return
+ R.unemag()
+ log_admin("[key_name(usr)] has un-emagged [key_name(current)]")
+ message_admins("[key_name_admin(usr)] has un-emagged [key_name_admin(current)]")
if("unemagcyborgs")
- if(isAI(current))
- var/mob/living/silicon/ai/ai = current
- for(var/mob/living/silicon/robot/R in ai.connected_robots)
- R.emagged = 0
- if(R.module)
- if(R.activated(R.module.emag))
- R.module_active = null
- if(R.module_state_1 == R.module.emag)
- R.module_state_1 = null
- R.contents -= R.module.emag
- else if(R.module_state_2 == R.module.emag)
- R.module_state_2 = null
- R.contents -= R.module.emag
- else if(R.module_state_3 == R.module.emag)
- R.module_state_3 = null
- R.contents -= R.module.emag
- R.clear_supplied_laws()
- R.laws = new /datum/ai_laws/crewsimov
- log_admin("[key_name(usr)] has unemagged [key_name(ai)]'s cyborgs")
- message_admins("[key_name_admin(usr)] has unemagged [key_name_admin(ai)]'s cyborgs")
+ if(!isAI(current))
+ return
+ var/mob/living/silicon/ai/ai = current
+ for(var/mob/living/silicon/robot/R in ai.connected_robots)
+ R.unemag()
+ log_admin("[key_name(usr)] has unemagged [key_name(ai)]'s cyborgs")
+ message_admins("[key_name_admin(usr)] has unemagged [key_name_admin(ai)]'s cyborgs")
else if(href_list["common"])
switch(href_list["common"])
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 1c5aba0f171..283b6951b9f 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -111,6 +111,8 @@
for(var/path in backpack_contents)
var/number = backpack_contents[path]
+ if(!number)
+ number = 1
for(var/i in 1 to number)
H.equip_or_collect(new path(H), slot_in_backpack)
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 22d61c818ec..bb2c4647d89 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -3,7 +3,7 @@
/datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
- if(!visualsOnly)
+ if(!visualsOnly && H.mind)
H.mind.assigned_role = name
H.job = name
@@ -627,6 +627,10 @@
/obj/item/implanter/death_alarm = 1,
)
+ implants = list(/obj/item/implant/mindshield,
+ /obj/item/implant/death_alarm
+ )
+
/datum/outfit/admin/solgov_rep/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
@@ -634,33 +638,44 @@
var/obj/item/card/id/I = H.wear_id
if(istype(I))
- apply_to_card(I, H, get_all_accesses(), name, "lifetimeid")
+ apply_to_card(I, H, get_all_centcom_access(), name, "lifetimeid")
+ I.assignment = "Solar Federation Representative"
+ H.sec_hud_set_ID()
/datum/outfit/admin/solgov
name = "Solar Federation Marine"
-
uniform = /obj/item/clothing/under/solgov
suit = /obj/item/clothing/suit/armor/bulletproof
back = /obj/item/storage/backpack/security
- belt = /obj/item/storage/belt/military/assault
- head = /obj/item/clothing/head/soft/solgov
- glasses = /obj/item/clothing/glasses/hud/security/night
+ belt = /obj/item/storage/belt/military/assault/marines/full
+ head = /obj/item/clothing/head/soft/solgov/marines
+ glasses = /obj/item/clothing/glasses/night
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/radio/headset/ert
id = /obj/item/card/id
- l_hand = /obj/item/gun/projectile/automatic/ar
+ l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog
+ suit_store = /obj/item/gun/projectile/automatic/pistol/m1911
r_pocket = /obj/item/flashlight/seclite
pda = /obj/item/pda
backpack_contents = list(
/obj/item/storage/box/responseteam = 1,
- /obj/item/ammo_box/magazine/m556 = 3,
/obj/item/clothing/shoes/magboots = 1,
- /obj/item/gun/projectile/automatic/pistol/m1911 = 1,
- /obj/item/ammo_box/magazine/m45 = 2
+ /obj/item/whetstone = 1,
+ /obj/item/clothing/mask/gas/explorer/marines = 1,
+ /obj/item/reagent_containers/hypospray/autoinjector/survival = 1
)
- var/is_tsf_lieutenant = FALSE
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/arm/flash,
+ /obj/item/organ/internal/cyberimp/chest/nutriment,
+ /obj/item/organ/internal/cyberimp/eyes/hud/security
+ )
+ implants = list(/obj/item/implant/mindshield,
+ /obj/item/implant/death_alarm
+ )
+
+ var/is_solgov_lieutenant = FALSE
/datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -668,31 +683,80 @@
if(visualsOnly)
return
- if(is_tsf_lieutenant)
+ if(is_solgov_lieutenant)
H.real_name = "Lieutenant [pick(GLOB.last_names)]"
else
H.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(GLOB.last_names)]"
H.name = H.real_name
var/obj/item/card/id/I = H.wear_id
- if(istype(I))
- apply_to_card(I, H, get_all_accesses(), name, "lifetimeid")
+ I.assignment = name
+ if(istype(I) && is_solgov_lieutenant)
+ apply_to_card(I, H, get_centcom_access("Emergency Response Team Leader"), name, "lifetimeid")
+ else if(istype(I))
+ apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), name, "lifetimeid")
+ H.sec_hud_set_ID()
/datum/outfit/admin/solgov/lieutenant
name = "Solar Federation Lieutenant"
-
uniform = /obj/item/clothing/under/solgov/command
- head = /obj/item/clothing/head/soft/solgov/command
+ head = /obj/item/clothing/head/beret/solgov/command
+ glasses = /obj/item/clothing/glasses/night
back = /obj/item/storage/backpack/satchel
+ l_ear = /obj/item/radio/headset/ert/alt/commander
l_hand = null
+ belt = /obj/item/melee/baton/loaded
+ suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
l_pocket = /obj/item/pinpointer/advpinpointer
backpack_contents = list(
/obj/item/storage/box/responseteam = 1,
- /obj/item/melee/classic_baton/telescopic = 1,
+ /obj/item/storage/box/handcuffs = 1,
/obj/item/clothing/shoes/magboots/advance = 1,
- /obj/item/gun/projectile/automatic/pistol/deagle = 1,
- /obj/item/ammo_box/magazine/m50 = 2
+ /obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
+ /obj/item/clothing/mask/gas/explorer/marines = 1,
+ /obj/item/ammo_box/magazine/m50 = 3
)
- is_tsf_lieutenant = TRUE
+ is_solgov_lieutenant = TRUE
+
+/datum/outfit/admin/solgov/elite
+ name = "Solar Federation Specops Marine"
+ uniform = /obj/item/clothing/under/solgov/elite
+ head = /obj/item/clothing/head/soft/solgov/marines/elite
+ belt = /obj/item/storage/belt/military/assault/marines/elite/full
+ l_hand = /obj/item/gun/projectile/automatic/ar
+ backpack_contents = list(
+ /obj/item/storage/box/responseteam = 1,
+ /obj/item/clothing/shoes/magboots/advance = 1,
+ /obj/item/whetstone = 1,
+ /obj/item/clothing/mask/gas/explorer/marines = 1,
+ /obj/item/reagent_containers/hypospray/autoinjector/survival = 1
+ )
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/eyes/hud/security,
+ /obj/item/organ/internal/cyberimp/chest/nutriment,
+ /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
+ /obj/item/organ/internal/cyberimp/arm/flash,
+ /obj/item/organ/internal/eyes/cybernetic/shield
+ )
+/datum/outfit/admin/solgov/elite/lieutenant
+ name = "Solar Federation Specops Lieutenant"
+ uniform = /obj/item/clothing/under/solgov/command/elite
+ head = /obj/item/clothing/head/beret/solgov/command/elite
+ glasses = /obj/item/clothing/glasses/night
+ back = /obj/item/storage/backpack/satchel
+ belt = /obj/item/melee/baton/loaded
+ l_hand = null
+ suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
+ l_pocket = /obj/item/pinpointer/advpinpointer
+ l_ear = /obj/item/radio/headset/ert/alt/commander
+ backpack_contents = list(
+ /obj/item/storage/box/responseteam = 1,
+ /obj/item/storage/box/handcuffs = 1,
+ /obj/item/clothing/shoes/magboots/advance = 1,
+ /obj/item/clothing/mask/gas/explorer/marines = 1,
+ /obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
+ /obj/item/ammo_box/magazine/m50 = 3
+ )
+ is_solgov_lieutenant = TRUE
/datum/outfit/admin/sol_trader
name = "Sol Trader"
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
index 5986da3a412..b931bd9840f 100644
--- a/code/datums/spells/area_teleport.dm
+++ b/code/datums/spells/area_teleport.dm
@@ -11,7 +11,7 @@
/obj/effect/proc_holder/spell/targeted/area_teleport/perform(list/targets, recharge = 1, mob/living/user = usr)
var/thearea = before_cast(targets)
- if(!thearea || !cast_check(TRUE, FALSE, user))
+ if(!thearea || !cast_check(FALSE, FALSE, user))
revert_cast()
return
invocation(thearea)
diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm
index afc91f922ab..57dd43ad38c 100644
--- a/code/datums/spells/construct_spells.dm
+++ b/code/datums/spells/construct_spells.dm
@@ -49,7 +49,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
name = "Summon Soulstone"
- desc = "This spell reaches into Nar'Sie's realm, summoning one of the legendary fragments across time and space"
+ desc = "This spell reaches into Redspace, summoning one of the legendary fragments across time and space"
action_icon_state = "summonsoulstone"
action_background_icon_state = "bg_cult"
school = "conjuration"
@@ -68,7 +68,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/pylon
name = "Cult Pylon"
- desc = "This spell conjures a fragile crystal from Nar'Sie's realm. Makes for a convenient light source."
+ desc = "This spell conjures a fragile crystal from Redspace. Makes for a convenient light source."
action_icon_state = "pylon"
action_background_icon_state = "bg_cult"
school = "conjuration"
@@ -118,7 +118,12 @@
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/do_jaunt(mob/living/target)
target.set_light(0)
..()
- target.set_light(2, 3, l_color = SSticker.cultdat ? SSticker.cultdat.construct_glow : LIGHT_COLOR_BLOOD_MAGIC)
+ if(isconstruct(target))
+ var/mob/living/simple_animal/hostile/construct/C = target
+ if(C.holy)
+ C.set_light(3, 5, LIGHT_COLOR_DARK_BLUE)
+ else
+ C.set_light(2, 3, l_color = SSticker.cultdat ? SSticker.cultdat.construct_glow : LIGHT_COLOR_BLOOD_MAGIC)
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc)
return
diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm
index 7142448dbdf..79c4e796aa1 100644
--- a/code/datums/spells/mime.dm
+++ b/code/datums/spells/mime.dm
@@ -21,7 +21,7 @@
if(!usr.mind.miming)
to_chat(usr, "You must dedicate yourself to silence first.")
return
- invocation = "[usr.real_name] looks as if a wall is in front of [usr.p_them()]."
+ invocation = "[usr.name] looks as if a wall is in front of [usr.p_them()]."
else
invocation_type ="none"
..()
@@ -86,7 +86,7 @@
if(!usr.mind.miming)
to_chat(usr, "You must dedicate yourself to silence first.")
return
- invocation = "[usr.real_name] looks as if a blockade is in front of [usr.p_them()]."
+ invocation = "[usr.name] looks as if a blockade is in front of [usr.p_them()]."
else
invocation_type ="none"
..()
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index a954f72cb13..acaeeb41487 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -374,7 +374,7 @@
for(var/am in thrownatoms)
var/atom/movable/AM = am
- if(AM == user || AM.anchored)
+ if(AM == user || AM.anchored || AM.move_resist == INFINITY)
continue
throwtarget = get_edge_target_turf(user, get_dir(user, get_step_away(AM, user)))
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 3a856a8d130..5ee45d3291f 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -935,6 +935,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
containername = "surgery crate"
access = ACCESS_MEDICAL
+/datum/supply_packs/medical/gloves
+ name = "Nitrile Glove Crate"
+ contains = list(/obj/item/clothing/gloves/color/latex/nitrile,
+ /obj/item/clothing/gloves/color/latex/nitrile,
+ /obj/item/clothing/gloves/color/latex/nitrile,
+ /obj/item/clothing/gloves/color/latex/nitrile)
+ cost = 50
+ containername = "nitrile glove crate"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Science /////////////////////////////////////////
diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm
index df140ad6ff6..9dd5b624115 100644
--- a/code/datums/tgs_event_handler.dm
+++ b/code/datums/tgs_event_handler.dm
@@ -1,39 +1,53 @@
+/// Will our restart be slower?
+GLOBAL_VAR_INIT(slower_restart, FALSE)
+
+/proc/server_announce_global(announcement_text)
+ to_chat(world, "\[Server] [announcement_text]")
+
+/proc/server_announce_adminonly(announcement_text)
+ to_chat(GLOB.admins, "\[Server] \[Admin] [announcement_text]")
+
/datum/tgs_event_handler/impl
var/datum/timedevent/reattach_timer
+
/datum/tgs_event_handler/impl/HandleEvent(event_code, ...)
switch(event_code)
if(TGS_EVENT_REBOOT_MODE_CHANGE)
var/list/reboot_mode_lookup = list ("[TGS_REBOOT_MODE_NORMAL]" = "be normal", "[TGS_REBOOT_MODE_SHUTDOWN]" = "shutdown the server", "[TGS_REBOOT_MODE_RESTART]" = "hard restart the server")
var/old_reboot_mode = args[2]
var/new_reboot_mode = args[3]
- message_admins("\[Server]\[Info] Reboot will no longer [reboot_mode_lookup["[old_reboot_mode]"]], it will instead [reboot_mode_lookup["[new_reboot_mode]"]]")
+ if(new_reboot_mode == TGS_REBOOT_MODE_SHUTDOWN)
+ GLOB.slower_restart = TRUE
+ else
+ GLOB.slower_restart = FALSE
+ server_announce_adminonly("\[Info] Reboot will no longer [reboot_mode_lookup["[old_reboot_mode]"]], it will instead [reboot_mode_lookup["[new_reboot_mode]"]]")
if(TGS_EVENT_PORT_SWAP)
- message_admins("\[Server]\[Info] Changing port from [world.port] to [args[2]]")
+ server_announce_adminonly("\[Info] Changing port from [world.port] to [args[2]]")
if(TGS_EVENT_INSTANCE_RENAMED)
- message_admins("\[Server]\[Info] Instance renamed to from [world.TgsInstanceName()] to [args[2]]")
+ server_announce_adminonly("\[Info] Instance renamed to from [world.TgsInstanceName()] to [args[2]]")
if(TGS_EVENT_COMPILE_START)
- message_admins("\[Server]\[Info] Code deployment started, new game version incoming next round...")
+ server_announce_adminonly("\[Info] Code deployment started, new game version incoming next round...")
if(TGS_EVENT_COMPILE_CANCELLED)
- message_admins("\[Server]\[Warning] Code deployment cancelled!")
+ server_announce_adminonly("\[Warning] Code deployment cancelled! Consult a maintainer/host to see if this was intentional!")
if(TGS_EVENT_COMPILE_FAILURE)
- message_admins("\[Server]\[Error] Code deployment failed! Inform a maintainer/host immediately!")
+ server_announce_adminonly("\[Error] Code deployment failed! Inform a maintainer/host immediately!")
if(TGS_EVENT_DEPLOYMENT_COMPLETE)
- message_admins("\[Server]\[Info] Code deployment complete!")
- to_chat(world, "Server updated, changes will be applied on the next round...")
+ server_announce_adminonly("\[Info] Code deployment complete!")
+ server_announce_global("Server update complete. Changes will be applied on the next round.")
if(TGS_EVENT_WATCHDOG_DETACH)
- message_admins("\[Server]\[Info] Server manager restarting...")
+ server_announce_adminonly("\[Info] Server manager restarting...")
reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES, TIMER_STOPPABLE)
if(TGS_EVENT_WATCHDOG_REATTACH)
var/datum/tgs_version/old_version = world.TgsVersion()
var/datum/tgs_version/new_version = args[2]
if(!old_version.Equals(new_version))
- message_admins("\[Server]\[Info] Manager back online. TGS has been updated to v[new_version.deprefixed_parameter]")
+ server_announce_adminonly("\[Info] Server manager back online. TGS has been updated to v[new_version.deprefixed_parameter]")
else
- message_admins("\[Server]\[Info] Manager back online")
+ server_announce_adminonly("\[Info] Server manager back online")
if(reattach_timer)
deltimer(reattach_timer)
reattach_timer = null
/datum/tgs_event_handler/impl/proc/LateOnReattach()
- message_admins("\[Server]\[Warning] TGS hasn't notified us of it coming back for a full minute! Is there a problem?")
+ server_announce_adminonly("\[Warning] TGS hasn't notified us of it coming back for a full minute! Is there a problem?")
diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index 691018cd6fa..102b80f4359 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -209,7 +209,7 @@
/**
* Proc called to determine if the user can see wire define information, such as "Contraband", "Door Bolts", etc.
*
- * If the user is an admin, or has a multitool which reveals wire information in their active hand, the proc returns TRUE.
+ * If the user is an admin, or has an item which reveals wire information in their active hand, the proc returns TRUE.
*
* Arguments:
* * user - the mob who is interacting with the wires.
@@ -217,10 +217,9 @@
/datum/wires/proc/can_see_wire_info(mob/user)
if(user.can_admin_interact())
return TRUE
- else if(istype(user.get_active_hand(), /obj/item/multitool))
- var/obj/item/multitool/M = user.get_active_hand()
- if(M.shows_wire_information)
- return TRUE
+ var/obj/item/held_item = user.get_active_hand()
+ if(istype(held_item) && HAS_TRAIT(held_item, TRAIT_SHOW_WIRE_INFO))
+ return TRUE
return FALSE
/**
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 6565779e14b..e8e08609e82 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -75,6 +75,12 @@
///Used to decide what the maximum time between ambience is
var/max_ambience_cooldown = 90 SECONDS
+/area/New(loc, ...)
+ if(!there_can_be_many) // Has to be done in New else the maploader will fuck up and find subtypes for the parent
+ GLOB.all_unique_areas[type] = src
+ ..()
+
+
/area/Initialize(mapload)
GLOB.all_areas += src
icon_state = ""
diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm
index 736a6d84447..decf7408b74 100644
--- a/code/game/area/ss13_areas.dm
+++ b/code/game/area/ss13_areas.dm
@@ -607,53 +607,75 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "fpmaint"
/area/maintenance/fpmaint
- name = "EVA Maintenance"
+ name = "Fore-Port Maintenance"
icon_state = "fpmaint"
/area/maintenance/fpmaint2
- name = "Arrivals North Maintenance"
+ name = "Fore-Port Secondary Maintenance"
icon_state = "fpmaint"
/area/maintenance/fsmaint
- name = "Dormitory Maintenance"
+ name = "Fore-Starboard Maintenance"
icon_state = "fsmaint"
/area/maintenance/fsmaint2
- name = "Bar Maintenance"
+ name = "Fore-Starboard Secondary Maintenance"
icon_state = "fsmaint"
/area/maintenance/asmaint
- name = "Medbay Maintenance"
+ name = "Aft-Starboard Maintenance"
icon_state = "asmaint"
/area/maintenance/asmaint2
- name = "Science Maintenance"
+ name = "Aft-Starboard Secondary Maintenance"
icon_state = "asmaint"
/area/maintenance/apmaint
- name = "Cargo Maintenance"
+ name = "Aft-Port Maintenance"
+ icon_state = "apmaint"
+
+/area/maintenance/apmaint2
+ name = "Aft-Port Secondary Maintenance"
icon_state = "apmaint"
/area/maintenance/maintcentral
- name = "Bridge Maintenance"
+ name = "Central Maintenance"
icon_state = "maintcentral"
+/area/maintenance/maintcentral2
+ name = "Central Secondary Maintenance"
+ icon_state = "maintcentral"
/area/maintenance/fore
name = "Fore Maintenance"
icon_state = "fmaint"
+/area/maintenance/fore2
+ name = "Fore Secondary Maintenance"
+ icon_state = "fmaint"
+
+/area/maintenance/aft
+ name = "Aft Maintenance"
+ icon_state = "amaint"
+
+/area/maintenance/aft2
+ name = "Aft Secondary Maintenance"
+ icon_state = "amaint"
+
/area/maintenance/starboard
name = "Starboard Maintenance"
icon_state = "smaint"
+/area/maintenance/starboard2
+ name = "Starboard Secondary Maintenance"
+ icon_state = "smaint"
+
/area/maintenance/port
- name = "Locker Room Maintenance"
+ name = "Port Maintenance"
icon_state = "pmaint"
-/area/maintenance/aft
- name = "Engineering Maintenance"
- icon_state = "amaint"
-
+/area/maintenance/port2
+ name = "Port Secondary Maintenance"
+ icon_state = "pmaint"
/area/maintenance/storage
name = "Atmospherics Maintenance"
icon_state = "green"
@@ -677,18 +699,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/maintenance/electrical
name = "Electrical Maintenance"
- icon_state = "yellow"
+ icon_state = "elec"
/area/maintenance/abandonedbar
name = "Maintenance Bar"
- icon_state = "yellow"
+ icon_state = "oldbar"
power_equip = 0
power_light = 0
power_environ = 0
/area/maintenance/electrical_shop
name ="Electronics Den"
- icon_state = "yellow"
+ icon_state = "elec"
/area/maintenance/gambling_den
name = "Gambling Den"
@@ -696,7 +718,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/maintenance/consarea
name = "Alternate Construction Area"
- icon_state = "yellow"
+ icon_state = "construction"
//Hallway
@@ -836,7 +858,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/comms
name = "\improper Communications Relay"
- icon_state = "tcomsatcham"
+ icon_state = "tcomms"
sound_environment = SOUND_AREA_STANDARD_STATION
/area/server
@@ -846,11 +868,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ntrep
name = "\improper Nanotrasen Representative's Office"
- icon_state = "bluenew"
+ icon_state = "ntrep"
/area/blueshield
name = "\improper Blueshield's Office"
- icon_state = "blueold"
+ icon_state = "blueshield"
/area/centcomdocks
name = "\improper Central Command Docks"
@@ -919,7 +941,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/bar
name = "\improper Bar"
- icon_state = "bar"
+ icon_state = "barstation"
sound_environment = SOUND_AREA_WOODFLOOR
/area/crew_quarters/bar/atrium
@@ -1048,45 +1070,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/holodeck/source_knightarena
name = "\improper Holodeck - Knight Arena"
-
-//Embassies
-/area/embassy/
- name = "\improper Embassy Hallway"
-
-/area/embassy/tajaran
- name = "\improper Tajaran Embassy"
- icon_state = "tajaran"
-
-/area/embassy/skrell
- name = "\improper Skrell Embassy"
- icon_state = "skrell"
-
-/area/embassy/unathi
- name = "\improper Unathi Embassy"
- icon_state = "unathi"
-
-/area/embassy/kidan
- name = "\improper Kidan Embassy"
- icon_state = "kidan"
-
-/area/embassy/diona
- name = "\improper Diona Embassy"
- icon_state = "diona"
-
-/area/embassy/slime
- name = "\improper Slime Person Embassy"
- icon_state = "slime"
-
-/area/embassy/grey
- name = "\improper Grey Embassy"
- icon_state = "grey"
-
-/area/embassy/vox
- name = "\improper Vox Embassy"
- icon_state = "vox"
-
-
-
//Engineering
/area/engine
ambientsounds = ENGINEERING_SOUNDS
@@ -1108,7 +1091,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
sound_environment = SOUND_AREA_SMALL_ENCLOSED
/area/engine/equipmentstorage
- name = "\improper Engineering Equipment Storage"
+ name = "Engineering Equipment Storage"
icon_state = "storage"
sound_environment = SOUND_AREA_SMALL_ENCLOSED
@@ -1260,7 +1243,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/medical/biostorage
- name = "\improper Medical Storage"
+ name = "Medical Storage"
icon_state = "medbaysecstorage"
/area/medical/reception
@@ -1285,19 +1268,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "patientsward"
/area/medical/patient_a
- name = "\improper Isolation A"
+ name = "Isolation A"
icon_state = "medbayisoa"
/area/medical/patient_b
- name = "\improper Isolation B"
+ name = "Isolation B"
icon_state = "medbayisob"
/area/medical/patient_c
- name = "\improper Isolation C"
+ name = "Isolation C"
icon_state = "medbayisoc"
/area/medical/iso_access
- name = "\improper Isolation Access"
+ name = "Isolation Access"
icon_state = "medbayisoaccess"
/area/medical/cmo
@@ -1305,23 +1288,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "CMO"
/area/medical/cmostore
- name = "\improper Medical Secondary Storage"
+ name = "Medical Secondary Storage"
icon_state = "medbaysecstorage"
/area/medical/robotics
- name = "\improper Robotics"
- icon_state = "medresearch"
+ name = "Robotics"
+ icon_state = "research"
/area/medical/research
- name = "\improper Medical Research"
- icon_state = "medresearch"
-
-/area/medical/research_shuttle_dock
- name = "\improper Research Shuttle Dock"
- icon_state = "medresearch"
+ name = "Research Division"
+ icon_state = "research"
/area/medical/virology
- name = "\improper Virology"
+ name = "Virology"
icon_state = "virology"
/area/medical/virology/lab
@@ -1336,7 +1315,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
sound_environment = SOUND_AREA_SMALL_ENCLOSED
/area/medical/chemistry
- name = "\improper Chemistry"
+ name = "Chemistry"
icon_state = "chem"
/area/medical/surgery
@@ -1344,19 +1323,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "surgery"
/area/medical/surgery1
- name = "\improper Surgery 1"
+ name = "Surgery 1"
icon_state = "surgery1"
/area/medical/surgery2
- name = "\improper Surgery 2"
+ name = "Surgery 2"
icon_state = "surgery2"
/area/medical/surgeryobs
- name = "\improper Surgery Observation"
+ name = "Surgery Observation"
icon_state = "surgery"
/area/medical/cryo
- name = "\improper Cryogenics"
+ name = "Cryogenics"
icon_state = "cryo"
/area/medical/exam_room
@@ -1376,7 +1355,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "exam_room"
/area/medical/paramedic
- name = "\improper Paramedic"
+ name = "Paramedic"
icon_state = "medbay"
//Security
@@ -1441,35 +1420,31 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "brig"
/area/security/execution
- name = "\improper Execution"
+ name = "Execution"
icon_state = "execution"
can_get_auto_cryod = FALSE
/area/security/processing
- name = "\improper Prisoner Processing"
+ name = "Prisoner Processing"
icon_state = "prisonerprocessing"
can_get_auto_cryod = FALSE
/area/security/interrogation
- name = "\improper Interrogation"
+ name = "Interrogation"
icon_state = "interrogation"
can_get_auto_cryod = FALSE
/area/security/seceqstorage
- name = "\improper Security Equipment Storage"
+ name = "Security Equipment Storage"
icon_state = "securityequipmentstorage"
-/area/security/interrogationhallway
- name = "\improper Interrogation Hallway"
- icon_state = "interrogationhall"
-
/area/security/courtroomdandp
name = "\improper Courtroom Defense and Prosecution"
icon_state = "seccourt"
sound_environment = SOUND_AREA_LARGE_ENCLOSED
/area/security/interrogationobs
- name = "\improper Interrogation Observation"
+ name = "Interrogation Observation"
icon_state = "security"
can_get_auto_cryod = FALSE
@@ -1505,7 +1480,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "secarmory"
/area/security/securehallway
- name = "\improper Security Secure Hallway"
+ name = "\improper Brig Secure Hallway"
icon_state = "securehall"
/area/security/hos
@@ -1530,11 +1505,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "nuke_storage"
/area/security/customs
- name = "\improper Customs"
+ name = "Customs"
icon_state = "checkpoint1"
/area/security/customs2
- name = "\improper Customs"
+ name = "Customs"
icon_state = "security"
/area/security/checkpoint
@@ -1601,7 +1576,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "mining"
/area/quartermaster/miningstorage
- name = "\improper Mining Storage"
+ name = "Mining Storage"
icon_state = "green"
/area/quartermaster/mechbay
@@ -1614,7 +1589,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
sound_environment = SOUND_AREA_SMALL_ENCLOSED
/area/hydroponics
- name = "\improper Hydroponics"
+ name = "Hydroponics"
icon_state = "hydro"
sound_environment = SOUND_AREA_STANDARD_STATION
@@ -1629,7 +1604,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
sound_environment = SOUND_AREA_STANDARD_STATION
/area/toxins/lab
- name = "\improper Research and Development"
+ name = "Research and Development"
icon_state = "toxlab"
/area/toxins/hallway
@@ -1650,7 +1625,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
xenobiology_compatible = TRUE
/area/toxins/xenobiology/xenoflora_storage
- name = "\improper Xenoflora Storage"
+ name = "Xenoflora Storage"
icon_state = "toxlab"
/area/toxins/xenobiology/xenoflora
@@ -1658,7 +1633,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "toxlab"
/area/toxins/storage
- name = "\improper Toxins Storage"
+ name = "Toxins Storage"
icon_state = "toxstorage"
/area/toxins/test_area
@@ -1671,7 +1646,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "toxmix"
/area/toxins/launch
- name = "Toxins Launch Room"
+ name = "\improper Toxins Launch Room"
icon_state = "toxlaunch"
/area/toxins/misc_lab
@@ -1739,7 +1714,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "auxstorage"
/area/storage/office
- name = "\improper Office Supplies"
+ name = "Office Supplies"
icon_state = "office_supplies"
// ENGIE OUTPOST
@@ -2061,45 +2036,27 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/tcommsat/chamber
name = "\improper Telecoms Central Compartment"
- icon_state = "tcomsatcham"
+ icon_state = "tcomms"
// These areas are needed for MetaStation's AI sat
-/area/turret_protected/tcomsat
- name = "\improper Telecoms Satellite"
- icon_state = "tcomsatlob"
- ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-
/area/turret_protected/tcomfoyer
name = "\improper Telecoms Foyer"
- icon_state = "tcomsatentrance"
- ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-
-/area/turret_protected/tcomwest
- name = "\improper Telecoms West Wing"
- icon_state = "tcomsatwest"
+ icon_state = "tcomms"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/turret_protected/tcomeast
name = "\improper Telecoms East Wing"
- icon_state = "tcomsateast"
+ icon_state = "tcomms"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/tcommsat/computer
name = "\improper Telecoms Control Room"
- icon_state = "tcomsatcomp"
+ icon_state = "tcomms"
sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
/area/tcommsat/server
name = "\improper Telecoms Server Room"
- icon_state = "tcomsatcham"
-
-/area/tcommsat/lounge
- name = "\improper Telecoms Lounge"
- icon_state = "tcomsatlounge"
-
-/area/tcommsat/powercontrol
- name = "\improper Telecoms Power Control"
- icon_state = "tcomsatwest"
+ icon_state = "tcomms"
// Away Missions
/area/awaymission
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 66df3d4a76c..d9cc6ab55c0 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -413,6 +413,9 @@
/atom/proc/emag_act()
return
+/atom/proc/unemag()
+ return
+
/**
* Respond to a radioactive wave hitting this atom
*
@@ -941,9 +944,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
/atom/proc/narsie_act()
return
-/atom/proc/ratvar_act()
- return
-
/**
* Respond to an electric bolt action on our item
*
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 3692f725361..284b130f803 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -181,11 +181,18 @@
var/dead = stat == DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH)
// To the right of health bar
if(dead)
- var/revivable = timeofdeath && (round(world.time - timeofdeath) < DEFIB_TIME_LIMIT)
+ var/mob/dead/observer/ghost = get_ghost(TRUE)
+ var/revivable
+ if(ghost && !ghost.can_reenter_corpse) // DNR or AntagHUD
+ revivable = FALSE
+ else if(timeofdeath && (round(world.time - timeofdeath) < DEFIB_TIME_LIMIT))
+ revivable = TRUE
+
if(revivable)
holder.icon_state = "hudflatline"
else
holder.icon_state = "huddead"
+
else if(HAS_TRAIT(src, TRAIT_XENO_HOST))
holder.icon_state = "hudxeno"
else if(B && B.controlling)
diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index b0323825c70..2dfe4d660c9 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(assigned_mutation_blocks, new(DNA_SE_LENGTH))
// Used to determine what each block means (admin hax and species stuff on /vg/, mostly)
GLOBAL_LIST_INIT(assigned_blocks, new(DNA_SE_LENGTH))
+/// Assoc list. Key = type of the mutation, value = the mutation
GLOBAL_LIST_EMPTY(dna_mutations)
GLOBAL_LIST_EMPTY(good_blocks)
diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm
index d82e652dbb7..8da02df0806 100644
--- a/code/game/dna/dna2_domutcheck.dm
+++ b/code/game/dna/dna2_domutcheck.dm
@@ -3,7 +3,8 @@
// M: Mob to mess with
// flags: See below, bitfield.
/proc/domutcheck(mob/living/M, flags = 0)
- for(var/datum/mutation/mutation in GLOB.dna_mutations)
+ for(var/mutation_type in GLOB.dna_mutations)
+ var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
if(!M || !M.dna)
return
if(!mutation.block)
@@ -32,7 +33,7 @@
var/mutation_active = M.dna.GetSEState(mutation.block)
// Sanity checks, don't skip.
- if(!mutation.can_activate(M, flags) && mutation_active)
+ if(mutation_active && !mutation.can_activate(M, flags))
//testing("[M] - Failed to activate [gene.name] (can_activate fail).")
return FALSE
@@ -46,11 +47,7 @@
if(mutation_active)
//testing("[gene.name] activated!")
mutation.activate(M)
- if(M)
- M.active_mutations |= mutation.type
// If Gene is NOT active:
else
//testing("[gene.name] deactivated!")
mutation.deactivate(M)
- if(M)
- M.active_mutations -= mutation.type
diff --git a/code/game/dna/mutations/_mutations.dm b/code/game/dna/mutations/_mutations.dm
index a9718394066..8ed4022c5be 100644
--- a/code/game/dna/mutations/_mutations.dm
+++ b/code/game/dna/mutations/_mutations.dm
@@ -31,7 +31,9 @@
// Called when the gene activates. Do your magic here.
/datum/mutation/proc/activate(mob/living/M)
+ SHOULD_CALL_PARENT(TRUE)
M.gene_stability -= instability
+ M.active_mutations |= type // |= is probably not required but just in case
for(var/thing in traits_to_add)
ADD_TRAIT(M, thing, GENETIC_MUTATION)
if(length(activation_messages))
@@ -42,7 +44,9 @@
// Called when the gene deactivates. Undo your magic here.
// Only called when the block is deactivated.
/datum/mutation/proc/deactivate(mob/living/M)
+ SHOULD_CALL_PARENT(TRUE)
M.gene_stability += instability
+ M.active_mutations -= type
for(var/thing in traits_to_add)
REMOVE_TRAIT(M, thing, GENETIC_MUTATION)
if(length(deactivation_messages))
diff --git a/code/game/dna/mutations/monkey.dm b/code/game/dna/mutations/monkey.dm
index 4ebe366bfb7..c9e91179527 100644
--- a/code/game/dna/mutations/monkey.dm
+++ b/code/game/dna/mutations/monkey.dm
@@ -9,6 +9,7 @@
return ishuman(M)
/datum/mutation/monkey/activate(mob/living/carbon/human/H)
+ ..()
if(!istype(H))
return
if(issmall(H))
@@ -42,6 +43,7 @@
return H
/datum/mutation/monkey/deactivate(mob/living/carbon/human/H)
+ ..()
if(!istype(H))
return
if(!issmall(H))
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 83fefdf9deb..ba674aae658 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -15,7 +15,6 @@ GLOBAL_LIST_EMPTY(blob_nodes)
recommended_enemies = 1
restricted_jobs = list("Cyborg", "AI")
- var/declared = 0
var/burst = 0
var/cores_to_spawn = 1
@@ -75,8 +74,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
log_game("[key_name(blob)] has been selected as a Blob")
greet_blob(blobmind)
to_chat(blob, "You feel very tired and bloated! You don't have long before you burst!")
- spawn(600)
- burst_blob(blobmind)
+ addtimer(CALLBACK(src, .proc/burst_blob, blobmind), 60 SECONDS)
return 1
/datum/game_mode/blob/proc/make_blobs(count)
@@ -103,6 +101,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
to_chat(blob.current, "Find a good location to spawn the core and then take control and overwhelm the station!")
to_chat(blob.current, "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process.")
to_chat(blob.current, "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover.")
+ to_chat(blob.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Blob)")
SEND_SOUND(blob.current, sound('sound/magic/mutate.ogg'))
return
@@ -127,8 +126,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(!warned)
to_chat(C, "You feel ready to burst, but this isn't an appropriate place! You must return to the station!")
message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if [C.p_they()] [C.p_do()] not return to the station.")
- spawn(300)
- burst_blob(blob, 1)
+ addtimer(CALLBACK(src, .proc/burst_blob, blob, 1), 30 SECONDS)
else
burst++
log_admin("[key_name(C)] was in space when attempting to burst as a blob.")
@@ -172,33 +170,22 @@ GLOBAL_LIST_EMPTY(blob_nodes)
show_message("You feel like you are about to burst.")
- sleep(wait_time / 2)
-
- burst_blobs()
-
- // Stage 0
- sleep(wait_time)
- stage(0)
+ addtimer(CALLBACK(src, .proc/burst_blobs), (wait_time / 2))
// Stage 1
- sleep(wait_time)
- stage(1)
+ addtimer(CALLBACK(src, .proc/stage, 1), (wait_time * 2 + wait_time / 2))
// Stage 2
- sleep(30000)
- stage(2)
+ addtimer(CALLBACK(src, .proc/stage, 2), 50 MINUTES)
return ..()
/datum/game_mode/blob/proc/stage(stage)
switch(stage)
- if(0)
- send_intercept(1)
- declared = 1
if(1)
GLOB.event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
if(2)
- send_intercept(2)
+ send_intercept(1)
/datum/game_mode/proc/update_blob_icons_added(datum/mind/mob_mind)
var/datum/atom_hud/antag/antaghud = GLOB.huds[ANTAG_HUD_BLOB]
diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm
index d14069b9d24..c95c0fb2539 100644
--- a/code/game/gamemodes/blob/blob_finish.dm
+++ b/code/game/gamemodes/blob/blob_finish.dm
@@ -26,7 +26,6 @@
to_chat(world, "The staff has won!")
to_chat(world, "The alien organism has been eradicated from the station")
log_game("Blob mode completed with a crew victory.")
- to_chat(world, "Rebooting in 30s")
..()
return 1
diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm
index 670c9ea8aa4..ad3cedafb85 100644
--- a/code/game/gamemodes/blob/blob_report.dm
+++ b/code/game/gamemodes/blob/blob_report.dm
@@ -5,19 +5,6 @@
if(0)
return
if(1)
- interceptname = "Level 5-6 Biohazard Response Procedures"
- intercepttext += "Nanotrasen Update: Biohazard Alert."
- intercepttext += "Reports indicate the probable transfer of a biohazardous agent onto [station_name()] during the last crew deployment cycle. "
- intercepttext += "Preliminary analysis of the organism classifies it as a level 5 biohazard. Its origin is unknown. "
- intercepttext += "Nanotrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined. "
- intercepttext += "Orders for all [station_name()] personnel follows: "
- intercepttext += " 1. Do not leave the quarantine area. "
- intercepttext += " 2. Locate any outbreaks of the organism on the station. "
- intercepttext += " 3. If found, use any neccesary means to contain the organism. "
- intercepttext += " 4. Avoid damage to the capital infrastructure of the station. "
- 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)
for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)
if(bomb && bomb.r_code)
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index a12f53150ca..b4a9bf3c3e8 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -117,13 +117,13 @@
if(C && !QDELETED(src))
var/mob/camera/blob/B = new(loc)
+ B.is_offspring = is_offspring
B.key = C.key
B.blob_core = src
overmind = B
color = overmind.blob_reagent_datum.color
if(B.mind && !B.mind.special_role)
B.mind.make_Overmind()
- B.is_offspring = is_offspring
/obj/structure/blob/core/proc/lateblobtimer()
addtimer(CALLBACK(src, .proc/lateblobcheck), 50)
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 7d074e869e7..01f87d3b758 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -147,6 +147,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E
for(var/datum/objective/objective in changeling.objectives)
to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]")
obj_count++
+ to_chat(changeling.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Changeling)")
return
/datum/game_mode/proc/remove_changeling(datum/mind/changeling_mind)
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 420628a0198..08f11e672a7 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -173,8 +173,11 @@
name = "Tentacle"
desc = "We ready a tentacle to grab items or victims with. Costs 10 chemicals."
helptext = "We can use it once to retrieve a distant item. If used on living creatures, the effect depends on the intent: \
- Help will simply drag them closer, Disarm will grab whatever they are holding instead of them, Grab will put the victim in our hold after catching it, \
- and Harm will stun it, and stab it if we are also holding a sharp weapon. Cannot be used while in lesser form."
+ Help will drag the target closer. \
+ Disarm will grab whatever the target is holding. \
+ Grab will put the target in our grip after we catch it. \
+ Harm will drag the target closer and stab it if we are holding a sharp weapon in our other hand. \
+ Cannot be used while in our lesser form."
button_icon_state = "tentacle"
chemical_cost = 10
dna_cost = 2
diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm
index 072f5b8f40d..14d93439510 100644
--- a/code/game/gamemodes/changeling/powers/tiny_prick.dm
+++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm
@@ -94,7 +94,7 @@
/datum/action/changeling/sting/transformation/can_sting(mob/user, mob/target)
if(!..())
return
- if(HAS_TRAIT(target, TRAIT_HUSK) || (!ishuman(target)))
+ if(HAS_TRAIT(target, TRAIT_HUSK) || !ishuman(target) || (NOTRANSSTING in target.dna.species.species_traits))
to_chat(user, "Our sting appears ineffective against its DNA.")
return FALSE
if(ishuman(target))
diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 2583fd693d3..c1b4f6a98d5 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -249,7 +249,7 @@
/datum/action/innate/cult/blood_spell/horror/Destroy()
var/obj/effect/proc_holder/horror/destroy = PH
. = ..()
- if(destroy && !QDELETED(destroy))
+ if(!QDELETED(destroy))
QDEL_NULL(destroy)
/datum/action/innate/cult/blood_spell/horror/Activate()
@@ -264,7 +264,7 @@
/obj/effect/proc_holder/horror/Destroy()
var/datum/action/innate/cult/blood_spell/AA = attached_action
. = ..()
- if(AA && !QDELETED(AA))
+ if(!QDELETED(AA))
QDEL_NULL(AA)
/obj/effect/proc_holder/horror/proc/toggle(mob/user)
@@ -464,9 +464,15 @@
var/list/potential_runes = list()
var/list/teleportnames = list()
var/list/duplicaterunecount = list()
+ var/atom/movable/teleportee
if(!iscultist(target) || !proximity)
to_chat(user, "You can only teleport adjacent cultists with this spell!")
return
+ if(user != target) // So that the teleport effect shows on the correct mob
+ teleportee = target
+ else
+ teleportee = user
+
for(var/R in GLOB.teleport_runes)
var/obj/effect/rune/teleport/T = R
var/resultkey = T.listkey
@@ -487,16 +493,15 @@
log_game("Teleport spell failed - user in away mission")
return
- var/mob/living/L = target
var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked
var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(!src || QDELETED(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune)
+ if(QDELETED(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune)
return
uses--
- var/turf/origin = get_turf(user)
+ var/turf/origin = get_turf(teleportee)
var/turf/destination = get_turf(actual_selected_rune)
- INVOKE_ASYNC(actual_selected_rune, /obj/effect/rune/.proc/teleport_effect, user, origin, destination)
+ INVOKE_ASYNC(actual_selected_rune, /obj/effect/rune/.proc/teleport_effect, teleportee, origin, destination)
if(is_mining_level(user.z) && !is_mining_level(destination.z)) //No effect if you stay on lavaland
actual_selected_rune.handle_portal("lava")
@@ -510,7 +515,7 @@
target.visible_message("Dust flows from [user]'s hand, and [target] disappears in a flash of red light!", \
"You suddenly find yourself somewhere else!")
destination.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.")
- L.forceMove(destination)
+ teleportee.forceMove(destination)
return ..()
//Shackles
@@ -658,7 +663,7 @@
/obj/item/melee/blood_magic/empower/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(proximity_flag)
- //Shielded suit
+ // Shielded suit
if(istype(target, /obj/item/clothing/suit/hooded/cultrobes/cult_shield))
var/obj/item/clothing/suit/hooded/cultrobes/cult_shield/C = target
if(C.current_charges < 3)
@@ -672,7 +677,7 @@
to_chat(user, "[target] is already at full charge!")
return
- //Plasteel to runed metal
+ // Veil Shifter
else if(istype(target, /obj/item/cult_shift))
var/obj/item/cult_shift/S = target
if(S.uses < 4)
@@ -846,39 +851,6 @@
var/list/options = list("Blood Orb (50)", "Blood Recharge (75)", "Blood Spear (150)", "Blood Bolt Barrage (300)")
var/choice = input(user, "Choose a greater blood rite...", "Greater Blood Rites") as null|anything in options
switch(choice)
- if("Blood Spear (150)")
- if(uses < BLOOD_SPEAR_COST)
- to_chat(user, "You need [BLOOD_SPEAR_COST] charges to perform this rite.")
- else
- uses -= BLOOD_SPEAR_COST
- var/turf/T = get_turf(user)
- qdel(src)
- var/datum/action/innate/cult/spear/S = new(user)
- var/obj/item/twohanded/cult_spear/rite = new(T)
- S.Grant(user, rite)
- rite.spear_act = S
- if(user.put_in_hands(rite))
- to_chat(user, "A [rite.name] appears in your hand!")
- else
- user.visible_message("A [rite.name] appears at [user]'s feet!", \
- "A [rite.name] materializes at your feet.")
-
- if("Blood Bolt Barrage (300)")
- if(uses < BLOOD_BARRAGE_COST)
- to_chat(user, "You need [BLOOD_BARRAGE_COST] charges to perform this rite.")
- else
- var/obj/rite = new /obj/item/gun/projectile/shotgun/boltaction/enchanted/arcane_barrage/blood()
- uses -= BLOOD_BARRAGE_COST
- qdel(src)
- user.swap_hand()
- user.drop_item()
- if(user.put_in_hands(rite))
- to_chat(user, "Both of your hands glow with power!")
- else
- to_chat(user, "You need a free hand for this rite!")
- uses += BLOOD_BARRAGE_COST // Refund the charges
- qdel(rite)
-
if("Blood Orb (50)")
if(uses < BLOOD_ORB_COST)
to_chat(user, "You need [BLOOD_ORB_COST] charges to perform this rite.")
@@ -898,7 +870,7 @@
if(user.put_in_hands(rite))
to_chat(user, "A [rite.name] appears in your hand!")
else
- user.visible_message("A [rite.name] appears at [user]'s feet!", \
+ user.visible_message("A [rite.name] appears at [user]'s feet!",
"A [rite.name] materializes at your feet.")
if("Blood Recharge (75)")
@@ -914,3 +886,36 @@
to_chat(user, "You need a free hand for this rite!")
uses += BLOOD_RECHARGE_COST // Refund the charges
qdel(rite)
+
+ if("Blood Spear (150)")
+ if(uses < BLOOD_SPEAR_COST)
+ to_chat(user, "You need [BLOOD_SPEAR_COST] charges to perform this rite.")
+ else
+ uses -= BLOOD_SPEAR_COST
+ var/turf/T = get_turf(user)
+ qdel(src)
+ var/datum/action/innate/cult/spear/S = new(user)
+ var/obj/item/twohanded/cult_spear/rite = new(T)
+ S.Grant(user, rite)
+ rite.spear_act = S
+ if(user.put_in_hands(rite))
+ to_chat(user, "A [rite.name] appears in your hand!")
+ else
+ user.visible_message("A [rite.name] appears at [user]'s feet!",
+ "A [rite.name] materializes at your feet.")
+
+ if("Blood Bolt Barrage (300)")
+ if(uses < BLOOD_BARRAGE_COST)
+ to_chat(user, "You need [BLOOD_BARRAGE_COST] charges to perform this rite.")
+ else
+ var/obj/rite = new /obj/item/gun/projectile/shotgun/boltaction/enchanted/arcane_barrage/blood()
+ uses -= BLOOD_BARRAGE_COST
+ qdel(src)
+ user.swap_hand()
+ user.drop_item()
+ if(user.put_in_hands(rite))
+ to_chat(user, "Both of your hands glow with power!")
+ else
+ to_chat(user, "You need a free hand for this rite!")
+ uses += BLOOD_BARRAGE_COST // Refund the charges
+ qdel(rite)
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 04c9e13b605..fb15a380c60 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -85,6 +85,9 @@ GLOBAL_LIST_EMPTY(all_cults)
to_chat(cult_mind.current, CULT_GREETING)
equip_cultist(cult_mind.current)
cult_mind.current.faction |= "cult"
+ var/datum/objective/servecult/obj = new
+ obj.owner = cult_mind
+ cult_mind.objectives += obj
if(cult_mind.assigned_role == "Clown")
to_chat(cult_mind.current, "A dark power has allowed you to overcome your clownish nature, letting you wield weapons without harming yourself.")
@@ -96,54 +99,11 @@ GLOBAL_LIST_EMPTY(all_cults)
add_cult_actions(cult_mind)
update_cult_icons_added(cult_mind)
cult_objs.study(cult_mind.current)
+ to_chat(cult_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Cultist)")
cult_threshold_check()
addtimer(CALLBACK(src, .proc/cult_threshold_check), 2 MINUTES) // Check again in 2 minutes for latejoiners
..()
-/**
- * Decides at the start of the round how many conversions are needed to rise/ascend.
- *
- * The number is decided by (Percentage * (Players - Cultists)), so for example at 110 players it would be 11 conversions for rise. (0.1 * (110 - 4))
- * These values change based on population because 20 cultists are MUCH more powerful if there's only 50 players, compared to 120.
- *
- * Below 100 players, [CULT_RISEN_LOW] and [CULT_ASCENDANT_LOW] are used.
- * Above 100 players, [CULT_RISEN_HIGH] and [CULT_ASCENDANT_HIGH] are used.
- */
-/datum/game_mode/proc/cult_threshold_check()
- var/players = length(GLOB.player_list)
- var/cultists = get_cultists() // Don't count the starting cultists towards the number of needed conversions
- if(players >= CULT_POPULATION_THRESHOLD)
- // Highpop
- ascend_percent = CULT_ASCENDANT_HIGH
- rise_number = round(CULT_RISEN_HIGH * (players - cultists))
- ascend_number = round(CULT_ASCENDANT_HIGH * (players - cultists))
- else
- // Lowpop
- ascend_percent = CULT_ASCENDANT_LOW
- rise_number = round(CULT_RISEN_LOW * (players - cultists))
- ascend_number = round(CULT_ASCENDANT_LOW * (players - cultists))
-
-/**
- * Returns the current number of cultists and constructs.
- *
- * Returns the number of cultists and constructs in a list ([1] = Cultists, [2] = Constructs), or as one combined number.
- *
- * * separate - Should the number be returned in two separate values (Humans and Constructs) or as one?
- */
-/datum/game_mode/proc/get_cultists(separate = FALSE)
- var/cultists = 0
- var/constructs = 0
- for(var/I in cult)
- var/datum/mind/M = I
- if(ishuman(M.current) && !M.current.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST))
- cultists++
- else if(isconstruct(M.current))
- constructs++
- if(separate)
- return list(cultists, constructs)
- else
- return cultists + constructs
-
/datum/game_mode/proc/equip_cultist(mob/living/carbon/human/H, metal = TRUE)
if(!istype(H))
return
@@ -207,8 +167,84 @@ GLOBAL_LIST_EMPTY(all_cults)
ascend(cult_mind.current)
check_cult_size()
cult_objs.study(cult_mind.current)
+ to_chat(cult_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Cultist)")
return TRUE
+/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = TRUE, remove_gear = FALSE)
+ if(!(cult_mind in cult)) // Not actually a cultist in the first place
+ return
+
+ var/mob/cultist = cult_mind.current
+ cult -= cult_mind
+ cultist.faction -= "cult"
+ cult_mind.special_role = null
+ for(var/datum/objective/servecult/S in cult_mind.objectives)
+ cult_mind.objectives -= S
+ qdel(S)
+ for(var/datum/action/innate/cult/C in cultist.actions)
+ qdel(C)
+ update_cult_icons_removed(cult_mind)
+
+ if(ishuman(cultist))
+ var/mob/living/carbon/human/H = cultist
+ REMOVE_TRAIT(H, CULT_EYES, null)
+ H.change_eye_color(H.original_eye_color, FALSE)
+ H.update_eyes()
+ H.remove_overlay(HALO_LAYER)
+ H.update_body()
+ if(remove_gear) // No flagellants robe for non-cultists
+ for(var/I in H.contents)
+ if(is_type_in_list(I, CULT_CLOTHING))
+ H.unEquip(I)
+ check_cult_size()
+ if(show_message)
+ cultist.visible_message("[cultist] looks like [cultist.p_they()] just reverted to [cultist.p_their()] old faith!",
+ "An unfamiliar white light flashes through your mind, cleansing the taint of [SSticker.cultdat ? SSticker.cultdat.entity_title1 : "Nar'Sie"] and the memories of your time as their servant with it.")
+
+
+/**
+ * Decides at the start of the round how many conversions are needed to rise/ascend.
+ *
+ * The number is decided by (Percentage * (Players - Cultists)), so for example at 110 players it would be 11 conversions for rise. (0.1 * (110 - 4))
+ * These values change based on population because 20 cultists are MUCH more powerful if there's only 50 players, compared to 120.
+ *
+ * Below 100 players, [CULT_RISEN_LOW] and [CULT_ASCENDANT_LOW] are used.
+ * Above 100 players, [CULT_RISEN_HIGH] and [CULT_ASCENDANT_HIGH] are used.
+ */
+/datum/game_mode/proc/cult_threshold_check()
+ var/players = length(GLOB.player_list)
+ var/cultists = get_cultists() // Don't count the starting cultists towards the number of needed conversions
+ if(players >= CULT_POPULATION_THRESHOLD)
+ // Highpop
+ ascend_percent = CULT_ASCENDANT_HIGH
+ rise_number = round(CULT_RISEN_HIGH * (players - cultists))
+ ascend_number = round(CULT_ASCENDANT_HIGH * (players - cultists))
+ else
+ // Lowpop
+ ascend_percent = CULT_ASCENDANT_LOW
+ rise_number = round(CULT_RISEN_LOW * (players - cultists))
+ ascend_number = round(CULT_ASCENDANT_LOW * (players - cultists))
+
+/**
+ * Returns the current number of cultists and constructs.
+ *
+ * Returns the number of cultists and constructs in a list ([1] = Cultists, [2] = Constructs), or as one combined number.
+ *
+ * * separate - Should the number be returned as a list with two separate values (Humans and Constructs) or as one number.
+ */
+/datum/game_mode/proc/get_cultists(separate = FALSE)
+ var/cultists = 0
+ var/constructs = 0
+ for(var/I in cult)
+ var/datum/mind/M = I
+ if(ishuman(M.current) && !M.current.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST))
+ cultists++
+ else if(isconstruct(M.current))
+ constructs++
+ if(separate)
+ return list(cultists, constructs)
+ else
+ return cultists + constructs
/datum/game_mode/proc/check_cult_size()
if(cult_ascendant)
@@ -238,6 +274,8 @@ GLOBAL_LIST_EMPTY(all_cults)
/datum/game_mode/proc/rise(cultist)
if(ishuman(cultist) && iscultist(cultist))
var/mob/living/carbon/human/H = cultist
+ if(!H.original_eye_color)
+ H.original_eye_color = H.get_eye_color()
H.change_eye_color(BLOODCULT_EYE, FALSE)
H.update_eyes()
ADD_TRAIT(H, CULT_EYES, CULT_TRAIT)
@@ -249,29 +287,6 @@ GLOBAL_LIST_EMPTY(all_cults)
new /obj/effect/temp_visual/cult/sparks(get_turf(H), H.dir)
H.update_halo_layer()
-
-/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = TRUE)
- if(cult_mind in cult)
- var/mob/cultist = cult_mind.current
- cult -= cult_mind
- cultist.faction -= "cult"
- cult_mind.special_role = null
- for(var/datum/action/innate/cult/C in cultist.actions)
- qdel(C)
- update_cult_icons_removed(cult_mind)
-
- if(ishuman(cultist))
- var/mob/living/carbon/human/H = cultist
- REMOVE_TRAIT(H, CULT_EYES, null)
- H.change_eye_color(H.original_eye_color, FALSE)
- H.update_eyes()
- H.remove_overlay(HALO_LAYER)
- H.update_body()
- check_cult_size()
- if(show_message)
- cultist.visible_message("[cultist] looks like [cultist.p_they()] just reverted to [cultist.p_their()] old faith!",
- "An unfamiliar white light flashes through your mind, cleansing the taint of [SSticker.cultdat ? SSticker.cultdat.entity_title1 : "Nar'Sie"] and the memories of your time as their servant with it.")
-
/datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind)
var/datum/atom_hud/antag/culthud = GLOB.huds[ANTAG_HUD_CULT]
if(cult_mind.current)
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index ca1938a76ea..24ffbb96ce3 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -316,7 +316,8 @@
var/mob/living/carbon/C = user
if(C.pulling)
var/atom/movable/pulled = C.pulling
- pulled.forceMove(T)
+ var/turf/turf_behind = get_turf(get_step(T, turn(C.dir, 180)))
+ pulled.forceMove(turf_behind)
. = pulled
/obj/item/cult_shift/attack_self(mob/user)
@@ -324,7 +325,7 @@
to_chat(user, "[src] is dull and unmoving in your hands.")
return
if(!iscultist(user))
- user.unEquip(src, 1)
+ user.unEquip(src, TRUE)
step(src, pick(GLOB.alldirs))
to_chat(user, "[src] flickers out of your hands, too eager to move!")
return
@@ -332,36 +333,31 @@
var/outer_tele_radius = 9
var/mob/living/carbon/C = user
- var/turf/mobloc = get_turf(C)
- var/list/turfs = new/list()
- for(var/turf/T in range(user, outer_tele_radius))
+ var/list/turfs = list()
+ for(var/turf/T in orange(user, outer_tele_radius))
if(!is_teleport_allowed(T.z))
break
- if(get_dir(C, T) != C.dir)
+ if(get_dir(C, T) != C.dir) // This seems like a very bad way to do this
continue
- if(T == mobloc)
- continue
- if(istype(T, /turf/space))
+ if(isspaceturf(T))
continue
if(T.x > world.maxx-outer_tele_radius || T.x < outer_tele_radius)
continue //putting them at the edge is dumb
if(T.y > world.maxy-outer_tele_radius || T.y < outer_tele_radius)
continue
-
turfs += T
- if(turfs)
+ if(length(turfs))
uses--
+ var/turf/mobloc = get_turf(C)
var/turf/destination = pick(turfs)
if(uses <= 0)
- icon_state ="shifter_drained"
- playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ icon_state = "shifter_drained"
+ playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, C.dir)
- var/atom/movable/pulled = handle_teleport_grab(destination, C)
+ handle_teleport_grab(destination, C)
C.forceMove(destination)
- if(pulled)
- C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull
new /obj/effect/temp_visual/dir_setting/cult/phase(destination, C.dir)
playsound(destination, 'sound/effects/phasein.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm
index 4565e66ff29..ca8921b7534 100644
--- a/code/game/gamemodes/cult/cult_objectives.dm
+++ b/code/game/gamemodes/cult/cult_objectives.dm
@@ -133,13 +133,13 @@
for(var/mob/living/carbon/human/H in GLOB.player_list)
if(is_admin_level(H.z)) //We can't sacrifice people that are on the centcom z-level
continue
- if(H.mind && !is_convertable_to_cult(H.mind) && (H.stat != DEAD) && (H.mind.offstation_role != TRUE))
+ if(H.mind && !iscultist(H) && !is_convertable_to_cult(H.mind) && (H.stat != DEAD) && !H.mind.offstation_role)
target_candidates += H.mind
if(!length(target_candidates)) //There are no living unconvertables on the station. Looking for a Sacrifice Target among the ordinary crewmembers
for(var/mob/living/carbon/human/H in GLOB.player_list)
if(is_admin_level(H.z)) //We can't sacrifice people that are on the centcom z-level
continue
- if(H.mind && !iscultist(H) && (H.stat != DEAD) && (H.mind.offstation_role != TRUE))
+ if(H.mind && !iscultist(H) && (H.stat != DEAD) && !H.mind.offstation_role) // Same checks, but add them even if they could be converted
target_candidates += H.mind
if(length(target_candidates))
target = pick(target_candidates)
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 5211b82ea44..47a53ef89c6 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -84,6 +84,10 @@
/obj/item/melee/cultblade/dagger/proc/can_scribe(mob/living/user)
if(!src || !user || loc != user || user.incapacitated())
return FALSE
+ if(drawing_rune)
+ to_chat(user, "You're already drawing a rune!")
+ return FALSE
+
var/turf/T = get_turf(user)
if(isspaceturf(T))
return FALSE
@@ -135,12 +139,12 @@
to_chat(user, "The veil is not weak enough here to summon a cultist, you must be on station!")
return
- var/old_color = user.color // we'll temporarily redden the user for better feedback to fellow cultists. Store this to revert them back.
+ var/old_color = user.color // we'll temporarily redden the user for better feedback to fellow cultists. Store this to revert them back.
if(narsie_rune)
if(!narsie_rune_check(user, A))
return // don't do shit
var/list/summon_areas = gamemode.cult_objs.obj_summon.summon_spots
- if(!(A in summon_areas)) // Check again to make sure they didn't move
+ if(!(A in summon_areas)) // Check again to make sure they didn't move
to_chat(user, "The ritual can only begin where the veil is weak - in [english_list(summon_areas)]!")
return
GLOB.command_announcement.Announce("Figments from an eldritch god are being summoned into the [A.map_name] from an unknown dimension. Disrupt the ritual at all costs, before the station is destroyed! Space law and SOP are suspended. The entire crew must kill cultists on sight.", "Central Command Higher Dimensional Affairs", 'sound/AI/spanomalies.ogg')
@@ -148,7 +152,7 @@
var/turf/T = I
var/obj/machinery/shield/cult/narsie/N = new(T)
shields |= N
- user.color = "red"
+ user.color = COLOR_RED
// Draw the rune
var/mob/living/carbon/human/H = user
@@ -161,12 +165,14 @@
user.visible_message(others_message,
"You slice open your body and begin drawing a sigil of [SSticker.cultdat.entity_title3].")
+ drawing_rune = TRUE // Only one at a time
var/scribe_successful = do_after(user, initial(rune.scribe_delay) * scribe_multiplier, target = runeturf)
for(var/V in shields) // Only used for the 'Tear Veil' rune
var/obj/machinery/shield/S = V
if(S && !QDELETED(S))
qdel(S)
user.color = old_color
+ drawing_rune = FALSE
if(!scribe_successful)
return
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 4c98a3c59d3..90498c9ab26 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -263,6 +263,8 @@ structure_check() searches for nearby cultist structures required for the invoca
var/turf/T = get_turf(src)
for(var/mob/living/M in T)
if(!iscultist(M) || (M.mind && is_sacrifice_target(M.mind)))
+ if(isconstruct(M)) // No offering constructs please
+ continue
offer_targets += M
// Offering a head/brain
@@ -364,6 +366,7 @@ structure_check() searches for nearby cultist structures required for the invoca
return
var/sacrifice_fulfilled
+ var/worthless = FALSE
var/datum/game_mode/gamemode = SSticker.mode
if(offering.mind)
GLOB.sacrificed += offering.mind
@@ -377,13 +380,16 @@ structure_check() searches for nearby cultist structures required for the invoca
if(sacrifice_fulfilled)
to_chat(M, "\"Yes! This is the one I desire! You have done well.\"")
else
- if(ishuman(offering) || isrobot(offering))
+ if(ishuman(offering) && offering.mind.offstation_role && offering.mind.special_role != SPECIAL_ROLE_ERT) //If you try it on a ghost role, you get nothing
+ to_chat(M, "\"This soul is of no use to either of us.\"")
+ worthless = TRUE
+ else if(ishuman(offering) || isrobot(offering))
to_chat(M, "\"I accept this sacrifice.\"")
else
to_chat(M, "\"I accept this meager sacrifice.\"")
playsound(offering, 'sound/misc/demon_consume.ogg', 100, TRUE)
- if((ishuman(offering) || isrobot(offering) || isbrain(offering)) && offering.mind)
+ if(((ishuman(offering) || isrobot(offering) || isbrain(offering)) && offering.mind) && !worthless)
var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src))
stone.invisibility = INVISIBILITY_MAXIMUM // So it's not picked up during transfer_soul()
stone.transfer_soul("FORCE", offering, user) // If it cannot be added
@@ -418,6 +424,8 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/teleport/Destroy()
GLOB.teleport_runes -= src
+ QDEL_NULL(inner_portal)
+ QDEL_NULL(outer_portal)
return ..()
/obj/effect/rune/teleport/invoke(list/invokers)
@@ -452,7 +460,7 @@ structure_check() searches for nearby cultist structures required for the invoca
var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked
var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(!src || !Adjacent(user) || QDELETED(src) || user.incapacitated() || !actual_selected_rune)
+ if(QDELETED(src) || QDELETED(actual_selected_rune) ||!Adjacent(user) || user.incapacitated())
fail_invoke()
return
@@ -685,7 +693,7 @@ structure_check() searches for nearby cultist structures required for the invoca
cultists[M.current.real_name] = M.current
var/input = input(user, "Who do you wish to call to [src]?", "Acolytes") as null|anything in cultists
var/mob/living/cultist_to_summon = cultists[input]
- if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated())
+ if(QDELETED(src) || !Adjacent(user) || user.incapacitated())
return
if(!cultist_to_summon)
log_game("Summon Cultist rune failed - no target")
@@ -882,6 +890,7 @@ structure_check() searches for nearby cultist structures required for the invoca
var/mob/living/carbon/human/new_human = new(T)
new_human.real_name = ghost_to_spawn.real_name
new_human.key = ghost_to_spawn.key
+ new_human.gender = ghost_to_spawn.gender
new_human.alpha = 150 //Makes them translucent
new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor
new_human.apply_status_effect(STATUS_EFFECT_SUMMONEDGHOST) //ghosts can't summon more ghosts, also lets you see actual ghosts
@@ -999,7 +1008,7 @@ structure_check() searches for nearby cultist structures required for the invoca
//BEGIN THE SUMMONING
gamemode.cult_objs.succesful_summon()
used = TRUE
- color = rgb(255, 0, 0)
+ color = COLOR_RED
..()
SEND_SOUND(world, sound('sound/effects/dimensional_rend.ogg'))
to_chat(world, "The veil... is...TORN!!!--")
diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 4277fc76916..a579a90273c 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -181,6 +181,7 @@ GLOBAL_LIST_EMPTY(cortical_stacks) //Stacks for 'leave nobody behind' objective.
to_chat(raider.current, "Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious.")
to_chat(raider.current, "Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!")
to_chat(raider.current, "Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them.")
+ to_chat(raider.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Vox_Raider)")
spawn(25)
show_objectives(raider)
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 69d37bf1ce6..e299f0c97c2 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -331,7 +331,8 @@
to_chat(L, "The blast wave from [src] tears you atom from atom!")
L.dust()
to_chat(world, "The AI cleansed the station of life with the doomsday device!")
- SSticker.force_ending = 1
+ SSticker.force_ending = TRUE
+ SSticker.mode.station_was_nuked = TRUE
//AI Turret Upgrade: Increases the health and damage of all turrets.
/datum/AI_Module/large/upgrade_turrets
@@ -785,4 +786,3 @@
/datum/AI_Module/large/cameracrack/upgrade(mob/living/silicon/ai/AI)
if(AI.builtInCamera)
QDEL_NULL(AI.builtInCamera)
-
diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm
index 60de5ba4238..6587907cdbd 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction.dm
@@ -158,6 +158,7 @@
to_chat(abductor.current, "You are an agent of [team_name]!")
to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!")
to_chat(abductor.current, "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve.")
+ to_chat(abductor.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Abductor)")
abductor.announce_objectives()
@@ -170,6 +171,7 @@
to_chat(abductor.current, "You are a scientist of [team_name]!")
to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!")
to_chat(abductor.current, "Use your tool and ship consoles to support the agent and retrieve human specimens.")
+ to_chat(abductor.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Abductor)")
abductor.announce_objectives()
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index a0dcd826972..0342c1d4707 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -119,7 +119,7 @@
remove_from_all_data_huds()
generation = gen
add_language("Cortical Link")
- notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK)
+ notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK, role = ROLE_BORER)
real_name = "Cortical Borer [rand(1000,9999)]"
truename = "[borer_names[min(generation, borer_names.len)]] [rand(1000,9999)]"
GrantBorerActions()
@@ -837,6 +837,7 @@
to_chat(src, "You are a brain slug that worms its way into the head of its victim. Use stealth, persuasion and your powers of mind control to keep you, your host and your eventual spawn safe and warm.")
to_chat(src, "Sugar nullifies your abilities, avoid it at all costs!")
to_chat(src, "You can speak to your fellow borers by prefixing your messages with ':bo'. Check out your Borer tab to see your abilities.")
+ to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Cortical_Borer)")
/proc/create_borer_mind(key)
var/datum/mind/M = new /datum/mind(key)
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
index c434f130fd4..9711f2c0bfa 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
@@ -21,7 +21,7 @@
roundstart = FALSE
important_info = "Follow your objectives, do not make the station inhospitable or try and kill crew."
flavour_text = "You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate."
- description = {" Your goal is to create more of yourself by consuming the station. Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful. Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage.
+ description = {"Your goal is to create more of yourself by consuming the station. Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful. Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage.
Objectives:
1. Consume resources and replicate until there are no more resources left.
2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable.
@@ -63,12 +63,10 @@
mob_biotypes = MOB_ROBOTIC
health = 40
maxHealth = 40
- status_flags = CANPUSH
icon_state = "swarmer"
icon_living = "swarmer"
icon_dead = "swarmer_unactivated"
- icon_gib = null
- wander = 0
+ wander = FALSE
harm_intent_damage = 5
minbodytemp = 0
maxbodytemp = 500
@@ -86,22 +84,22 @@
friendly = "pinches"
speed = 0
a_intent = INTENT_HARM
- can_change_intents = 0
+ can_change_intents = FALSE
faction = list("swarmer")
AIStatus = AI_OFF
pass_flags = PASSTABLE
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
mob_size = MOB_SIZE_SMALL
ventcrawler = VENTCRAWLER_ALWAYS
- ranged = 1
+ ranged = TRUE
projectiletype = /obj/item/projectile/beam/disabler
ranged_cooldown_time = 20
projectilesound = 'sound/weapons/taser2.ogg'
loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/stack/ore/bluespace_crystal)
- del_on_death = 1
+ del_on_death = TRUE
deathmessage = "explodes with a sharp pop!"
light_color = LIGHT_COLOR_CYAN
- universal_speak = 0
- universal_understand = 0
+ universal_understand = FALSE
var/resources = 0 //Resource points, generated by consuming metal/glass
var/max_resources = 100
@@ -114,6 +112,7 @@
to_chat(src, "1. Consume resources and replicate until there are no more resources left.")
to_chat(src, "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable.")
to_chat(src, "3. Biological and sentient resources will be harvested at a later date, do not harm them.")
+ to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Swarmer)")
/mob/living/simple_animal/hostile/swarmer/New()
..()
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index b0194c53f33..db33bc355a8 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -250,10 +250,9 @@
var/name_list = list("Aries", "Leo", "Sagittarius", "Taurus", "Virgo", "Capricorn", "Gemini", "Libra", "Aquarius", "Cancer", "Scorpio", "Pisces")
/obj/item/guardiancreator/attack_self(mob/living/user)
- for(var/mob/living/simple_animal/hostile/guardian/G in GLOB.alive_mob_list)
- if(G.summoner == user)
- to_chat(user, "You already have a [mob_name]!")
- return
+ if(has_guardian(user))
+ to_chat(user, "You already have a [mob_name]!")
+ return
if(user.mind && (user.mind.changeling || user.mind.vampire))
to_chat(user, "[ling_failure]")
return
@@ -285,6 +284,10 @@
if(candidates.len)
theghost = pick(candidates)
+ if(has_guardian(user))
+ to_chat(user, "You already have a [mob_name]!")
+ used = FALSE
+ return
spawn_guardian(user, theghost.key, guardian_type)
else
to_chat(user, "[failure_message]")
@@ -295,6 +298,13 @@
if(used)
. += "[used_message]"
+/obj/item/guardiancreator/proc/has_guardian(mob/living/user)
+ for(var/mob/living/simple_animal/hostile/guardian/G in GLOB.alive_mob_list)
+ if(G.summoner == user)
+ return TRUE
+ return FALSE
+
+
/obj/item/guardiancreator/proc/spawn_guardian(mob/living/user, key, guardian_type)
var/pickedtype = /mob/living/simple_animal/hostile/guardian/punch
switch(guardian_type)
@@ -333,6 +343,7 @@
to_chat(G, "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there.")
to_chat(G, "While personally invincible, you will die if [user.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself.")
to_chat(G, "[G.playstyle_string]")
+ to_chat(G, "For more information, check the wiki page: ([config.wikiurl]/index.php/Guardian)")
G.faction = user.faction
var/color = pick(color_list)
diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm
index dd1a198f6f8..f24166b1381 100644
--- a/code/game/gamemodes/miniantags/morph/morph_event.dm
+++ b/code/game/gamemodes/miniantags/morph/morph_event.dm
@@ -26,6 +26,7 @@
player_mind.special_role = SPECIAL_ROLE_MORPH
SSticker.mode.traitors |= player_mind
to_chat(S, S.playstyle_string)
+ to_chat(S, "For more information, check the wiki page: ([config.wikiurl]/index.php/Morph)")
SEND_SOUND(S, sound('sound/magic/mutate.ogg'))
message_admins("[key_of_morph] has been made into morph by an event.")
log_game("[key_of_morph] was spawned as a morph by an event.")
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index fb46533b817..9373861798e 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -168,7 +168,7 @@
to_chat(src, "You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable.")
to_chat(src, "To function, you are to drain the life essence from humans. This essence is a resource, as well as your health, and will power all of your abilities.")
to_chat(src, "You do not remember anything of your past lives, nor will you remember anything about this one after your death.")
- to_chat(src, "Be sure to read the wiki page at http://www.paradisestation.org/wiki/index.php/Revenant to learn more.")
+ to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Revenant)")
var/datum/objective/revenant/objective = new
objective.owner = mind
mind.objectives += objective
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index b488e0a826c..88ce7fbff99 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -92,6 +92,7 @@
mind.objectives += fluffObjective
to_chat(src, "Objective #[1]: [objective.explanation_text]")
to_chat(src, "Objective #[2]: [fluffObjective.explanation_text]")
+ to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Slaughter_Demon)")
/obj/effect/decal/cleanable/blood/innards
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 11b49f225bf..9540efe8f89 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -245,6 +245,7 @@
for(var/datum/objective/objective in syndicate.objectives)
to_chat(syndicate.current, "Objective #[obj_count]: [objective.explanation_text]")
obj_count++
+ to_chat(syndicate.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Nuclear_Agent)")
return
@@ -452,10 +453,9 @@
for(var/obj/machinery/nuclearbomb/nuke in GLOB.machines)
if(nuke.r_code == "Nope") continue
- var/turf/T = get_turf(nuke)
- var/area/A = T.loc
+ var/area/A = get_area(nuke)
- var/list/thousand_penalty = list(/area/wizard_station, /area/solar, /area)
+ var/list/thousand_penalty = list(/area/solar)
var/list/fiftythousand_penalty = list(/area/security/main, /area/security/brig, /area/security/armoury, /area/security/checkpoint2)
if(is_type_in_list(A, thousand_penalty))
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index a1f214fa4a1..3fb59002032 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -14,7 +14,8 @@ GLOBAL_VAR(bomb_set)
icon_state = "nuclearbomb0"
density = 1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- var/extended = FALSE
+ anchored = TRUE
+ var/extended = TRUE
var/lighthack = FALSE
var/timeleft = 120
var/timing = FALSE
@@ -34,6 +35,10 @@ GLOBAL_VAR(bomb_set)
/obj/machinery/nuclearbomb/syndicate
is_syndicate = TRUE
+/obj/machinery/nuclearbomb/undeployed
+ extended = FALSE
+ anchored = FALSE
+
/obj/machinery/nuclearbomb/New()
..()
r_code = rand(10000, 99999.0) // Creates a random code upon object spawn.
@@ -269,11 +274,6 @@ GLOBAL_VAR(bomb_set)
else
code = "ERROR"
return
-
- if(!yes_code) // All requests below here require both NAD inserted AND code correct
- return
-
- switch(action)
if("toggle_anchor")
if(removal_stage == NUKE_MOBILE)
anchored = FALSE
@@ -288,6 +288,11 @@ GLOBAL_VAR(bomb_set)
else
visible_message("The anchoring bolts slide back into the depths of [src].")
return
+
+ if(!yes_code) // All requests below here require both NAD inserted AND code correct
+ return
+
+ switch(action)
if("set_time")
var/time = input(usr, "Detonation time (seconds, min 120, max 600)", "Input Time", 120) as num|null
if(time)
@@ -354,8 +359,9 @@ GLOBAL_VAR(bomb_set)
var/off_station = 0
var/turf/bomb_location = get_turf(src)
+ var/area/A = get_area(src)
if( bomb_location && is_station_level(bomb_location.z) )
- if( (bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE)) )
+ if( (bomb_location.x < (128 - NUKERANGE)) || (bomb_location.x > (128 + NUKERANGE)) || (bomb_location.y < (128 - NUKERANGE)) || (bomb_location.y > (128 + NUKERANGE)) && (!(A in GLOB.the_station_areas)))
off_station = 1
else
off_station = 2
@@ -376,9 +382,9 @@ GLOBAL_VAR(bomb_set)
else if(off_station == 2)
to_chat(world, "A nuclear device was set off, but the device was not on the station!")
else
- to_chat(world, "The station was destoyed by the nuclear blast!")
+ to_chat(world, "The station was destroyed by the nuclear blast!")
- SSticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated.
+ SSticker.mode.station_was_nuked = (off_station < 2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated.
//kinda shit but I couldn't get permission to do what I wanted to do.
if(!SSticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 9837b1ea896..b7ff2d7992e 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -262,11 +262,13 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/block/check_completion()
if(!istype(owner.current, /mob/living/silicon))
- return 0
+ return FALSE
+ if(SSticker.mode.station_was_nuked)
+ return TRUE
if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME)
- return 0
+ return FALSE
if(!owner.current)
- return 0
+ return FALSE
var/area/A = SSshuttle.emergency.areaInstance
@@ -276,9 +278,9 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(player.mind && player.stat != DEAD)
if(get_area(player) == A)
- return 0 // If there are any other organic mobs on the shuttle, you failed the objective.
+ return FALSE // If there are any other organic mobs on the shuttle, you failed the objective.
- return 1
+ return TRUE
/datum/objective/escape
explanation_text = "Escape on the shuttle or an escape pod alive and free."
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index c8a9d39e555..a89f12f06ce 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -110,6 +110,7 @@
to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]")
rev_mind.special_role = SPECIAL_ROLE_HEAD_REV
obj_count++
+ to_chat(rev_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Revolution)")
/////////////////////////////////////////////////////////////////////////////////
//This are equips the rev heads with their gear, and makes the clown not clumsy//
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index 9ce71866e88..d749f8ef553 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -114,18 +114,21 @@
if(G.block)
if(G.block in blocks_assigned)
warning("DNA2: Gene [G.name] trying to use already-assigned block [G.block] (used by [english_list(blocks_assigned[G.block])])")
- GLOB.dna_mutations.Add(G)
+ GLOB.dna_mutations[mutation_type] = G
var/list/assignedToBlock[0]
if(blocks_assigned[G.block])
- assignedToBlock=blocks_assigned[G.block]
+ assignedToBlock = blocks_assigned[G.block]
assignedToBlock.Add(G.name)
- blocks_assigned[G.block]=assignedToBlock
+ blocks_assigned[G.block] = assignedToBlock
//testing("DNA2: Gene [G.name] assigned to block [G.block].")
+ else
+ qdel(G)
// I WILL HAVE A LIST OF MUTATIONS THAT MATCHES THE RANDOMIZED BLOCKS GODDAMNIT!
for(var/block in 1 to DNA_SE_LENGTH)
var/name = GLOB.assigned_blocks[block]
- for(var/datum/mutation/mutation in GLOB.dna_mutations)
+ for(var/mutation_type in GLOB.dna_mutations)
+ var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type]
if(mutation.name == name || mutation.block == block)
if(mutation.block in GLOB.assigned_mutation_blocks)
warning("DNA2: Mutation [mutation.name] trying to add to already assigned gene block list (used by [english_list(GLOB.assigned_mutation_blocks[block])])")
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index a017b6d9af0..67109419040 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -126,8 +126,7 @@ Made by Xhuis
to_chat(shadow.current, "Currently, you are disguised as an employee aboard [world.name].")
to_chat(shadow.current, "In your limited state, you have two abilities: Hatch and Shadowling Hivemind (:8).")
to_chat(shadow.current, "Any other shadowlings are your allies. You must assist them as they shall assist you.")
- to_chat(shadow.current, "If you are new to shadowling, or want to read about abilities, check the wiki page at https://www.paradisestation.org/wiki/index.php/Shadowling ")
-
+ to_chat(shadow.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Shadowling)")
/datum/game_mode/proc/process_shadow_objectives(datum/mind/shadow_mind)
@@ -169,6 +168,7 @@ Made by Xhuis
to_chat(new_thrall_mind.current, "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.")
to_chat(new_thrall_mind.current, "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.")
to_chat(new_thrall_mind.current, "You may communicate with your allies by speaking in the Shadowling Hivemind (:8).")
+ to_chat(new_thrall_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Shadowling)")
if(jobban_isbanned(new_thrall_mind.current, ROLE_SHADOWLING) || jobban_isbanned(new_thrall_mind.current, ROLE_SYNDICATE))
replace_jobbanned_player(new_thrall_mind.current, ROLE_SHADOWLING)
if(!victory_warning_announced && (length(shadowling_thralls) >= warning_threshold))//are the slings very close to winning?
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 7d2f0e404f5..ff3a6152da1 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -193,8 +193,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
for(var/datum/objective/objective in vampire.objectives)
to_chat(vampire.current, "Objective #[obj_count]: [objective.explanation_text]")
obj_count++
+ to_chat(vampire.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Vampire)")
return
-
/datum/vampire
var/bloodtotal = 0 // CHANGE TO ZERO WHEN PLAYTESTING HAPPENS
var/bloodusable = 0 // CHANGE TO ZERO WHEN PLAYTESTING HAPPENS
@@ -220,6 +220,10 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
/obj/effect/proc_holder/spell/vampire/targetted/enthrall = 300,
/datum/vampire_passive/full = 500)
+/datum/vampire/proc/adjust_nullification(base, extra)
+ // First hit should give full nullification, while subsequent hits increase the value slower
+ nullified = max(nullified + extra, base)
+
/datum/vampire/New(gend = FEMALE)
gender = gend
@@ -286,7 +290,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
draining = null
return
add_attack_logs(owner, H, "vampirebit & is draining their blood.", ATKLOG_ALMOSTALL)
- owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [owner.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.")
+ owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [H.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.")
if(!iscarbon(owner))
H.LAssailant = null
else
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index cd7c5d21546..6c1b6052a78 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -95,6 +95,10 @@
to_chat(user, "\"Come now, do not capture your fellow's soul.\"")
return ..()
+ if(M.mind.offstation_role && M.mind.special_role != SPECIAL_ROLE_ERT)
+ to_chat(user, "This being's soul seems worthless. Not even the stone will absorb it.")
+ return ..()
+
if(optional)
if(!M.ckey)
to_chat(user, "They have no soul!")
@@ -312,9 +316,9 @@
"Wraith" = /mob/living/simple_animal/hostile/construct/wraith,
"Artificer" = /mob/living/simple_animal/hostile/construct/builder)
/// Custom construct icons for different cults
- var/list/construct_icons = list("Juggernaut" = image(icon = 'icons/mob/mob.dmi', icon_state = SSticker.cultdat.get_icon("juggernaut")),
- "Wraith" = image(icon = 'icons/mob/mob.dmi', icon_state = SSticker.cultdat.get_icon("wraith")),
- "Artificer" = image(icon = 'icons/mob/mob.dmi', icon_state = SSticker.cultdat.get_icon("builder")))
+ var/list/construct_icons = list("Juggernaut" = image(icon = 'icons/mob/cult.dmi', icon_state = SSticker.cultdat.get_icon("juggernaut")),
+ "Wraith" = image(icon = 'icons/mob/cult.dmi', icon_state = SSticker.cultdat.get_icon("wraith")),
+ "Artificer" = image(icon = 'icons/mob/cult.dmi', icon_state = SSticker.cultdat.get_icon("builder")))
if(shade)
var/construct_choice = show_radial_menu(user, shell, construct_icons, custom_check = CALLBACK(src, .proc/radial_check, user), require_near = TRUE)
@@ -323,6 +327,7 @@
var/mob/living/simple_animal/hostile/construct/C = new picked_class(shell.loc)
C.init_construct(shade, src, shell)
to_chat(C, C.playstyle_string)
+ to_chat(C, "For more information, check the wiki page: ([config.wikiurl]/index.php/Construct)")
else
to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!")
@@ -339,13 +344,11 @@
if(shade.mind)
shade.mind.transfer_to(src)
if(SS.purified)
- set_light(3, 5, LIGHT_COLOR_DARK_BLUE)
- name = "Holy [name]"
- real_name = "Holy [real_name]"
-
+ make_holy()
// Replace regular soulstone summoning with purified soulstones
- RemoveSpell(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone)
- AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/holy)
+ if(is_type_in_list(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone, mob_spell_list))
+ RemoveSpell(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone)
+ AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/holy)
else if(iscultist(src)) // Re-grant cult actions, lost in the transfer
var/datum/action/innate/cult/comm/CC = new
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index b3c84d28ec4..c22a26181ad 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -88,7 +88,7 @@
if(!S)
S = new spell_type()
var/dat =""
- dat += "[initial(S.name)]"
+ dat += "[name]"
if(S.charge_type == "recharge")
dat += " Cooldown:[S.charge_max/10]"
dat += " Cost:[cost] "
@@ -172,18 +172,6 @@
log_name = "IG"
category = "Offensive"
-/datum/spellbook_entry/sacred_flame
- name = "Sacred Flame"
- spell_type = /obj/effect/proc_holder/spell/targeted/sacred_flame
- cost = 1
- log_name = "SF"
- refundable = 0 //You get fire immunity out of it, no.
-
-/datum/spellbook_entry/sacred_flame/LearnSpell(mob/living/carbon/human/user, obj/item/spellbook/book, obj/effect/proc_holder/spell/newspell)
- ..()
- user.dna.SetSEState(GLOB.coldblock, 1)
- singlemutcheck(user, GLOB.coldblock, MUTCHK_FORCED)
-
//Defensive
/datum/spellbook_entry/disabletech
name = "Disable Tech"
@@ -239,6 +227,25 @@
log_name = "TS"
category = "Defensive"
+/datum/spellbook_entry/sacred_flame
+ name = "Sacred Flame and Fire Immunity"
+ spell_type = /obj/effect/proc_holder/spell/targeted/sacred_flame
+ cost = 1
+ log_name = "SF"
+ category = "Defensive"
+
+/datum/spellbook_entry/sacred_flame/LearnSpell(mob/living/carbon/human/user, obj/item/spellbook/book, obj/effect/proc_holder/spell/newspell)
+ to_chat(user, "You feel fireproof.")
+ ADD_TRAIT(user, TRAIT_RESISTHEAT, MAGIC_TRAIT)
+ ADD_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT)
+ return ..()
+
+/datum/spellbook_entry/sacred_flame/Refund(mob/living/carbon/human/user, obj/item/spellbook/book)
+ to_chat(user, "You no longer feel fireproof.")
+ REMOVE_TRAIT(user, TRAIT_RESISTHEAT, MAGIC_TRAIT)
+ REMOVE_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT)
+ return ..()
+
//Mobility
/datum/spellbook_entry/knock
name = "Knock"
@@ -431,7 +438,7 @@
category = "Artefacts"
/datum/spellbook_entry/item/voice_of_god
- name = "Voice of god"
+ name = "Voice of God"
desc = "A magical vocal cord that can be used to yell out with the voice of a god, be it to harm, help, or confuse the target."
item_path = /obj/item/organ/internal/vocal_cords/colossus/wizard
log_name = "VG"
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index 43e768a1ef2..d076afbaadb 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -108,6 +108,7 @@
for(var/datum/objective/objective in wizard.objectives)
to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]")
obj_count++
+ to_chat(wizard.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Wizard)")
return
/*/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 6eaaf03aaef..f2b28fea297 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -400,6 +400,9 @@
/proc/get_all_centcom_jobs()
return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team Member","Emergency Response Team Leader","Intel Officer","Medical Officer","Death Commando","Research Officer","Deathsquad Officer","Special Operations Officer","Nanotrasen Navy Representative","Nanotrasen Navy Officer","Nanotrasen Navy Captain","Supreme Commander")
+/proc/get_all_solgov_jobs()
+ return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader")
+
//gets the actual job rank (ignoring alt titles)
//this is used solely for sechuds
/obj/proc/GetJobRealName()
@@ -424,24 +427,6 @@
return "Unknown"
-//gets the alt title, failing that the actual job rank
-//this is unused
-// THEN WHY IS IT STILL HERE?? -AA07, 2020-07-31
-/obj/proc/sdsdsd() //GetJobDisplayName
- if(!istype(src, /obj/item/pda) && !istype(src,/obj/item/card/id))
- return
-
- var/assignment
- if(istype(src, /obj/item/pda))
- if(src:id)
- assignment = src:id:assignment
- else if(istype(src, /obj/item/card/id))
- assignment = src:assignment
-
- if(assignment)
- return assignment
-
- return "Unknown"
/proc/GetIdCard(mob/living/carbon/human/H)
if(H.wear_id)
@@ -499,12 +484,18 @@
var/job_icons = get_all_job_icons()
var/centcom = get_all_centcom_jobs()
+ var/solgov = get_all_solgov_jobs()
if(assignmentName in centcom) //Return with the NT logo if it is a Centcom job
return "Centcom"
if(rankName in centcom)
return "Centcom"
+ if(assignmentName in solgov) //Return with the SolGov logo if it is a SolGov job
+ return "solgov"
+ if(rankName in solgov)
+ return "solgov"
+
if(assignmentName in job_icons) //Check if the job has a hud icon
return assignmentName
if(rankName in job_icons)
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 670e58247d4..05d16c49c6c 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -481,7 +481,7 @@
if(unknown_body || e.hidden)
imp += "Unknown body present:"
- if(!AN && !open && !infected & !imp)
+ if(!AN && !open && !infected && !imp)
AN = "None:"
dat += "
"
dat += ""
diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm
index 1e1a39d49d0..024274aa973 100644
--- a/code/game/objects/items/mixing_bowl.dm
+++ b/code/game/objects/items/mixing_bowl.dm
@@ -31,7 +31,7 @@
return 1
if(istype(I, /obj/item/stack))
var/obj/item/stack/S = I
- if(S.amount > 1)
+ if(S.get_amount() > 1)
var/obj/item/stack/to_add = S.split(user, 1)
to_add.forceMove(src)
user.visible_message("[user] adds one of [S] to [src].", "You add one of [S] to [src].")
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 81733bd91e7..bcc5bd35dd9 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -7,19 +7,72 @@
icon = 'icons/obj/module.dmi'
icon_state = "cyborg_upgrade"
origin_tech = "programming=2"
- var/locked = 0
- var/installed = 0
+ /// Whether or not the cyborg needs to have a chosen module before they can recieve this upgrade.
var/require_module = FALSE
+ /// The type of module this upgrade is compatible with: Engineering, Medical, etc.
var/module_type = null
+ /// A list of items, and their replacements that this upgrade should replace on installation, in the format of `item_type_to_replace = replacement_item_type`.
+ var/list/items_to_replace = list()
+ /// A list of replacement items will need to be placed into a cyborg module's `special_rechargable` list after this upgrade is installed.
+ var/list/special_rechargables = list()
+/**
+ * Called when someone clicks on a borg with an upgrade in their hand.
+ *
+ * Arguments:
+ * * R - the cyborg that was clicked on with an upgrade.
+ */
/obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R)
+ if(!pre_install_checks(R))
+ return
+ if(!do_install(R))
+ return
+ after_install(R)
+ return TRUE
+
+/**
+ * Checks if the upgrade is able to be applied to the cyborg, before actually applying it.
+ *
+ * Arguments:
+ * * R - the cyborg that was clicked on with an upgrade.
+ */
+/obj/item/borg/upgrade/proc/pre_install_checks(mob/living/silicon/robot/R)
if(R.stat == DEAD)
- to_chat(usr, "[src] will not function on a deceased cyborg.")
- return TRUE
+ to_chat(usr, "[src] will not function on a deceased cyborg.")
+ return FALSE
if(module_type && !istype(R.module, module_type))
- to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!")
- to_chat(usr, "There's no mounting point for the module!")
- return TRUE
+ to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!")
+ to_chat(usr, "There's no mounting point for the module!")
+ return FALSE
+ return TRUE
+
+/**
+ * Executes code that will modify the cyborg or its module.
+ *
+ * Arguments:
+ * * R - the cyborg we're applying the upgrade to.
+ */
+/obj/item/borg/upgrade/proc/do_install(mob/living/silicon/robot/R)
+ return TRUE
+
+/**
+ * Executes code after the module has been installed and the cyborg has been modified in some way.
+ *
+ * Arguments:
+ * * R - the cyborg that we've applied the upgrade to.
+ */
+/obj/item/borg/upgrade/proc/after_install(mob/living/silicon/robot/R)
+ for(var/item in items_to_replace)
+ var/replacement_type = items_to_replace[item]
+ var/obj/item/replacement = new replacement_type(R.module)
+ R.module.remove_item_from_lists(item)
+ R.module.basic_modules += replacement
+
+ if(replacement_type in special_rechargables)
+ R.module.special_rechargables += replacement
+
+ R.module.rebuild_modules()
+ return TRUE
/obj/item/borg/upgrade/reset
name = "cyborg module reset board"
@@ -27,14 +80,13 @@
icon_state = "cyborg_upgrade1"
require_module = TRUE
-/obj/item/borg/upgrade/reset/action(mob/living/silicon/robot/R)
- if(..())
- return
-
+/obj/item/borg/upgrade/reset/do_install(mob/living/silicon/robot/R)
R.reset_module()
-
return TRUE
+/obj/item/borg/upgrade/reset/after_install(mob/living/silicon/robot/R)
+ return // We don't need to give them replacement items, or rebuild their module list. It's going to be a blank borg.
+
/obj/item/borg/upgrade/rename
name = "cyborg reclassification board"
desc = "Used to rename a cyborg."
@@ -44,9 +96,7 @@
/obj/item/borg/upgrade/rename/attack_self(mob/user)
heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN)
-/obj/item/borg/upgrade/rename/action(mob/living/silicon/robot/R)
- if(..())
- return
+/obj/item/borg/upgrade/rename/do_install(mob/living/silicon/robot/R)
if(!R.allow_rename)
to_chat(R, "Internal diagnostic error: incompatible upgrade module detected.")
return 0
@@ -63,7 +113,7 @@
desc = "Used to force a reboot of a disabled-but-repaired cyborg, bringing it back online."
icon_state = "cyborg_upgrade1"
-/obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R)
+/obj/item/borg/upgrade/restart/do_install(mob/living/silicon/robot/R)
if(R.health < 0)
to_chat(usr, "You have to repair the cyborg before using this module!")
return 0
@@ -88,9 +138,7 @@
require_module = TRUE
origin_tech = "engineering=4;materials=5;programming=4"
-/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R)
- if(..())
- return
+/obj/item/borg/upgrade/vtec/do_install(mob/living/silicon/robot/R)
if(R.speed < 0)
to_chat(R, "A VTEC unit is already installed!")
to_chat(usr, "There's no room for another VTEC unit!")
@@ -108,10 +156,7 @@
require_module = TRUE
module_type = /obj/item/robot_module/security
-/obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R)
- if(..())
- return
-
+/obj/item/borg/upgrade/disablercooler/do_install(mob/living/silicon/robot/R)
var/obj/item/gun/energy/disabler/cyborg/T = locate() in R.module.modules
if(!T)
to_chat(usr, "There's no disabler in this unit!")
@@ -131,10 +176,7 @@
icon_state = "cyborg_upgrade3"
origin_tech = "engineering=4;powerstorage=4"
-/obj/item/borg/upgrade/thrusters/action(mob/living/silicon/robot/R)
- if(..())
- return
-
+/obj/item/borg/upgrade/thrusters/do_install(mob/living/silicon/robot/R)
if(R.ionpulse)
to_chat(usr, "This unit already has ion thrusters installed!")
return
@@ -149,20 +191,9 @@
origin_tech = "engineering=4;materials=5"
require_module = TRUE
module_type = /obj/item/robot_module/miner
-
-/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R)
- if(..())
- return
-
- for(var/obj/item/pickaxe/drill/cyborg/D in R.module.modules)
- qdel(D)
- for(var/obj/item/shovel/S in R.module.modules)
- qdel(S)
-
- R.module.modules += new /obj/item/pickaxe/drill/cyborg/diamond(R.module)
- R.module.rebuild()
-
- return TRUE
+ items_to_replace = list(
+ /obj/item/pickaxe/drill/cyborg = /obj/item/pickaxe/drill/cyborg/diamond
+ )
/obj/item/borg/upgrade/soh
name = "mining cyborg satchel of holding"
@@ -171,18 +202,9 @@
origin_tech = "engineering=4;materials=4;bluespace=4"
require_module = TRUE
module_type = /obj/item/robot_module/miner
-
-/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
- if(..())
- return
-
- for(var/obj/item/storage/bag/ore/cyborg/S in R.module.modules)
- qdel(S)
-
- R.module.modules += new /obj/item/storage/bag/ore/holding(R.module)
- R.module.rebuild()
-
- return TRUE
+ items_to_replace = list(
+ /obj/item/storage/bag/ore/cyborg = /obj/item/storage/bag/ore/holding
+ )
/obj/item/borg/upgrade/abductor_engi
name = "engineering cyborg abductor upgrade"
@@ -191,33 +213,17 @@
origin_tech = "engineering=6;materials=6;abductor=3"
require_module = TRUE
module_type = /obj/item/robot_module/engineering
-
-/obj/item/borg/upgrade/abductor_engi/action(mob/living/silicon/robot/R)
- if(..())
- return
-
- for(var/obj/item/weldingtool/largetank/cyborg/W in R.module.modules)
- qdel(W)
- for(var/obj/item/screwdriver/cyborg/S in R.module.modules)
- qdel(S)
- for(var/obj/item/wrench/cyborg/E in R.module.modules)
- qdel(E)
- for(var/obj/item/crowbar/cyborg/C in R.module.modules)
- qdel(C)
- for(var/obj/item/wirecutters/cyborg/I in R.module.modules)
- qdel(I)
- for(var/obj/item/multitool/cyborg/M in R.module.modules)
- qdel(M)
-
- R.module.modules += new /obj/item/weldingtool/abductor(R.module)
- R.module.modules += new /obj/item/wrench/abductor(R.module)
- R.module.modules += new /obj/item/screwdriver/abductor(R.module)
- R.module.modules += new /obj/item/crowbar/abductor(R.module)
- R.module.modules += new /obj/item/wirecutters/abductor(R.module)
- R.module.modules += new /obj/item/multitool/abductor(R.module)
- R.module.rebuild()
-
- return TRUE
+ items_to_replace = list(
+ /obj/item/weldingtool = /obj/item/weldingtool/abductor,
+ /obj/item/wrench = /obj/item/wrench/abductor,
+ /obj/item/screwdriver = /obj/item/screwdriver/abductor,
+ /obj/item/crowbar = /obj/item/crowbar/abductor,
+ /obj/item/wirecutters = /obj/item/wirecutters/abductor,
+ /obj/item/multitool = /obj/item/multitool/abductor
+ )
+ special_rechargables = list(
+ /obj/item/weldingtool/abductor
+ )
/obj/item/borg/upgrade/abductor_medi
name = "medical cyborg abductor upgrade"
@@ -226,39 +232,16 @@
origin_tech = "biotech=6;materials=6;abductor=3"
require_module = TRUE
module_type = /obj/item/robot_module/medical
-
-/obj/item/borg/upgrade/abductor_medi/action(mob/living/silicon/robot/R)
- if(..())
- return
-
- for(var/obj/item/scalpel/laser/laser1/L in R.module.modules)
- qdel(L)
- for(var/obj/item/hemostat/H in R.module.modules)
- qdel(H)
- for(var/obj/item/retractor/E in R.module.modules)
- qdel(E)
- for(var/obj/item/bonegel/B in R.module.modules)
- qdel(B)
- for(var/obj/item/FixOVein/F in R.module.modules)
- qdel(F)
- for(var/obj/item/bonesetter/S in R.module.modules)
- qdel(S)
- for(var/obj/item/circular_saw/C in R.module.modules)
- qdel(C)
- for(var/obj/item/surgicaldrill/D in R.module.modules)
- qdel(D)
-
- R.module.modules += new /obj/item/scalpel/laser/laser3(R.module) //no abductor laser scalpel, so next best thing.
- R.module.modules += new /obj/item/hemostat/alien(R.module)
- R.module.modules += new /obj/item/retractor/alien(R.module)
- R.module.modules += new /obj/item/bonegel/alien(R.module)
- R.module.modules += new /obj/item/FixOVein/alien(R.module)
- R.module.modules += new /obj/item/bonesetter/alien(R.module)
- R.module.modules += new /obj/item/circular_saw/alien(R.module)
- R.module.modules += new /obj/item/surgicaldrill/alien(R.module)
- R.module.rebuild()
-
- return TRUE
+ items_to_replace = list(
+ /obj/item/scalpel/laser/laser1 = /obj/item/scalpel/laser/laser3, // No abductor laser scalpel, so next best thing.
+ /obj/item/hemostat = /obj/item/hemostat/alien,
+ /obj/item/retractor = /obj/item/retractor/alien,
+ /obj/item/bonegel = /obj/item/bonegel/alien,
+ /obj/item/FixOVein = /obj/item/FixOVein/alien,
+ /obj/item/bonesetter = /obj/item/bonesetter/alien,
+ /obj/item/circular_saw = /obj/item/circular_saw/alien,
+ /obj/item/surgicaldrill = /obj/item/surgicaldrill/alien
+ )
/obj/item/borg/upgrade/syndicate
name = "safety override module"
@@ -267,13 +250,11 @@
origin_tech = "combat=6;materials=6"
require_module = TRUE
-/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R)
- if(..())
- return
+/obj/item/borg/upgrade/syndicate/do_install(mob/living/silicon/robot/R)
if(R.weapons_unlock)
- to_chat(R, "Warning: Safety Overide Protocols have be disabled.")
- return
- R.weapons_unlock = 1
+ return // They already had the safety override upgrade, or they're a cyborg type which has this by default.
+ R.weapons_unlock = TRUE
+ to_chat(R, "Warning: Safety Overide Protocols have be disabled.")
return TRUE
/obj/item/borg/upgrade/lavaproof
@@ -284,9 +265,7 @@
require_module = TRUE
module_type = /obj/item/robot_module/miner
-/obj/item/borg/upgrade/lavaproof/action(mob/living/silicon/robot/R)
- if(..())
- return
+/obj/item/borg/upgrade/lavaproof/do_install(mob/living/silicon/robot/R)
if(istype(R))
R.weather_immunities += "lava"
return TRUE
@@ -303,10 +282,7 @@
var/powercost = 10
var/mob/living/silicon/robot/cyborg
-/obj/item/borg/upgrade/selfrepair/action(mob/living/silicon/robot/R)
- if(..())
- return
-
+/obj/item/borg/upgrade/selfrepair/do_install(mob/living/silicon/robot/R)
var/obj/item/borg/upgrade/selfrepair/U = locate() in R
if(U)
to_chat(usr, "This unit is already equipped with a self-repair module.")
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index f9d02c8f515..a0bd2a3f708 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -17,13 +17,18 @@
var/healverb = "bandage"
/obj/item/stack/medical/attack(mob/living/M, mob/user)
+ if(get_amount() <= 0)
+ if(is_cyborg)
+ to_chat(user, "You don't have enough energy to dispense more [singular_name]\s!")
+ return TRUE
+
if(!iscarbon(M) && !isanimal(M))
to_chat(user, "[src] cannot be applied to [M]!")
- return 1
+ return TRUE
if(!user.IsAdvancedToolUser())
to_chat(user, "You don't have the dexterity to do this!")
- return 1
+ return TRUE
if(ishuman(M))
@@ -167,7 +172,12 @@
heal_brute = 25
stop_bleeding = 0
+/obj/item/stack/medical/bruise_pack/advanced/cyborg
+ energy_type = /datum/robot_energy_storage/medical/adv_brute_kit
+ is_cyborg = TRUE
+/obj/item/stack/medical/bruise_pack/advanced/cyborg/syndicate
+ energy_type = /datum/robot_energy_storage/medical/adv_brute_kit/syndicate
//Ointment//
@@ -208,6 +218,13 @@
icon_state = "burnkit"
heal_burn = 25
+/obj/item/stack/medical/ointment/advanced/cyborg
+ energy_type = /datum/robot_energy_storage/medical/adv_burn_kit
+ is_cyborg = TRUE
+
+/obj/item/stack/medical/ointment/advanced/cyborg/syndicate
+ energy_type = /datum/robot_energy_storage/medical/adv_burn_kit/syndicate
+
//Medical Herbs//
/obj/item/stack/medical/bruise_pack/comfrey
name = "\improper Comfrey leaf"
@@ -283,6 +300,13 @@
H.handle_splints()
use(1)
+/obj/item/stack/medical/splint/cyborg
+ energy_type = /datum/robot_energy_storage/medical/splint
+ is_cyborg = TRUE
+
+/obj/item/stack/medical/splint/cyborg/syndicate
+ energy_type = /datum/robot_energy_storage/medical/splint/syndicate
+
/obj/item/stack/medical/splint/tribal
name = "tribal splints"
icon_state = "tribal_splint"
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index ff469ba3c59..11a5dc4c39c 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -63,3 +63,16 @@
to_chat(user, "Nothing to fix here.")
else
to_chat(user, "[src] won't work on that.")
+
+/obj/item/stack/nanopaste/cyborg
+ energy_type = /datum/robot_energy_storage/medical/nanopaste
+ is_cyborg = TRUE
+
+/obj/item/stack/nanopaste/cyborg/attack(mob/living/M, mob/user)
+ if(get_amount() <= 0)
+ to_chat(user, "You don't have enough energy to dispense more [name]!")
+ else
+ return ..()
+
+/obj/item/stack/nanopaste/cyborg/syndicate
+ energy_type = /datum/robot_energy_storage/medical/nanopaste/syndicate
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 3911ab51cc7..f9ec5cff198 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -21,10 +21,16 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
hitsound = 'sound/weapons/grenadelaunch.ogg'
toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
+ merge_type = /obj/item/stack/rods
/obj/item/stack/rods/cyborg
+ energy_type = /datum/robot_energy_storage/rods
+ is_cyborg = TRUE
materials = list()
+/obj/item/stack/rods/cyborg/update_icon()
+ return // icon_state should always be a full stack of rods.
+
/obj/item/stack/rods/ten
amount = 10
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 0e0bb55df85..91ededd189c 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -40,6 +40,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
amount = 50
/obj/item/stack/sheet/glass/cyborg
+ energy_type = /datum/robot_energy_storage/glass
+ is_cyborg = TRUE
materials = list()
/obj/item/stack/sheet/glass/New(loc, amount)
@@ -48,15 +50,15 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
/obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params)
..()
- if(istype(W,/obj/item/stack/cable_coil))
+ if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CC = W
- if(CC.amount < 5)
+ if(CC.get_amount() < 5)
to_chat(user, "There is not enough wire in this coil. You need 5 lengths.")
return
CC.use(5)
to_chat(user, "You attach wire to the [name].")
new /obj/item/stack/light_w(user.loc)
- src.use(1)
+ use(1)
else if( istype(W, /obj/item/stack/rods) )
var/obj/item/stack/rods/V = W
var/obj/item/stack/sheet/rglass/RG = new (user.loc)
@@ -97,9 +99,6 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
merge_type = /obj/item/stack/sheet/rglass
point_value = 4
-/obj/item/stack/sheet/rglass/cyborg
- materials = list()
-
/obj/item/stack/sheet/rglass/New(loc, amount)
recipes = GLOB.reinforced_glass_recipes
..()
@@ -109,6 +108,11 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/plasmabasic, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
))
+/obj/item/stack/sheet/rglass/cyborg
+ energy_type = /datum/robot_energy_storage/rglass
+ is_cyborg = TRUE
+ materials = list()
+
/obj/item/stack/sheet/plasmaglass
name = "plasma glass"
desc = "A very strong and very resistant sheet of a plasma-glass alloy."
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index 4eadda37c32..ddbe453a324 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -13,25 +13,16 @@
flags = CONDUCT
max_amount = 60
-/obj/item/stack/light_w/attackby(obj/item/O as obj, mob/user as mob, params)
+/obj/item/stack/light_w/attackby(obj/item/I, mob/user, params)
..()
- if(istype(O,/obj/item/wirecutters))
- var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)
+ if(istype(I, /obj/item/wirecutters))
+ var/obj/item/stack/cable_coil/CC = new(user.loc)
CC.amount = 5
- amount--
new/obj/item/stack/sheet/glass(user.loc)
- if(amount <= 0)
- user.unEquip(src, 1)
- qdel(src)
+ use(1)
- if(istype(O,/obj/item/stack/sheet/metal))
- var/obj/item/stack/sheet/metal/M = O
- M.amount--
- if(M.amount <= 0)
- user.unEquip(src, 1)
- qdel(M)
- amount--
- new/obj/item/stack/tile/light(user.loc)
- if(amount <= 0)
- user.unEquip(src, 1)
- qdel(src)
+ if(istype(I, /obj/item/stack/sheet/metal))
+ var/obj/item/stack/sheet/metal/M = I
+ M.use(1)
+ new /obj/item/stack/tile/light(user.loc)
+ use(1)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index a004cfd0de8..99dee4e4961 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -110,15 +110,13 @@ GLOBAL_LIST_INIT(metal_recipes, list(
point_value = 2
/obj/item/stack/sheet/metal/cyborg
+ energy_type = /datum/robot_energy_storage/metal
+ is_cyborg = TRUE
materials = list()
/obj/item/stack/sheet/metal/fifty
amount = 50
-/obj/item/stack/sheet/metal/ratvar_act()
- new /obj/item/stack/tile/brass(loc, amount)
- qdel(src)
-
/obj/item/stack/sheet/metal/narsie_act()
new /obj/item/stack/sheet/runed_metal(loc, amount)
qdel(src)
@@ -162,6 +160,10 @@ GLOBAL_LIST_INIT(plasteel_recipes, list(
recipes = GLOB.plasteel_recipes
return ..()
+/obj/item/stack/sheet/wood/cyborg
+ energy_type = /datum/robot_energy_storage/wood
+ is_cyborg = TRUE
+
/*
* Wood
*/
@@ -372,10 +374,6 @@ GLOBAL_LIST_INIT(cult_recipes, list ( \
. = ..()
icon_state = SSticker.cultdat?.runed_metal_icon_state
-/obj/item/stack/sheet/runed_metal/ratvar_act()
- new /obj/item/stack/tile/brass(loc, amount)
- qdel(src)
-
/obj/item/stack/sheet/runed_metal/attack_self(mob/living/user)
if(!iscultist(user))
to_chat(user, "Only one with forbidden knowledge could hope to work this metal...")
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index b57c3435132..6a2af11f0dc 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -10,7 +10,16 @@
*/
/obj/item/stack
origin_tech = "materials=1"
- var/list/recipes = list() // /datum/stack_recipe
+ /// Whether this stack is a `/cyborg` subtype or not.
+ var/is_cyborg = FALSE
+ /// The energy storage datum that will be used with this stack. Used only with `/cyborg` type stacks.
+ var/datum/robot_energy_storage/source
+ /// Which `robot_energy_storage` to choose when this stack is created in cyborgs. Used only with `/cyborg` type stacks.
+ var/energy_type
+ /// How much energy using 1 sheet from the stack costs. Used only with `/cyborg` type stacks.
+ var/cost = 1
+ /// A list of recipes buildable with this stack.
+ var/list/recipes = list()
var/singular_name
var/amount = 1
var/to_transfer = 0
@@ -52,15 +61,27 @@
/obj/item/stack/examine(mob/user)
. = ..()
- if(in_range(user, src))
+ if(!in_range(user, src))
+ return
+
+ if(is_cyborg)
if(singular_name)
- . += "There are [amount] [singular_name]\s in the stack."
+ . += "There is enough energy for [get_amount()] [singular_name]\s."
else
- . += "There are [amount] [name]\s in the stack."
- . +="Alt-click to take a custom amount."
+ . += "There is enough energy for [get_amount()]."
+ return
+
+ if(singular_name)
+ . += "There are [amount] [singular_name]\s in the stack."
+ else
+ . += "There are [amount] [name]\s in the stack."
+ . +="Alt-click to take a custom amount."
/obj/item/stack/proc/add(newamount)
- amount += newamount
+ if(is_cyborg)
+ source.add_charge(newamount * cost)
+ else
+ amount += newamount
update_icon()
/obj/item/stack/attack_self(mob/user)
@@ -87,8 +108,10 @@
if(!recipes)
return
- if(amount <= 0)
+ if(get_amount() <= 0)
user << browse(null, "window=stack")
+ if(is_cyborg)
+ to_chat(user, "You don't have enough energy to dispense more [name]!")
return
user.set_machine(src) //for correct work of onclose
@@ -98,7 +121,7 @@
var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist]
recipe_list = srl.recipes
- var/t1 = "Amount Left: [amount] "
+ var/t1 = "Amount Left: [get_amount()] "
for(var/i in 1 to recipe_list.len)
var/E = recipe_list[i]
if(isnull(E))
@@ -114,7 +137,7 @@
if(istype(E, /datum/stack_recipe))
var/datum/stack_recipe/R = E
- var/max_multiplier = round(amount / R.req_amount)
+ var/max_multiplier = round(get_amount() / R.req_amount)
var/title
var/can_build = 1
can_build = can_build && (max_multiplier > 0)
@@ -154,7 +177,7 @@
list_recipes(usr, text2num(href_list["sublist"]))
if(href_list["make"])
- if(amount < 1)
+ if(amount < 0 && !is_cyborg)
qdel(src) //Never should happen
var/list/recipes_list = recipes
@@ -167,8 +190,8 @@
if(!multiplier || multiplier <= 0 || multiplier > 50) // Href exploit checks
multiplier = 1
- if(amount < R.req_amount * multiplier)
- if(R.req_amount * multiplier>1)
+ if(get_amount() < R.req_amount * multiplier)
+ if(R.req_amount * multiplier > 1)
to_chat(usr, "You haven't got enough [src] to build \the [R.req_amount * multiplier] [R.title]\s!")
else
to_chat(usr, "You haven't got enough [src] to build \the [R.title]!")
@@ -195,7 +218,7 @@
if(!do_after(usr, R.time, target = usr))
return 0
- if(amount < R.req_amount * multiplier)
+ if(get_amount() < R.req_amount * multiplier)
return
var/atom/O
@@ -205,6 +228,7 @@
O = new R.result_type(usr.drop_location())
O.setDir(usr.dir)
use(R.req_amount * multiplier)
+ updateUsrDialog()
R.post_build(src, O)
@@ -231,6 +255,8 @@
/obj/item/stack/use(used, check = TRUE)
if(check && zero_amount())
return FALSE
+ if(is_cyborg)
+ return source.use_charge(used * cost)
if(amount < used)
return FALSE
amount -= used
@@ -240,6 +266,8 @@
return TRUE
/obj/item/stack/proc/get_amount()
+ if(is_cyborg)
+ return round(source.energy / cost)
return amount
/obj/item/stack/proc/get_max_amount()
@@ -258,7 +286,7 @@
return F
/obj/item/stack/attack_hand(mob/user)
- if(user.is_in_inactive_hand(src) && amount > 1)
+ if(user.is_in_inactive_hand(src) && get_amount() > 1)
change_stack(user, 1)
if(src && usr.machine == src)
spawn(0)
@@ -272,6 +300,8 @@
return
if(!in_range(src, user))
return
+ if(is_cyborg)
+ return
if(!ishuman(usr))
return
if(amount < 1)
@@ -305,11 +335,9 @@
// Returns TRUE if the stack amount is zero.
// Also qdels the stack gracefully if it is.
/obj/item/stack/proc/zero_amount()
+ if(is_cyborg)
+ return source.energy < cost
if(amount < 1)
- if(isrobot(loc))
- var/mob/living/silicon/robot/R = loc
- if(locate(src) in R.module.modules)
- R.module.modules -= src
if(ismob(loc))
var/mob/living/L = loc // At this stage, stack code is so horrible and atrocious, I wouldn't be all surprised ghosts can somehow have stacks. If this happens, then the world deserves to burn.
L.unEquip(src, TRUE)
@@ -325,7 +353,10 @@
if(QDELETED(S) || QDELETED(src) || S == src) //amusingly this can cause a stack to consume itself, let's not allow that.
return FALSE
var/transfer = get_amount()
- transfer = min(transfer, S.max_amount - S.amount)
+ if(S.is_cyborg)
+ transfer = min(transfer, round((S.source.max_energy - S.source.energy) / S.cost))
+ else
+ transfer = min(transfer, S.max_amount - S.amount)
if(transfer <= 0)
return
if(pulledby)
@@ -333,6 +364,7 @@
S.copy_evidences(src)
S.add(transfer)
use(transfer)
+ return transfer
/obj/item/stack/proc/copy_evidences(obj/item/stack/from)
blood_DNA = from.blood_DNA
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 007be9d3535..d148123be94 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -61,8 +61,13 @@
icon_state = "tile-wood"
origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/wood
+ merge_type = /obj/item/stack/tile/wood
resistance_flags = FLAMMABLE
+/obj/item/stack/tile/wood/cyborg
+ energy_type = /datum/robot_energy_storage/wood_tile
+ is_cyborg = TRUE
+
//Carpets
/obj/item/stack/tile/carpet
name = "carpet"
@@ -101,13 +106,17 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
+/obj/item/stack/tile/plasteel/cyborg
+ energy_type = /datum/robot_energy_storage/metal_tile
+ is_cyborg = TRUE
+
//Light
/obj/item/stack/tile/light
name = "light tiles"
gender = PLURAL
singular_name = "light floor tile"
- desc = "A floor tile, made out off glass. Use a multitool on it to change its color."
- icon_state = "tile_light blue"
+ desc = "A floor tile made of glass, with an integrated light. Use a multitool on it to change its color."
+ icon_state = "tile_white"
force = 3
throwforce = 5
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm
index bad1a325b26..61f512eff2e 100644
--- a/code/game/objects/items/tools/multitool.dm
+++ b/code/game/objects/items/tools/multitool.dm
@@ -12,7 +12,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "multitool"
flags = CONDUCT
- force = 5.0
+ force = 0
w_class = WEIGHT_CLASS_SMALL
throwforce = 0
throw_range = 7
@@ -24,7 +24,6 @@
toolspeed = 1
tool_behaviour = TOOL_MULTITOOL
hitsound = 'sound/weapons/tap.ogg'
- var/shows_wire_information = FALSE // shows what a wire does if set to TRUE
var/obj/machinery/buffer // simple machine buffer for device linkage
/obj/item/multitool/proc/IsBufferA(typepath)
@@ -95,7 +94,10 @@
/obj/item/multitool/ai_detect/admin
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item?
track_delay = 5
- shows_wire_information = TRUE
+
+/obj/item/multitool/ai_detect/admin/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT)
/obj/item/multitool/ai_detect/admin/multitool_detect()
var/turf/our_turf = get_turf(src)
@@ -112,6 +114,12 @@
desc = "Optimised and stripped-down version of a regular multitool."
toolspeed = 0.5
+/obj/item/multitool/cyborg/drone
+
+/obj/item/multitool/cyborg/drone/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT) // Drones are linked to the station
+
/obj/item/multitool/abductor
name = "alien multitool"
desc = "An omni-technological interface."
@@ -119,4 +127,7 @@
icon_state = "multitool"
toolspeed = 0.1
origin_tech = "magnets=5;engineering=5;abductor=3"
- shows_wire_information = TRUE
+
+/obj/item/multitool/abductor/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT)
diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm
index 41801fe0287..8ab4c12cf0f 100644
--- a/code/game/objects/items/tools/welder.dm
+++ b/code/game/objects/items/tools/welder.dm
@@ -177,6 +177,9 @@
update_torch()
..()
+/obj/item/weldingtool/cyborg_recharge(coeff, emagged)
+ if(reagents.check_and_add("fuel", maximum_fuel, 2 * coeff))
+ update_icon()
/obj/item/weldingtool/largetank
name = "industrial welding tool"
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index 12da212f4f3..17f4167868a 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -62,11 +62,21 @@
origin_tech = "materials=5;engineering=4;abductor=3"
random_color = FALSE
+/obj/item/wirecutters/abductor/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT)
+
/obj/item/wirecutters/cyborg
name = "wirecutters"
desc = "This cuts wires."
toolspeed = 0.5
+/obj/item/wirecutters/cyborg/drone
+
+/obj/item/wirecutters/cyborg/drone/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT) // Drones are linked to the station
+
/obj/item/wirecutters/power
name = "jaws of life"
desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a cutting head."
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 80dd45d1b02..c2ff3879968 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -52,12 +52,12 @@
icon_state = "waffles"
/obj/item/trash/plate
- name = "Plate"
+ name = "plate"
icon_state = "plate"
resistance_flags = NONE
/obj/item/trash/snack_bowl
- name = "Snack bowl"
+ name = "snack bowl"
icon_state = "snack_bowl"
/obj/item/trash/fried_vox
diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm
index 27583a7edd3..02827d3bcef 100644
--- a/code/game/objects/items/weapons/RCL.dm
+++ b/code/game/objects/items/weapons/RCL.dm
@@ -29,7 +29,7 @@
return
else
if(loaded.amount < max_amount)
- var/amount = min(loaded.amount + C.amount, max_amount)
+ var/amount = min(loaded.amount + C.get_amount(), max_amount)
C.use(amount - loaded.amount)
loaded.amount = amount
else
diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm
index 8f6f0b2a82f..f78232653a8 100644
--- a/code/game/objects/items/weapons/alien_specific.dm
+++ b/code/game/objects/items/weapons/alien_specific.dm
@@ -29,6 +29,7 @@
desc = "squirts smokey liquids."
icon = 'icons/mob/alien.dmi'
icon_state = "borg-spray-smoke"
+ list_reagents = list("water" = 50)
/obj/item/reagent_containers/spray/alien/smoke/afterattack(atom/A as mob|obj, mob/user as mob)
if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1)
@@ -45,17 +46,29 @@
smoke.start()
playsound(user.loc, 'sound/effects/bamf.ogg', 50, 2)
+/obj/item/reagent_containers/spray/alien/smoke/cyborg_recharge(coeff, emagged)
+ reagents.check_and_add("water", volume, 2 * coeff)
+
/obj/item/reagent_containers/spray/alien/acid
name = "acid synthesizer"
desc = "squirts burny liquids."
icon = 'icons/mob/alien.dmi'
icon_state = "borg-spray-acid"
+ list_reagents = list("facid" = 125, "sacid" = 125)
+
+/obj/item/reagent_containers/spray/alien/acid/cyborg_recharge(coeff, emagged)
+ reagents.check_and_add("facid", volume / 2, 2 * coeff) // Volume / 2 here becuase there should be an even amount of both chems.
+ reagents.check_and_add("sacid", volume / 2, 2 * coeff)
/obj/item/reagent_containers/spray/alien/stun
name = "paralytic toxin synthesizer"
desc = "squirts viagra."
icon = 'icons/mob/alien.dmi'
icon_state = "borg-spray-stun"
+ list_reagents = list("ether" = 250)
+
+/obj/item/reagent_containers/spray/alien/stun/cyborg_recharge(coeff, emagged)
+ reagents.check_and_add("ether", volume, 2 * coeff)
//SKREEEEEEEEEEEE tool
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 797932190ed..f181233e9ba 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -363,7 +363,7 @@
/obj/item/card/id/syndicate/attack_self(mob/user as mob)
if(!src.registered_name)
- var/t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name))
+ var/t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name), TRUE)
if(!t)
to_chat(user, "Invalid name.")
return
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 43808c9105f..d7993768fec 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -363,7 +363,7 @@
if(do_after(user, 30 * toolspeed, target = M)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.")
playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
- var/mob/dead/observer/ghost = H.get_ghost()
+ var/mob/dead/observer/ghost = H.get_ghost(TRUE)
if(ghost && !ghost.client)
// In case the ghost's not getting deleted for some reason
H.key = ghost.key
@@ -446,10 +446,13 @@
else if(total_burn >= 180 || total_brute >= 180)
user.visible_message("[defib] buzzes: Resuscitation failed - Severe tissue damage detected.")
else if(ghost)
- user.visible_message("[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.")
- to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)")
- window_flash(ghost.client)
- ghost << sound('sound/effects/genetics.ogg')
+ if(!ghost.can_reenter_corpse) // DNR or AntagHUD
+ user.visible_message("[defib] buzzes: Resucitation failed: No electrical brain activity detected.")
+ else
+ user.visible_message("[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.")
+ to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)")
+ window_flash(ghost.client)
+ ghost << sound('sound/effects/genetics.ogg')
else
user.visible_message("[defib] buzzes: Resuscitation failed.")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index ecc485737a4..0a3e8cd4a70 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -180,3 +180,6 @@
sleep(2)
else
return ..()
+
+/obj/item/extinguisher/cyborg_recharge(coeff, emagged)
+ reagents.check_and_add("water", max_water, 5 * coeff)
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 59880fdcc8c..0b9aeee47dd 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -39,7 +39,7 @@
if(ishuman(M) && M.mind?.vampire)
if(!M.mind.vampire.get_ability(/datum/vampire_passive/full))
to_chat(M, "The nullrod's power interferes with your own!")
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ M.mind.vampire.adjust_nullification(5, 2)
/obj/item/nullrod/pickup(mob/living/user)
. = ..()
@@ -471,12 +471,12 @@
if(target.mind)
if(iscultist(target))
- SSticker.mode.remove_cultist(target.mind) // This proc will handle message generation.
+ SSticker.mode.remove_cultist(target.mind, TRUE, TRUE) // This proc will handle message generation.
praying = FALSE
return
if(target.mind.vampire && !target.mind.vampire.get_ability(/datum/vampire_passive/full)) // Getting a full prayer off on a vampire will interrupt their powers for a large duration.
- target.mind.vampire.nullified = max(120, target.mind.vampire.nullified + 120)
+ target.mind.vampire.adjust_nullification(120, 50)
to_chat(target, "[user]'s prayer to [SSticker.Bible_deity_name] has interfered with your power!")
praying = FALSE
return
@@ -500,7 +500,7 @@
if(holder.l_hand == src || holder.r_hand == src) // Holding this in your hand will
for(var/mob/living/carbon/human/H in range(5, loc))
if(H.mind && H.mind.vampire && !H.mind.vampire.get_ability(/datum/vampire_passive/full))
- H.mind.vampire.nullified = max(5, H.mind.vampire.nullified + 2)
+ H.mind.vampire.adjust_nullification(5, 2)
if(prob(10))
to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your powers!")
diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm
index 52262ac8edb..a776cbce2aa 100644
--- a/code/game/objects/items/weapons/implants/implant_explosive.dm
+++ b/code/game/objects/items/weapons/implants/implant_explosive.dm
@@ -3,6 +3,7 @@
desc = "And boom goes the weasel."
icon_state = "explosive"
origin_tech = "materials=2;combat=3;biotech=4;syndicate=4"
+ actions_types = list(/datum/action/item_action/hands_free/activate/always)
var/weak = 2
var/medium = 0.8
var/heavy = 0.4
@@ -135,6 +136,7 @@
desc = "An alarm which monitors host vital signs, transmitting a radio message and dusting the corpse on death."
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
+ actions_types = list(/datum/action/item_action/hands_free/activate/always)
/obj/item/implant/dust/get_data()
var/dat = {"Implant Specifications:
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index f2b0b475e30..f93f7220c75 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -314,7 +314,7 @@
//Therefore, make a new stack internally that has the remainder.
// -Sayu
- if(S.amount > S.max_amount)
+ if(S.get_amount() > S.max_amount)
var/obj/item/stack/sheet/temp = new S.type(src)
temp.amount = S.amount - S.max_amount
S.amount = S.max_amount
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 301b43403f6..eb700165441 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -366,6 +366,22 @@
item_state = "assault"
storage_slots = 6
+/obj/item/storage/belt/military/assault/marines/full/populate_contents()
+ new /obj/item/ammo_box/magazine/m12g(src)
+ new /obj/item/ammo_box/magazine/m12g(src)
+ new /obj/item/ammo_box/magazine/m12g(src)
+ new /obj/item/ammo_box/magazine/m12g(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ update_icon()
+
+/obj/item/storage/belt/military/assault/marines/elite/full/populate_contents()
+ new /obj/item/ammo_box/magazine/m556/arg(src)
+ new /obj/item/ammo_box/magazine/m556/arg(src)
+ new /obj/item/ammo_box/magazine/m556/arg(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ new /obj/item/ammo_box/magazine/m45(src)
+ update_icon()
/obj/item/storage/belt/janitor
name = "janibelt"
desc = "A belt used to hold most janitorial supplies."
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 71852c60541..8cc8f5729f2 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -121,19 +121,21 @@
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonbox"
w_class = WEIGHT_CLASS_SMALL
- storage_slots = 6
+ storage_slots = 8
icon_type = "crayon"
can_hold = list(
/obj/item/toy/crayon
)
/obj/item/storage/fancy/crayons/populate_contents()
+ new /obj/item/toy/crayon/white(src)
new /obj/item/toy/crayon/red(src)
new /obj/item/toy/crayon/orange(src)
new /obj/item/toy/crayon/yellow(src)
new /obj/item/toy/crayon/green(src)
new /obj/item/toy/crayon/blue(src)
new /obj/item/toy/crayon/purple(src)
+ new /obj/item/toy/crayon/black(src)
update_icon()
/obj/item/storage/fancy/crayons/update_icon()
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index f8104a2d9ea..0df5817f598 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -76,6 +76,10 @@
if(!cell)
return
cell.use(amount)
+ if(cell.rigged)
+ cell = null
+ turned_on = FALSE
+ update_icon()
if(cell.charge < (hitcost)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off.
turned_on = FALSE
update_icon()
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index b267b51d7d9..a7ac1d632c7 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -638,7 +638,7 @@
/obj/item/twohanded/singularityhammer
name = "singularity hammer"
desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
- icon_state = "mjollnir0"
+ icon_state = "singulohammer0"
flags = CONDUCT
slot_flags = SLOT_BACK
force = 5
@@ -665,7 +665,7 @@
charged++
/obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons.
- icon_state = "mjollnir[wielded]"
+ icon_state = "singulohammer[wielded]"
..()
/obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
index ef80d50371a..55e44163a06 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
@@ -22,6 +22,7 @@
new /obj/item/storage/backpack/cultpack(src)
new /obj/item/clothing/head/helmet/riot/knight/templar(src)
new /obj/item/clothing/suit/armor/riot/knight/templar(src)
+ new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/soulstone/anybody/purified/chaplain(src)
new /obj/item/storage/fancy/candle_box/eternal(src)
new /obj/item/storage/fancy/candle_box/eternal(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 8c878cd6c59..5b2f0a54f24 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -69,7 +69,6 @@
togglelock(user)
/obj/structure/closet/secure_closet/AltClick(mob/user)
- ..()
if(Adjacent(user))
togglelock(user)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 6219fe7cfeb..c1aa16efc99 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -35,10 +35,19 @@
QDEL_NULL(showpiece)
return ..()
+/obj/structure/displaycase/emag_act(mob/user)
+ if(!emagged)
+ to_chat(user, "You override the ID lock on [src].")
+ trigger_alarm()
+
+ emagged = TRUE
+
/obj/structure/displaycase/examine(mob/user)
. = ..()
if(alert)
. += "Hooked up with an anti-theft system."
+ if(emagged)
+ . += "The ID lock has been shorted out."
if(showpiece)
. += "There's [showpiece] inside."
if(trophy_message)
@@ -100,7 +109,7 @@
/obj/structure/displaycase/attackby(obj/item/I, mob/user, params)
if(I.GetID() && !broken && openable)
- if(allowed(user))
+ if(allowed(user) || emagged)
to_chat(user, "You [open ? "close":"open"] [src].")
toggle_lock(user)
else
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 8217a86e505..c52338b9e7d 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -51,10 +51,6 @@
if(0 to 40)
return "It looks heavily damaged."
-/obj/structure/falsewall/ratvar_act()
- new /obj/structure/falsewall/brass(loc)
- qdel(src)
-
/obj/structure/falsewall/Destroy()
density = 0
air_update_turf(1)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 68025f98fce..c9f78cf01d0 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -55,13 +55,6 @@
if(!anchored)
. += "The anchoring screws are unscrewed. The rods look like they could be cut through."
-/obj/structure/grille/ratvar_act()
- if(broken)
- new /obj/structure/grille/ratvar/broken(loc)
- else
- new /obj/structure/grille/ratvar(loc)
- qdel(src)
-
/obj/structure/grille/Bumped(atom/user)
if(ismob(user))
if(!(shockcooldown <= world.time))
@@ -289,9 +282,6 @@
color = "#960000"
animate(src, color = previouscolor, time = 8)
-/obj/structure/grille/ratvar/ratvar_act()
- return
-
/obj/structure/grille/ratvar/broken
icon_state = "brokenratvargrille"
density = FALSE
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index d84c1f39728..3561bd1f239 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -61,18 +61,6 @@
/obj/structure/lattice/clockwork/Initialize(mapload)
. = ..()
- ratvar_act()
-
-/obj/structure/lattice/clockwork/ratvar_act()
- if((x + y) % 2 != 0)
- icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
- pixel_x = -9
- pixel_y = -9
- else
- icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
- pixel_x = 0
- pixel_y = 0
- return TRUE
/obj/structure/lattice/catwalk
name = "catwalk"
@@ -109,18 +97,6 @@
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
. = ..()
- ratvar_act()
if(!mapload)
new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
-
-/obj/structure/lattice/catwalk/clockwork/ratvar_act()
- if((x + y) % 2 != 0)
- icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi'
- pixel_x = -9
- pixel_y = -9
- else
- icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
- pixel_x = 0
- pixel_y = 0
- return TRUE
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 5bfe4e8a880..4266d6ef254 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -402,7 +402,7 @@ GLOBAL_LIST_EMPTY(safes)
for(var/safe in GLOB.safes)
var/obj/structure/safe/S = safe
if(owner in S.known_by)
- info += " The combination for the safe located in the [get_area(S).name] is: [S.get_combination()] "
+ info += " The combination for the safe located in the [get_area_name(S, TRUE)] is: [S.get_combination()] "
info_links = info
update_icon()
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 2c7ffbe2e90..15874e0c812 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -46,9 +46,6 @@
user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
"You rub some dust off from the [name]'s surface.")
-/obj/structure/statue/CanAtmosPass()
- return !density
-
/obj/structure/statue/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
if(material_drop_type)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 256376d30a7..d12dc172b0c 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -24,11 +24,6 @@
W.setDir(dir)
qdel(src)
-/obj/structure/chair/ratvar_act()
- var/obj/structure/chair/brass/B = new(get_turf(src))
- B.setDir(dir)
- qdel(src)
-
/obj/structure/chair/Move(atom/newloc, direct)
..()
handle_rotation()
@@ -441,9 +436,6 @@
if(turns >= 8)
STOP_PROCESSING(SSfastprocess, src)
-/obj/structure/chair/brass/ratvar_act()
- return
-
/obj/structure/chair/brass/AltClick(mob/living/user)
turns = 0
if(!istype(user) || user.incapacitated() || !in_range(src, user))
diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
index 9def5542c76..1a162c250fa 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
@@ -156,3 +156,6 @@
else
. = 1
+
+/obj/structure/chair/wheelchair/bike/wrench_act(mob/user, obj/item/I)
+ return
diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm
index 575f666848a..966c3f313b4 100644
--- a/code/game/objects/structures/table_frames.dm
+++ b/code/game/objects/structures/table_frames.dm
@@ -91,10 +91,6 @@
new /obj/structure/table_frame/wood(loc)
qdel(src)
-/obj/structure/table_frame/ratvar_act()
- new /obj/structure/table_frame/brass(loc)
- qdel(src)
-
/*
* Wooden Frames
*/
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index d287c2f5bbf..28e61e90e58 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -84,10 +84,6 @@
new /obj/structure/table/wood(loc)
qdel(src)
-/obj/structure/table/ratvar_act()
- new /obj/structure/table/reinforced/brass(loc)
- qdel(src)
-
/obj/structure/table/do_climb(mob/living/user)
. = ..()
item_placed(user)
@@ -571,9 +567,6 @@
color = "#960000"
animate(src, color = previouscolor, time = 8)
-/obj/structure/table/reinforced/brass/ratvar_act()
- obj_integrity = max_integrity
-
/obj/structure/table/tray
name = "surgical tray"
desc = "A small metal tray with wheels."
@@ -591,7 +584,7 @@
verbs -= /obj/structure/table/verb/do_flip
typecache_can_hold = typecacheof(typecache_can_hold)
for(var/atom/movable/held in get_turf(src))
- if(is_type_in_typecache(held, typecache_can_hold))
+ if(!held.anchored && held.move_resist != INFINITY && is_type_in_typecache(held, typecache_can_hold))
held_items += held.UID()
/obj/structure/table/tray/Move(NewLoc, direct)
@@ -637,9 +630,6 @@
/obj/structure/table/tray/narsie_act()
return 0
-/obj/structure/table/tray/ratvar_act()
- return 0
-
/*
* Racks
*/
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index b0d9464a0a3..0643db75416 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -72,13 +72,6 @@
/obj/structure/window/narsie_act()
color = NARSIE_WINDOW_COLOUR
-/obj/structure/window/ratvar_act()
- if(!fulltile)
- new/obj/structure/window/reinforced/clockwork(get_turf(src), dir)
- else
- new/obj/structure/window/reinforced/clockwork/fulltile(get_turf(src))
- qdel(src)
-
/obj/structure/window/rpd_act()
return
@@ -243,6 +236,7 @@
if(!I.use_tool(src, user, decon_speed, volume = I.tool_volume, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
return
anchored = !anchored
+ air_update_turf(TRUE)
update_nearby_icons()
to_chat(user, "You [anchored ? "fasten the frame to":"unfasten the frame from"] the floor.")
@@ -397,7 +391,8 @@
return TRUE
/obj/structure/window/AltClick(mob/user)
-
+ if(fulltile) // Can't rotate these.
+ return ..()
if(user.incapacitated())
to_chat(user, "You can't do that right now!")
return
@@ -725,10 +720,6 @@
made_glow = TRUE
..()
-/obj/structure/window/reinforced/clockwork/ratvar_act()
- obj_integrity = max_integrity
- update_nearby_icons()
-
/obj/structure/window/reinforced/clockwork/narsie_act()
take_damage(rand(25, 75), BRUTE)
if(src)
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 3ba2e638099..24fcba648f2 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -1,12 +1,9 @@
//This is so damaged or burnt tiles or platings don't get remembered as the default tile
GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","damaged3","damaged4",
"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2",
- "platingdmg3","plating","light_on","light_on_flicker1","light_on_flicker2",
- "warnplate", "warnplatecorner","metalfoam", "ironfoam",
- "light_on_clicker3","light_on_clicker4","light_on_clicker5","light_broken",
- "light_on_broken","light_off","wall_thermite","grass1","grass2","grass3","grass4",
- "asteroid","asteroid_dug",
- "asteroid0","asteroid1","asteroid2","asteroid3","asteroid4",
+ "platingdmg3","plating","light_on","warnplate", "warnplatecorner","metalfoam", "ironfoam",
+ "light_off","wall_thermite","grass1","grass2","grass3","grass4",
+ "asteroid","asteroid_dug","asteroid0","asteroid1","asteroid2","asteroid3","asteroid4",
"asteroid5","asteroid6","asteroid7","asteroid8","asteroid9","asteroid10","asteroid11","asteroid12",
"oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken", "carpet",
"carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5",
@@ -234,11 +231,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
if(prob(20))
ChangeTurf(/turf/simulated/floor/engine/cult)
-/turf/simulated/floor/ratvar_act(force, ignore_mobs)
- . = ..()
- if(.)
- ChangeTurf(/turf/simulated/floor/clockwork)
-
/turf/simulated/floor/acid_melt()
ChangeTurf(baseturf)
diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm
index cd7abaeb188..67e3f3f5ecd 100644
--- a/code/game/turfs/simulated/floor/indestructible.dm
+++ b/code/game/turfs/simulated/floor/indestructible.dm
@@ -15,9 +15,6 @@
/turf/simulated/floor/indestructible/narsie_act()
return
-/turf/simulated/floor/indestructible/ratvar_act(force, ignore_mobs)
- return
-
/turf/simulated/floor/indestructible/burn_down()
return
diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm
index 0d27e02537f..6264fb366ab 100644
--- a/code/game/turfs/simulated/floor/light_floor.dm
+++ b/code/game/turfs/simulated/floor/light_floor.dm
@@ -1,23 +1,14 @@
-#define LIGHTFLOOR_ON 1
-#define LIGHTFLOOR_WHITE 2
-#define LIGHTFLOOR_RED 3
-#define LIGHTFLOOR_GREEN 4
-#define LIGHTFLOOR_YELLOW 5
-#define LIGHTFLOOR_BLUE 6
-#define LIGHTFLOOR_PURPLE 7
-
-#define LIGHTFLOOR_GENERICCYCLE 8
-#define LIGHTFLOOR_CYCLEA 9
-#define LIGHTFLOOR_CYCLEB 10
-
/turf/simulated/floor/light
name = "\improper light floor"
light_range = 5
icon_state = "light_on"
floor_tile = /obj/item/stack/tile/light
- broken_states = list("light_broken")
+ broken_states = list("light_off")
+ /// Are we on
var/on = TRUE
- var/state = LIGHTFLOOR_ON
+ /// Are we broken
+ var/light_broken = FALSE
+ /// Can we modify a colour
var/can_modify_colour = TRUE
/turf/simulated/floor/light/Initialize(mapload)
@@ -27,43 +18,11 @@
/turf/simulated/floor/light/update_icon()
..()
if(on)
- switch(state)
- if(LIGHTFLOOR_ON)
- icon_state = "light_on"
- set_light(5, null,LIGHT_COLOR_LIGHTBLUE)
- if(LIGHTFLOOR_WHITE)
- icon_state = "light_on-w"
- set_light(5, null,LIGHT_COLOR_WHITE)
- if(LIGHTFLOOR_RED)
- icon_state = "light_on-r"
- set_light(5, null,LIGHT_COLOR_RED)
- if(LIGHTFLOOR_GREEN)
- icon_state = "light_on-g"
- set_light(5, null,LIGHT_COLOR_PURE_GREEN)
- if(LIGHTFLOOR_YELLOW)
- icon_state = "light_on-y"
- set_light(5, null,"#FFFF00")
- if(LIGHTFLOOR_BLUE)
- icon_state = "light_on-b"
- set_light(5, null,LIGHT_COLOR_DARKBLUE)
- if(LIGHTFLOOR_PURPLE)
- icon_state = "light_on-p"
- set_light(5, null,LIGHT_COLOR_PURPLE)
- if(LIGHTFLOOR_GENERICCYCLE)
- icon_state = "light_on-cycle_all"
- set_light(5, null,LIGHT_COLOR_WHITE)
- if(LIGHTFLOOR_CYCLEA)
- icon_state = "light_on-dancefloor_A"
- set_light(5,null,LIGHT_COLOR_RED)
- if(LIGHTFLOOR_CYCLEB)
- icon_state = "light_on-dancefloor_B"
- set_light(5, null,LIGHT_COLOR_DARKBLUE)
- else
- icon_state = "light_off"
- set_light(0)
+ icon_state = "light_on"
+ set_light(5, null, color)
else
- set_light(0)
icon_state = "light_off"
+ set_light(0)
/turf/simulated/floor/light/BeforeChange()
set_light(0)
@@ -76,9 +35,9 @@
/turf/simulated/floor/light/attackby(obj/item/C, mob/user, params)
if(istype(C, /obj/item/light/bulb)) //only for light tiles
- if(!state)
+ if(!light_broken)
qdel(C)
- state = LIGHTFLOOR_ON
+ light_broken = FALSE
update_icon()
to_chat(user, "You replace the light bulb.")
else
@@ -92,11 +51,21 @@
return
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- if(state != 0)
- if(state < LIGHTFLOOR_PURPLE)
- state++
- else
- state = LIGHTFLOOR_ON
+ if(!light_broken)
+ var/new_color = input(user, "Select a bulb color", "Select a bulb color", color) as color|null
+ if(!new_color)
+ return
+
+ // Cancel if they walked away
+ if(!Adjacent(user, src))
+ return
+
+ // Now lets make sure it cant go fully black. Yes I know this is more dense than my skull.
+ var/list/hsl = rgb2hsl(hex2num(copytext(new_color, 2, 4)), hex2num(copytext(new_color, 4, 6)), hex2num(copytext(new_color, 6, 8)))
+ hsl[3] = max(hsl[3], 0.4)
+ var/list/rgb = hsl2rgb(arglist(hsl))
+ color = "#[num2hex(rgb[1], 2)][num2hex(rgb[2], 2)][num2hex(rgb[3], 2)]"
+
to_chat(user, "You change [src]'s light bulb color.")
update_icon()
else
@@ -111,33 +80,3 @@
/turf/simulated/floor/light/extinguish_light()
toggle_light(FALSE)
visible_message("[src] flickers and falls dark.")
-
-//Cycles through all of the colours
-/turf/simulated/floor/light/colour_cycle
- state = LIGHTFLOOR_GENERICCYCLE
- can_modify_colour = FALSE
-
-//Two different "dancefloor" types so that you can have a checkered pattern
-// (also has a longer delay than colour_cycle between cycling colours)
-/turf/simulated/floor/light/colour_cycle/dancefloor_a
- name = "dancefloor"
- desc = "Funky floor."
- state = LIGHTFLOOR_CYCLEA
-
-/turf/simulated/floor/light/colour_cycle/dancefloor_b
- name = "dancefloor"
- desc = "Funky floor."
- state = LIGHTFLOOR_CYCLEB
-
-
-#undef LIGHTFLOOR_ON
-#undef LIGHTFLOOR_WHITE
-#undef LIGHTFLOOR_RED
-#undef LIGHTFLOOR_GREEN
-#undef LIGHTFLOOR_YELLOW
-#undef LIGHTFLOOR_BLUE
-#undef LIGHTFLOOR_PURPLE
-
-#undef LIGHTFLOOR_GENERICCYCLE
-#undef LIGHTFLOOR_CYCLEA
-#undef LIGHTFLOOR_CYCLEB
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 2876378eb06..96b79588793 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -176,11 +176,6 @@
QDEL_NULL(realappearence)
return ..()
-/turf/simulated/floor/clockwork/ReplaceWithLattice()
- . = ..()
- for(var/obj/structure/lattice/L in src)
- L.ratvar_act()
-
/turf/simulated/floor/clockwork/crowbar_act(mob/user, obj/item/I)
. = TRUE
if(!I.tool_use_check(user, 0))
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 94d95c2af86..d0805cf5099 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -187,13 +187,6 @@
/turf/simulated/floor/engine/cult/narsie_act()
return
-/turf/simulated/floor/engine/cult/ratvar_act()
- . = ..()
- if(istype(src, /turf/simulated/floor/engine/cult)) //if we haven't changed type
- var/previouscolor = color
- color = "#FAE48C"
- animate(src, color = previouscolor, time = 8)
-
//air filled floors; used in atmos pressure chambers
/turf/simulated/floor/engine/n20
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 026eef852d8..d2109bee2f0 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -20,7 +20,7 @@
var/mineralType = null
var/mineralAmt = 3
var/spread = 0 //will the seam spread?
- var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
+ var/spreadChance = 0 //the percentile chance of an ore spreading to the neighboring tiles
var/last_act = 0
var/scan_state = "" //Holder for the image we display when we're pinged by a mining scanner
var/defer_change = 0
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 02035e17f95..1eb89e6a238 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -4,7 +4,7 @@
/turf/simulated/wall
name = "wall"
- desc = "A huge chunk of metal used to seperate rooms."
+ desc = "A huge chunk of metal used to separate rooms."
icon = 'icons/turf/walls/wall.dmi'
icon_state = "wall"
var/rotting = FALSE
diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
index 56feb811745..37208cd0b81 100644
--- a/code/game/turfs/simulated/walls_indestructible.dm
+++ b/code/game/turfs/simulated/walls_indestructible.dm
@@ -27,9 +27,6 @@
/turf/simulated/wall/indestructible/narsie_act()
return
-/turf/simulated/wall/indestructible/ratvar_act(force, ignore_mobs)
- return
-
/turf/simulated/wall/indestructible/burn_down()
return
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index f49863ca141..9d743ae9c18 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -82,7 +82,7 @@
/turf/simulated/wall/mineral/plasma
name = "plasma wall"
- desc = "A wall with plasma plating. This is definately a bad idea."
+ desc = "A wall with plasma plating. This is definitely a bad idea."
icon = 'icons/turf/walls/plasma_wall.dmi'
icon_state = "plasma"
sheet_type = /obj/item/stack/sheet/mineral/plasma
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 89122891702..a841f06665e 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -11,7 +11,7 @@
/turf/simulated/wall/cult/Initialize(mapload)
. = ..()
- if(SSticker.mode)//game hasn't started offically don't do shit..
+ if(SSticker.mode)//game hasn't started officially don't do shit..
new /obj/effect/temp_visual/cult/turf(src)
icon_state = SSticker.cultdat.cult_wall_icon_state
@@ -69,11 +69,6 @@
QDEL_NULL(realappearance)
return ..()
-/turf/simulated/wall/clockwork/ReplaceWithLattice()
- ..()
- for(var/obj/structure/lattice/L in src)
- L.ratvar_act()
-
/turf/simulated/wall/clockwork/narsie_act()
..()
if(istype(src, /turf/simulated/wall/clockwork)) //if we haven't changed type
@@ -122,19 +117,3 @@
to_chat(M.occupant, "The wall's intense heat completely reflects your [M.name]'s attack!")
M.take_damage(20, BURN)
-/turf/simulated/wall/clockwork/proc/turn_up_the_heat()
- if(!heated)
- name = "superheated [name]"
- visible_message("[src] sizzles with heat!")
- playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE)
- heated = TRUE
- hardness = -100 //Lower numbers are tougher, so this makes the wall essentially impervious to smashing
- slicing_duration = 150
- animate(realappearance, color = "#FFC3C3", time = 5)
- else
- name = initial(name)
- visible_message("[src] cools down.")
- heated = FALSE
- hardness = initial(hardness)
- slicing_duration = initial(slicing_duration)
- animate(realappearance, color = initial(realappearance.color), time = 25)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 4678bd94ce4..108555e0dcd 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -508,15 +508,6 @@
/turf/proc/can_lay_cable()
return can_have_cabling() & !intact
-/turf/ratvar_act(force, ignore_mobs, probability = 40)
- . = (prob(probability) || force)
- for(var/I in src)
- var/atom/A = I
- if(ignore_mobs && ismob(A))
- continue
- if(ismob(A) || .)
- A.ratvar_act()
-
/turf/proc/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = icon
underlay_appearance.icon_state = icon_state
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 4a0429dd576..4c21afebdd2 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -1,63 +1,98 @@
-
/client/verb/who()
set name = "Who"
set category = "OOC"
- var/msg = "Current Players:\n"
+ var/list/lines = list()
+ var/list/temp = list()
+ for(var/client/C in GLOB.clients)
+ if(C.holder && C.holder.big_brother) // BB doesn't show up at all
+ continue
+
+ if(C.holder && C.holder.fakekey)
+ temp += C.holder.fakekey
+ else
+ temp += C.key
+
+ temp = sortList(temp) // Sort it. We dont do this above because fake keys would be out of order, which would be a giveaway
+
+ var/list/output_players = list()
+
+ // Now go over it again to apply colours.
+ for(var/p in temp)
+ var/client/C = GLOB.directory[ckey(p)]
+ if(!C)
+ // This should NEVER happen, but better to be safe
+ continue
+ // Get the colour
+ var/colour = client2rankcolour(C)
+ var/out = "[p]"
+ if(C.holder)
+ out = "[out]"
+ if(colour)
+ out = "[out]"
+
+ output_players += out
+
+ lines += "Current Players ([length(output_players)]): "
+ lines += output_players.Join(", ") // Turn players into a comma separated list
+
+ if(check_rights(R_ADMIN, FALSE))
+ lines += "Click here for detailed (old) who."
+
+ var/msg = lines.Join("\n")
+
+ to_chat(src, msg)
+
+// Advanced version of `who` to show player age, antag status and more. Lags the chat when loading, so its in its own proc
+/client/proc/who_advanced()
+ if(!check_rights(R_ADMIN))
+ return
var/list/Lines = list()
- if(check_rights(R_ADMIN,0))
- for(var/client/C in GLOB.clients)
- if(C.holder && C.holder.big_brother && !check_rights(R_PERMISSIONS, 0)) // need PERMISSIONS to see BB
- continue
+ for(var/client/C in GLOB.clients)
+ if(C.holder && C.holder.big_brother && !check_rights(R_PERMISSIONS, FALSE)) // need PERMISSIONS to see BB
+ continue
- var/entry = "\t[C.key]"
- if(C.holder && C.holder.fakekey)
- entry += " (as [C.holder.fakekey])"
- entry += " - Playing as [C.mob.real_name]"
- switch(C.mob.stat)
- if(UNCONSCIOUS)
- entry += " - Unconscious"
- if(DEAD)
- if(isobserver(C.mob))
- var/mob/dead/observer/O = C.mob
- if(O.started_as_observer)
- entry += " - Observing"
- else
- entry += " - DEAD"
- else if(isnewplayer(C.mob))
- entry += " - New Player"
+ var/entry = "\t[C.key]"
+ if(C.holder && C.holder.fakekey)
+ entry += " (as [C.holder.fakekey])"
+ entry += " - Playing as [C.mob.real_name]"
+ switch(C.mob.stat)
+ if(UNCONSCIOUS)
+ entry += " - Unconscious"
+ if(DEAD)
+ if(isobserver(C.mob))
+ var/mob/dead/observer/O = C.mob
+ if(O.started_as_observer)
+ entry += " - Observing"
else
entry += " - DEAD"
+ else if(isnewplayer(C.mob))
+ entry += " - New Player"
+ else
+ entry += " - DEAD"
- var/age
- if(isnum(C.player_age))
- age = C.player_age
- else
- age = 0
+ var/age
+ if(isnum(C.player_age))
+ age = C.player_age
+ else
+ age = 0
- if(age <= 1)
- age = "[age]"
- else if(age < 10)
- age = "[age]"
+ if(age <= 1)
+ age = "[age]"
+ else if(age < 10)
+ age = "[age]"
- entry += " - [age]"
+ entry += " - [age]"
- if(is_special_character(C.mob))
- entry += " - Antagonist"
- entry += " ([ADMIN_QUE(C.mob,"?")])"
- Lines += entry
- else
- for(var/client/C in GLOB.clients)
- if(C.holder && C.holder.big_brother) // BB doesn't show up at all
- continue
+ if(is_special_character(C.mob))
+ entry += " - Antagonist"
+ entry += " ([ADMIN_QUE(C.mob, "?")])"
+ Lines += entry
- if(C.holder && C.holder.fakekey)
- Lines += C.holder.fakekey
- else
- Lines += C.key
+ var/msg = ""
for(var/line in sortList(Lines))
msg += "[line]\n"
@@ -83,7 +118,12 @@
if(C.holder.big_brother && !check_rights(R_PERMISSIONS, 0)) // normal admins can't see BB
continue
- msg += "\t[C] is a [C.holder.rank]"
+ // Their rank may not have a defined colour, only set colour if so
+ var/rank_colour = client2rankcolour(C)
+ if(rank_colour)
+ msg += "[C] is a [C.holder.rank]"
+ else
+ msg += "[C] is a [C.holder.rank]"
if(C.holder.fakekey)
msg += " (as [C.holder.fakekey])"
@@ -102,7 +142,12 @@
num_admins_online++
else if(check_rights(R_MENTOR|R_MOD, 0, C.mob))
- modmsg += "\t[C] is a [C.holder.rank]"
+ // Their rank may not have a defined colour, only set colour if so
+ var/rank_colour = client2rankcolour(C)
+ if(rank_colour)
+ modmsg += "[C] is a [C.holder.rank]"
+ else
+ modmsg += "[C] is a [C.holder.rank]"
if(isobserver(C.mob))
modmsg += " - Observing"
@@ -120,10 +165,20 @@
if(check_rights(R_ADMIN, 0, C.mob))
if(!C.holder.fakekey)
- msg += "\t[C] is a [C.holder.rank]\n"
+ var/rank_colour = client2rankcolour(C)
+ if(rank_colour)
+ msg += "[C] is a [C.holder.rank]"
+ else
+ msg += "[C] is a [C.holder.rank]"
+ msg += "\n"
num_admins_online++
else if(check_rights(R_MOD|R_MENTOR, 0, C.mob) && !check_rights(R_ADMIN, 0, C.mob))
- modmsg += "\t[C] is a [C.holder.rank]\n"
+ var/rank_colour = client2rankcolour(C)
+ if(rank_colour)
+ modmsg += "[C] is a [C.holder.rank]"
+ else
+ modmsg += "[C] is a [C.holder.rank]"
+ modmsg += "\n"
num_mods_online++
var/noadmins_info = "\nIf no admins or mentors are online, make a ticket anyways. Adminhelps and mentorhelps will be relayed to discord, and staff will still be informed."
diff --git a/code/game/world.dm b/code/game/world.dm
index 5ba97917661..e5bab32cf55 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,4 +1,4 @@
-GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG)
+GLOBAL_LIST_INIT(map_transition_config, list(CC_TRANSITION_CONFIG))
/world/New()
// IMPORTANT
@@ -142,11 +142,11 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
return
#endif
- // If we had an update or pending TM, set a 60 second timeout
+ // If the server has been gracefully shutdown in TGS, have a 60 seconds grace period for SQL updates and stuff
var/secs_before_auto_reconnect = 10
- if(GLOB.pending_server_update)
+ if(GLOB.slower_restart)
secs_before_auto_reconnect = 60
- to_chat(world, "Reboot will take a little longer, due to pending updates.")
+ server_announce_global("Reboot will take a little longer due to pending backend changes.")
// Send the reboot banner to all players
for(var/client/C in GLOB.clients)
@@ -190,6 +190,7 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
config.load("config/game_options.txt","game_options")
config.loadsql("config/dbconfig.txt")
config.loadoverflowwhitelist("config/ofwhitelist.txt")
+ config.load_rank_colour_map()
// apply some settings from config..
/world/proc/update_status()
@@ -247,7 +248,6 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
GLOB.world_href_log = "[GLOB.log_directory]/hrefs.log"
GLOB.world_runtime_log = "[GLOB.log_directory]/runtime.log"
GLOB.world_qdel_log = "[GLOB.log_directory]/qdel.log"
- GLOB.world_asset_log = "[GLOB.log_directory]/asset.log"
GLOB.tgui_log = "[GLOB.log_directory]/tgui.log"
GLOB.http_log = "[GLOB.log_directory]/http.log"
GLOB.sql_log = "[GLOB.log_directory]/sql.log"
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index e160ee3838d..e70fa4acac8 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -1,5 +1,5 @@
//Blocks an attempt to connect before even creating our client datum thing.
-/world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE)
+/world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE, check_2fa = TRUE)
if(!key || !address || !computer_id)
log_adminwarn("Failed Login (invalid data): [key] [address]-[computer_id]")
@@ -44,6 +44,49 @@
return list("reason"="using proxy or vpn", "desc"="\nReason: Proxies/VPNs are not allowed here. [mistakemessage]")
+ // If 2FA is enabled, makes sure they were authed within the last minute
+ if(check_2fa && config._2fa_auth_host)
+ // First see if they exist at all
+ var/datum/db_query/check_query = SSdbcore.NewQuery("SELECT 2fa_status, ip FROM [format_table_name("player")] WHERE ckey=:ckey", list("ckey" = ckey(key)))
+
+ if(!check_query.warn_execute())
+ message_admins("Failed to do a DB 2FA check for [key]. You have been warned.")
+ qdel(check_query)
+ return
+
+
+ // If a row is returned, the player exists
+ var/_2fa_enabled = FALSE
+ var/always_check = FALSE
+ var/last_ip
+ if(check_query.NextRow())
+ if(check_query.item[1] != _2FA_DISABLED)
+ _2fa_enabled = TRUE
+ if(check_query.item[1] == _2FA_ENABLED_ALWAYS)
+ always_check = TRUE
+ last_ip = check_query.item[2]
+ qdel(check_query)
+
+ // If client has 2FA enabled, and they either:
+ // Have it set to always check, or their IP is different
+ if(_2fa_enabled && (always_check || (address != last_ip)))
+ // They have 2FA enabled, lets make sure they have authed within the last minute
+ var/datum/db_query/verify_query = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("2fa_secrets")] WHERE (last_time BETWEEN NOW() - INTERVAL 1 MINUTE AND NOW()) AND ckey=:ckey LIMIT 1", list(
+ "ckey" = ckey(key)
+ ))
+
+ if(!verify_query.warn_execute())
+ message_admins("Failed to do a DB 2FA check for [key]. You have been warned.")
+ qdel(verify_query)
+ return
+
+ if(!verify_query.NextRow())
+ // If no row was returned, fail 2FA
+ qdel(verify_query)
+ return list("reason"="2fa check failed", "desc"="You have 2FA enabled but did not properly authenticate.")
+
+ qdel(verify_query)
+
if(config.ban_legacy_system)
//Ban Checking
. = CheckBan(ckey(key), computer_id, address)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index f63473216a9..63591062382 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -137,7 +137,8 @@ GLOBAL_LIST_INIT(admin_verbs_server, list(
/client/proc/toggle_antagHUD_restrictions,
/client/proc/set_ooc,
/client/proc/reset_ooc,
- /client/proc/toggledrones
+ /client/proc/toggledrones,
+ /client/proc/set_next_map
))
GLOBAL_LIST_INIT(admin_verbs_debug, list(
/client/proc/cmd_admin_list_open_jobs,
@@ -263,6 +264,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
verbs += GLOB.admin_verbs_proccall
if(holder.rights & R_VIEWRUNTIMES)
verbs += /client/proc/view_runtimes
+ verbs += /client/proc/cmd_display_del_log
+ verbs += /client/proc/cmd_display_del_log_simple
spawn(1) // This setting exposes the profiler for people with R_VIEWRUNTIMES. They must still have it set in cfg/admin.txt
control_freak = 0
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 26fa05cebfb..437721f383a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2341,7 +2341,7 @@
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 = "
[SSmapping.map_datum.fluff_name]
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."
else if(stype == "Illegible fax")
@@ -2630,7 +2630,7 @@
fax_panel(usr)
else if(href_list["getplaytimewindow"])
- if(!check_rights(R_ADMIN))
+ if(!check_rights(R_ADMIN | R_MOD | R_MENTOR))
return
var/mob/M = locateUID(href_list["getplaytimewindow"])
if(!istype(M, /mob))
@@ -2810,7 +2810,7 @@
if(R.module)
R.module.modules += I
I.loc = R.module
- R.module.rebuild()
+ R.module.rebuild_modules()
R.activate_module(I)
R.module.fix_modules()
@@ -3556,6 +3556,8 @@
var/datum/browser/popup = new(usr, "view_karma", "Karma stats for [target_ckey]", 600, 300)
popup.set_content(dat)
popup.open(FALSE)
+ else if(href_list["who_advanced"])
+ usr.client.who_advanced()
/client/proc/create_eventmob_for(mob/living/carbon/human/H, killthem = 0)
if(!check_rights(R_EVENT))
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index b09941d0f06..c24eaddf19e 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -790,7 +790,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
set name = "Display del() Log"
set desc = "Display del's log of everything that's passed through it."
- if(!check_rights(R_DEBUG))
+ if(!check_rights(R_DEBUG|R_VIEWRUNTIMES))
return
var/list/dellog = list("List of things that have gone through qdel this round
")
@@ -822,7 +822,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
set name = "Display Simple del() Log"
set desc = "Display a compacted del's log."
- if(!check_rights(R_DEBUG))
+ if(!check_rights(R_DEBUG|R_VIEWRUNTIMES))
return
var/dat = "List of things that failed to GC this round
"
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 43b806b86f5..90b0fb912ae 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -179,3 +179,28 @@ GLOBAL_VAR_INIT(intercom_range_display_status, 0)
to_chat(world, "There are [count] objects of type [type_path] in the game world.")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Count Objects (Global)") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/set_next_map()
+ set category = "Server"
+ set name = "Set Next Map"
+
+ if(!check_rights(R_SERVER))
+ return
+
+ var/list/map_datums = list()
+ for(var/x in subtypesof(/datum/map))
+ var/datum/map/M = x
+ map_datums["[initial(M.fluff_name)] ([initial(M.technical_name)])"] = M // Put our map in
+
+ var/target_map_name = input(usr, "Select target map", "Next map", null) as null|anything in map_datums
+
+ if(!target_map_name)
+ return
+
+ var/datum/map/TM = map_datums[target_map_name]
+ SSmapping.next_map = new TM
+ var/announce_to_players = alert(usr, "Do you wish to tell the playerbase about your choice?", "Announce", "Yes", "No")
+ message_admins("[key_name_admin(usr)] has set the next map to [SSmapping.next_map.fluff_name] ([SSmapping.next_map.technical_name])")
+ log_admin("[key_name(usr)] has set the next map to [SSmapping.next_map.fluff_name] ([SSmapping.next_map.technical_name])")
+ if(announce_to_players == "Yes")
+ to_chat(world, "[key] has chosen the following map for next round: [SSmapping.next_map.fluff_name] ([SSmapping.next_map.technical_name])")
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index 59ab53f3ca6..55895e5b282 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -136,15 +136,14 @@ GLOBAL_VAR_INIT(sent_strike_team, 0)
/client/proc/create_death_commando(obj/spawn_location, is_leader = FALSE)
var/mob/living/carbon/human/new_commando = new(spawn_location.loc)
var/commando_leader_rank = pick("Lieutenant", "Captain", "Major")
- var/commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
- var/commando_name = pick(GLOB.last_names)
+ var/commando_name = pick(GLOB.commando_names)
var/datum/preferences/A = new()//Randomize appearance for the commando.
if(is_leader)
A.age = rand(35,45)
A.real_name = "[commando_leader_rank] [commando_name]"
else
- A.real_name = "[commando_rank] [commando_name]"
+ A.real_name = "[commando_name]"
A.copy_to(new_commando)
diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
index 210f2cb01fd..fe18df41628 100644
--- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
@@ -301,7 +301,7 @@
else if(!ismob(contract.target.current))
invalidate()
return
- U.message_holder("Extraction signal received, agent. [GLOB.using_map.full_name]'s bluespace transport jamming systems have been sabotaged. "\
+ U.message_holder("Extraction signal received, agent. [SSmapping.map_datum.fluff_name]'s bluespace transport jamming systems have been sabotaged. "\
+ "We have opened a temporary portal at your flare location - proceed to the target's extraction by inserting them into the portal.", 'sound/effects/confirmdropoff.ogg')
// Open a portal
var/obj/effect/portal/redspace/contractor/P = new(get_turf(F), pick(GLOB.syndieprisonwarp), null, 0)
@@ -528,7 +528,7 @@
var/datum/feed_message/FM = new
FM.author = "Nyx Daily"
FM.admin_locked = TRUE
- FM.body = "Suspected Syndicate activity was reported in the system. Rumours have surfaced about a [R?.fields["rank"] || M?.mind.assigned_role || DEFAULT_RANK] aboard the [GLOB.using_map.full_name] being the victim of a kidnapping.\n\n" +\
+ FM.body = "Suspected Syndicate activity was reported in the system. Rumours have surfaced about a [R?.fields["rank"] || M?.mind.assigned_role || DEFAULT_RANK] aboard the [SSmapping.map_datum.fluff_name] being the victim of a kidnapping.\n\n" +\
"A reliable source said the following: There was a note with the victim's initials which were \"[initials]\" and a scribble saying \"[fluff_message]\""
GLOB.news_network.get_channel_by_name("Nyx Daily")?.add_message(FM)
@@ -539,7 +539,7 @@
var/datum/feed_message/FM2 = new
FM2.author = "Nyx Daily"
FM2.admin_locked = TRUE
- FM2.body = "Nanotrasen's Asset Management board has resigned today after a series of kidnappings aboard the [GLOB.using_map.full_name]." +\
+ FM2.body = "Nanotrasen's Asset Management board has resigned today after a series of kidnappings aboard the [SSmapping.map_datum.fluff_name]." +\
"One former member of the board was heard saying: \"I can't do this anymore. How does a single shift on this cursed station manage to cost us over ten million Credits in ransom payments? Is there no security aboard?!\""
GLOB.news_network.get_channel_by_name("Nyx Daily")?.add_message(FM2)
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index b4d9db4817f..c1905917c9d 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -248,6 +248,7 @@
owner.announce_objectives()
if(should_give_codewords)
give_codewords()
+ to_chat(owner.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Traitor)")
/datum/antagonist/traitor/proc/update_traitor_icons_added(datum/mind/traitor_mind)
diff --git a/code/modules/arcade/mob_hunt/mob_type_datums.dm b/code/modules/arcade/mob_hunt/mob_type_datums.dm
index 0ae84b1b764..c042a9c7cfc 100644
--- a/code/modules/arcade/mob_hunt/mob_type_datums.dm
+++ b/code/modules/arcade/mob_hunt/mob_type_datums.dm
@@ -133,7 +133,6 @@
area_whitelist = list(/area/medical/virology,
/area/toxins,
/area/medical/research,
- /area/medical/research_shuttle_dock,
/area/crew_quarters/hor,
/area/maintenance/asmaint2)
@@ -164,7 +163,6 @@
TYPE_PSYCHIC)
area_blacklist = list(/area/toxins,
/area/medical/research,
- /area/medical/research_shuttle_dock,
/area/crew_quarters/hor,
/area/maintenance/asmaint2,
/area/teleporter,
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 13e2d7bcb16..bfeaaa5c374 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -961,15 +961,13 @@
if(1)
if(iscoil(I))
var/obj/item/stack/cable_coil/coil = I
- if(coil.amount < 5)
+ if(coil.get_amount() < 5)
to_chat(user, "You need more cable for this!")
return
to_chat(user, "You wire \the [src]!")
playsound(get_turf(src), coil.usesound, 50, 1)
- coil.amount -= 5
- if(!coil.amount)
- qdel(coil)
+ coil.use(5)
buildstage = 2
update_icon()
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index 9f3e629d6b0..48aa90651a5 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -237,6 +237,11 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
full_def = copytext(full_def, variables_start + 1, length(full_def)) // removing the last '}'
fields = readlist(full_def, ";")
+ for(var/I in fields)
+ var/value = fields[I]
+ if(istext(value))
+ fields[I] = apply_text_macros(value)
+
// then fill the members_attributes list with the corresponding variables
members_attributes.len++
members_attributes[index++] = fields
@@ -353,61 +358,69 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
/datum/dmm_suite/proc/readlist(text, delimiter = ",")
var/list/to_return = list()
- var/position
+ var/delimiter_position
var/old_position = 1
do
// find next delimiter that is not within "..."
- position = find_next_delimiter_position(text, old_position, delimiter)
+ delimiter_position = find_next_delimiter_position(text, old_position, delimiter)
// check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo", var2=7))
- var/equal_position = findtext(text, "=", old_position, position)
+ var/equal_position = findtext(text, "=", old_position, delimiter_position)
- var/trim_left = trim_text(copytext(text, old_position, (equal_position ? equal_position : position)), 1) // the name of the variable, must trim quotes to build a BYOND compliant associatives list
- old_position = position + 1
+ // Take the left value of the association or just the value if it isn't an association
+ var/left_value = copytext(text, old_position, (equal_position ? equal_position : delimiter_position))
+ old_position = delimiter_position + 1
if(equal_position) // associative var, so do the association
- var/trim_right = trim_text(copytext(text, equal_position + 1, position)) // the content of the variable
+ left_value = trim_text(left_value, TRUE) // the name of the variable, must trim quotes to build a BYOND compliant associatives list
+ var/trim_right = trim_text(copytext(text, equal_position + 1, delimiter_position)) // the content of the variable
- // Check for string
- // Make it read to the next delimiter, instead of the quote
- if(findtext(trim_right, quote, 1, 2))
- var/endquote = findtext(trim_right, quote, -1)
- if(!endquote)
- log_runtime(EXCEPTION("Terminating quote not found!"), src)
- // Our map writer escapes quotes and curly brackets to avoid
- // letting our simple parser choke on meanly-crafted names/etc
- // - so we decode it here so it's back to good ol' legibility
- trim_right = dmm_decode(copytext(trim_right, 2, endquote))
-
- // Check for number
- else if(isnum(text2num(trim_right)))
- trim_right = text2num(trim_right)
-
- // Check for null
- else if(trim_right == "null")
- trim_right = null
-
- // Check for list
- else if(copytext(trim_right, 1, 5) == "list")
- trim_right = readlist(copytext(trim_right, 6, length(trim_right)))
-
- // Check for file
- else if(copytext(trim_right, 1, 2) == "'")
- trim_right = file(copytext(trim_right, 2, length(trim_right)))
-
- // Check for path
- else if(ispath(text2path(trim_right)))
- trim_right = text2path(trim_right)
-
- to_return[trim_left] = trim_right
+ to_return[left_value] = parse_value(trim_right)
else// simple var
- to_return[trim_left] = null
+ to_return += parse_value(trim_text(left_value)) // Don't trim the quotes
- while(position != 0)
+ while(delimiter_position != 0)
return to_return
+/**
+ * Tries to parse the given value_text. Will fallback on the value_text as a string if it fails
+ */
+/datum/dmm_suite/proc/parse_value(value_text)
+ // Check for string
+ // Make it read to the next delimiter, instead of the quote
+ if(findtext(value_text, quote, 1, 2))
+ var/endquote = findtext(value_text, quote, -1)
+ if(!endquote)
+ stack_trace("Terminating quote not found!")
+ // Our map writer escapes quotes and curly brackets to avoid
+ // letting our simple parser choke on meanly-crafted names/etc
+ // - so we decode it here so it's back to good ol' legibility
+ . = dmm_decode(copytext(value_text, 2, endquote))
+
+ // Check for number
+ else if(isnum(text2num(value_text)))
+ . = text2num(value_text)
+
+ // Check for null
+ else if(value_text == "null")
+ . = null
+
+ // Check for list
+ else if(copytext(value_text, 1, 5) == "list")
+ . = readlist(copytext(value_text, 6, length(value_text)))
+
+ // Check for file
+ else if(copytext(value_text, 1, 2) == "'")
+ . = file(copytext(value_text, 2, length(value_text)))
+
+ // Check for path
+ else if(ispath(text2path(value_text)))
+ . = text2path(value_text)
+
+ else
+ . = value_text // Assume it is a string without quotes
/datum/dmm_suite/Destroy()
..()
@@ -470,7 +483,9 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
if(initial(A.there_can_be_many))
area_list[A] = new A
else
- area_list[A] = locate(A)
+ if(!GLOB.all_unique_areas[A])
+ GLOB.all_unique_areas[A] = new A // No locate here else it will find a subtype of the one we're looking for
+ area_list[A] = GLOB.all_unique_areas[A]
return area_list[A]
diff --git a/code/modules/client/2fa.dm b/code/modules/client/2fa.dm
new file mode 100644
index 00000000000..9de8ef73476
--- /dev/null
+++ b/code/modules/client/2fa.dm
@@ -0,0 +1,131 @@
+// This is in its own file as it has so much stuff to contend with
+/client/proc/edit_2fa()
+ if(!config._2fa_auth_host)
+ alert(usr, "This server does not have 2FA enabled.")
+ return
+ // Client does not have 2FA enabled. Set it up.
+ if(prefs._2fa_status == _2FA_DISABLED)
+ // Get us an auth token
+ var/datum/http_response/qrcr = wrap_http_get("[config._2fa_auth_host]/generateQR?ckey=[ckey]")
+ // If this fails, shits gone bad
+ if(qrcr.errored)
+ alert(usr, "Something has gone VERY wrong ingame. Please inform the server host.\nError details: [qrcr.error]")
+ return
+
+ if(qrcr.status_code != 200)
+ alert(usr, "2FA QR code generation returned a non-200 code. Please inform the server host.\nError code: [qrcr.status_code]\nError details: [qrcr.body]")
+ return
+
+ var/list/data = json_decode(qrcr.body)
+ var/qr_img_src = data["qr_image"]
+ var/datum/browser/B = new(usr, "2fa_qrc", "2FA QR Code", 600, 400)
+ var/title_text = "
Below is a QR code to scan inside your authenticator app to generate 2FA codes. Please verify it before closing this window. (Behind this window is a text box)
"
+ var/img_data = "
"
+ B.set_content("[title_text][img_data]")
+ B.open(FALSE)
+
+ var/entered_code = input(usr, "Please enter a code from your auth app. Failure to enter the code correctly will abort 2FA setup.", "2FA Validation")
+ if(!entered_code)
+ // Cleanup so they can start again
+ var/datum/db_query/dbq = SSdbcore.NewQuery("DELETE FROM [format_table_name("2fa_secrets")] WHERE ckey=:ckey", list("ckey" = ckey))
+ dbq.warn_execute()
+ alert(usr, "2FA Setup aborted!")
+ B.close()
+ return
+
+ var/datum/http_response/vr = wrap_http_get("[config._2fa_auth_host]/validateCode?ckey=[ckey]&code=[entered_code]")
+ // If this fails, shits gone bad
+ if(vr.errored)
+ alert(usr, "Something has gone VERY wrong ingame. Please inform the server host.\nError details: [vr.error]")
+ B.close()
+ return
+
+ if(vr.status_code != 200)
+ // Cleanup so they can start again
+ var/datum/db_query/dbq = SSdbcore.NewQuery("DELETE FROM [format_table_name("2fa_secrets")] WHERE ckey=:ckey", list("ckey" = ckey))
+ dbq.warn_execute()
+
+ // See if its unauthorised. I used 400 for that dont at me
+ if(vr.status_code == 400)
+ alert(usr, "Invalid code entered. 2FA Setup aborted!")
+ B.close()
+ else
+ alert(usr, "2FA validation returned a non-200 code. Please inform the server host.\nError code: [vr.status_code]\nError details: [vr.body]")
+ B.close()
+ return
+
+ // If we are here, they authed successfully
+ alert(usr, "Congratulations. 2FA is now setup properly for your account. In preferences, you can change whether you want it to ask for a code on every connection or only when your IP changes")
+ B.close()
+ // Default to IP change only
+ prefs._2fa_status = _2FA_ENABLED_IP
+ prefs.save_preferences(src)
+ prefs.ShowChoices(usr)
+ return
+
+
+ // If we are here, they just want to change the mode
+ var/option = alert(usr, "Would you like to change 2FA mode or disable it entirely?", "2FA Mode", "Enable (Always)", "Enable (On IP Change)", "Deactivate")
+ switch(option)
+ if("Enable (Always)")
+ prefs._2fa_status = _2FA_ENABLED_ALWAYS
+ prefs.save_preferences(src)
+ prefs.ShowChoices(usr)
+ if("Enable (On IP Change)")
+ prefs._2fa_status = _2FA_ENABLED_IP
+ prefs.save_preferences(src)
+ prefs.ShowChoices(usr)
+ if("Deactivate")
+ var/confirm = alert(usr, "Are you SURE you want to deactivate 2FA?", "WARNING", "Yes", "No")
+ if(confirm != "Yes")
+ return
+
+ // Prompt them for a code to make sure they know what they are doing
+ var/entered_code = input(usr, "Please enter a code from your auth app", "2FA Validation")
+ if(!entered_code)
+ alert(usr, "2FA deactivation aborted!")
+ return
+
+ var/datum/http_response/vr = wrap_http_get("[config._2fa_auth_host]/validateCode?ckey=[ckey]&code=[entered_code]")
+ // If this fails, shits gone bad
+ if(vr.errored)
+ alert(usr, "Something has gone VERY wrong ingame. Please inform the server host.\nError details: [vr.error]")
+ return
+
+ if(vr.status_code != 200)
+ // See if its unauthorised. I used 400 for that dont at me
+ if(vr.status_code == 400)
+ alert(usr, "Invalid code entered. 2FA deactivation aborted!")
+ else
+ alert(usr, "2FA validation returned non-200 code. Please inform the server host.\nError code: [vr.status_code]\nError details: [vr.body]")
+ return
+
+ // If we are here, they authed properly
+ var/datum/db_query/dbq = SSdbcore.NewQuery("DELETE FROM [format_table_name("2fa_secrets")] WHERE ckey=:ckey", list("ckey" = ckey))
+ dbq.warn_execute()
+ prefs._2fa_status = _2FA_DISABLED
+ prefs.save_preferences(src)
+ prefs.ShowChoices(usr)
+ alert(usr, "2FA disabled successfully")
+
+/datum/preferences/proc/_2fastatus_to_text()
+ switch(_2fa_status)
+ if(_2FA_DISABLED)
+ return "Disabled"
+ if(_2FA_ENABLED_IP)
+ return "Enabled (Will prompt on IP changes)"
+ if(_2FA_ENABLED_ALWAYS)
+ return "Enabled (Will prompt every time)"
+
+
+// Proc to wrap HTTP requests properly, without needing SShttp firing
+/proc/wrap_http_get(url)
+ var/datum/http_request/req = new()
+ req.prepare(RUSTG_HTTP_METHOD_GET, url)
+ req.begin_async()
+ // Check if we are complete
+ UNTIL(req.is_complete())
+ var/datum/http_response/res = req.into_response()
+
+ return res
+
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index ce32a9c28b4..0e302252116 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -44,7 +44,6 @@ You can set verify to TRUE if you want send() to sleep until the client has the
if(client.cache.Find(asset_name) || client.sending.Find(asset_name))
return 0
- log_asset("Sending asset [asset_name] to client [client]")
client << browse_rsc(SSassets.cache[asset_name], asset_name)
if(!verify) // Can't access the asset cache browser, rip.
client.cache += asset_name
@@ -93,7 +92,6 @@ You can set verify to TRUE if you want send() to sleep until the client has the
to_chat(client, "Sending Resources...")
for(var/asset in unreceived)
if(asset in SSassets.cache)
- log_asset("Sending asset [asset] to client [client]")
client << browse_rsc(SSassets.cache[asset], asset)
if(!verify) // Can't access the asset cache browser, rip.
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index dac6b8f3dac..fe1799b5048 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -8,8 +8,8 @@
#define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen?
#define MIN_CLIENT_VERSION 513 // Minimum byond major version required to play.
//I would just like the code ready should it ever need to be used.
-#define SUGGESTED_CLIENT_VERSION 513 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1536
-#define SUGGESTED_CLIENT_BUILD 1536 // only integers (e.g: 1536, 1539) are useful here. This is the part AFTER the ".", IE 1536 out of 513.1536
+#define SUGGESTED_CLIENT_VERSION 513 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1542
+#define SUGGESTED_CLIENT_BUILD 1542 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542
#define SSD_WARNING_TIMER 30 // cycles, not seconds, so 30=60s
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 2911e64e87c..e188431f719 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -4,7 +4,7 @@
slot = slot_w_uniform
sort_category = "Uniforms and Casual Dress"
-/datum/gear/uniform/suits
+/datum/gear/uniform/suit
subtype_path = /datum/gear/uniform/suit
//there's a lot more colors than I thought there were @_@
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index 7c45d7ce88a..12d7bc62237 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -192,6 +192,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
"1020" = 100, // CHANNEL_HEARTBEAT
"1019" = 100, // CHANNEL_BUZZ
"1018" = 100, // CHANNEL_AMBIENCE
+ "1017" = 100, // CHANNEL_ENGINE
)
/// The volume mixer save timer handle. Used to debounce the DB call to save, to avoid spamming.
var/volume_mixer_saving = null
@@ -204,6 +205,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/gear_tab = "General"
// Parallax
var/parallax = PARALLAX_HIGH
+ /// 2FA status
+ var/_2fa_status = _2FA_DISABLED
/// Do we want to force our runechat colour to be white?
var/force_white_runechat = FALSE
@@ -447,6 +450,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
// LEFT SIDE OF THE PAGE
dat += "
"
dat += "
General Settings
"
+ dat += "2FA Setup:[_2fastatus_to_text()] "
if(user.client.holder)
dat += "Adminhelp sound:[(sound & SOUND_ADMINHELP)?"On":"Off"] "
dat += "AFK Cryoing:[(toggles2 & PREFTOGGLE_2_AFKWATCH) ? "Yes" : "No"] "
@@ -1433,7 +1437,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
if(S.autohiss_basic_map)
var/list/autohiss_choice = list("Off" = AUTOHISS_OFF, "Basic" = AUTOHISS_BASIC, "Full" = AUTOHISS_FULL)
var/new_autohiss_pref = input(user, "Choose your character's auto-accent level:", "Character Preference") as null|anything in autohiss_choice
- autohiss_mode = autohiss_choice[new_autohiss_pref]
+ if(new_autohiss_pref)
+ autohiss_mode = autohiss_choice[new_autohiss_pref]
if("metadata")
var/new_metadata = input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , metadata) as message|null
@@ -2041,7 +2046,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
if("UIalpha")
var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parameter for UI, between 50 and 255", UI_style_alpha) as num
- if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+ if(!UI_style_alpha_new || !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50))
+ return
UI_style_alpha = UI_style_alpha_new
if(ishuman(usr)) //mid-round preference changes, for aesthetics
@@ -2141,6 +2147,11 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
if(parent && parent.mob && parent.mob.hud_used)
parent.mob.hud_used.update_parallax_pref()
+ if("edit_2fa")
+ // Do this async so we arent holding up a topic() call
+ INVOKE_ASYNC(user.client, /client.proc/edit_2fa)
+ return // We return here to avoid focus being lost
+
ShowChoices(user)
return 1
diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
index 509a5402eaa..bcb5823af6a 100644
--- a/code/modules/client/preference/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -16,7 +16,8 @@
clientfps,
atklog,
fuid,
- parallax
+ parallax,
+ 2fa_status
FROM [format_table_name("player")]
WHERE ckey=:ckey"}, list(
"ckey" = C.ckey
@@ -45,12 +46,13 @@
atklog = text2num(query.item[14])
fuid = text2num(query.item[15])
parallax = text2num(query.item[16])
+ _2fa_status = query.item[17]
qdel(query)
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
- UI_style = sanitize_inlist(UI_style, list("White", "Midnight"), initial(UI_style))
+ UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative"), initial(UI_style))
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
toggles = sanitize_integer(toggles, 0, TOGGLES_TOTAL, initial(toggles))
toggles2 = sanitize_integer(toggles2, 0, TOGGLES_2_TOTAL, initial(toggles2))
@@ -93,7 +95,8 @@
volume_mixer=:volume_mixer,
lastchangelog=:lastchangelog,
clientfps=:clientfps,
- parallax=:parallax
+ parallax=:parallax,
+ 2fa_status=:_2fa_status
WHERE ckey=:ckey"}, list(
// OH GOD THE PARAMETERS
"ooccolour" = ooccolor,
@@ -111,7 +114,8 @@
"lastchangelog" = lastchangelog,
"clientfps" = clientfps,
"parallax" = parallax,
- "ckey" = C.ckey
+ "_2fa_status" = _2fa_status,
+ "ckey" = C.ckey,
)
)
@@ -440,7 +444,7 @@
"f_style" = f_style,
"markingstyleslist" = markingstyleslist,
"ha_style" = ha_style,
- "alt_head" = alt_head || "",
+ "alt_head" = (alt_head ? alt_head : ""), // This it intentional. It wont work without it!
"e_colour" = e_colour,
"underwear" = underwear,
"undershirt" = undershirt,
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index a1d84912f3f..c34e17943cb 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -263,6 +263,7 @@
icon_state = "meson"
item_state = "meson"
resistance_flags = NONE
+ prescription_upgradable = TRUE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 7126f8513f7..9baf6c46079 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -618,7 +618,9 @@ BLIND // can't see anything
resistance_flags = NONE
hide_tail_by_species = null
species_restricted = list("exclude","Wryn")
-
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/suit.dmi'
+ )
//Under clothing
/obj/item/clothing/under
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 68539c0822f..2f3fcca395f 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -4,31 +4,33 @@
// Pre-upgraded upgradable glasses
name = "prescription [name]"
-/obj/item/clothing/glasses/attackby(obj/item/O as obj, mob/user as mob)
- if(user.stat || user.restrained() || !ishuman(user))
+/obj/item/clothing/glasses/attackby(obj/item/I, mob/user)
+ if(!prescription_upgradable || user.stat || user.restrained() || !ishuman(user))
return ..()
var/mob/living/carbon/human/H = user
- if(prescription_upgradable)
- if(istype(O, /obj/item/clothing/glasses/regular))
- if(prescription)
- to_chat(H, "You can't possibly imagine how adding more lenses would improve \the [name].")
- return
- H.unEquip(O)
- O.loc = src // Store the glasses for later removal
- to_chat(H, "You fit \the [name] with lenses from \the [O].")
- prescription = 1
- name = "prescription [name]"
+
+ // Adding prescription glasses
+ if(istype(I, /obj/item/clothing/glasses/regular))
+ if(prescription)
+ to_chat(H, "You can't possibly imagine how adding more lenses would improve [src].")
return
- if(prescription && istype(O, /obj/item/screwdriver))
- var/obj/item/clothing/glasses/regular/G = locate() in src
- if(!G)
- G = new(get_turf(H))
- to_chat(H, "You salvage the prescription lenses from \the [name].")
- prescription = 0
- name = initial(name)
- H.put_in_hands(G)
- return
- return ..()
+ H.unEquip(I)
+ I.loc = src // Store the glasses for later removal
+ to_chat(H, "You fit [src] with lenses from [I].")
+ prescription = TRUE
+ name = "prescription [initial(name)]"
+
+ // Removing prescription glasses
+ else if(prescription && istype(I, /obj/item/screwdriver))
+ var/obj/item/clothing/glasses/regular/G = locate() in src
+ if(!G)
+ G = new(src)
+ to_chat(H, "You salvage the prescription lenses from [src].")
+ prescription = FALSE
+ name = initial(name)
+ H.put_in_hands(G)
+
+ H.update_nearsighted_effects()
/obj/item/clothing/glasses/visor_toggling()
..()
@@ -114,7 +116,7 @@
icon_state = "purple"
item_state = "glasses"
origin_tech = "magnets=2;engineering=1"
- prescription_upgradable = 0
+ prescription_upgradable = TRUE
scan_reagents = 1 //You can see reagents while wearing science goggles
resistance_flags = ACID_PROOF
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
@@ -135,6 +137,7 @@
icon_state = "nvpurple"
item_state = "glasses"
see_in_dark = 8
+ prescription_upgradable = FALSE
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
/obj/item/clothing/glasses/janitor
@@ -421,9 +424,9 @@
..()
/obj/item/clothing/glasses/thermal/monocle
- name = "thermoncle"
+ name = "thermonocle"
desc = "A thermal monocle."
- icon_state = "thermoncle"
+ icon_state = "thermonocle"
flags_cover = null //doesn't protect eyes because it's a monocle, duh
/obj/item/clothing/glasses/thermal/eyepatch
@@ -454,6 +457,7 @@
vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
scan_reagents = 1
+ prescription = TRUE
flags = NODROP
flags_cover = null
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 146ca3cf25e..b889246f73d 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -78,7 +78,7 @@
desc = "These gloves are fire-resistant."
icon_state = "black"
item_state = "bgloves"
- item_color="brown"
+ item_color="black"
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 9292bd85292..a6ece08feee 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -166,7 +166,7 @@
var/mob/living/M = loc
if(M.a_intent in accepted_intents)
- if(istype(M.mind.martial_art, /datum/martial_art/cqc))
+ if(M.mind.martial_art || HAS_TRAIT(M, TRAIT_HULK))
M.changeNext_move(CLICK_CD_MELEE)//normal attack speed for hulk, CQC and Carp.
else
M.changeNext_move(click_speed_modifier)
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index dc880f82541..95c4e04b3ac 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -55,14 +55,12 @@
icon_state = "hardhat0_orange"
item_state = "hardhat0_orange"
item_color = "orange"
- dog_fashion = null
/obj/item/clothing/head/hardhat/red
name = "firefighter helmet"
icon_state = "hardhat0_red"
item_state = "hardhat0_red"
item_color = "red"
- dog_fashion = null
flags = STOPSPRESSUREDMAGE
heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
@@ -84,7 +82,6 @@
icon_state = "hardhat0_dblue"
item_state = "hardhat0_dblue"
item_color = "dblue"
- dog_fashion = null
/obj/item/clothing/head/hardhat/atmos
name = "atmospheric technician's firefighting helmet"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index bafe3a9f0a9..e8ce88dba1e 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -162,7 +162,7 @@
icon_state = "roman"
item_state = "roman"
strip_delay = 100
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/roman
/obj/item/clothing/head/helmet/roman/fake
desc = "An ancient helmet made of plastic and leather."
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 44b1431bdfe..dd99bba3211 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -25,7 +25,7 @@
name = "captain's parade cap"
desc = "Worn only by Captains with an abundance of class."
icon_state = "capcap"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/captain
//Head of Personnel
/obj/item/clothing/head/hopcap
@@ -106,11 +106,13 @@
icon_state = "hoscap"
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
strip_delay = 80
+ dog_fashion = /datum/dog_fashion/head/HoS
/obj/item/clothing/head/HoS/beret
name = "head of security's beret"
desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
icon_state = "beret_hos_black"
+ dog_fashion = /datum/dog_fashion/head/HoS
/obj/item/clothing/head/warden
name = "warden's police hat"
@@ -134,7 +136,7 @@
icon_state = "beret_officer"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
strip_delay = 60
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/beret/sec
/obj/item/clothing/head/beret/sec/warden
name = "warden's beret"
@@ -180,15 +182,35 @@
/obj/item/clothing/head/surgery/purple
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple."
icon_state = "surgcap_purple"
+ dog_fashion = /datum/dog_fashion/head/surgery
/obj/item/clothing/head/surgery/blue
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue."
icon_state = "surgcap_blue"
+ dog_fashion = /datum/dog_fashion/head/surgery
/obj/item/clothing/head/surgery/green
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green."
icon_state = "surgcap_green"
+ dog_fashion = /datum/dog_fashion/head/surgery
/obj/item/clothing/head/surgery/black
- desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark than the coroner's humor."
+ desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark as the coroner's humor."
icon_state = "surgcap_black"
+ dog_fashion = /datum/dog_fashion/head/surgery
+
+//Special Roles
+/obj/item/clothing/head/beret/solgov/command
+ name = "\improper Trans-Solar Federation Lieutenant's beret"
+ desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
+ icon_state = "solgovcberet"
+ item_color = "solgovc"
+ dog_fashion = null
+ armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
+ strip_delay = 80
+
+/obj/item/clothing/head/beret/solgov/command/elite
+ name = "\improper Trans-Solar Federation Specops Lieutenant's beret"
+ desc = "A beret worn by marines of the Trans-Solar Federation Psiops division. The insignia signifies the wearer bears the rank of a Lieutenant."
+ icon_state = "solgovceliteberet"
+ item_color = "solgovcelite"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index ba01f0347b2..388fa0374ed 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -25,6 +25,7 @@
desc = "A fancy powdered wig given to arbitrators of the law. It looks itchy."
icon_state = "jwig"
item_state = "jwig"
+ dog_fashion = /datum/dog_fashion/head/justice_wig
/obj/item/clothing/head/beret/blue
icon_state = "beret_blue"
@@ -187,6 +188,7 @@
icon_state = "bowler_hat"
item_state = "bowler_hat"
desc = "For that industrial age look."
+ dog_fashion = /datum/dog_fashion/head/bowlerhat
/obj/item/clothing/head/beaverhat
name = "beaver hat"
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 818e92eb667..ca0e6d5aad5 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -38,35 +38,35 @@
desc = "It's a baseball hat in a tasteless red colour."
icon_state = "redsoft"
item_color = "red"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/blue
name = "blue cap"
desc = "It's a baseball hat in a tasteless blue colour."
icon_state = "bluesoft"
item_color = "blue"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/green
name = "green cap"
desc = "It's a baseball hat in a tasteless green colour."
icon_state = "greensoft"
item_color = "green"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/yellow
name = "yellow cap"
desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "yellowsoft"
item_color = "yellow"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/grey
name = "grey cap"
desc = "It's a baseball hat in a tasteful grey colour."
icon_state = "greysoft"
item_color = "grey"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/orange
name = "orange cap"
@@ -79,28 +79,28 @@
desc = "It's a baseball hat in a tasteless white colour."
icon_state = "mimesoft"
item_color = "mime"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/purple
name = "purple cap"
desc = "It's a baseball hat in a tasteless purple colour."
icon_state = "purplesoft"
item_color = "purple"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/black
name = "black cap"
desc = "It's a baseball hat in a tasteless black colour."
icon_state = "blacksoft"
item_color = "black"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/rainbow
name = "rainbow cap"
desc = "It's a baseball hat in a bright rainbow of colors."
icon_state = "rainbowsoft"
item_color = "rainbow"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/sec
name = "security cap"
@@ -109,7 +109,7 @@
item_color = "sec"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
strip_delay = 60
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/sec/corp
name = "corporate security cap"
@@ -124,9 +124,29 @@
item_color = "solgov"
dog_fashion = null
-/obj/item/clothing/head/soft/solgov/command
+/obj/item/clothing/head/soft/solgov/marines
+ armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
+ strip_delay = 60
+ icon_state = "solgovsoft_flipped"
+ flipped = TRUE
+
+/obj/item/clothing/head/soft/solgov/marines/elite
+ name = "\improper Trans-Solar Federation Specops marine cap"
+ desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division."
+ icon_state = "solgovelitesoft_flipped"
+ item_color = "solgovelite"
+
+/obj/item/clothing/head/soft/solgov/marines/command
name = "\improper Trans-Solar Federation lieutenant's cap"
desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
- icon_state = "solgovcsoft"
+ icon_state = "solgovcsoft_flipped"
item_color = "solgovc"
dog_fashion = null
+ armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
+ strip_delay = 80
+
+/obj/item/clothing/head/soft/solgov/marines/command/elite
+ name = "\improper Trans-Solar Federation Specops Lieutenant's cap"
+ desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
+ icon_state = "solgovcelitesoft"
+ item_color = "solgovcelite"
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index d9a3c6030d1..d8cba5290b7 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -58,6 +58,9 @@
"Grey" = 'icons/mob/species/grey/mask.dmi'
)
+/obj/item/clothing/mask/gas/explorer/marines
+ name = "military gas mask"
+
/obj/item/clothing/mask/gas/explorer/attack_self(mob/user)
adjustmask(user)
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 5b35f14f943..d7c146e3602 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -22,7 +22,7 @@
name = "black wizard hat"
desc = "Strange-looking black hat-wear that most certainly belongs to a real skeleton. Spooky."
icon_state = "blackwizard"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/black_wizard
/obj/item/clothing/head/wizard/clown
name = "purple wizard hat"
@@ -58,14 +58,14 @@
name = "witch hat"
desc = "Strange-looking hat-wear, makes you want to cast fireballs."
icon_state = "marisa"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/wizard/marisa
/obj/item/clothing/head/wizard/magus
name = "magus helm"
desc = "A mysterious helmet that hums with an unearthly power"
icon_state = "magus"
item_state = "magus"
- dog_fashion = null
+ dog_fashion = /datum/dog_fashion/head/wizard/magus
/obj/item/clothing/head/wizard/amp
name = "psychic amplifier"
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 33563eabe29..53b53f54f48 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -141,7 +141,7 @@
user.visible_message("[user] places \the [src] against [M]'s chest and listens attentively.", "You place \the [src] against [M]'s chest...")
var/obj/item/organ/internal/H = M.get_int_organ(/obj/item/organ/internal/heart)
var/obj/item/organ/internal/L = M.get_int_organ(/obj/item/organ/internal/lungs)
- if((H && M.pulse) || (L && !HAS_TRAIT(M, TRAIT_NOBREATH)))
+ if(M.pulse && (H || (L && !HAS_TRAIT(M, TRAIT_NOBREATH))))
var/color = "notice"
if(H)
var/heart_sound
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index f4a16283fac..e91942e8e5f 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -68,14 +68,25 @@
item_color = "solgov"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
displays_id = 0
+/obj/item/clothing/under/solgov/elite
+ name = "\improper Trans-Solar Federation Specops marine uniform"
+ desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces."
+ icon_state = "solgovelite"
+ item_color = "solgovelite"
/obj/item/clothing/under/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's uniform"
- desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces. This one has additional insignia on its shoulders."
+ desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces. This one has additional insignia on its shoulders and cuffs."
icon_state = "solgovc"
item_color = "solgovc"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
+/obj/item/clothing/under/solgov/command/elite
+ name = "\improper Trans-Solar Federation Specops Lieutenant's uniform"
+ desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces. This one has additional insignia on its shoulders and cuffs."
+ icon_state = "solgovcelite"
+ item_color = "solgovcelite"
+
/obj/item/clothing/under/solgov/rep
name = "\improper Trans-Solar Federation representative's uniform"
desc = "A formal uniform worn by the diplomatic representatives of the Trans-Solar Federation."
diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm
index f6dbb48ed63..0fc71ecf4c9 100644
--- a/code/modules/crafting/craft.dm
+++ b/code/modules/crafting/craft.dm
@@ -245,7 +245,7 @@
var/obj/item/stack/SD
while(amt > 0)
S = locate(A) in surroundings
- if(S.amount >= amt)
+ if(S.get_amount() >= amt)
if(!locate(S.type) in Deletion)
SD = new S.type()
Deletion += SD
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 1be2504d387..3905458d864 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -361,6 +361,13 @@
/obj/item/bikehorn)
category = CAT_MISC
+/datum/crafting_recipe/sad_trombone
+ name = "Sad trombone"
+ result = list(/obj/item/instrument/trombone/sad)
+ time = 20
+ reqs = list(/obj/item/stack/sheet/mineral/bananium = 5)
+ category = CAT_MISC
+
/datum/crafting_recipe/blackcarpet
name = "Black Carpet"
result = list(/obj/item/stack/tile/carpet/black)
diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm
index 555dbe542de..e8bb1b578ae 100644
--- a/code/modules/detective_work/evidence.dm
+++ b/code/modules/detective_work/evidence.dm
@@ -76,6 +76,7 @@
"You hear someone rustle around in a plastic bag, and remove something.")
overlays.Cut() //remove the overlays
user.put_in_hands(I)
+ I.pickup(user)
w_class = WEIGHT_CLASS_TINY
icon_state = "evidenceobj"
desc = "An empty evidence bag."
@@ -83,4 +84,3 @@
else
to_chat(user, "[src] is empty.")
icon_state = "evidenceobj"
-
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index e2733ba2446..be8df4c3ae5 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -244,17 +244,12 @@ log transactions
if(amount <= 0)
to_chat(usr, "[bicon(src)]That is not a valid amount.")
else if(authenticated_account && amount > 0)
- if(amount <= authenticated_account.money)
+ if(amount > 100000) // Prevent crashes
+ to_chat(usr, "[bicon(src)]The ATM's screen flashes, 'Maximum single withdrawal limit reached, defaulting to 100,000.'")
+ amount = 100000
+ if(authenticated_account.charge(amount, null, "Credit withdrawal", machine_id, authenticated_account.owner_name))
playsound(src, 'sound/machines/chime.ogg', 50, TRUE)
-
- //remove the money
- if(amount > 100000) // prevent crashes
- to_chat(usr, "The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 100,000.'")
- amount = 100000
withdraw_arbitrary_sum(amount)
- authenticated_account.charge(amount, null, "Credit withdrawal", machine_id, authenticated_account.owner_name)
- else
- to_chat(usr, "[bicon(src)]You don't have enough funds to do that!")
if("balance_statement")
if(authenticated_account)
diff --git a/code/modules/events/apc_short.dm b/code/modules/events/apc_short.dm
index 9560140c2d8..759b443e2bf 100644
--- a/code/modules/events/apc_short.dm
+++ b/code/modules/events/apc_short.dm
@@ -46,6 +46,7 @@
// skip any APCs that are too critical to disable
var/list/skipped_areas_apc = list(
/area/engine/engineering,
+ /area/engine/supermatter,
/area/turret_protected/ai)
if(announce)
GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/attention.ogg')
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index eb5dfc6a738..8282cc11317 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -30,5 +30,6 @@
SSticker.mode.update_blob_icons_added(B.mind)
to_chat(B, "You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.")
+ to_chat(B, "For more information, check the wiki page: ([config.wikiurl]/index.php/Blob)")
notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B)
successSpawn = TRUE
diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm
index 36a8d452248..019ef568908 100644
--- a/code/modules/events/spider_terror.dm
+++ b/code/modules/events/spider_terror.dm
@@ -56,6 +56,7 @@
var/mob/living/simple_animal/hostile/poison/terror_spider/S = new spider_type(vent.loc)
var/mob/M = pick_n_take(candidates)
S.key = M.key
+ to_chat(S, "For more information, check the wiki page: ([config.wikiurl]/index.php/Terror_Spider)")
spawncount--
successSpawn = TRUE
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index a24b73ae56c..4cdb2f88f07 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -18,13 +18,13 @@
/mob/living/carbon/proc/custom_dreams(list/dreamlist, mob/user)
var/list/newlist = dreamlist.Copy()
for(var/i in 1 to newlist.len)
- newlist[i] = replacetext(newlist[i], "\[DREAMER\]", "[user.name]")
+ newlist[i] = replacetext(newlist[i], "DREAMER", "[user.name]")
return newlist
//NIGHTMARES
/mob/living/carbon/proc/nightmare()
- var/list/nightmares = GLOB.nightmare_strings.Copy()
+ var/list/nightmares = custom_dreams(GLOB.nightmare_strings, src)
for(var/obj/item/bedsheet/sheet in loc)
nightmares += sheet.nightmare_messages
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 898d3f3cc71..9d9e81be9af 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -23,6 +23,7 @@
"sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
"blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
"cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
+ "wasabi" = list("wasabitube", "wasabi bottle", "A pungent paste commonly served in tiny amounts with sushi. Spicy!"),
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
@@ -113,6 +114,9 @@
icon_state = "enzyme"
list_reagents = list("enzyme" = 50)
+/obj/item/reagent_containers/food/condiment/enzyme/cyborg_recharge(coeff, emagged)
+ reagents.check_and_add("enzyme", volume, 2 * coeff) // Only recharge if the current amount of enzyme is under `volume`.
+
/obj/item/reagent_containers/food/condiment/sugar
name = "sugar bottle"
desc = "Tasty spacey sugar!"
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index ef2ad5f777b..e08e5e243be 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -41,14 +41,13 @@
/obj/item/trash/bowl
name = "bowl"
desc = "An empty bowl. Put some food in it to start making a soup."
- icon = 'icons/obj/food/food.dmi'
+ icon = 'icons/obj/food/custom.dmi'
icon_state = "soup"
-/obj/item/trash/bowl/attackby(obj/item/W, mob/user, params)
-
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
+/obj/item/trash/bowl/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/reagent_containers/food/snacks) && !(I.flags & NODROP))
var/obj/item/reagent_containers/food/snacks/customizable/soup/S = new(get_turf(user))
- S.attackby(W,user, params)
+ S.attackby(I, user, params)
qdel(src)
else
..()
@@ -313,6 +312,7 @@
icon_state = "soup"
baseicon = "soup"
basename = "soup"
+ consume_sound = 'sound/items/drink.ogg'
snack_overlays = 0
trash = /obj/item/trash/bowl
top = 0
diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm
index 17b70a26308..16048147fb3 100644
--- a/code/modules/food_and_drinks/food/foods/soups.dm
+++ b/code/modules/food_and_drinks/food/foods/soups.dm
@@ -3,143 +3,132 @@
// Soups //
//////////////////////
-/obj/item/reagent_containers/food/snacks/meatballsoup
+// Base object for soups, should never appear ingame.
+/obj/item/reagent_containers/food/snacks/soup
+ name = "impossible soup"
+ desc = "This soup is so good, it shouldn't even exist!"
+ icon_state = "beans" // If you don't have a sprite, you get beans.
+ consume_sound = 'sound/items/drink.ogg'
+ trash = /obj/item/trash/snack_bowl
+ bitesize = 5
+
+/obj/item/reagent_containers/food/snacks/soup/meatballsoup
name = "meatball soup"
desc = "You've got balls kid, BALLS!"
icon_state = "meatballsoup"
- trash = /obj/item/trash/snack_bowl
filling_color = "#785210"
- bitesize = 5
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("meatball" = 1)
-/obj/item/reagent_containers/food/snacks/slimesoup
+/obj/item/reagent_containers/food/snacks/soup/slimesoup
name = "slime soup"
desc = "If no water is available, you may substitute tears."
icon_state = "slimesoup"
filling_color = "#C4DBA0"
- bitesize = 5
list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
tastes = list("slime" = 1)
-/obj/item/reagent_containers/food/snacks/bloodsoup
+/obj/item/reagent_containers/food/snacks/soup/bloodsoup
name = "tomato soup"
desc = "Smells like copper."
icon_state = "tomatosoup"
filling_color = "#FF0000"
- bitesize = 5
list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
tastes = list("iron" = 1)
-/obj/item/reagent_containers/food/snacks/clownstears
+/obj/item/reagent_containers/food/snacks/soup/clownstears
name = "clown's tears"
desc = "Not very funny."
icon_state = "clownstears"
filling_color = "#C4FBFF"
- bitesize = 5
list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8)
tastes = list("a bad joke" = 1)
-/obj/item/reagent_containers/food/snacks/vegetablesoup
+/obj/item/reagent_containers/food/snacks/soup/vegetablesoup
name = "vegetable soup"
desc = "A true vegan meal." //TODO
icon_state = "vegetablesoup"
- trash = /obj/item/trash/snack_bowl
filling_color = "#AFC4B5"
- bitesize = 5
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/nettlesoup
+/obj/item/reagent_containers/food/snacks/soup/nettlesoup
name = "nettle soup"
desc = "To think, the botanist would've beaten you to death with one of these."
icon_state = "nettlesoup"
- trash = /obj/item/trash/snack_bowl
filling_color = "#AFC4B5"
- bitesize = 5
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("nettles" = 1)
-/obj/item/reagent_containers/food/snacks/mysterysoup
+/obj/item/reagent_containers/food/snacks/soup/mysterysoup
name = "mystery soup"
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
var/extra_reagent = null
- bitesize = 5
list_reagents = list("nutriment" = 6)
tastes = list("chaos" = 1)
-/obj/item/reagent_containers/food/snacks/mysterysoup/New()
+/obj/item/reagent_containers/food/snacks/soup/mysterysoup/New()
..()
extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine")
reagents.add_reagent("[extra_reagent]", 5)
-/obj/item/reagent_containers/food/snacks/wishsoup
+/obj/item/reagent_containers/food/snacks/soup/wishsoup
name = "wish soup"
desc = "I wish this was soup."
icon_state = "wishsoup"
- trash = /obj/item/trash/snack_bowl
filling_color = "#D1F4FF"
- bitesize = 5
list_reagents = list("water" = 10)
tastes = list("wishes" = 1)
-/obj/item/reagent_containers/food/snacks/wishsoup/New()
+/obj/item/reagent_containers/food/snacks/soup/wishsoup/New()
..()
if(prob(25))
desc = "A wish come true!" // hue
reagents.add_reagent("nutriment", 9)
reagents.add_reagent("vitamin", 1)
-/obj/item/reagent_containers/food/snacks/tomatosoup
+/obj/item/reagent_containers/food/snacks/soup/tomatosoup
name = "tomato soup"
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
- trash = /obj/item/trash/snack_bowl
filling_color = "#D92929"
- bitesize = 5
list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
tastes = list("tomato" = 1)
-/obj/item/reagent_containers/food/snacks/misosoup
+/obj/item/reagent_containers/food/snacks/soup/misosoup
name = "miso soup"
desc = "The universe's best soup! Yum!!!"
icon_state = "misosoup"
- trash = /obj/item/trash/snack_bowl
- bitesize = 5
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("miso" = 1)
-/obj/item/reagent_containers/food/snacks/mushroomsoup
+/obj/item/reagent_containers/food/snacks/soup/mushroomsoup
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
- trash = /obj/item/trash/snack_bowl
filling_color = "#E386BF"
- bitesize = 5
list_reagents = list("nutriment" = 8, "vitamin" = 4)
tastes = list("mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/beetsoup
+/obj/item/reagent_containers/food/snacks/soup/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
- trash = /obj/item/trash/snack_bowl
- bitesize = 5
filling_color = "#FAC9FF"
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("beet" = 1)
-/obj/item/reagent_containers/food/snacks/beetsoup/New()
+/obj/item/reagent_containers/food/snacks/soup/beetsoup/New()
..()
- name = pick("borsch","bortsch","borstch","borsh","borshch","borscht")
+ name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht")
//////////////////////
// Stews //
//////////////////////
-/obj/item/reagent_containers/food/snacks/stew
+/obj/item/reagent_containers/food/snacks/soup/stew
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
@@ -161,22 +150,18 @@
// Chili //
//////////////////////
-/obj/item/reagent_containers/food/snacks/hotchili
+/obj/item/reagent_containers/food/snacks/soup/hotchili
name = "hot chili"
desc = "A five alarm Texan Chili!"
icon_state = "hotchili"
- trash = /obj/item/trash/snack_bowl
filling_color = "#FF3C00"
- bitesize = 5
list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("hot peppers" = 1, "tomato" = 1)
-/obj/item/reagent_containers/food/snacks/coldchili
+/obj/item/reagent_containers/food/snacks/soup/coldchili
name = "cold chili"
desc = "This slush is barely a liquid!"
icon_state = "coldchili"
filling_color = "#2B00FF"
- trash = /obj/item/trash/snack_bowl
- bitesize = 5
list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("tomato" = 1, "mint" = 1)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
index 72782f532a6..12f09adeb10 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
@@ -115,7 +115,7 @@
return 1
if(istype(O,/obj/item/stack))
var/obj/item/stack/S = O
- if(S.amount > 1)
+ if(S.get_amount() > 1)
var/obj/item/stack/to_add = S.split(user, 1)
to_add.forceMove(src)
user.visible_message("[user] adds one of [S] to [src].", "You add one of [S] to [src].")
diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
index 2214e44b772..a54ef40918a 100644
--- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
@@ -227,30 +227,30 @@
/datum/recipe/microwave/meatballsoup
reagents = list("water" = 10)
items = list(/obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot)
- result = /obj/item/reagent_containers/food/snacks/meatballsoup
+ result = /obj/item/reagent_containers/food/snacks/soup/meatballsoup
/datum/recipe/microwave/vegetablesoup
reagents = list("water" = 10)
items = list(/obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot,
/obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/eggplant)
- result = /obj/item/reagent_containers/food/snacks/vegetablesoup
+ result = /obj/item/reagent_containers/food/snacks/soup/vegetablesoup
/datum/recipe/microwave/nettlesoup
reagents = list("water" = 10)
items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato)
- result = /obj/item/reagent_containers/food/snacks/nettlesoup
+ result = /obj/item/reagent_containers/food/snacks/soup/nettlesoup
/datum/recipe/microwave/wishsoup
reagents = list("water" = 20)
- result= /obj/item/reagent_containers/food/snacks/wishsoup
+ result = /obj/item/reagent_containers/food/snacks/soup/wishsoup
/datum/recipe/microwave/hotchili
items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/hotchili
+ result = /obj/item/reagent_containers/food/snacks/soup/hotchili
/datum/recipe/microwave/coldchili
items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/icepepper, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/coldchili
+ result = /obj/item/reagent_containers/food/snacks/soup/coldchili
/datum/recipe/microwave/spellburger
items = list(
@@ -314,14 +314,14 @@
/datum/recipe/microwave/tomatosoup
reagents = list("water" = 10)
items = list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/tomatosoup
+ result = /obj/item/reagent_containers/food/snacks/soup/tomatosoup
/datum/recipe/microwave/stew
reagents = list("water" = 10)
items= list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/potato,
/obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/eggplant,
/obj/item/reagent_containers/food/snacks/grown/mushroom, /obj/item/reagent_containers/food/snacks/meat)
- result = /obj/item/reagent_containers/food/snacks/stew
+ result = /obj/item/reagent_containers/food/snacks/soup/stew
/datum/recipe/microwave/slimetoast
reagents = list("slimejelly" = 5)
@@ -345,7 +345,7 @@
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
)
- result = /obj/item/reagent_containers/food/snacks/misosoup
+ result = /obj/item/reagent_containers/food/snacks/soup/misosoup
/datum/recipe/microwave/stewedsoymeat
items = list(/obj/item/reagent_containers/food/snacks/soydope, /obj/item/reagent_containers/food/snacks/soydope,
@@ -463,11 +463,11 @@
/datum/recipe/microwave/bloodsoup
reagents = list("blood" = 10)
items = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blood, /obj/item/reagent_containers/food/snacks/grown/tomato/blood)
- result = /obj/item/reagent_containers/food/snacks/bloodsoup
+ result = /obj/item/reagent_containers/food/snacks/soup/bloodsoup
/datum/recipe/microwave/slimesoup
reagents = list("water" = 10, "slimejelly" = 5)
- result = /obj/item/reagent_containers/food/snacks/slimesoup
+ result = /obj/item/reagent_containers/food/snacks/soup/slimesoup
/datum/recipe/microwave/clownstears
reagents = list("water" = 10)
@@ -475,7 +475,7 @@
/obj/item/stack/ore/bananium,
/obj/item/reagent_containers/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/clownstears
+ result = /obj/item/reagent_containers/food/snacks/soup/clownstears
/datum/recipe/microwave/boiledslimeextract
reagents = list("water" = 5)
@@ -503,12 +503,12 @@
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/mysterysoup
+ result = /obj/item/reagent_containers/food/snacks/soup/mysterysoup
/datum/recipe/microwave/mushroomsoup
reagents = list("water" = 5, "milk" = 5)
items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom)
- result = /obj/item/reagent_containers/food/snacks/mushroomsoup
+ result = /obj/item/reagent_containers/food/snacks/soup/mushroomsoup
/datum/recipe/microwave/chawanmushi
reagents = list("water" = 5, "soysauce" = 5)
@@ -522,7 +522,7 @@
/datum/recipe/microwave/beetsoup
reagents = list("water" = 10)
items = list(/obj/item/reagent_containers/food/snacks/grown/whitebeet, /obj/item/reagent_containers/food/snacks/grown/cabbage)
- result = /obj/item/reagent_containers/food/snacks/beetsoup
+ result = /obj/item/reagent_containers/food/snacks/soup/beetsoup
/datum/recipe/microwave/herbsalad
items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 5a73313601a..104593a62d9 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -178,7 +178,7 @@
return
if(queen_bee)
- visible_message("[user] sets [qb] down inside the apiary, making it [user.p_their()] new home.")
+ visible_message("[user] sets [qb] down inside the apiary, making it [qb.p_their()] new home.")
var/relocated = 0
for(var/b in bees)
var/mob/living/simple_animal/hostile/poison/bees/B = b
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 72bd5fe8bf7..a937a8a6ebb 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -58,7 +58,7 @@
icon_state = "orange" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
tastes = list("orange" = 1)
filling_color = "#FFA500"
- distill_reagent = "triple_sec"
+ distill_reagent = "tequilasunrise"
// Lemon
/obj/item/seeds/lemon
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index ad80934ca18..136b4c7dbf4 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -26,7 +26,6 @@
filling_color = "#FFD700"
bitesize_mod = 2
tastes = list("cocoa" = 1)
- distill_reagent = "creme_de_cacao"
// Vanilla Pod
/obj/item/seeds/cocoapod/vanillapod
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 97d35aa4eed..da7c63393b2 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -11,7 +11,7 @@
growthstages = 5
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy)
mutatelist = list(/obj/item/seeds/nettle/death)
- reagents_add = list("sacid" = 0.5)
+ reagents_add = list("wasabi" = 0.15)
/obj/item/seeds/nettle/death
name = "pack of death-nettle seeds"
diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm
index cff3fcafdba..8594c6f37ea 100644
--- a/code/modules/hydroponics/grown/onion.dm
+++ b/code/modules/hydroponics/grown/onion.dm
@@ -37,6 +37,7 @@
plantname = "Red Onion Sprouts"
weed_chance = 1
product = /obj/item/reagent_containers/food/snacks/grown/onion/red
+ mutatelist = list()
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1, "onionjuice" = 0.05)
/obj/item/reagent_containers/food/snacks/grown/onion/red
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index 3087fa1dddb..36be1599728 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -22,7 +22,7 @@
icon_state = "tobacco_leaves"
tastes = list("tobacco" = 1)
filling_color = "#008000"
- distill_reagent = "creme_de_menthe" //Menthol, I guess.
+ distill_reagent = "menthol"
// Space Tobacco
/obj/item/seeds/tobacco/space
diff --git a/code/modules/instruments/objs/items/instruments.dm b/code/modules/instruments/objs/items/instruments.dm
index 9920a808fc0..ec41f9578a7 100644
--- a/code/modules/instruments/objs/items/instruments.dm
+++ b/code/modules/instruments/objs/items/instruments.dm
@@ -135,6 +135,16 @@
playsound (src, 'sound/instruments/trombone/Cn4.mid', 100,1,-1)
..()
+/obj/item/instrument/trombone/sad
+ name = "sad trombone"
+ desc = "Wah. Waah. Waaah. Waaaaaaah."
+ force = 0
+ attack_verb = list("Wahed", "Waahed", "Waaahed", "Honked")
+
+/obj/item/instrument/trombone/sad/attack(mob/living/carbon/C, mob/user)
+ playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1)
+ ..()
+
/obj/item/instrument/recorder
name = "recorder"
desc = "Just like in school, playing ability and all."
diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm
index de8b42f04ae..7c80166c46f 100644
--- a/code/modules/karma/karma.dm
+++ b/code/modules/karma/karma.dm
@@ -127,11 +127,13 @@ GLOBAL_LIST_EMPTY(karma_spenders)
continue
if(M == src)
continue
+ if(M.get_preference(PREFTOGGLE_DISABLE_KARMA))
+ continue
if(!isobserver(src) && isNonCrewAntag(M))
continue // Don't include special roles for non-observers, because players use it to meta
karma_list += M
- if(!karma_list.len)
+ if(!length(karma_list))
to_chat(usr, "There's no-one to spend your karma on.")
return
diff --git a/code/modules/map_fluff/cyberiad.dm b/code/modules/map_fluff/cyberiad.dm
deleted file mode 100644
index e0865f6fb1d..00000000000
--- a/code/modules/map_fluff/cyberiad.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/map/cyberiad
- name = "Cyberiad"
- full_name = "NSS Cyberiad"
-
- station_name = "NSS Cyberiad"
- station_short = "Cyberiad"
- dock_name = "NAS Trurl"
- company_name = "Nanotrasen"
- company_short = "NT"
- starsys_name = "Epsilon Eridani "
diff --git a/code/modules/map_fluff/delta.dm b/code/modules/map_fluff/delta.dm
deleted file mode 100644
index d68266e3146..00000000000
--- a/code/modules/map_fluff/delta.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/map/delta
- name = "Delta"
- full_name = "NSS Kerberos"
-
- station_name = "NSS Kerberos"
- station_short = "Kerberos"
- dock_name = "NAS Trurl"
- company_name = "Nanotrasen"
- company_short = "NT"
- starsys_name = "Epsilon Eridani "
diff --git a/code/modules/map_fluff/maps.dm b/code/modules/map_fluff/maps.dm
deleted file mode 100644
index e2684d5c735..00000000000
--- a/code/modules/map_fluff/maps.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/map
- var/name = "Unnamed Map"
- var/full_name = "Unnamed Map"
-
- var/station_name = "BAD Station"
- var/station_short = "Baddy"
- var/dock_name = "THE PirateBay"
- var/company_name = "BadMan"
- var/company_short = "BM"
- var/starsys_name = "Dull Star"
diff --git a/code/modules/map_fluff/metastation.dm b/code/modules/map_fluff/metastation.dm
deleted file mode 100644
index a8714b5cb19..00000000000
--- a/code/modules/map_fluff/metastation.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/map/metastation
- name = "MetaStation"
- full_name = "NSS Cerebron"
-
- station_name = "NSS Cerebron"
- station_short = "Cerebron"
- dock_name = "NAS Trurl"
- company_name = "Nanotrasen"
- company_short = "NT"
- starsys_name = "Epsilon Eridani "
diff --git a/code/modules/mapping/base_map_datum.dm b/code/modules/mapping/base_map_datum.dm
new file mode 100644
index 00000000000..6a5c7260f3a
--- /dev/null
+++ b/code/modules/mapping/base_map_datum.dm
@@ -0,0 +1,14 @@
+/**
+ * Map Datum
+ *
+ * Datum which holds all of the information for maps ingame
+ * This is used for showing map information, as well as map loading
+ *
+ **/
+/datum/map
+ /// Name of the map to be shown in the statpanel
+ var/fluff_name
+ /// Name to be used when using the map from a technical standpoint. Used in TGUI Nanomaps among other things.
+ var/technical_name
+ /// Path to the map file
+ var/map_path
diff --git a/code/modules/mapping/cyberiad.dm b/code/modules/mapping/cyberiad.dm
new file mode 100644
index 00000000000..29c27d59c73
--- /dev/null
+++ b/code/modules/mapping/cyberiad.dm
@@ -0,0 +1,4 @@
+/datum/map/cyberiad
+ fluff_name = "NSS Cyberiad"
+ technical_name = "Cyberiad"
+ map_path = "_maps/map_files/cyberiad/cyberiad.dmm"
diff --git a/code/modules/mapping/delta.dm b/code/modules/mapping/delta.dm
new file mode 100644
index 00000000000..6b8bbce94cd
--- /dev/null
+++ b/code/modules/mapping/delta.dm
@@ -0,0 +1,4 @@
+/datum/map/delta
+ fluff_name = "NSS Kerberos"
+ technical_name = "Delta"
+ map_path = "_maps/map_files/Delta/delta.dmm"
diff --git a/code/modules/mapping/metastation.dm b/code/modules/mapping/metastation.dm
new file mode 100644
index 00000000000..654aad46ac8
--- /dev/null
+++ b/code/modules/mapping/metastation.dm
@@ -0,0 +1,4 @@
+/datum/map/metastation
+ fluff_name = "NSS Cerebron"
+ technical_name = "MetaStation"
+ map_path = "_maps/map_files/MetaStation/MetaStation.dmm"
diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm
index 7da1634b9da..faded5e7fec 100644
--- a/code/modules/martial_arts/sleeping_carp.dm
+++ b/code/modules/martial_arts/sleeping_carp.dm
@@ -12,6 +12,7 @@
var/obj/item/grab/G = D.grabbedby(A,1)
if(G)
G.state = GRAB_AGGRESSIVE //Instant aggressive grab
+ add_attack_logs(A, D, "Melee attacked with martial-art [src] : Grabbed", ATKLOG_ALL)
return TRUE
/datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -27,6 +28,7 @@
if(prob(D.getBruteLoss()) && !D.lying)
D.visible_message("[D] stumbles and falls!", "The blow sends you to the ground!")
D.Weaken(4)
+ add_attack_logs(A, D, "Melee attacked with martial-art [src] : Punched", ATKLOG_ALL)
return TRUE
/datum/martial_art/the_sleeping_carp/explaination_header(user)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 47edad1c4fa..08324fb937a 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -387,6 +387,30 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(usr, "AntagHud Toggled OFF")
M.antagHUD = FALSE
+/mob/dead/observer/verb/set_dnr()
+ set name = "Set DNR"
+ set category = "Ghost"
+ set desc = "Prevent your character from being revived."
+
+ if(!isobserver(src)) // Somehow
+ return
+ if(!can_reenter_corpse)
+ to_chat(src, "You are already set to DNR!")
+ return
+ if(!mind || QDELETED(mind.current))
+ to_chat(src, "You have no body.")
+ return
+ if(mind.current.stat != DEAD)
+ to_chat(src, "Your body is still alive!")
+ return
+
+ var/choice = alert(src, "If you enable this, your body will be unrevivable for the remainder of the round.", "Are you sure?", "Yes", "No")
+ if(choice == "Yes")
+ to_chat(src, "Do Not Revive state enabled.")
+ can_reenter_corpse = FALSE
+ if(!QDELETED(mind.current)) // Could change while they're choosing
+ mind.current.med_hud_set_status()
+
/mob/dead/observer/proc/dead_tele()
set category = "Ghost"
set name = "Teleport"
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 977c39bb923..d5410015f5e 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -66,7 +66,7 @@
if(istype(M))
if(isnewplayer(M)) // People in the lobby screen; only have their ckey as a name.
continue
- if(isobserver(M))
+ if(isobserver(M) && M.client)
ghosts += list(serialized)
else if(M.mind == null)
npcs += list(serialized)
@@ -114,6 +114,12 @@
antag_serialized["antag"] = antag_name
antagonists += list(antag_serialized)
+ // Player terror spiders have their own category to help see how much there are.
+ // Not in the above block because terrors can be known whether AHUD is on or not.
+ if(isterrorspider(M))
+ var/list/antag_serialized = serialized.Copy()
+ antag_serialized["antag"] = "Terror Spider"
+ antagonists += list(antag_serialized)
else
misc += list(serialized)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 6d706c94ede..b14f82758b9 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -77,15 +77,15 @@
user.set_machine(src)
var/dat = {"
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index d0a9b79aa01..d26f87d76c3 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -99,6 +99,7 @@
new_xeno.mind.assigned_role = SPECIAL_ROLE_XENOMORPH
new_xeno.mind.special_role = SPECIAL_ROLE_XENOMORPH
new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)//To get the player's attention
+ to_chat(new_xeno, "For more information, check the wiki page: ([config.wikiurl]/index.php/Xenomorph)")
if(gib_on_success)
owner.gib()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 8b0f8961e53..8877281fd39 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -215,7 +215,7 @@
if(stat == DEAD)
if(M != src)
M.visible_message("[M] desperately shakes [src] trying to wake [p_them()] up, but sadly there is no reaction!", \
- "You shake [src] trying to wake [p_them()] sadly they appear to be too far gone!")
+ "You shake [src] trying to wake [p_them()], sadly they appear to be too far gone!")
return
if(health >= HEALTH_THRESHOLD_CRIT)
if(src == M && ishuman(src))
@@ -667,19 +667,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
user.set_machine(src)
var/dat = {"
"
-/*
- if(activated(obj))
- dat += text("[obj]: \[Activated | Deactivate\] ")
- else
- dat += text("[obj]: \[Activate | Deactivated\] ")
-*/
- var/datum/browser/popup = new(src, "robotmod", "Modules")
- popup.set_content(dat)
- popup.open()
-
-
/mob/living/silicon/robot/Topic(href, href_list)
if(..())
return 1
@@ -1111,7 +1079,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
return 1
activate_module(O)
- installed_modules()
//Show alerts window if user clicked on "Show alerts" in chat
if(href_list["showalerts"])
@@ -1134,7 +1101,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
to_chat(src, "Module isn't activated.")
else
to_chat(src, "Module isn't activated")
- installed_modules()
return 1
return 1
@@ -1146,17 +1112,20 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(stat || lamp_recharging || low_power_mode)
to_chat(src, "This function is currently offline.")
return
+ if(is_ventcrawling(src))
+ return
//Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0.
lamp_intensity = (lamp_intensity+2) % (lamp_max+2)
to_chat(src, "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]")
update_headlamp()
-/mob/living/silicon/robot/proc/update_headlamp(turn_off = 0, cooldown = 100)
+/mob/living/silicon/robot/proc/update_headlamp(turn_off = 0, cooldown = 100, show_warning = TRUE)
set_light(0)
if(lamp_intensity && (turn_off || stat || low_power_mode))
- to_chat(src, "Your headlamp has been deactivated.")
+ if(show_warning)
+ to_chat(src, "Your headlamp has been deactivated.")
lamp_intensity = 0
lamp_recharging = 1
spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long.
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 29fd2a0235c..26d15986d86 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -6,77 +6,213 @@
item_state = "electronic"
flags = CONDUCT
+ /// A list of all currently usable and created modules the robot currently has access too.
var/list/modules = list()
- var/obj/item/emag = null
- var/list/subsystems = list()
+ /// A list of module-specific, non-emag modules the borg will gain when this module is chosen.
+ var/list/basic_modules = list()
+ /// A list of modules the robot gets when emagged.
+ var/list/emag_modules = list()
+ /// A list of modules that require special recharge handling. Examples include things like flashes, sprays and welding tools.
+ var/list/special_rechargables = list()
+ /// A list of all "energy stacks", i.e metal, glass, brute kits, splints, etc.
+ var/list/storages = list()
+ /// Special actions this module will gain when chosen such as meson vision, or thermal vision.
var/list/module_actions = list()
-
- var/module_type = "NoMod" // For icon usage
-
- var/list/stacktypes
- var/channels = list()
+ /// Available tools given in the verb tab such as a crew monitor, or power monitor.
+ var/list/subsystems = list()
+ /// Radio channels the module owner has access to.
+ var/list/channels = list()
+ /// Special items that are able to be removed from the robot owner via crowbar.
var/list/custom_removals = list()
-
-
-/obj/item/robot_module/emp_act(severity)
- if(modules)
- for(var/obj/O in modules)
- O.emp_act(severity)
- if(emag)
- emag.emp_act(severity)
- ..()
+ /// For icon usage.
+ var/module_type = "NoMod"
/obj/item/robot_module/New()
..()
- add_default_robot_items()
- emag = new /obj/item/toy/sword(src)
- emag.name = "Placeholder Emag Item"
+
+ // Creates new objects from the type lists.
+ for(var/i in basic_modules)
+ var/obj/item/I = new i(src)
+ basic_modules += I
+ basic_modules -= i
+
+ // Even though these are created here the robot won't be able to see and equip them until they actually get emagged/hacked.
+ for(var/i in emag_modules)
+ var/obj/item/I = new i(src)
+ emag_modules += I
+ emag_modules -= i
+
+ // Flashes need a special recharge, and since basically every module uses it, add it here.
+ // Even if the module doesn't use a flash, it wont cause any issues to have it in this list.
+ special_rechargables += /obj/item/flash/cyborg
+
+ // This is done so we can loop through this list later and call cyborg_recharge() on the items while the borg is recharging.
+ var/all_modules = basic_modules | emag_modules
+ for(var/path in special_rechargables)
+ var/obj/item/I = locate(path) in all_modules
+ if(I) // If it exists, add the object reference.
+ special_rechargables += I
+ special_rechargables -= path // No matter what, remove the path from the list.
+
+ // Add all the modules into the robot's inventory. Without this, their inventory will be blank.
+ rebuild_modules()
+
+
+/obj/item/robot_module/emp_act(severity)
+ . = ..()
+ for(var/object in modules)
+ var/obj/O = object
+ O.emp_act(severity)
/obj/item/robot_module/Destroy()
+ // These can all contain actual objects, so we need to null them out.
QDEL_LIST(modules)
- QDEL_NULL(emag)
+ QDEL_LIST(basic_modules)
+ QDEL_LIST(emag_modules)
+ QDEL_LIST(storages)
+ QDEL_LIST(special_rechargables)
return ..()
-// By default, all robots will get the items in this proc, unless you override it for your specific module. See: ../robot_module/drone
-/obj/item/robot_module/proc/add_default_robot_items()
- modules += new /obj/item/flash/cyborg(src)
+/**
+ * Searches through the various module lists for the given `item_type`, deletes and removes the item from all supplied lists, if the item is found.
+ *
+ * NOTE: be careful with using this proc, as it irreversibly removes entries from a borg's module list.
+ * This is safe to do with upgrades because the only way to revert upgrades currently is either to rebuild the borg or use a reset module, which allows the lists to regenerate.
+ *
+ * Arugments:
+ * * item_type - the type of item to search for. Also accepts objects themselves.
+ */
+/obj/item/robot_module/proc/remove_item_from_lists(item_or_item_type)
+ var/list/lists = list(
+ basic_modules,
+ emag_modules,
+ storages,
+ special_rechargables
+ )
+ for(var/_list in lists)
+ for(var/item in _list)
+ var/obj/item/I = item
+ if(!istype(I, item_or_item_type))
+ continue
+ if(!QDELETED(I))
+ qdel(I)
+ _list -= I
+
+// Here for admin debugging purposes only.
/obj/item/robot_module/proc/fix_modules()
- for(var/obj/item/I in modules)
+ for(var/item in modules)
+ var/obj/item/I = item
I.flags |= NODROP
I.mouse_opacity = MOUSE_OPACITY_OPAQUE
- if(emag)
- emag.flags |= NODROP
- emag.mouse_opacity = MOUSE_OPACITY_OPAQUE
-/obj/item/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R)
- if(!stacktypes || !stacktypes.len)
+/**
+ * Returns a `robot_energy_strage` datum of type `storage_type`. If one already exists, it returns that one, otherwise it create a new one.
+ *
+ * Arguments:
+ * * storage_type - the subtype of `datum/robot_energy_storage` to fetch or create.
+ */
+/obj/item/robot_module/proc/get_or_create_estorage(storage_type)
+ for(var/e_storage in storages)
+ var/datum/robot_energy_storage/S = e_storage
+ if(istype(S, storage_type))
+ return S
+ return new storage_type(src)
+
+/**
+ * Adds the item `I` to our `modules` list, and sets up an `/datum/robot_energy_storage` if its a stack.
+ *
+ * Arugments:
+ * * I - the item to add to our modules.
+ * * requires_rebuild - if adding this item requires `rebuild_modules()` to be called.
+ */
+/obj/item/robot_module/proc/add_module(obj/item/I, requires_rebuild)
+ if(I in modules) // No duplicate items.
return
- var/stack_respawned = 0
- for(var/T in stacktypes)
- var/O = locate(T) in modules
- var/obj/item/stack/S = O
+ if(istype(I, /obj/item/stack))
+ var/obj/item/stack/S = I
- if(!S)
- S = new T(src)
- modules += S
- S.amount = 1
- stack_respawned = 1
+ if(S.energy_type)
+ S.source = get_or_create_estorage(S.energy_type)
+ S.is_cyborg = TRUE
- if(S && S.amount < stacktypes[T])
- S.amount++
- if(stack_respawned && istype(R) && R.hud_used)
+ // Here for safety. Using a cyborg stack without a `source` will create hundreds of runtimes.
+ if(!S.source)
+ qdel(S)
+ return
+
+ if(I.loc != src)
+ I.forceMove(src)
+
+ modules += I
+ I.flags |= NODROP
+ I.mouse_opacity = MOUSE_OPACITY_OPAQUE
+
+ if(requires_rebuild)
+ rebuild_modules()
+ return I
+
+/**
+ * Builds the usable module list from the modules we have in `basic_modules` and `emag_modules`
+ */
+/obj/item/robot_module/proc/rebuild_modules()
+ var/mob/living/silicon/robot/R = loc
+ R.uneq_all()
+ modules = list()
+
+ // By this point these lists should only contain items. It's safe to use typeless loops here.
+ for(var/item in basic_modules)
+ add_module(item, FALSE)
+
+ if(R.emagged || R.weapons_unlock)
+ for(var/item in emag_modules)
+ add_module(item, FALSE)
+
+ if(R.hud_used)
R.hud_used.update_robot_modules_display()
-/obj/item/robot_module/proc/rebuild()//Rebuilds the list so it's possible to add/remove items from the module
- var/list/temp_list = modules
- modules = list()
- for(var/obj/O in temp_list)
- if(!QDELETED(O)) //so items getting deleted don't stay in module list and haunt you
- modules += O
+/**
+ * Handles the recharging of all borg stack items and any items which are in the `special_rechargables` list.
+ *
+ * Arguments:
+ * * R - the owner of this module.
+ * * coeff - a coefficient which can be used to modify the recharge rate of consumables.
+ */
+/obj/item/robot_module/proc/recharge_consumables(mob/living/silicon/robot/R, coeff = 1)
+ for(var/e_storage in storages)
+ var/datum/robot_energy_storage/E = e_storage
+ E.add_charge(max(1, coeff * E.recharge_rate))
+ for(var/item in special_rechargables)
+ var/obj/item/I = item
+ I.cyborg_recharge(coeff, R.emagged)
+/**
+ * Called when the robot owner of this module has the `unemag()` proc called on them, which is only via admin means.
+ *
+ * Deletes this module's emag items, and recreates them.
+ */
+/obj/item/robot_module/unemag()
+ . = ..()
+ for(var/item in emag_modules)
+ var/obj/item/old_item = item
+ var/obj/item/new_item = new old_item.type(src)
+ emag_modules += new_item
+ if(old_item in special_rechargables) // If the old item was in this list, make sure the new one goes into it as well.
+ special_rechargables += new_item
+ special_rechargables -= old_item
+ modules -= old_item
+ emag_modules -= old_item
+ qdel(old_item)
+ rebuild_modules()
+
+/**
+ * Adds all of the languages this module is suppose to know and/or speak.
+ *
+ * Arugments:
+ * * R - the owner of this module.
+ */
/obj/item/robot_module/proc/add_languages(mob/living/silicon/robot/R)
//full set of languages
R.add_language("Galactic Common", 1)
@@ -94,8 +230,9 @@
R.add_language("Chittin", 0)
R.add_language("Bubblish", 0)
R.add_language("Orluum", 0)
- R.add_language("Clownish",0)
+ R.add_language("Clownish", 0)
+/// Adds anything in `subsystems` to the robot's verbs, and grants any actions that are in `module_actions`.
/obj/item/robot_module/proc/add_subsystems_and_actions(mob/living/silicon/robot/R)
R.verbs |= subsystems
for(var/A in module_actions)
@@ -103,6 +240,7 @@
act.Grant(R)
R.module_actions += act
+/// Removes any verbs from the robot that are in `subsystems`, and removes any actions that are in `module_actions`.
/obj/item/robot_module/proc/remove_subsystems_and_actions(mob/living/silicon/robot/R)
R.verbs -= subsystems
for(var/datum/action/A in R.module_actions)
@@ -117,6 +255,7 @@
/obj/item/robot_module/proc/handle_death(mob/living/silicon/robot/R, gibbed)
return
+// Standard cyborg module.
/obj/item/robot_module/standard
// if station is fine, assist with constructing station goal room, cleaning, and repairing cables chewed by rats
// if medical crisis, assist by providing basic healthcare, retrieving corpses, and monitoring crew lifesigns
@@ -125,221 +264,214 @@
name = "generalist robot module"
module_type = "Standard"
subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor, /mob/living/silicon/proc/subsystem_crew_monitor)
- stacktypes = list(
- /obj/item/stack/sheet/metal/cyborg = 50,
- /obj/item/stack/cable_coil/cyborg = 50,
- /obj/item/stack/rods/cyborg = 60,
- /obj/item/stack/tile/plasteel = 20
- )
-
-/obj/item/robot_module/standard/New()
- ..()
- // sec
- modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
- // janitorial
- modules += new /obj/item/soap/nanotrasen(src)
- modules += new /obj/item/lightreplacer/cyborg(src)
- // eng
- modules += new /obj/item/crowbar/cyborg(src)
- modules += new /obj/item/wrench/cyborg(src)
- modules += new /obj/item/extinguisher(src) // for firefighting, and propulsion in space
- modules += new /obj/item/weldingtool/largetank/cyborg(src)
- // mining
- modules += new /obj/item/pickaxe(src)
- modules += new /obj/item/t_scanner/adv_mining_scanner(src)
- modules += new /obj/item/storage/bag/ore/cyborg(src)
- // med
- modules += new /obj/item/healthanalyzer(src)
- modules += new /obj/item/reagent_containers/borghypo/basic(src)
- modules += new /obj/item/roller_holder(src) // for taking the injured to medbay without worsening their injuries or leaving a blood trail the whole way
- emag = new /obj/item/melee/energy/sword/cyborg(src)
- for(var/G in stacktypes)
- var/obj/item/stack/sheet/M = new G(src)
- M.amount = stacktypes[G]
- modules += M
- fix_modules()
-
+ basic_modules = list(
+ // sec
+ /obj/item/flash/cyborg,
+ /obj/item/restraints/handcuffs/cable/zipties/cyborg,
+ // janitorial
+ /obj/item/soap/nanotrasen,
+ /obj/item/lightreplacer/cyborg,
+ // eng
+ /obj/item/crowbar/cyborg,
+ /obj/item/wrench/cyborg,
+ /obj/item/extinguisher, // for firefighting, and propulsion in space
+ /obj/item/weldingtool/largetank/cyborg,
+ // mining
+ /obj/item/pickaxe,
+ /obj/item/t_scanner/adv_mining_scanner,
+ /obj/item/storage/bag/ore/cyborg,
+ // med
+ /obj/item/healthanalyzer,
+ /obj/item/reagent_containers/borghypo/basic,
+ /obj/item/roller_holder, // for taking the injured to medbay without worsening their injuries or leaving a blood trail the whole way
+ /obj/item/stack/sheet/metal/cyborg,
+ /obj/item/stack/cable_coil/cyborg,
+ /obj/item/stack/rods/cyborg,
+ /obj/item/stack/tile/plasteel/cyborg
+ )
+ emag_modules = list(/obj/item/melee/energy/sword/cyborg)
+ special_rechargables = list(
+ /obj/item/extinguisher,
+ /obj/item/weldingtool/largetank/cyborg,
+ /obj/item/lightreplacer/cyborg
+ )
+// Medical cyborg module.
/obj/item/robot_module/medical
name = "medical robot module"
module_type = "Medical"
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
- stacktypes = list(
- /obj/item/stack/medical/bruise_pack/advanced = 6,
- /obj/item/stack/medical/ointment/advanced = 6,
- /obj/item/stack/medical/splint = 6,
- /obj/item/stack/nanopaste = 6
- )
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/healthanalyzer/advanced,
+ /obj/item/robotanalyzer,
+ /obj/item/reagent_scanner/adv,
+ /obj/item/borg_defib,
+ /obj/item/handheld_defibrillator,
+ /obj/item/roller_holder,
+ /obj/item/reagent_containers/borghypo,
+ /obj/item/scalpel/laser/laser1,
+ /obj/item/hemostat,
+ /obj/item/retractor,
+ /obj/item/circular_saw,
+ /obj/item/surgicaldrill,
+ /obj/item/bonesetter,
+ /obj/item/bonegel,
+ /obj/item/FixOVein,
+ /obj/item/extinguisher/mini,
+ /obj/item/reagent_containers/glass/beaker/large,
+ /obj/item/reagent_containers/dropper,
+ /obj/item/reagent_containers/syringe,
+ /obj/item/stack/medical/bruise_pack/advanced/cyborg,
+ /obj/item/stack/medical/ointment/advanced/cyborg,
+ /obj/item/stack/medical/splint/cyborg,
+ /obj/item/stack/nanopaste/cyborg,
+ /obj/item/gripper/medical
+ )
+ emag_modules = list(/obj/item/reagent_containers/spray/cyborg_facid)
+ special_rechargables = list(/obj/item/reagent_containers/spray/cyborg_facid, /obj/item/extinguisher/mini)
-/obj/item/robot_module/medical/New()
- ..()
- modules += new /obj/item/healthanalyzer/advanced(src)
- modules += new /obj/item/robotanalyzer(src)
- modules += new /obj/item/reagent_scanner/adv(src)
- modules += new /obj/item/borg_defib(src)
- modules += new /obj/item/handheld_defibrillator(src)
- modules += new /obj/item/roller_holder(src)
- modules += new /obj/item/reagent_containers/borghypo(src)
- modules += new /obj/item/reagent_containers/glass/beaker/large(src)
- modules += new /obj/item/reagent_containers/dropper(src)
- modules += new /obj/item/reagent_containers/syringe(src)
- modules += new /obj/item/extinguisher/mini(src)
- modules += new /obj/item/stack/medical/bruise_pack/advanced(src)
- modules += new /obj/item/stack/medical/ointment/advanced(src)
- modules += new /obj/item/stack/medical/splint(src)
- modules += new /obj/item/stack/nanopaste(src)
- modules += new /obj/item/scalpel/laser/laser1(src)
- modules += new /obj/item/hemostat(src)
- modules += new /obj/item/retractor(src)
- modules += new /obj/item/bonegel(src)
- modules += new /obj/item/FixOVein(src)
- modules += new /obj/item/bonesetter(src)
- modules += new /obj/item/circular_saw(src)
- modules += new /obj/item/surgicaldrill(src)
- modules += new /obj/item/gripper/medical(src)
+// Disable safeties on the borg's defib.
+/obj/item/robot_module/medical/emag_act()
+ . = ..()
+ for(var/obj/item/borg_defib/F in modules)
+ F.safety = FALSE
- emag = new /obj/item/reagent_containers/spray(src)
+// Enable safeties on the borg's defib.
+/obj/item/robot_module/medical/unemag()
+ for(var/obj/item/borg_defib/F in modules)
+ F.safety = TRUE
+ return ..()
- emag.reagents.add_reagent("facid", 250)
- emag.name = "Polyacid spray"
+// Fluorosulphuric acid spray bottle.
+/obj/item/reagent_containers/spray/cyborg_facid
+ name = "Polyacid spray"
+ list_reagents = list("facid" = 250)
- fix_modules()
-
-/obj/item/robot_module/medical/respawn_consumable(mob/living/silicon/robot/R)
- if(emag)
- var/obj/item/reagent_containers/spray/PS = emag
- PS.reagents.add_reagent("facid", 2)
- ..()
+/obj/item/reagent_containers/spray/cyborg_facid/cyborg_recharge(coeff, emagged)
+ if(emagged)
+ reagents.check_and_add("facid", volume, 2 * coeff)
+// Engineering cyborg module.
/obj/item/robot_module/engineering
name = "engineering robot module"
module_type = "Engineer"
subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor)
- module_actions = list(
- /datum/action/innate/robot_sight/meson,
+ module_actions = list(/datum/action/innate/robot_sight/meson)
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/rcd/borg,
+ /obj/item/rpd,
+ /obj/item/extinguisher,
+ /obj/item/weldingtool/largetank/cyborg,
+ /obj/item/screwdriver/cyborg,
+ /obj/item/wrench/cyborg,
+ /obj/item/crowbar/cyborg,
+ /obj/item/wirecutters/cyborg,
+ /obj/item/multitool/cyborg,
+ /obj/item/t_scanner,
+ /obj/item/analyzer,
+ /obj/item/geiger_counter/cyborg,
+ /obj/item/holosign_creator/engineering,
+ /obj/item/gripper,
+ /obj/item/matter_decompiler,
+ /obj/item/floor_painter,
+ /obj/item/areaeditor/blueprints/cyborg,
+ /obj/item/stack/sheet/metal/cyborg,
+ /obj/item/stack/rods/cyborg,
+ /obj/item/stack/tile/plasteel/cyborg,
+ /obj/item/stack/cable_coil/cyborg,
+ /obj/item/stack/sheet/glass/cyborg,
+ /obj/item/stack/sheet/rglass/cyborg
)
-
- stacktypes = list(
- /obj/item/stack/sheet/metal/cyborg = 50,
- /obj/item/stack/sheet/glass/cyborg = 50,
- /obj/item/stack/sheet/rglass/cyborg = 50,
- /obj/item/stack/cable_coil/cyborg = 50,
- /obj/item/stack/rods/cyborg = 60,
- /obj/item/stack/tile/plasteel = 20
- )
-
-/obj/item/robot_module/engineering/New()
- ..()
- modules += new /obj/item/rcd/borg(src)
- modules += new /obj/item/rpd(src)
- modules += new /obj/item/extinguisher(src)
- modules += new /obj/item/weldingtool/largetank/cyborg(src)
- modules += new /obj/item/screwdriver/cyborg(src)
- modules += new /obj/item/wrench/cyborg(src)
- modules += new /obj/item/crowbar/cyborg(src)
- modules += new /obj/item/wirecutters/cyborg(src)
- modules += new /obj/item/multitool/cyborg(src)
- modules += new /obj/item/t_scanner(src)
- modules += new /obj/item/analyzer(src)
- modules += new /obj/item/geiger_counter/cyborg(src)
- modules += new /obj/item/holosign_creator/engineering(src)
- modules += new /obj/item/gripper(src)
- modules += new /obj/item/matter_decompiler(src)
- modules += new /obj/item/floor_painter(src)
- modules += new /obj/item/areaeditor/blueprints/cyborg(src)
- emag = new /obj/item/borg/stun(src)
-
- for(var/G in stacktypes) //Attempt to unify Engi-Borg material stacks into fewer lines. See Line 492 for example. Variables changed out of paranoia.
- var/obj/item/stack/sheet/M = new G(src)
- M.amount = stacktypes[G]
- modules += M
-
- fix_modules()
+ emag_modules = list(/obj/item/borg/stun)
+ special_rechargables = list(/obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg)
/obj/item/robot_module/engineering/handle_death(mob/living/silicon/robot/R, gibbed)
var/obj/item/gripper/G = locate(/obj/item/gripper) in modules
if(G)
G.drop_gripped_item(silent = TRUE)
+// Security cyborg module.
/obj/item/robot_module/security
name = "security robot module"
module_type = "Security"
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/restraints/handcuffs/cable/zipties/cyborg,
+ /obj/item/melee/baton/loaded,
+ /obj/item/gun/energy/disabler/cyborg,
+ /obj/item/holosign_creator/security,
+ /obj/item/clothing/mask/gas/sechailer/cyborg
+ )
+ emag_modules = list(/obj/item/gun/energy/laser/cyborg)
+ special_rechargables = list(/obj/item/melee/baton/loaded, /obj/item/gun/energy/disabler/cyborg)
-/obj/item/robot_module/security/New()
- ..()
- modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
- modules += new /obj/item/melee/baton/loaded(src)
- modules += new /obj/item/gun/energy/disabler/cyborg(src)
- modules += new /obj/item/holosign_creator/security(src)
- modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
- emag = new /obj/item/gun/energy/laser/cyborg(src)
-
- fix_modules()
-
+// Janitor cyborg module.
/obj/item/robot_module/janitor
name = "janitorial robot module"
module_type = "Janitor"
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/soap/nanotrasen,
+ /obj/item/storage/bag/trash/cyborg,
+ /obj/item/mop/advanced/cyborg,
+ /obj/item/lightreplacer/cyborg,
+ /obj/item/holosign_creator,
+ /obj/item/extinguisher/mini
+ )
+ emag_modules = list(/obj/item/reagent_containers/spray/cyborg_lube)
+ special_rechargables = list(
+ /obj/item/lightreplacer,
+ /obj/item/reagent_containers/spray/cyborg_lube,
+ /obj/item/extinguisher/mini
+ )
-/obj/item/robot_module/janitor/New()
- ..()
- modules += new /obj/item/soap/nanotrasen(src)
- modules += new /obj/item/storage/bag/trash/cyborg(src)
- modules += new /obj/item/mop/advanced/cyborg(src)
- modules += new /obj/item/lightreplacer/cyborg(src)
- modules += new /obj/item/holosign_creator(src)
- modules += new /obj/item/extinguisher/mini(src)
- emag = new /obj/item/reagent_containers/spray(src)
+/obj/item/reagent_containers/spray/cyborg_lube
+ name = "Lube spray"
+ list_reagents = list("lube" = 250)
- emag.reagents.add_reagent("lube", 250)
- emag.name = "Lube spray"
-
- fix_modules()
-
-/obj/item/robot_module/janitor/respawn_consumable(mob/living/silicon/robot/R)
- if(emag)
- var/obj/item/reagent_containers/spray/S = emag
- S.reagents.add_reagent("lube", 5)
- ..()
+/obj/item/reagent_containers/spray/cyborg_lube/cyborg_recharge(coeff, emagged)
+ if(emagged)
+ reagents.check_and_add("lube", volume, 2 * coeff)
+// Service cyborg module.
/obj/item/robot_module/butler
name = "service robot module"
module_type = "Service"
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/handheld_chem_dispenser/booze,
+ /obj/item/handheld_chem_dispenser/soda,
+ /obj/item/pen,
+ /obj/item/razor,
+ /obj/item/instrument/piano_synth,
+ /obj/item/healthanalyzer/advanced,
+ /obj/item/reagent_scanner/adv,
+ /obj/item/rsf/cyborg,
+ /obj/item/reagent_containers/dropper/cyborg,
+ /obj/item/lighter/zippo,
+ /obj/item/storage/bag/tray/cyborg,
+ /obj/item/reagent_containers/food/drinks/shaker
+ )
+ emag_modules = list(/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer)
+ special_rechargables = list(
+ /obj/item/reagent_containers/food/condiment/enzyme,
+ /obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer
+ )
-/obj/item/robot_module/butler/New()
- ..()
- modules += new /obj/item/handheld_chem_dispenser/booze(src)
- modules += new /obj/item/handheld_chem_dispenser/soda(src)
+/obj/item/rsf/cyborg
+ matter = 30
- modules += new /obj/item/pen(src)
- modules += new /obj/item/razor(src)
- modules += new /obj/item/instrument/piano_synth(src)
- modules += new /obj/item/healthanalyzer/advanced(src)
- modules += new /obj/item/reagent_scanner/adv(src)
+// This is a special type of beer given when emagged, one sip and the target falls asleep.
+/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer
+ name = "Mickey Finn's Special Brew"
+ list_reagents = list("beer2" = 50)
- var/obj/item/rsf/M = new /obj/item/rsf(src)
- M.matter = 30
- modules += M
-
- modules += new /obj/item/reagent_containers/dropper/cyborg(src)
- modules += new /obj/item/lighter/zippo(src)
- modules += new /obj/item/storage/bag/tray/cyborg(src)
- modules += new /obj/item/reagent_containers/food/drinks/shaker(src)
- emag = new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-
- var/datum/reagents/R = new/datum/reagents(50)
- emag.reagents = R
- R.my_atom = emag
- R.add_reagent("beer2", 50)
- emag.name = "Mickey Finn's Special Brew"
-
- fix_modules()
-
-/obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R)
- if(emag)
- var/obj/item/reagent_containers/food/drinks/cans/beer/B = emag
- B.reagents.add_reagent("beer2", 5)
- ..()
+/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer/cyborg_recharge(coeff, emagged)
+ if(emagged)
+ reagents.check_and_add("beer2", volume, 5)
/obj/item/robot_module/butler/add_languages(mob/living/silicon/robot/R)
//full set of languages
@@ -368,267 +500,352 @@
/obj/item/robot_module/miner
name = "miner robot module"
module_type = "Miner"
- module_actions = list(
- /datum/action/innate/robot_sight/meson,
- )
+ module_actions = list(/datum/action/innate/robot_sight/meson)
custom_removals = list("KA modkits")
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/storage/bag/ore/cyborg,
+ /obj/item/pickaxe/drill/cyborg,
+ /obj/item/shovel,
+ /obj/item/weldingtool/mini,
+ /obj/item/extinguisher/mini,
+ /obj/item/storage/bag/sheetsnatcher/borg,
+ /obj/item/t_scanner/adv_mining_scanner/cyborg,
+ /obj/item/gun/energy/kinetic_accelerator/cyborg,
+ /obj/item/gps/cyborg
+ )
+ emag_modules = list(/obj/item/borg/stun, /obj/item/pickaxe/drill/cyborg/diamond)
+ special_rechargables = list(/obj/item/extinguisher/mini, /obj/item/weldingtool/mini)
-/obj/item/robot_module/miner/New()
- ..()
- modules += new /obj/item/storage/bag/ore/cyborg(src)
- modules += new /obj/item/pickaxe/drill/cyborg(src)
- modules += new /obj/item/shovel(src)
- modules += new /obj/item/weldingtool/mini(src)
- modules += new /obj/item/extinguisher/mini(src)
- modules += new /obj/item/storage/bag/sheetsnatcher/borg(src)
- modules += new /obj/item/t_scanner/adv_mining_scanner/cyborg(src)
- modules += new /obj/item/gun/energy/kinetic_accelerator/cyborg(src)
- modules += new /obj/item/gps/cyborg(src)
- emag = new /obj/item/borg/stun(src)
+// Replace their normal drill with a diamond drill.
+/obj/item/robot_module/miner/emag_act()
+ . = ..()
+ for(var/obj/item/pickaxe/drill/cyborg/D in modules)
+ // Make sure we don't remove the diamond drill If they already have a diamond drill from the borg upgrade.
+ if(!istype(D, /obj/item/pickaxe/drill/cyborg/diamond))
+ qdel(D)
+ basic_modules -= D // Remove it from this list so it doesn't get added in the rebuild.
- fix_modules()
+// Readd the normal drill
+/obj/item/robot_module/miner/unemag()
+ var/obj/item/pickaxe/drill/cyborg/C = new(src)
+ basic_modules += C
+ return ..()
+// This makes it so others can crowbar out KA upgrades from the miner borg.
/obj/item/robot_module/miner/handle_custom_removal(component_id, mob/living/user, obj/item/W)
- if(component_id == "KA modkits")
- for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src)
- D.attackby(W, user)
- return TRUE
- return ..()
+ if(component_id == "KA modkits")
+ for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src)
+ D.attackby(W, user)
+ return TRUE
+ return ..()
+// Deathsquad cyborg module.
/obj/item/robot_module/deathsquad
name = "NT advanced combat module"
module_type = "Malf"
- module_actions = list(
- /datum/action/innate/robot_sight/thermal,
+ module_actions = list(/datum/action/innate/robot_sight/thermal)
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/melee/energy/sword/cyborg,
+ /obj/item/gun/energy/pulse/cyborg,
+ /obj/item/crowbar/cyborg
)
-/obj/item/robot_module/deathsquad/New()
- ..()
- modules += new /obj/item/melee/energy/sword/cyborg(src)
- modules += new /obj/item/gun/energy/pulse/cyborg(src)
- modules += new /obj/item/crowbar(src)
- emag = null
-
- fix_modules()
-
+// Sydicate assault cyborg module.
/obj/item/robot_module/syndicate
name = "syndicate assault robot module"
module_type = "Malf" // cuz it looks cool
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/melee/energy/sword/cyborg,
+ /obj/item/gun/energy/printer,
+ /obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg,
+ /obj/item/card/emag,
+ /obj/item/crowbar/cyborg,
+ /obj/item/pinpointer/operative
+ )
-/obj/item/robot_module/syndicate/New()
- ..()
- modules += new /obj/item/melee/energy/sword/cyborg(src)
- modules += new /obj/item/gun/energy/printer(src)
- modules += new /obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg(src)
- modules += new /obj/item/card/emag(src)
- modules += new /obj/item/crowbar/cyborg(src)
- modules += new /obj/item/pinpointer/operative(src)
- emag = null
-
- fix_modules()
-
+// Sydicate medical cyborg module.
/obj/item/robot_module/syndicate_medical
name = "syndicate medical robot module"
module_type = "Malf"
- stacktypes = list(
- /obj/item/stack/medical/bruise_pack/advanced = 25,
- /obj/item/stack/medical/ointment/advanced = 25,
- /obj/item/stack/medical/splint = 25,
- /obj/item/stack/nanopaste = 25
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/healthanalyzer/advanced,
+ /obj/item/reagent_scanner/adv,
+ /obj/item/bodyanalyzer/borg/syndicate,
+ /obj/item/borg_defib,
+ /obj/item/handheld_defibrillator,
+ /obj/item/roller_holder,
+ /obj/item/reagent_containers/borghypo/syndicate,
+ /obj/item/scalpel/laser/laser1,
+ /obj/item/hemostat,
+ /obj/item/retractor,
+ /obj/item/melee/energy/sword/cyborg/saw, //Energy saw -- primary weapon
+ /obj/item/surgicaldrill,
+ /obj/item/bonesetter,
+ /obj/item/bonegel,
+ /obj/item/FixOVein,
+ /obj/item/card/emag,
+ /obj/item/crowbar/cyborg,
+ /obj/item/pinpointer/operative,
+ /obj/item/stack/medical/bruise_pack/advanced/cyborg/syndicate,
+ /obj/item/stack/medical/ointment/advanced/cyborg/syndicate,
+ /obj/item/stack/medical/splint/cyborg/syndicate,
+ /obj/item/stack/nanopaste/cyborg/syndicate,
+ /obj/item/gun/medbeam,
+ /obj/item/extinguisher/mini,
+ /obj/item/gripper/medical
)
+ special_rechargables = list(/obj/item/extinguisher/mini)
-/obj/item/robot_module/syndicate_medical/New()
- ..()
- modules += new /obj/item/healthanalyzer/advanced(src)
- modules += new /obj/item/reagent_scanner/adv(src)
- modules += new /obj/item/bodyanalyzer/borg/syndicate(src)
- modules += new /obj/item/borg_defib(src)
- modules += new /obj/item/handheld_defibrillator(src)
- modules += new /obj/item/roller_holder(src)
- modules += new /obj/item/reagent_containers/borghypo/syndicate(src)
- modules += new /obj/item/extinguisher/mini(src)
- modules += new /obj/item/stack/medical/bruise_pack/advanced(src)
- modules += new /obj/item/stack/medical/ointment/advanced(src)
- modules += new /obj/item/stack/medical/splint(src)
- modules += new /obj/item/stack/nanopaste(src)
- modules += new /obj/item/scalpel/laser/laser1(src)
- modules += new /obj/item/hemostat(src)
- modules += new /obj/item/retractor(src)
- modules += new /obj/item/bonegel(src)
- modules += new /obj/item/FixOVein(src)
- modules += new /obj/item/bonesetter(src)
- modules += new /obj/item/surgicaldrill(src)
- modules += new /obj/item/gripper/medical(src)
- modules += new /obj/item/gun/medbeam(src)
- modules += new /obj/item/melee/energy/sword/cyborg/saw(src) //Energy saw -- primary weapon
- modules += new /obj/item/card/emag(src)
- modules += new /obj/item/crowbar/cyborg(src)
- modules += new /obj/item/pinpointer/operative(src)
- emag = null
-
- fix_modules()
-
+// Sydicate engineer/sabotuer cyborg module.
/obj/item/robot_module/syndicate_saboteur
name = "engineering robot module" //to disguise in examine
module_type = "Malf"
-
- stacktypes = list(
- /obj/item/stack/sheet/metal/cyborg = 50,
- /obj/item/stack/sheet/glass/cyborg = 50,
- /obj/item/stack/sheet/rglass/cyborg = 50,
- /obj/item/stack/cable_coil/cyborg = 50,
- /obj/item/stack/rods/cyborg = 60,
- /obj/item/stack/tile/plasteel = 20
- )
-
-/obj/item/robot_module/syndicate_saboteur/New()
- ..()
- modules += new /obj/item/rcd/borg/syndicate(src)
- modules += new /obj/item/rpd(src)
- modules += new /obj/item/extinguisher(src)
- modules += new /obj/item/weldingtool/largetank/cyborg(src)
- modules += new /obj/item/screwdriver/cyborg(src)
- modules += new /obj/item/wrench/cyborg(src)
- modules += new /obj/item/crowbar/cyborg(src)
- modules += new /obj/item/wirecutters/cyborg(src)
- modules += new /obj/item/multitool/cyborg(src)
- modules += new /obj/item/t_scanner(src)
- modules += new /obj/item/analyzer(src)
- modules += new /obj/item/gripper(src)
- modules += new /obj/item/melee/energy/sword/cyborg(src)
- modules += new /obj/item/card/emag(src)
- modules += new /obj/item/borg_chameleon(src)
- modules += new /obj/item/pinpointer/operative(src)
- emag = null
-
- for(var/T in stacktypes)
- var/obj/item/stack/sheet/W = new T(src)
- W.amount = stacktypes[T]
- modules += W
-
- fix_modules()
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/rcd/borg/syndicate,
+ /obj/item/rpd,
+ /obj/item/extinguisher,
+ /obj/item/weldingtool/largetank/cyborg,
+ /obj/item/screwdriver/cyborg,
+ /obj/item/wrench/cyborg,
+ /obj/item/crowbar/cyborg,
+ /obj/item/wirecutters/cyborg,
+ /obj/item/multitool/cyborg,
+ /obj/item/t_scanner,
+ /obj/item/analyzer,
+ /obj/item/gripper,
+ /obj/item/melee/energy/sword/cyborg,
+ /obj/item/card/emag,
+ /obj/item/borg_chameleon,
+ /obj/item/pinpointer/operative,
+ /obj/item/stack/sheet/metal/cyborg,
+ /obj/item/stack/rods/cyborg,
+ /obj/item/stack/tile/plasteel/cyborg,
+ /obj/item/stack/cable_coil/cyborg,
+ /obj/item/stack/sheet/glass/cyborg,
+ /obj/item/stack/sheet/rglass/cyborg
+ )
+ special_rechargables = list(/obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg)
/obj/item/robot_module/destroyer
name = "destroyer robot module"
module_type = "Malf"
- module_actions = list(
- /datum/action/innate/robot_sight/thermal,
+ module_actions = list(/datum/action/innate/robot_sight/thermal)
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/gun/energy/immolator/multi/cyborg, // See comments on /robot_module/combat below
+ /obj/item/melee/baton/loaded, // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
+ /obj/item/restraints/handcuffs/cable/zipties/cyborg,
+ /obj/item/pickaxe/drill/jackhammer, // for breaking walls to execute flanking moves
+ /obj/item/borg/destroyer/mobility
)
-
-/obj/item/robot_module/destroyer/New()
- ..()
-
- modules += new /obj/item/gun/energy/immolator/multi/cyborg(src) // See comments on /robot_module/combat below
- modules += new /obj/item/melee/baton/loaded(src) // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
- modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
- modules += new /obj/item/pickaxe/drill/jackhammer(src) // for breaking walls to execute flanking moves
- modules += new /obj/item/borg/destroyer/mobility(src)
- emag = null
- fix_modules()
-
+ special_rechargables = list(/obj/item/melee/baton/loaded)
/obj/item/robot_module/combat
name = "combat robot module"
module_type = "Malf"
- module_actions = list()
-
-/obj/item/robot_module/combat/New()
- ..()
- modules += new /obj/item/gun/energy/immolator/multi/cyborg(src) // primary weapon, strong at close range (ie: against blob/terror/xeno), but consumes a lot of energy per shot.
- // Borg gets 40 shots of this weapon. Gamma Sec ERT gets 10.
- // So, borg has way more burst damage, but also takes way longer to recharge / get back in the fight once depleted. Has to find a borg recharger and sit in it for ages.
- // Organic gamma sec ERT carries alternate weapons, including a box of flashbangs, and can load up on a huge number of guns from science. Borg cannot do either.
- // Overall, gamma borg has higher skill floor but lower skill ceiling.
- modules += new /obj/item/melee/baton/loaded(src) // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
- modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
- modules += new /obj/item/pickaxe/drill/jackhammer(src) // for breaking walls to execute flanking moves
- emag = null
- fix_modules()
-
+ basic_modules = list(
+ /obj/item/flash/cyborg,
+ /obj/item/gun/energy/immolator/multi/cyborg, // primary weapon, strong at close range (ie: against blob/terror/xeno), but consumes a lot of energy per shot.
+ // Borg gets 40 shots of this weapon. Gamma Sec ERT gets 10.
+ // So, borg has way more burst damage, but also takes way longer to recharge / get back in the fight once depleted. Has to find a borg recharger and sit in it for ages.
+ // Organic gamma sec ERT carries alternate weapons, including a box of flashbangs, and can load up on a huge number of guns from science. Borg cannot do either.
+ // Overall, gamma borg has higher skill floor but lower skill ceiling.
+ /obj/item/melee/baton/loaded, // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
+ /obj/item/restraints/handcuffs/cable/zipties/cyborg,
+ /obj/item/pickaxe/drill/jackhammer // for breaking walls to execute flanking moves
+ )
+ special_rechargables = list(/obj/item/melee/baton/loaded)
+// Xenomorph cyborg module.
/obj/item/robot_module/alien/hunter
name = "alien hunter module"
module_type = "Standard"
- module_actions = list(
- /datum/action/innate/robot_sight/thermal/alien,
+ module_actions = list(/datum/action/innate/robot_sight/thermal/alien)
+ basic_modules = list(
+ /obj/item/melee/energy/alien/claws,
+ /obj/item/flash/cyborg/alien,
+ /obj/item/reagent_containers/spray/alien/stun,
+ /obj/item/reagent_containers/spray/alien/smoke,
+ )
+ emag_modules = list(/obj/item/reagent_containers/spray/alien/acid)
+ special_rechargables = list(
+ /obj/item/reagent_containers/spray/alien/acid,
+ /obj/item/reagent_containers/spray/alien/stun,
+ /obj/item/reagent_containers/spray/alien/smoke
)
-/obj/item/robot_module/alien/hunter/New()
- ..()
- modules += new /obj/item/melee/energy/alien/claws(src)
- modules += new /obj/item/flash/cyborg/alien(src)
- var/obj/item/reagent_containers/spray/alien/stun/S = new /obj/item/reagent_containers/spray/alien/stun(src)
- S.reagents.add_reagent("ether",250) //nerfed to sleeptoxin to make it less instant drop.
- modules += S
- var/obj/item/reagent_containers/spray/alien/smoke/A = new /obj/item/reagent_containers/spray/alien/smoke(src)
- S.reagents.add_reagent("water",50) //Water is used as a dummy reagent for the smoke bombs. More of an ammo counter.
- modules += A
- emag = new /obj/item/reagent_containers/spray/alien/acid(src)
- emag.reagents.add_reagent("facid", 125)
- emag.reagents.add_reagent("sacid", 125)
-
- fix_modules()
-
/obj/item/robot_module/alien/hunter/add_languages(mob/living/silicon/robot/R)
- ..()
+ . = ..()
R.add_language("xenocommon", 1)
+// Maintenance drone module.
/obj/item/robot_module/drone
name = "drone module"
module_type = "Engineer"
- stacktypes = list(
- /obj/item/stack/sheet/wood = 10,
- /obj/item/stack/sheet/rglass/cyborg = 50,
- /obj/item/stack/tile/wood = 20,
- /obj/item/stack/rods/cyborg = 60,
- /obj/item/stack/tile/plasteel = 20,
- /obj/item/stack/sheet/metal/cyborg = 50,
- /obj/item/stack/sheet/glass/cyborg = 50,
- /obj/item/stack/cable_coil/cyborg = 30
- )
-
-/obj/item/robot_module/drone/New()
- ..()
- modules += new /obj/item/weldingtool/largetank/cyborg(src)
- modules += new /obj/item/screwdriver/cyborg(src)
- modules += new /obj/item/wrench/cyborg(src)
- modules += new /obj/item/crowbar/cyborg(src)
- modules += new /obj/item/wirecutters/cyborg(src)
- modules += new /obj/item/multitool/cyborg(src)
- modules += new /obj/item/lightreplacer/cyborg(src)
- modules += new /obj/item/gripper(src)
- modules += new /obj/item/matter_decompiler(src)
- modules += new /obj/item/reagent_containers/spray/cleaner/drone(src)
- modules += new /obj/item/soap(src)
- modules += new /obj/item/t_scanner(src)
- modules += new /obj/item/rpd(src)
-
- for(var/T in stacktypes)
- var/obj/item/stack/sheet/W = new T(src)
- W.amount = stacktypes[T]
- modules += W
-
- fix_modules()
-
-/obj/item/robot_module/drone/add_default_robot_items()
- return
-
-/obj/item/robot_module/drone/respawn_consumable(mob/living/silicon/robot/R)
- var/obj/item/reagent_containers/spray/cleaner/C = locate() in modules
- C.reagents.add_reagent("cleaner", 3)
- ..()
-
+ basic_modules = list(
+ /obj/item/weldingtool/largetank/cyborg,
+ /obj/item/screwdriver/cyborg,
+ /obj/item/wrench/cyborg,
+ /obj/item/crowbar/cyborg,
+ /obj/item/wirecutters/cyborg/drone,
+ /obj/item/multitool/cyborg/drone,
+ /obj/item/lightreplacer/cyborg,
+ /obj/item/gripper,
+ /obj/item/matter_decompiler,
+ /obj/item/reagent_containers/spray/cleaner/drone,
+ /obj/item/soap,
+ /obj/item/t_scanner,
+ /obj/item/rpd,
+ /obj/item/stack/sheet/metal/cyborg,
+ /obj/item/stack/rods/cyborg,
+ /obj/item/stack/tile/plasteel/cyborg,
+ /obj/item/stack/cable_coil/cyborg,
+ /obj/item/stack/sheet/glass/cyborg,
+ /obj/item/stack/sheet/rglass/cyborg,
+ /obj/item/stack/sheet/wood/cyborg,
+ /obj/item/stack/tile/wood/cyborg
+ )
+ special_rechargables = list(
+ /obj/item/reagent_containers/spray/cleaner/drone,
+ /obj/item/weldingtool/largetank/cyborg,
+ /obj/item/lightreplacer/cyborg
+ )
/obj/item/robot_module/drone/handle_death(mob/living/silicon/robot/R, gibbed)
var/obj/item/gripper/G = locate(/obj/item/gripper) in modules
if(G)
G.drop_gripped_item(silent = TRUE)
-//checks whether this item is a module of the robot it is located in.
+/// Checks whether this item is a module of the robot it is located in.
/obj/item/proc/is_robot_module()
if(!istype(loc, /mob/living/silicon/robot))
- return 0
+ return FALSE
var/mob/living/silicon/robot/R = loc
return (src in R.module.modules)
+
+/**
+ * # The robot_energy_storage datum
+ *
+ * Used to handle robot stack items, such as metal, wood, nanopaste, etc.
+ *
+ * To make things simple, the default `cost` of using 1 item from a borg stack, is 1.
+ * So then for example, when we have a `max_energy` of 50, the borg can use 50 of that item before it runs out.
+ *
+ * The `recharge_rate` will be affected by the charge rate of a borg recharger, depending on the level of parts. By default it is 1.
+ * This amount will be given every 2 seconds. So at round start, rechargers will give 1 energy back every 2 seconds, to each stack the borg has.
+ */
+/datum/robot_energy_storage
+ /// The name of the energy storage.
+ var/name = "Generic energy storage"
+ /// The name that will be displayed in the status panel.
+ var/statpanel_name = "Statpanel name"
+ /// The max amount of energy the stack can hold at once.
+ var/max_energy = 50
+ /// The amount of energy the stack will regain while charging.
+ var/recharge_rate = 1
+ /// Current amount of energy.
+ var/energy
+
+/datum/robot_energy_storage/New(obj/item/robot_module/R = null)
+ if(!energy)
+ energy = max_energy
+ if(R)
+ R.storages += src
+
+/**
+ * Called whenever the cyborg uses one of its stacks. Subtract the amount used from this datum's `energy` variable.
+ *
+ * Arguments:
+ * * amount - the number to subtract from the `energy` var.
+ */
+/datum/robot_energy_storage/proc/use_charge(amount)
+ if(energy < amount)
+ return FALSE // If we have more energy that we're about to drain, return
+
+ energy -= amount
+ return TRUE
+
+/**
+ * Called whenever the cyborg is recharging and gains charge on its stack, or when clicking on other same-type stacks in the world.
+ *
+ * Arguments:
+ * * amount - the number to add to the `energy` var.
+ */
+/datum/robot_energy_storage/proc/add_charge(amount)
+ energy = min(energy + amount, max_energy)
+
+/datum/robot_energy_storage/metal
+ name = "Metal Synthesizer"
+ statpanel_name = "Metal"
+
+/datum/robot_energy_storage/metal_tile
+ name = "Floor tile Synthesizer"
+ statpanel_name = "Floor tiles"
+ max_energy = 60
+
+/datum/robot_energy_storage/rods
+ name = "Rod Synthesizer"
+ statpanel_name = "Rods"
+
+/datum/robot_energy_storage/glass
+ name = "Glass Synthesizer"
+ statpanel_name = "Glass"
+
+/datum/robot_energy_storage/rglass
+ name = "Reinforced glass Synthesizer"
+ statpanel_name = "Reinforced glass"
+
+/datum/robot_energy_storage/wood
+ name = "Wood Synthesizer"
+ statpanel_name = "Wood"
+
+/datum/robot_energy_storage/wood_tile
+ name = "Wooden tile Synthesizer"
+ statpanel_name = "Wooden tiles"
+ max_energy = 60
+
+/datum/robot_energy_storage/cable
+ name = "Cable Synthesizer"
+ statpanel_name = "Cable"
+
+// For the medical stacks, even though the recharge rate is 0, it will be set to 1 by default because of a `max()` proc.
+// It will always take ~12 seconds to fully recharge these stacks beacuse of this. This time does not apply to the syndicate storages.
+/datum/robot_energy_storage/medical
+ name = "Medical Synthesizer"
+ max_energy = 6
+ recharge_rate = 0
+
+/datum/robot_energy_storage/medical/splint
+ name = "Splint Synthesizer"
+ statpanel_name = "Splints"
+
+/datum/robot_energy_storage/medical/splint/syndicate
+ max_energy = 25
+
+/datum/robot_energy_storage/medical/adv_burn_kit
+ name = "Burn kit Synthesizer"
+ statpanel_name = "Burn kits"
+
+/datum/robot_energy_storage/medical/adv_burn_kit/syndicate
+ max_energy = 25
+
+/datum/robot_energy_storage/medical/adv_brute_kit
+ name = "Trauma kit Synthesizer"
+ statpanel_name = "Brute kits"
+
+/datum/robot_energy_storage/medical/adv_brute_kit/syndicate
+ max_energy = 25
+
+/datum/robot_energy_storage/medical/nanopaste
+ name = "Nanopaste Synthesizer"
+ statpanel_name = "Nanopaste"
+
+/datum/robot_energy_storage/medical/nanopaste/syndicate
+ max_energy = 25
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 6c9d9d38bee..84a87fbd51f 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -101,6 +101,14 @@
addtimer(CALLBACK(src, .proc/react_buzz), 5)
return ..()
+/mob/living/simple_animal/bot/honkbot/attackby(obj/item/W, mob/user, params)
+ ..()
+ if(istype(W, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) // Any intent but harm will heal, so we shouldn't get angry.
+ return
+ if(!istype(W, /obj/item/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass.
+ retaliate(user)
+ addtimer(CALLBACK(src, .proc/react_buzz), 5)
+
/mob/living/simple_animal/bot/honkbot/emag_act(mob/user)
..()
if(emagged == 2)
@@ -167,6 +175,9 @@
sensor_blink()
if(!spam_flag)
if(ishuman(C))
+ var/mob/living/carbon/human/H = C
+ if(H.check_ear_prot() >= HEARING_PROTECTION_MAJOR)
+ return
C.stuttering = 20 //stammer
C.AdjustEarDamage(0, 5) //far less damage than the H.O.N.K.
C.Jitter(50)
@@ -202,6 +213,7 @@
// if can't reach perp for long enough, go idle
if(frustration >= 5) //gives up easier than beepsky
walk_to(src, 0)
+ playsound(loc, 'sound/misc/sadtrombone.ogg', 25, 1, -1)
back_to_idle()
return
if(target) // make sure target exists
@@ -257,14 +269,12 @@
if((C.name == oldtarget_name) && (world.time < last_found + 100))
continue
- if(threatlevel <= 3)
+ if(threatlevel <= 3 && emagged <= 1)
if(C in view(4, src)) //keep the range short for patrolling
if(!spam_flag)
bike_horn()
- else if(threatlevel >= 10)
- bike_horn() //just spam the shit outta this
else if(threatlevel >= 4)
- if(!spam_flag)
+ if(!spam_flag || emagged > 1)
target = C
oldtarget_name = C.name
bike_horn()
@@ -275,6 +285,8 @@
break
else
continue
+ else if(emagged > 1)
+ bike_horn() //just spam the shit outta this
/mob/living/simple_animal/bot/honkbot/explode() //doesn't drop cardboard nor its assembly, since its a very frail material.
walk_to(src, 0)
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index e45f8e311fd..b888836c5d7 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -4,9 +4,10 @@
mob_biotypes = NONE
speak_emote = list("hisses")
emote_hear = list("wails","screeches")
- response_help = "thinks better of touching"
+ response_help = "thinks better of touching"
response_disarm = "flails at"
- response_harm = "punches"
+ response_harm = "punches"
+ icon = 'icons/mob/cult.dmi'
icon_dead = "shade_dead"
speed = 0
a_intent = INTENT_HARM
@@ -26,6 +27,9 @@
deathmessage = "collapses in a shattered heap."
var/construct_type = "shade"
var/list/construct_spells = list()
+ /// Is this a holy/purified construct?
+ var/holy = FALSE
+ /// Message to send to the construct when they are created, containing information about their role.
var/playstyle_string = "You are a generic construct! Your job is to not exist, and you should probably adminhelp this."
/mob/living/simple_animal/hostile/construct/New()
@@ -98,7 +102,6 @@
name = "Juggernaut"
real_name = "Juggernaut"
desc = "A possessed suit of armour driven by the will of the restless dead"
- icon = 'icons/mob/mob.dmi'
icon_state = "behemoth"
icon_living = "behemoth"
maxHealth = 250
@@ -149,7 +152,6 @@
name = "Wraith"
real_name = "Wraith"
desc = "A wicked bladed shell contraption piloted by a bound spirit"
- icon = 'icons/mob/mob.dmi'
icon_state = "floating"
icon_living = "floating"
maxHealth = 75
@@ -174,7 +176,6 @@
name = "Artificer"
real_name = "Artificer"
desc = "A bulbous construct dedicated to building and maintaining Cult armies."
- icon = 'icons/mob/mob.dmi'
icon_state = "artificer"
icon_living = "artificer"
maxHealth = 50
@@ -254,7 +255,6 @@
name = "Behemoth"
real_name = "Behemoth"
desc = "The pinnacle of occult technology, Behemoths are the ultimate weapon in the Cult's arsenal."
- icon = 'icons/mob/mob.dmi'
icon_state = "behemoth"
icon_living = "behemoth"
maxHealth = 750
@@ -288,7 +288,6 @@
name = "Harvester"
real_name = "Harvester"
desc = "A harbinger of enlightenment. It'll be all over soon."
- icon = 'icons/mob/mob.dmi'
icon_state = "harvester"
icon_living = "harvester"
maxHealth = 60
@@ -316,6 +315,17 @@
AIStatus = AI_ON
environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP
+
+/mob/living/simple_animal/hostile/construct/proc/make_holy()
+ if(holy) // Already holy-fied
+ return
+ holy = TRUE
+ set_light(3, 5, LIGHT_COLOR_DARK_BLUE)
+ name = "Holy [name]"
+ real_name = "Holy [real_name]"
+ faction.Remove("cult")
+
+
///ui stuff
/mob/living/simple_animal/hostile/construct/armoured/update_health_hud()
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 415d012b402..73cf8f6a155 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -140,8 +140,8 @@
var/dat = "
Inventory of [name]
"
- dat += " Head:[inventory_head]" : "add_inv=head'>Nothing"]"
- dat += " Back:[inventory_back]" : "add_inv=back'>Nothing"]"
+ dat += " Head:[html_encode(inventory_head)]" : "add_inv=head'>Nothing"]"
+ dat += " Back:[html_encode(inventory_back)]" : "add_inv=back'>Nothing"]"
dat += " Collar:[pcollar]" : "add_inv=collar'>Nothing"]"
var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250)
@@ -503,53 +503,58 @@
/mob/living/simple_animal/pet/dog/corgi/Ian/handle_automated_movement()
. = ..()
//Feeding, chasing food, FOOOOODDDD
- if(!resting && !buckled)
- turns_since_scan++
- if(turns_since_scan > 5)
- turns_since_scan = 0
- if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
- movement_target = null
- stop_automated_movement = 0
- if( !movement_target || !(movement_target.loc in oview(src, 3)) )
- movement_target = null
- stop_automated_movement = 0
- for(var/obj/item/reagent_containers/food/snacks/S in oview(src,3))
- if(isturf(S.loc) || ishuman(S.loc))
- movement_target = S
+ if(resting || buckled)
+ return
+
+ if(++turns_since_scan > 5)
+ turns_since_scan = 0
+
+ // Has a target, but it's not where it was before, and it wasn't picked up by someone.
+ if(movement_target && !(isturf(movement_target.loc) || ishuman(movement_target.loc)))
+ movement_target = null
+ stop_automated_movement = FALSE
+
+ // No current target, or current target is out of range.
+ var/list/snack_range = oview(src, 3)
+ if(!movement_target || !(movement_target.loc in snack_range))
+ movement_target = null
+ stop_automated_movement = FALSE
+ var/obj/item/possible_target = null
+ for(var/I in snack_range)
+ if(istype(I, /obj/item/reagent_containers/food/snacks)) // Noms
+ possible_target = I
+ break
+ else if(istype(I, /obj/item/paper)) // Important noms
+ if(prob(10))
+ possible_target = I
break
- if(movement_target)
- spawn(0)
- stop_automated_movement = 1
- step_to(src,movement_target,1)
- sleep(3)
- step_to(src,movement_target,1)
- sleep(3)
- step_to(src,movement_target,1)
+ if(possible_target && (isturf(possible_target.loc) || ishuman(possible_target.loc))) // On the ground or in someone's hand.
+ movement_target = possible_target
+ if(movement_target)
+ INVOKE_ASYNC(src, .proc/move_to_target)
- if(movement_target) //Not redundant due to sleeps, Item can be gone in 6 decisecomds
- if(movement_target.loc.x < src.x)
- dir = WEST
- else if(movement_target.loc.x > src.x)
- dir = EAST
- else if(movement_target.loc.y < src.y)
- dir = SOUTH
- else if(movement_target.loc.y > src.y)
- dir = NORTH
- else
- dir = SOUTH
+ if(prob(1))
+ chasetail()
- if(!Adjacent(movement_target)) //can't reach food through windows.
- return
+/mob/living/simple_animal/pet/dog/corgi/Ian/proc/move_to_target()
+ stop_automated_movement = TRUE
+ step_to(src, movement_target, 1)
+ sleep(3)
+ step_to(src, movement_target, 1)
+ sleep(3)
+ step_to(src, movement_target, 1)
- if(isturf(movement_target.loc) )
- movement_target.attack_animal(src)
- else if(ishuman(movement_target.loc) )
- if(prob(20))
- custom_emote(1, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face")
+ if(movement_target) // Not redundant due to sleeps, Item can be gone in 6 deciseconds
+ // Face towards the thing
+ dir = get_dir(src, movement_target)
- if(prob(1))
- custom_emote(1, pick("dances around.","chases its tail!"))
- spin(20, 1)
+ if(!Adjacent(movement_target)) //can't reach food through windows.
+ return
+
+ if(isturf(movement_target.loc))
+ movement_target.attack_animal(src) // Eat the thing
+ else if(prob(30) && ishuman(movement_target.loc)) // mean hooman has stolen it
+ custom_emote(EMOTE_VISUAL, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face.")
/obj/item/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat"
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index ac245258c7b..0370a84baba 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -265,6 +265,7 @@
icon_state = "queen_item"
item_state = ""
icon = 'icons/mob/bees.dmi'
+ gender = FEMALE
var/mob/living/simple_animal/hostile/poison/bees/queen/queen
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index a2972b7d14f..819612d0f34 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -419,11 +419,13 @@
back = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath
if("Cultist")
- uniform = /obj/item/clothing/under/roman
- suit = /obj/item/clothing/suit/hooded/cultrobes
- suit_store = /obj/item/tome
- r_pocket = /obj/item/restraints/legcuffs/bola/cult
+ uniform = /obj/item/clothing/under/color/black
+ back = /obj/item/storage/backpack/cultpack
+ suit = /obj/item/clothing/suit/hooded/cultrobes/alt
+ if(prob(40))
+ suit_store = /obj/item/melee/cultblade
l_pocket = /obj/item/melee/cultblade/dagger
- glasses = /obj/item/clothing/glasses/hud/health/night
- backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare = 1, /obj/item/stack/sheet/runed_metal = 15)
+ if(prob(60))
+ r_pocket = /obj/item/reagent_containers/food/drinks/bottle/unholywater
+ backpack_contents = list(/obj/item/tome = 1, /obj/item/restraints/legcuffs/bola/cult = 1, /obj/item/stack/sheet/runed_metal = 15)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm
index daed363b8d9..685b508c291 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm
@@ -42,5 +42,6 @@
to_chat(user, "Someone else already took this spider.")
return
key = user.key
+ to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Terror_Spider)")
for(var/mob/dead/observer/G in GLOB.player_list)
G.show_message("A ghost has taken control of [src]. ([ghost_follow_link(src, ghost=G)]).")
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 18c7e17e655..2dfc5ca2376 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -137,10 +137,10 @@
var/dat = {"
Close
@@ -963,6 +963,9 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
statpanel("Status") // We only want alt-clicked turfs to come before Status
stat(null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]")
+ stat(null, "Map: [SSmapping.map_datum.fluff_name]")
+ if(SSmapping.next_map)
+ stat(null, "Next Map: [SSmapping.next_map.fluff_name]")
if(mob_spell_list && mob_spell_list.len)
for(var/obj/effect/proc_holder/spell/S in mob_spell_list)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index ff48fe1256b..cb39d6cc9c0 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -174,6 +174,7 @@
var/stance_damage = 0 //Whether this mob's ability to stand has been affected
+ /// List of the active mutation types
var/list/active_mutations = list()
var/last_movement = -100 // Last world.time the mob actually moved of its own accord.
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 14901a8384d..61118a32cdb 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -193,6 +193,8 @@
/obj/item/grab/proc/adjust_position()
if(affecting.buckled)
return
+ if(!assailant.Adjacent(affecting)) // To prevent teleportation via grab
+ return
if(affecting.lying && state != GRAB_KILL)
animate(affecting, pixel_x = 0, pixel_y = 0, 5, 1, LINEAR_EASING)
return //KJK
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 24b87e836fa..146f5562c54 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -478,9 +478,9 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM
lname = "[lname] "
to_chat(M, "[lname][follow][message]")
-/proc/notify_ghosts(message, ghost_sound = null, enter_link = null, title = null, atom/source = null, image/alert_overlay = null, flashwindow = TRUE, action = NOTIFY_JUMP) //Easy notification of ghosts.
+/proc/notify_ghosts(message, ghost_sound = null, enter_link = null, title = null, atom/source = null, image/alert_overlay = null, flashwindow = TRUE, action = NOTIFY_JUMP, role = null) //Easy notification of ghosts.
for(var/mob/dead/observer/O in GLOB.player_list)
- if(O.client)
+ if(O.client && (!role || (role in O.client.prefs.be_special)))
to_chat(O, "[message][(enter_link) ? " [enter_link]" : ""]")
if(ghost_sound)
O << sound(ghost_sound)
@@ -670,4 +670,3 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM
message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.")
return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well
return TRUE
-
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index e694f3531ed..d7b38a6e6d3 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -198,7 +198,8 @@
QDEL_NULL(mind)
GLOB.respawnable_list += observer
qdel(src)
- return 1
+ return TRUE
+ return FALSE
if(href_list["tos"])
privacy_consent()
return FALSE
@@ -448,6 +449,7 @@
var/dat = "
"
dat += "Round Duration: [round(hours)]h [round(mins)]m "
+ dat += "The station alert level is: [get_security_level_colors()] "
if(SSshuttle.emergency.mode >= SHUTTLE_ESCAPE)
dat += "The station has been evacuated. "
diff --git a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
index 6868521f9c2..316f50b96fa 100644
--- a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
+++ b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
@@ -88,6 +88,14 @@
name = "Glider IPC Screen"
icon_state = "gol_glider"
+/datum/sprite_accessory/hair/ipc/ipc_screen_smoking
+ name = "Smoking IPC Screen"
+ icon_state = "smoking"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_test
+ name = "Test IPC Screen"
+ icon_state = "test"
+
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_off
name = "Dark Hesphiastos Screen"
icon_state = "off"
diff --git a/code/modules/newscaster/obj/newspaper.dm b/code/modules/newscaster/obj/newspaper.dm
index 025b404064f..b9d8e1dd857 100644
--- a/code/modules/newscaster/obj/newspaper.dm
+++ b/code/modules/newscaster/obj/newspaper.dm
@@ -114,7 +114,8 @@
dat += " There is a small scribble near the end of this page... It reads: \"[scribble]\""
dat+= "
"
else
- dat += "i'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
+ // No trailing punctuation so that it's easy to copy and paste the address
+ dat += "We're sorry to break your immersion, but there has been an error with the newscaster. Please report this error, along with any more information you have, to [config.githuburl]/issues/new?template=bug_report.md"
dat += "
[curr_page+1]
"
human_user << browse(dat, "window=newspaper_main;size=300x400")
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index c8b24eea2c5..ba809fd7119 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -163,6 +163,51 @@
else
return ..()
+/obj/item/paper/attack_animal(mob/living/simple_animal/M)
+ if(!isdog(M)) // Only dogs can eat homework.
+ return
+ var/mob/living/simple_animal/pet/dog/D = M
+ D.changeNext_move(CLICK_CD_MELEE)
+ if(world.time < D.last_eaten + 30 SECONDS)
+ to_chat(D, "You are too full to try eating [src] now.")
+ return
+
+ D.visible_message("[D] starts chewing the corner of [src]!",
+ "You start chewing the corner of [src].",
+ "You hear a quiet gnawing, and the sound of paper rustling.")
+ playsound(src, 'sound/effects/pageturn2.ogg', 100, TRUE)
+ if(!do_after(D, 10 SECONDS, FALSE, src))
+ return
+
+ if(world.time < D.last_eaten + 30 SECONDS) // Check again to prevent eating multiple papers at once.
+ to_chat(D, "You are too full to try eating [src] now.")
+ return
+ D.last_eaten = world.time
+
+ // 90% chance of a crumpled paper with illegible text.
+ if(prob(90))
+ var/message_ending = "."
+ var/obj/item/paper/crumpled/P = new(loc)
+ P.name = name
+ if(info) // Something written on the paper.
+ /*var/new_text = strip_html_properly(info, MAX_PAPER_MESSAGE_LEN, TRUE) // Don't want HTML stuff getting gibberished.
+ P.info = Gibberish(new_text, 100)*/
+ P.info = "Whatever was once written here has been made completely illegible by a combination of chew marks and saliva."
+ message_ending = ", the drool making it an unreadable mess!"
+ P.update_icon()
+ qdel(src)
+
+ D.visible_message("[D] finishes eating [src][message_ending]",
+ "You finish eating [src][message_ending]")
+ D.emote("bark")
+
+ // 10% chance of the paper just being eaten entirely.
+ else
+ D.visible_message("[D] swallows [src] whole!", "You swallow [src] whole. Tasty!")
+ playsound(D, 'sound/items/eatfood.ogg', 50, TRUE)
+ qdel(src)
+
+
/obj/item/paper/proc/addtofield(id, text, links = 0)
if(id > MAX_PAPER_FIELDS)
return
@@ -487,7 +532,8 @@
icon_state = "scrap"
/obj/item/paper/crumpled/update_icon()
- return
+ if(info)
+ icon_state = "scrap_words"
/obj/item/paper/crumpled/bloody
icon_state = "scrap_bloodied"
@@ -591,10 +637,6 @@
name = "paper- 'Note'"
info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!"
-/obj/item/paper/crumpled
- name = "paper scrap"
- icon_state = "scrap"
-
/obj/item/paper/syndicate
name = "paper"
header = "
"
@@ -611,13 +653,6 @@
info = ""
footer = "
Failure to adhere appropriately to orders that may be contained herein is in violation of Space Law, and punishments may be administered appropriately upon return to Central Command. The recipient(s) of this memorandum acknowledge by reading it that they are liable for any and all damages to crew or station that may arise from ignoring suggestions or advice given herein.
"
-
-/obj/item/paper/crumpled/update_icon()
- return
-
-/obj/item/paper/crumpled/bloody
- icon_state = "scrap_bloodied"
-
/obj/item/paper/evilfax
name = "Centcomm Reply"
info = ""
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index 1dbd072b263..4606003b49e 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -148,7 +148,7 @@
. = TRUE
- if(!pda.silent)
+ if(pda && !pda.silent)
playsound(pda, 'sound/machines/terminal_select.ogg', 15, TRUE)
switch(action)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 3c8db1f50df..96ad65666ca 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -596,7 +596,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/examine(mob/user)
. = ..()
- if(in_range(user, src))
+ if(in_range(user, src) && !is_cyborg)
if(get_amount() == 1)
. += "A short piece of power cable."
else if(get_amount() == 2)
@@ -612,10 +612,10 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
// Cable merging is handled by parent proc
- if(C.amount >= MAXCOIL)
+ if(C.get_amount() >= MAXCOIL)
to_chat(user, "The coil is as long as it will get.")
return
- if( (C.amount + src.amount <= MAXCOIL) )
+ if((C.get_amount() + get_amount() <= MAXCOIL))
to_chat(user, "You join the cable coils together.")
return
else
@@ -861,7 +861,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
return color
/obj/item/stack/cable_coil/cyborg
- name = "cyborg cable coil"
+ energy_type = /datum/robot_energy_storage/cable
+ is_cyborg = TRUE
+
+/obj/item/stack/cable_coil/cyborg/update_icon()
+ return // icon_state should always be a full cable
/obj/item/stack/cable_coil/cyborg/attack_self(mob/user)
var/cablecolor = input(user,"Pick a cable color.","Cable Color") in list("red","yellow","green","blue","pink","orange","cyan","white")
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 78d728377ae..38df561727d 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -249,6 +249,8 @@
/obj/machinery/power/port_gen/pacman/proc/overheat()
overheating++
if(overheating > 60)
+ message_admins("Pacman overheated at [ADMIN_JMP(loc)]. Last touched by: [fingerprintslast ? "[fingerprintslast]" : "*null*"].")
+ log_game("Pacman overheated at [COORD(loc)]. Last touched by: [fingerprintslast ? "[fingerprintslast]" : "*null*"].")
explode()
/obj/machinery/power/port_gen/pacman/explode()
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 70ef60b11d6..0701e848a53 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -7,6 +7,7 @@
density = 0
move_resist = INFINITY
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ flags_2 = RAD_NO_CONTAMINATE_2
use_power = NO_POWER_USE
light_range = 4
layer = OBJ_LAYER + 0.1
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 6da11d80c22..f830debdd17 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -149,7 +149,7 @@
return
var/obj/item/stack/cable_coil/C = I
- if(C.amount < 10)
+ if(C.get_amount() < 10)
to_chat(user, "You need more wires.")
return
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 00dd4dbff60..9dcd6eaf6dc 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -220,7 +220,7 @@
if(istype(W, /obj/item/stack/sheet/glass) || istype(W, /obj/item/stack/sheet/rglass))
var/obj/item/stack/sheet/S = W
if(S.use(2))
- glass_type = W.type
+ glass_type = S.merge_type
playsound(loc, S.usesound, 50, 1)
user.visible_message("[user] places the glass on the solar assembly.", "You place the glass on the solar assembly.")
if(tracker)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index aa4ae90d380..0cc682eae32 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -280,6 +280,10 @@
add_overlay(causality_field, TRUE)
var/speaking = "[emergency_alert] The supermatter has reached critical integrity failure. Emergency causality destabilization field has been activated."
+ for(var/mob/M in GLOB.player_list) // for all players
+ var/turf/T = get_turf(M)
+ if(istype(T) && atoms_share_level(T, src)) // if the player is on the same zlevel as the SM shared
+ SEND_SOUND(M, sound('sound/machines/engine_alert2.ogg')) // then send them the sound file
radio.autosay(speaking, name, null, list(z))
for(var/i in SUPERMATTER_COUNTDOWN_TIME to 0 step -10)
if(damage < explosion_point) // Cutting it a bit close there engineers
@@ -373,9 +377,9 @@
if(last_accent_sound < world.time && prob(20))
var/aggression = min(((damage / 800) * (power / 2500)), 1.0) * 100
if(damage >= 300)
- playsound(src, "smdelam", max(50, aggression), FALSE, 40, 30, falloff_distance = 10)
+ playsound(src, "smdelam", max(50, aggression), FALSE, 40, 30, falloff_distance = 10, channel = CHANNEL_ENGINE)
else
- playsound(src, "smcalm", max(50, aggression), FALSE, 25, 25, falloff_distance = 10)
+ playsound(src, "smcalm", max(50, aggression), FALSE, 25, 25, falloff_distance = 10, channel = CHANNEL_ENGINE)
var/next_sound = round((100 - aggression) * 5)
last_accent_sound = world.time + max(SUPERMATTER_ACCENT_SOUND_MIN_COOLDOWN, next_sound)
@@ -564,7 +568,7 @@
zap_count += 1
if(zap_count >= 1)
- playsound(src.loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10)
+ playsound(src.loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10, channel = CHANNEL_ENGINE)
for(var/i in 1 to zap_count)
supermatter_zap(src, range, clamp(power*2, 4000, 20000), flags)
@@ -803,7 +807,7 @@
icon_state = "darkmatter"
/obj/machinery/power/supermatter_crystal/proc/supermatter_pull(turf/center, pull_range = 3)
- playsound(center, 'sound/weapons/marauder.ogg', 100, TRUE, extrarange = pull_range - world.view)
+ playsound(center, 'sound/weapons/marauder.ogg', 100, TRUE, extrarange = pull_range - world.view, channel = CHANNEL_ENGINE)
for(var/atom/movable/P in orange(pull_range,center))
if((P.anchored || P.move_resist >= MOVE_FORCE_EXTREMELY_STRONG)) //move resist memes.
if(istype(P, /obj/structure/closet))
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index a840c583128..dd3a5136bd9 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -65,7 +65,7 @@
move_the_basket_ball(4 + length(orbiting_balls) * 1.5)
- playsound(loc, 'sound/magic/lightningbolt.ogg', 100, TRUE, extrarange = 30)
+ playsound(loc, 'sound/magic/lightningbolt.ogg', 100, TRUE, extrarange = 30, channel = CHANNEL_ENGINE)
pixel_x = 0
pixel_y = 0
@@ -112,7 +112,7 @@
energy_to_lower = energy_to_raise - 20
energy_to_raise = energy_to_raise * 1.25
- playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, TRUE, extrarange = 30)
+ playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, TRUE, extrarange = 30, channel = CHANNEL_ENGINE)
addtimer(CALLBACK(src, .proc/new_mini_ball), 100)
else if(energy < energy_to_lower && length(orbiting_balls))
@@ -216,6 +216,7 @@
/obj/machinery/gateway,
/obj/structure/lattice,
/obj/structure/grille,
+ /obj/structure/cable,
/obj/machinery/the_singularitygen/tesla,
/obj/machinery/constructable_frame/machine_frame))
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 135f8c14718..355972c8fda 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -375,6 +375,10 @@
max_ammo = 30
multiple_sprites = 2
+/obj/item/ammo_box/magazine/m556/arg
+ name = "ARG magazine (5.56mm)"
+ icon_state = "arg"
+
/obj/item/ammo_box/magazine/m12g
name = "shotgun magazine (12g slugs)"
desc = "A drum magazine."
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 85efba9e5dd..543989bb146 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -1,6 +1,6 @@
/obj/item/gun/energy/laser
name = "laser gun"
- desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
+ desc = "A WT-650 'Sentinel' laser carbine manufactured by Warp-Tac Inc. The golden shield of Nanotrasen Security is visible."
icon_state = "laser"
item_state = "laser"
w_class = WEIGHT_CLASS_NORMAL
@@ -8,7 +8,7 @@
origin_tech = "combat=4;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
ammo_x_offset = 1
- shaded_charge = 1
+ shaded_charge = TRUE
/obj/item/gun/energy/laser/practice
name = "practice laser gun"
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 3d9925da974..a39e018909a 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -1,15 +1,15 @@
/obj/item/gun/energy/gun
name = "energy gun"
- desc = "A basic energy-based gun with two settings: kill and disable."
+ desc = "An E-07 energy gun manufactured by Shellguard Munitions. The fire selector has 'kill' and 'disable' settings."
icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
origin_tech = "combat=4;magnets=3"
modifystate = 2
can_flashlight = 1
- ammo_x_offset = 3
- flight_x_offset = 15
+ flight_x_offset = 20
flight_y_offset = 10
+ shaded_charge = TRUE
/obj/item/gun/energy/gun/cyborg
desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
@@ -30,6 +30,7 @@
charge_sections = 3
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
actions_types = list(/datum/action/item_action/toggle_gunlight)
+ shaded_charge = FALSE
/obj/item/gun/energy/gun/mini/Initialize(mapload, ...)
gun_light = new /obj/item/flashlight/seclite(src)
@@ -51,6 +52,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 4
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ shaded_charge = FALSE
/obj/item/gun/energy/gun/blueshield
name = "advanced stun revolver"
@@ -60,7 +62,7 @@
force = 7
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos)
ammo_x_offset = 1
- shaded_charge = 1
+ shaded_charge = TRUE
/obj/item/gun/energy/gun/blueshield/pdw9
name = "PDW-9 taser pistol"
@@ -79,6 +81,7 @@
can_flashlight = 0
trigger_guard = TRIGGER_GUARD_NONE
ammo_x_offset = 2
+ shaded_charge = FALSE
/obj/item/gun/energy/gun/nuclear
name = "advanced energy gun"
@@ -92,3 +95,4 @@
ammo_x_offset = 1
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
selfcharge = 1
+ shaded_charge = FALSE
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 141366dd5d9..140c14171eb 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -15,7 +15,7 @@
origin_tech = "combat=4;materials=4;powerstorage=4"
ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver)
can_flashlight = 0
- shaded_charge = 1
+ shaded_charge = FALSE
/obj/item/gun/energy/gun/advtaser
name = "hybrid taser"
@@ -24,6 +24,8 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
origin_tech = "combat=4"
ammo_x_offset = 2
+ flight_x_offset = 15
+ shaded_charge = FALSE
/obj/item/gun/energy/gun/advtaser/cyborg
name = "cyborg taser"
@@ -53,3 +55,12 @@
/obj/item/gun/energy/disabler/cyborg/newshot()
..()
robocharge()
+
+/obj/item/gun/energy/disabler/cyborg/cyborg_recharge(coeff, emagged)
+ if(cell.charge < cell.maxcharge)
+ var/obj/item/ammo_casing/energy/E = ammo_type[select]
+ cell.give(E.e_cost * coeff)
+ on_recharge()
+ update_icon()
+ else
+ charge_tick = 0
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index aec8cf946d1..452023946ae 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -92,7 +92,7 @@
return 0
for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
if(B.owner != current_beam)
- turf.visible_message("The medbeams cross and EXPLODE!")
+ turf.visible_message("The medbeams cross and EXPLODE!")
explosion(B.loc,0,3,5,8)
qdel(dummy)
return 0
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index bbd0beca7e0..338cd24c6fe 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -240,7 +240,7 @@
item_state = "arg"
slot_flags = 0
origin_tech = "combat=6;engineering=4"
- mag_type = /obj/item/ammo_box/magazine/m556
+ mag_type = /obj/item/ammo_box/magazine/m556/arg
fire_sound = 'sound/weapons/gunshots/gunshot_mg.ogg'
magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index d265a420c26..639a34e1da5 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -328,7 +328,11 @@
name = "double-barreled shotgun"
desc = "A true classic."
icon_state = "dshotgun"
- item_state = "shotgun"
+ item_state = "shotgun_db"
+ lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi'
+ inhand_x_dimension = 64
+ inhand_y_dimension = 64
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
force = 10
@@ -358,8 +362,10 @@
var/obj/item/melee/energy/W = A
if(W.active)
sawoff(user)
+ item_state = "ishotgun_sawn"
if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter))
sawoff(user)
+ item_state = "ishotgun_sawn"
else
return ..()
@@ -389,7 +395,11 @@
name = "improvised shotgun"
desc = "Essentially a tube that aims shotgun shells."
icon_state = "ishotgun"
- item_state = "shotgun"
+ item_state = "ishotgun"
+ lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi'
+ inhand_x_dimension = 64
+ inhand_y_dimension = 64
w_class = WEIGHT_CLASS_BULKY
force = 10
slot_flags = null
@@ -406,6 +416,7 @@
if(C.use(10))
slot_flags = SLOT_BACK
icon_state = "ishotgunsling"
+ item_state = "ishotgunsling"
to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.")
slung = 1
update_icon()
@@ -420,6 +431,7 @@
if(slung && (slot_flags & SLOT_BELT) )
slung = 0
icon_state = "ishotgun-sawn"
+ item_state = "ishotgun_sawn"
/obj/item/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
. = ..()
@@ -436,6 +448,8 @@
icon = 'icons/obj/items.dmi'
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
icon_state = "cane"
item_state = "stick"
sawn_state = SAWN_OFF
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index d50865457dc..f710416258e 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -3,6 +3,10 @@
desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
icon_state = "shotgun"
item_state = "shotgun"
+ lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi'
+ inhand_x_dimension = 64
+ inhand_y_dimension = 64
w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
@@ -80,6 +84,7 @@
name = "riot shotgun"
desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
icon_state = "riotshotgun"
+ item_state = "shotgun_riot"
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
sawn_state = SAWN_INTACT
@@ -131,7 +136,7 @@
desc = sawn_desc
w_class = WEIGHT_CLASS_NORMAL
current_skin = "riotshotgun-short"
- item_state = "gun" //phil235 is it different with different skin?
+ item_state = "shotgun_assault" //phil235 is it different with different skin?
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
sawn_state = SAWN_OFF
@@ -208,6 +213,10 @@
desc = "This piece of junk looks like something that could have been used 700 years ago."
icon_state = "moistnugget"
item_state = "moistnugget"
+ lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
slot_flags = 0 //no SLOT_BACK sprite, alas
mag_type = /obj/item/ammo_box/magazine/internal/boltaction
fire_sound = 'sound/weapons/gunshots/gunshot_rifle.ogg'
@@ -305,6 +314,7 @@
name = "combat shotgun"
desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
icon_state = "cshotgun"
+ item_state = "shotgun_combat"
origin_tech = "combat=6"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_HUGE
@@ -315,6 +325,11 @@
name = "cycler shotgun"
desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types."
icon_state = "cycler"
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
+ lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+ item_state = "bulldog"
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
w_class = WEIGHT_CLASS_HUGE
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index d05f7f4d8ea..a8649eb5145 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -436,24 +436,26 @@
switch(mode)
if("dispense")
var/free = target.reagents.maximum_volume - target.reagents.total_volume
- var/actual = min(amount, cell.charge / efficiency, free)
- target.reagents.add_reagent(current_reagent, actual)
- cell.charge -= actual / efficiency
+ var/actual = min(amount, round(cell.charge * efficiency), free)
if(actual)
- to_chat(user, "You dispense [amount] units of [current_reagent] into the [target].")
- update_icon()
+ target.reagents.add_reagent(current_reagent, actual)
+ cell.charge -= actual / efficiency
+ to_chat(user, "You dispense [actual] unit\s of [current_reagent] into [target].")
+ update_icon()
+ else if(free) // If actual is nil and there's still free space, it means we're out of juice
+ to_chat(user, "Insufficient energy to complete operation.")
if("remove")
if(!target.reagents.remove_reagent(current_reagent, amount))
- to_chat(user, "You remove [amount] units of [current_reagent] from the [target].")
+ to_chat(user, "You remove [amount] unit\s of [current_reagent] from [target].")
if("isolate")
if(!target.reagents.isolate_reagent(current_reagent))
- to_chat(user, "You remove all but the [current_reagent] from the [target].")
+ to_chat(user, "You remove all but [current_reagent] from [target].")
/obj/item/handheld_chem_dispenser/attack_self(mob/user)
if(cell)
ui_interact(user)
else
- to_chat(user, "The [src] lacks a power cell!")
+ to_chat(user, "[src] lacks a power cell!")
/obj/item/handheld_chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
@@ -493,7 +495,7 @@
. = TRUE
switch(action)
if("amount")
- amount = clamp(round(text2num(params["amount"])), 0, 50) // round to nearest 1 and clamp to 0 - 50
+ amount = clamp(round(text2num(params["amount"])), 1, 50) // round to nearest 1 and clamp to 1 - 50
if("dispense")
if(params["reagent"] in dispensable_reagents)
current_reagent = params["reagent"]
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 2422c7a143d..1c6981ff0b5 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -30,7 +30,7 @@
/obj/item/stack/sheet/mineral/tranquillite = list("nothing" = 20),
/obj/item/stack/sheet/mineral/silver = list("silver" = 20),
/obj/item/stack/sheet/mineral/gold = list("gold" = 20),
- /obj/item/grown/nettle/basic = list("sacid" = 0),
+ /obj/item/grown/nettle/basic = list("wasabi" = 0),
/obj/item/grown/nettle/death = list("facid" = 0, "sacid" = 0),
/obj/item/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index d22adff060d..38430bc3dce 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -794,6 +794,21 @@
color = "#B4641B"
taste_description = "gravy"
+/datum/reagent/consumable/wasabi
+ name = "Wasabi"
+ id = "wasabi"
+ description = "A pungent green paste often served with sushi. Consuming too much causes an uncomfortable burning sensation in the nostrils."
+ reagent_state = LIQUID
+ color = "#80942F"
+ taste_description = "pungency"
+
+/datum/reagent/consumable/wasabi/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
+ if(method == REAGENT_INGEST)
+ if(volume <= 1)
+ to_chat(M, "Your nostrils tingle briefly.")
+ else
+ to_chat(M, "Your nostrils burn uncomfortably!")
+ M.adjustFireLoss(1)
///Food Related, but non-nutritious
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index c05b578a42c..b6074ca3936 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -774,6 +774,11 @@
if(M.getBruteLoss() + M.getFireLoss() + M.getCloneLoss() >= 150)
M.delayed_gib()
return
+ var/mob/dead/observer/ghost = M.get_ghost(TRUE)
+ if(ghost && !ghost.can_reenter_corpse) // DNR or AntagHUD
+ M.visible_message("[M] twitches slightly, but is otherwise unresponsive!")
+ return
+
if(!M.suiciding && !HAS_TRAIT(M, TRAIT_HUSK) && !HAS_TRAIT(M, TRAIT_BADDNA))
var/time_dead = world.time - M.timeofdeath
M.visible_message("[M] seems to rise from the dead!")
@@ -1006,7 +1011,7 @@
reagent_state = LIQUID
color = "#FFDCFF"
taste_description = "stability"
- var/list/drug_list = list("crank","methamphetamine","space_drugs","psilocybin","ephedrine","epinephrine","stimulants","bath_salts","lsd","thc")
+ var/list/drug_list = list("crank", "methamphetamine", "space_drugs", "synaptizine", "psilocybin", "ephedrine", "epinephrine", "stimulants", "stimulative_agent", "bath_salts", "lsd", "thc")
/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index b644e5ad2b9..c286c6a8ae4 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -203,6 +203,7 @@
reagent_state = LIQUID
color = "#7DFF00"
taste_description = "slime"
+ can_synth = FALSE
/datum/reagent/stable_mutagen/on_new(data)
..()
@@ -333,7 +334,7 @@
return ..() | update_flags
/datum/reagent/acid/facid/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
- if(ishuman(M))
+ if(ishuman(M) && !isgrey(M))
var/mob/living/carbon/human/H = M
if(method == REAGENT_TOUCH)
if(volume > 9)
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index cb69f3b7b31..6be18db54a5 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -265,16 +265,11 @@
M.SetConfused(0)
return
if(iscultist(M))
- SSticker.mode.remove_cultist(M.mind)
+ SSticker.mode.remove_cultist(M.mind, TRUE, TRUE)
holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
M.SetJitter(0)
M.SetStuttering(0)
M.SetConfused(0)
- if(ishuman(M)) // Unequip all cult clothing
- var/mob/living/carbon/human/H = M
- for(var/I in H.contents)
- if(is_type_in_list(I, CULT_CLOTHING))
- H.unEquip(I)
return
if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80))
var/mob/living/carbon/V = M
@@ -284,7 +279,7 @@
update_flags |= M.adjustStaminaLoss(5, FALSE)
if(prob(20))
M.emote("scream")
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ M.mind.vampire.adjust_nullification(5, 2)
M.mind.vampire.bloodusable = max(M.mind.vampire.bloodusable - 3,0)
if(M.mind.vampire.bloodusable)
V.vomit(0,1)
@@ -296,7 +291,7 @@
switch(current_cycle)
if(1 to 4)
to_chat(M, "Something sizzles in your veins!")
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ M.mind.vampire.adjust_nullification(5, 2)
if(5 to 12)
to_chat(M, "You feel an intense burning inside of you!")
update_flags |= M.adjustFireLoss(1, FALSE)
@@ -304,7 +299,7 @@
M.Jitter(20)
if(prob(20))
M.emote("scream")
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ M.mind.vampire.adjust_nullification(5, 2)
if(13 to INFINITY)
to_chat(M, "You suddenly ignite in a holy fire!")
for(var/mob/O in viewers(M, null))
@@ -316,7 +311,7 @@
M.Jitter(30)
if(prob(40))
M.emote("scream")
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ M.mind.vampire.adjust_nullification(5, 2)
return ..() | update_flags
@@ -333,7 +328,7 @@
return
else
to_chat(M, "Something holy interferes with your powers!")
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ M.mind.vampire.adjust_nullification(5, 2)
/datum/reagent/holywater/reaction_turf(turf/simulated/T, volume)
diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm
index 737ccb4e0b9..34ea484d712 100644
--- a/code/modules/reagents/chemistry/recipes/drinks.dm
+++ b/code/modules/reagents/chemistry/recipes/drinks.dm
@@ -455,7 +455,7 @@
name = "Daiquiri"
id = "daiquiri"
result = "daiquiri"
- required_reagents = list("limejuice" = 1, "sugar" = 1, "rum" = 2)
+ required_reagents = list("limejuice" = 1, "sugar" = 1, "rum" = 2, "ice" = 1)
result_amount = 4
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm
index 001d8d2f7c6..cf61f2f916b 100644
--- a/code/modules/reagents/chemistry/recipes/toxins.dm
+++ b/code/modules/reagents/chemistry/recipes/toxins.dm
@@ -154,19 +154,6 @@
result_amount = 3
mix_message = "The substance turns neon green and bubbles unnervingly."
-/datum/chemical_reaction/stable_mutagen
- name = "Stable mutagen"
- id = "stable_mutagen"
- result = "stable_mutagen"
- required_reagents = list("mutagen" = 1, "lithium" = 1, "acetone" = 1, "bromine" = 1)
- result_amount = 3
- mix_message = "The substance turns a drab green and begins to bubble."
-
-/datum/chemical_reaction/stable_mutagen/stable_mutagen2
- id = "stable_mutagen2"
- required_reagents = list("mutadone" = 3, "lithium" = 1)
- result_amount = 4
-
/datum/chemical_reaction/rotatium
name = "Rotatium"
id = "Rotatium"
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index c5a5195a848..bead1467de5 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -297,6 +297,7 @@
slot_flags = SLOT_HEAD
resistance_flags = NONE
container_type = OPENCONTAINER
+ dog_fashion = /datum/dog_fashion/head/bucket
/obj/item/reagent_containers/glass/bucket/wooden
name = "wooden bucket"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 828040aae80..1002ff117c1 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -131,6 +131,9 @@
volume = 50
list_reagents = list("cleaner" = 50)
+/obj/item/reagent_containers/spray/cleaner/drone/cyborg_recharge(coeff, emagged)
+ reagents.check_and_add("cleaner", volume, 3 * coeff)
+
//spray tan
/obj/item/reagent_containers/spray/spraytan
name = "spray tan"
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 7e376b0ebaa..c58cb676cc0 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -3,14 +3,19 @@
desc = "..."
icon = 'icons/obj/objects.dmi'
icon_state = "watertank"
- density = 1
- anchored = 0
+ density = TRUE
+ anchored = TRUE
pressure_resistance = 2*ONE_ATMOSPHERE
container_type = DRAINABLE | AMOUNT_VISIBLE
max_integrity = 300
- var/tank_volume = 1000 //In units, how much the dispenser can hold
- var/reagent_id = "water" //The ID of the reagent that the dispenser uses
- var/lastrigger = "" // The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation
+ /// How much this dispenser can hold (In units)
+ var/tank_volume = 1000
+ /// The ID of the reagent that the dispenser uses
+ var/reagent_id = "water"
+ /// The last person to rig this fuel tank - Stored with the object. Only the last person matters for investigation
+ var/lastrigger = ""
+ /// Can this tank be unwrenched
+ var/can_be_unwrenched = TRUE
/obj/structure/reagent_dispensers/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..()
@@ -28,6 +33,19 @@
create_reagents(tank_volume)
reagents.add_reagent(reagent_id, tank_volume)
+/obj/structure/reagent_dispensers/wrench_act(mob/user, obj/item/I)
+ if(!can_be_unwrenched)
+ return
+ . = TRUE
+ if(!I.tool_use_check(user, 0))
+ return
+ default_unfasten_wrench(user, I)
+
+/obj/structure/reagent_dispensers/examine(mob/user)
+ . = ..()
+ if(can_be_unwrenched)
+ . += "The wheels look like they can be [anchored ? "unlocked" : "locked in place"] with a wrench."
+
/obj/structure/reagent_dispensers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
if(reagents)
@@ -206,8 +224,8 @@
name = "pepper spray refiller"
desc = "Contains condensed capsaicin for use in law \"enforcement.\""
icon_state = "pepper"
- anchored = 1
- density = 0
+ density = FALSE
+ can_be_unwrenched = FALSE
reagent_id = "condensedcapsaicin"
/obj/structure/reagent_dispensers/water_cooler
@@ -215,7 +233,6 @@
desc = "A machine that dispenses liquid to drink."
icon = 'icons/obj/vending.dmi'
icon_state = "water_cooler"
- anchored = 1
tank_volume = 500
reagent_id = "water"
var/paper_cups = 25 //Paper cups left from the cooler
@@ -234,12 +251,6 @@
user.put_in_hands(S)
paper_cups--
-/obj/structure/reagent_dispensers/water_cooler/wrench_act(mob/user, obj/item/I)
- . = TRUE
- if(!I.tool_use_check(user, 0))
- return
- default_unfasten_wrench(user, I, 40)
-
/obj/structure/reagent_dispensers/beerkeg
name = "beer keg"
desc = "Beer is liquid bread, it's good for you..."
@@ -263,22 +274,22 @@
name = "virus food dispenser"
desc = "A dispenser of low-potency virus mutagenic."
icon_state = "virus_food"
- anchored = 1
- density = 0
+ can_be_unwrenched = FALSE
+ density = FALSE
reagent_id = "virusfood"
/obj/structure/reagent_dispensers/spacecleanertank
name = "space cleaner refiller"
desc = "Refills space cleaner bottles."
icon_state = "cleaner"
- anchored = 1
- density = 0
+ can_be_unwrenched = FALSE
+ density = FALSE
tank_volume = 5000
reagent_id = "cleaner"
/obj/structure/reagent_dispensers/fueltank/chem
icon_state = "fuel_chem"
- anchored = 1
- density = 0
- accepts_rig = 0
+ can_be_unwrenched = FALSE
+ density = FALSE
+ accepts_rig = FALSE
tank_volume = 1000
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 485039c56b7..44fa7e00e1b 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -63,18 +63,18 @@ Note: Must be placed west/left of and R&D console to function.
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
T += M.rating
materials.max_amount = T * 75000
- T = 1.2
+ T = 12
for(var/obj/item/stock_parts/manipulator/M in component_parts)
- T -= M.rating/10
- efficiency_coeff = min(max(0, T), 1)
+ T -= M.rating
+ efficiency_coeff = min(max(0, T / 10), 1)
/obj/machinery/r_n_d/protolathe/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material
var/A = materials.amount(M)
if(!A)
A = reagents.get_reagent_amount(M)
- A = A / max(1, (being_built.reagents_list[M]))
+ A = A / max(1, (being_built.reagents_list[M] * efficiency_coeff))
else
- A = A / max(1, (being_built.materials[M]))
+ A = A / max(1, (being_built.materials[M] * efficiency_coeff))
return A
/obj/machinery/r_n_d/protolathe/attackby(obj/item/O as obj, mob/user as mob, params)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 7d146e08feb..da21ae77d78 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -427,7 +427,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/enough_materials = TRUE
- if(!machine.materials.has_materials(efficient_mats, amount))
+ if(!machine.materials.has_materials(being_built.materials, coeff))
atom_say("Not enough materials to complete prototype.")
enough_materials = FALSE
else
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 5a83bce5536..d6d7312adc6 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -188,7 +188,7 @@
return
if(being_used || !ismob(M))
return
- if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled
+ if(!isanimal(M) || M.mind) //only works on animals that aren't player controlled
to_chat(user, "[M] is already too intelligent for this to work!")
return ..()
if(M.stat)
diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm
index 13002089925..f709e0455f9 100644
--- a/code/modules/response_team/ert.dm
+++ b/code/modules/response_team/ert.dm
@@ -312,6 +312,7 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
id = /obj/item/card/id/ert
l_ear = /obj/item/radio/headset/ert/alt
box = /obj/item/storage/box/responseteam
+ gloves = /obj/item/clothing/gloves/combat
implants = list(/obj/item/implant/mindshield)
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
index d5be97a4081..8c3fbda5e57 100644
--- a/code/modules/response_team/ert_outfits.dm
+++ b/code/modules/response_team/ert_outfits.dm
@@ -54,7 +54,6 @@
/datum/outfit/job/centcom/response_team/commander/amber
name = "RT Commander (Amber)"
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/color/black
suit = /obj/item/clothing/suit/armor/vest/ert/command
glasses = /obj/item/clothing/glasses/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer
@@ -71,7 +70,6 @@
/datum/outfit/job/centcom/response_team/commander/red
name = "RT Commander (Red)"
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/commander
glasses = /obj/item/clothing/glasses/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -95,7 +93,6 @@
/datum/outfit/job/centcom/response_team/commander/gamma
name = "RT Commander (Gamma)"
shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -136,7 +133,6 @@
/datum/outfit/job/centcom/response_team/security/amber
name = "RT Security (Amber)"
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/color/black
suit = /obj/item/clothing/suit/armor/vest/ert/security
suit_store = /obj/item/gun/energy/gun/advtaser
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
@@ -155,7 +151,6 @@
name = "RT Security (Red)"
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/color/black
suit = /obj/item/clothing/suit/space/hardsuit/ert/security
suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
glasses = /obj/item/clothing/glasses/sunglasses
@@ -183,7 +178,6 @@
/datum/outfit/job/centcom/response_team/security/gamma
name = "RT Security (Gamma)"
shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/security/gamma
belt = /obj/item/storage/belt/security/response_team_gamma
suit_store = /obj/item/gun/energy/gun/nuclear
@@ -221,7 +215,6 @@
rt_mob_job = "ERT Engineering"
back = /obj/item/storage/backpack/ert/engineer
uniform = /obj/item/clothing/under/rank/engineer
-
belt = /obj/item/storage/belt/utility/full/multitool
pda = /obj/item/pda/heads/ert/engineering
id = /obj/item/card/id/ert/engineering
@@ -229,7 +222,6 @@
/datum/outfit/job/centcom/response_team/engineer/amber
name = "RT Engineer (Amber)"
shoes = /obj/item/clothing/shoes/magboots
- gloves = /obj/item/clothing/gloves/color/yellow
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
suit_store = /obj/item/tank/internals/emergency_oxygen/engi
glasses = /obj/item/clothing/glasses/meson/engine
@@ -248,7 +240,6 @@
/datum/outfit/job/centcom/response_team/engineer/red
name = "RT Engineer (Red)"
shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/chief/full
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
suit_store = /obj/item/tank/internals/emergency_oxygen/engi
@@ -274,7 +265,6 @@
/datum/outfit/job/centcom/response_team/engineer/gamma
name = "RT Engineer (Gamma)"
shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/chief/full
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
@@ -316,7 +306,6 @@
name = "RT Medic (Amber)"
shoes = /obj/item/clothing/shoes/white
- gloves = /obj/item/clothing/gloves/color/latex
suit = /obj/item/clothing/suit/armor/vest/ert/medical
suit_store = /obj/item/gun/energy/gun/mini
glasses = /obj/item/clothing/glasses/hud/health
@@ -345,7 +334,6 @@
name = "RT Medic (Red)"
rt_mob_job = "ERT Medical"
shoes = /obj/item/clothing/shoes/white
- gloves = /obj/item/clothing/gloves/color/latex/nitrile
suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
suit_store = /obj/item/gun/energy/gun
@@ -378,7 +366,6 @@
/datum/outfit/job/centcom/response_team/medic/gamma
name = "RT Medic (Gamma)"
shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -418,7 +405,6 @@
rt_mob_job = "ERT Paranormal"
uniform = /obj/item/clothing/under/rank/chaplain
back = /obj/item/storage/backpack/ert/security
- gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/radio/headset/ert/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
@@ -487,7 +473,6 @@
uniform = /obj/item/clothing/under/color/purple/sensor
back = /obj/item/storage/backpack/ert/janitor
belt = /obj/item/storage/belt/janitor/full
- gloves = /obj/item/clothing/gloves/color/yellow
shoes = /obj/item/clothing/shoes/galoshes
l_ear = /obj/item/radio/headset/ert/alt
id = /obj/item/card/id/centcom
@@ -529,7 +514,6 @@
name = "RT Janitor (Gamma)"
suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- gloves = /obj/item/clothing/gloves/combat
suit_store = /obj/item/gun/energy/gun
l_pocket = /obj/item/grenade/clusterbuster/cleaner
r_pocket = /obj/item/scythe/tele
diff --git a/code/modules/ruins/lavalandruin_code/ash_walker_den.dm b/code/modules/ruins/lavalandruin_code/ash_walker_den.dm
index e03b5a56b00..c37fe1921e9 100644
--- a/code/modules/ruins/lavalandruin_code/ash_walker_den.dm
+++ b/code/modules/ruins/lavalandruin_code/ash_walker_den.dm
@@ -78,6 +78,7 @@
new_spawn.rename_character(new_spawn.real_name, new_spawn.dna.species.get_random_name(new_spawn.gender))
to_chat(new_spawn, "Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Glory to the Necropolis!")
+ to_chat(new_spawn, "For more information, check the wiki page: ([config.wikiurl]/index.php/Ash_Walker)")
/obj/effect/mob_spawn/human/ash_walker/New()
. = ..()
diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm
index c1ab7fce353..af22e0061e4 100644
--- a/code/modules/security_levels/security_levels.dm
+++ b/code/modules/security_levels/security_levels.dm
@@ -173,3 +173,18 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur
return SEC_LEVEL_EPSILON
if("delta")
return SEC_LEVEL_DELTA
+
+/proc/get_security_level_colors()
+ switch(GLOB.security_level)
+ if(SEC_LEVEL_GREEN)
+ return "Green"
+ if(SEC_LEVEL_BLUE)
+ return "Blue"
+ if(SEC_LEVEL_RED)
+ return "Red"
+ if(SEC_LEVEL_GAMMA)
+ return "Gamma"
+ if(SEC_LEVEL_EPSILON)
+ return "Epsilon"
+ if(SEC_LEVEL_DELTA)
+ return "Delta"
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 8a5c2118794..3be1df48458 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -269,6 +269,8 @@
for(var/mob/M in GLOB.player_list)
if(!isnewplayer(M) && !M.client.karma_spent && !(M.client.ckey in GLOB.karma_spenders) && !M.get_preference(PREFTOGGLE_DISABLE_KARMA_REMINDER))
to_chat(M, "You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under Special Verbs tab, Award Karma.")
+ if(config.map_voting_enabled)
+ SSvote.initiate_vote("map", "the server", TRUE)
if(SHUTTLE_ESCAPE)
if(time_left <= 0)
diff --git a/code/modules/space_management/level_traits.dm b/code/modules/space_management/level_traits.dm
index 6aa3fa802a7..c11a1e6e47c 100644
--- a/code/modules/space_management/level_traits.dm
+++ b/code/modules/space_management/level_traits.dm
@@ -36,7 +36,8 @@
secure = (z == level_name_to_num(CENTCOMM))
return secure
-GLOBAL_LIST_INIT(default_map_traits, MAP_TRANSITION_CONFIG)
+// Only CC
+GLOBAL_LIST_INIT(default_map_traits, list(CC_TRANSITION_CONFIG))
/proc/check_level_trait(z, trait)
if(!z)
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index 5bca3129d0f..6eb4cb9572e 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -156,10 +156,10 @@
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake,
/obj/item/reagent_containers/food/snacks/sliceable/bananacake,
/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake,
- /obj/item/reagent_containers/food/snacks/meatballsoup,
- /obj/item/reagent_containers/food/snacks/mysterysoup,
- /obj/item/reagent_containers/food/snacks/stew,
- /obj/item/reagent_containers/food/snacks/hotchili,
+ /obj/item/reagent_containers/food/snacks/soup/meatballsoup,
+ /obj/item/reagent_containers/food/snacks/soup/mysterysoup,
+ /obj/item/reagent_containers/food/snacks/soup/stew,
+ /obj/item/reagent_containers/food/snacks/soup/hotchili,
/obj/item/reagent_containers/food/snacks/burrito,
/obj/item/reagent_containers/food/snacks/fishburger,
/obj/item/reagent_containers/food/snacks/cubancarp,
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 4c8001c9f76..bc579f5387c 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -11,6 +11,9 @@
/obj/item/weldingtool = 30
)
+ if(M == user)
+ return // no self surgery
+
if(istype(M, /mob/living/carbon/human))
H = M
affecting = H.get_organ(check_zone(selected_zone))
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 571d3f06c18..035cb1b31b2 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -62,8 +62,13 @@
Retract()
..()
+/obj/item/organ/internal/cyberimp/arm/proc/check_cuffs()
+ if(owner.handcuffed)
+ to_chat(owner, "The handcuffs interfere with [src]!")
+ return TRUE
+
/obj/item/organ/internal/cyberimp/arm/proc/Retract()
- if(!holder || (holder in src))
+ if(!holder || (holder in src) || check_cuffs())
return
owner.visible_message("[owner] retracts [holder] back into [owner.p_their()] [parent_organ == "r_arm" ? "right" : "left"] arm.",
@@ -80,10 +85,9 @@
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
/obj/item/organ/internal/cyberimp/arm/proc/Extend(obj/item/item)
- if(!(item in src))
+ if(!(item in src) || check_cuffs())
return
-
holder = item
holder.flags |= NODROP
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index b317266dab0..b5df8f90479 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -17,7 +17,7 @@
var/tint = 0
var/flash_protect = FLASH_PROTECTION_NONE
var/see_invisible = SEE_INVISIBLE_LIVING
- var/lighting_alpha
+ var/lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
/obj/item/organ/internal/eyes/proc/update_colour()
dna.write_eyes_attributes(src)
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index 3317aca4648..9812c3d8fc6 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -5,6 +5,7 @@
amputation_point = "trunk"
encased = null
gendered_icon = 0
+ convertable_children = list(/obj/item/organ/external/groin/diona)
/obj/item/organ/external/groin/diona
name = "fork"
@@ -17,24 +18,28 @@
max_damage = 35
min_broken_damage = 20
amputation_point = "upper left trunk"
+ convertable_children = list(/obj/item/organ/external/arm/diona)
/obj/item/organ/external/arm/right/diona
name = "right upper tendril"
max_damage = 35
min_broken_damage = 20
amputation_point = "upper right trunk"
+ convertable_children = list(/obj/item/organ/external/arm/right/diona)
/obj/item/organ/external/leg/diona
name = "left lower tendril"
max_damage = 35
min_broken_damage = 20
amputation_point = "lower left fork"
+ convertable_children = list(/obj/item/organ/external/leg/diona)
/obj/item/organ/external/leg/right/diona
name = "right lower tendril"
max_damage = 35
min_broken_damage = 20
amputation_point = "lower right fork"
+ convertable_children = list(/obj/item/organ/external/leg/right/diona)
/obj/item/organ/external/foot/diona
name = "left foot"
diff --git a/code/modules/surgery/organs/subtypes/skrell.dm b/code/modules/surgery/organs/subtypes/skrell.dm
index 9021e53393b..46ca75b623f 100644
--- a/code/modules/surgery/organs/subtypes/skrell.dm
+++ b/code/modules/surgery/organs/subtypes/skrell.dm
@@ -51,15 +51,18 @@
held_item = null
/obj/item/organ/internal/headpocket/emp_act(severity)
- held_item.emp_act(severity)
+ if(held_item)
+ held_item.emp_act(severity)
..()
/obj/item/organ/internal/headpocket/hear_talk(mob/living/M, list/message_pieces)
- held_item.hear_talk(M, message_pieces)
+ if(held_item)
+ held_item.hear_talk(M, message_pieces)
..()
/obj/item/organ/internal/headpocket/hear_message(mob/living/M, msg)
- held_item.hear_message(M, msg)
+ if(held_item)
+ held_item.hear_message(M, msg)
..()
/obj/item/organ/internal/heart/skrell
diff --git a/code/modules/surgery/organs/subtypes/unbreakable.dm b/code/modules/surgery/organs/subtypes/unbreakable.dm
index b4fca2150fc..047e2f01fa1 100644
--- a/code/modules/surgery/organs/subtypes/unbreakable.dm
+++ b/code/modules/surgery/organs/subtypes/unbreakable.dm
@@ -1,21 +1,26 @@
/obj/item/organ/external/chest/unbreakable
cannot_break = TRUE
encased = null
+ convertable_children = list(/obj/item/organ/external/groin/unbreakable)
/obj/item/organ/external/groin/unbreakable
cannot_break = TRUE
/obj/item/organ/external/arm/unbreakable
cannot_break = TRUE
+ convertable_children = list(/obj/item/organ/external/hand/unbreakable)
/obj/item/organ/external/arm/right/unbreakable
cannot_break = TRUE
+ convertable_children = list(/obj/item/organ/external/hand/right/unbreakable)
/obj/item/organ/external/leg/unbreakable
cannot_break = TRUE
+ convertable_children = list(/obj/item/organ/external/foot/right/unbreakable)
/obj/item/organ/external/leg/right/unbreakable
cannot_break = TRUE
+ convertable_children = list(/obj/item/organ/external/foot/right/unbreakable)
/obj/item/organ/external/foot/unbreakable
cannot_break = TRUE
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 6e118068127..51267c859b9 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -112,6 +112,9 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
if(check_flags & AB_CHECK_CONSCIOUS)
if(owner.stat)
return FALSE
+ if(istype(owner.loc, /obj/effect/dummy/spell_jaunt))
+ to_chat(owner, "No one can hear you when you are jaunting, no point in talking now!")
+ return FALSE
return TRUE
/datum/action/item_action/organ_action/colossus/Trigger()
@@ -139,12 +142,15 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
return FALSE
if(owner.stat)
return FALSE
+ if(istype(owner.loc, /obj/effect/dummy/spell_jaunt))
+ to_chat(owner, "No one can hear you when you are jaunting, no point in talking now!")
+ return FALSE
return TRUE
/obj/item/organ/internal/vocal_cords/colossus/handle_speech(message)
spans = "colossus yell" //reset spans, just in case someone gets deculted or the cords change owner
if(iscultist(owner))
- spans += " narsiesmall"
+ spans += "narsiesmall"
return "[uppertext(message)]"
/obj/item/organ/internal/vocal_cords/colossus/speak_with(message)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index ae2b695b005..c9ab043cf4c 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -197,7 +197,7 @@
"fancy" = user.client.prefs.toggles2 & PREFTOGGLE_2_FANCYUI,
"observer" = isobserver(user),
"window" = window_id,
- "map" = (GLOB.using_map && GLOB.using_map.name) ? GLOB.using_map.name : "Unknown",
+ "map" = SSmapping.map_datum.technical_name,
"ref" = "[src.UID()]"
)
diff --git a/code/modules/world_topic/announce.dm b/code/modules/world_topic/announce.dm
index 99bc3d280cf..f84481c979f 100644
--- a/code/modules/world_topic/announce.dm
+++ b/code/modules/world_topic/announce.dm
@@ -4,8 +4,5 @@
/datum/world_topic_handler/announce/execute(list/input, key_valid)
var/prtext = input["announce"]
- var/pr_substring = copytext(prtext, 1, 23)
- if(pr_substring == "Pull Request merged by")
- GLOB.pending_server_update = TRUE
for(var/client/C in GLOB.clients)
to_chat(C, "PR: [prtext]")
diff --git a/code/modules/world_topic/hostannounce.dm b/code/modules/world_topic/hostannounce.dm
deleted file mode 100644
index 3deb5b3d717..00000000000
--- a/code/modules/world_topic/hostannounce.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-/datum/world_topic_handler/hostannounce
- topic_key = "hostannounce"
- requires_commskey = TRUE
-
-/datum/world_topic_handler/hostannounce/execute(list/input, key_valid)
- GLOB.pending_server_update = TRUE
- to_chat(world, "Server Announcement: [input["message"]]")
diff --git a/code/modules/world_topic/status.dm b/code/modules/world_topic/status.dm
index 84eaf1831f3..0bd3b8d8da4 100644
--- a/code/modules/world_topic/status.dm
+++ b/code/modules/world_topic/status.dm
@@ -30,7 +30,7 @@
player_count++
status_info["players"] = player_count
status_info["admins"] = admin_count
- status_info["map_name"] = GLOB.map_name ? GLOB.map_name : "Unknown"
+ status_info["map_name"] = SSmapping.map_datum.fluff_name
// Add more info if we are authed
if(key_valid)
diff --git a/config/example/admin_ranks.txt b/config/example/admin_ranks.txt
index 6f37f5bf234..84b0036e2c8 100644
--- a/config/example/admin_ranks.txt
+++ b/config/example/admin_ranks.txt
@@ -24,21 +24,15 @@
# +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too)
# +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
# +VIEWRUNTIMES = Allows a player to view the runtimes of the server, but not use other debug verbs
-
+
# Admin Ranks
Admin Observer
Mentor +MENTOR
-Moderator +MOD
-Trial Admin +ADMIN +BAN +DEBUG +REJUVINATE
-Game Admin +ADMIN +BAN +DEBUG +REJUVINATE +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +VAREDIT +SOUND +SPAWN
-Senior Admin +ADMIN +BAN +DEBUG +REJUVINATE +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +VAREDIT +SOUND +SPAWN
-Retired Admin +ADMIN +BAN +STEALTH +VAREDIT +SPAWN
+Trial Admin +ADMIN +BAN +STEALTH +REJUVINATE
+Game Admin +ADMIN +BAN +DEBUG +REJUVINATE +BUILDMODE +EVENT +SERVER +POSSESS +PROCCALL +STEALTH +VAREDIT +SOUND +SPAWN
Head of Staff +EVERYTHING
Hosting Provider +EVERYTHING
# Coder Ranks
-Trial Coder +ADMIN +VAREDIT +REJUVINATE +DEBUG
-Coders +ADMIN +VAREDIT +REJUVINATE +DEBUG +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +SOUND +SPAWN
-Retired Coder +ADMIN +VAREDIT +REJUVINATE +DEBUG +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +SOUND +SPAWN +BAN
Maintainers +EVERYTHING
\ No newline at end of file
diff --git a/config/example/away_mission_config.txt b/config/example/away_mission_config.txt
index 5d2967295c2..bfbc792d821 100644
--- a/config/example/away_mission_config.txt
+++ b/config/example/away_mission_config.txt
@@ -10,24 +10,25 @@
#===================================#
# BROKEN / INCOMPLETE AWAY MISSIONS #
#===================================#
-#_maps/map_files/RandomZLevels/centcomAway.dmm
#_maps/map_files/RandomZLevels/example.dmm
#_maps/map_files/RandomZLevels/spacebattle.dmm
#_maps/map_files/RandomZLevels/stationCollision.dmm
+#_maps/map_files/RandomZLevels/spacehotel.dmm
+#_maps/map_files/RandomZLevels/wildwest.dmm
+#_maps/map_files/RandomZLevels/academy.dmm
#===================================#
# USABLE AWAY MISSIONS #
#===================================#
-
-_maps/map_files/RandomZLevels/beach.dmm
_maps/map_files/RandomZLevels/moonoutpost19.dmm
-_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
-_maps/map_files/RandomZLevels/academy.dmm
+#_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/RandomZLevels/blackmarketpackers.dmm
-_maps/map_files/RandomZLevels/wildwest.dmm
_maps/map_files/RandomZLevels/terrorspiders.dmm
+_maps/map_files/RandomZLevels/centcomAway.dmm
+_maps/map_files/RandomZLevels/beach.dmm
+
#===================================#
# SPECIAL AWAY MISSIONS #
#===================================#
-#_maps/map_files/RandomZLevels/evil_santa.dmm
\ No newline at end of file
+#_maps/map_files/RandomZLevels/evil_santa.dmm
diff --git a/config/example/config.txt b/config/example/config.txt
index f38e30ba40c..27fe31e980e 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -1,11 +1,14 @@
-## Server name: This appears at the top of the screen in-game. In this case it will read "spacestation13: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice
-# SERVERNAME spacestation13
+## Server name: This identifies your server in the server list. It may also be used as the title of the game window.
+SERVERNAME ParaCode Test
## Server tagline: This appears on the hub entry.
-#SERVER_TAG_LINE The Perfect Mix of RP & Action
+SERVER_TAG_LINE ParaCode Test
## Server extra features: This appears in the feature list on the hub entry.
-#SERVER_EXTRA_FEATURES medium RP, varied species/jobs/modes
+SERVER_EXTRA_FEATURES Medium RP, varied species/jobs.
+
+## Download the RSC from the web - this needs to be regenerated every time the code is changed.
+#RESOURCE_URLS http://www.paradisestation.org/windows/paradise.rsc.zip
## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system.
ADMIN_LEGACY_SYSTEM
@@ -13,9 +16,6 @@ ADMIN_LEGACY_SYSTEM
## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system.
BAN_LEGACY_SYSTEM
-## Add a # infront of this to unlimit the builds used to play. Advised is to keep it atleast 1421 due to the middle mouse button locking exploit
-MINIMUM_CLIENT_BUILD 1421
-
## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments.
JOBS_HAVE_MINIMAL_ACCESS
@@ -46,12 +46,6 @@ LOG_SAY
## log admin actions
LOG_ADMIN
-## log debug messages
-LOG_DEBUG
-
-## log admin chat
-LOG_ADMINCHAT
-
## log client access (logon/logoff)
LOG_ACCESS
@@ -77,49 +71,53 @@ LOG_PDA
LOG_RUNTIME
## log world.log messages
-LOG_WORLD_OUTPUT
+# LOG_WORLD_OUTPUT
## log all Topic() calls (for use by coders in tracking down Topic issues)
-# LOG_HREFS
+LOG_HREFS
-## log admin warning messages
+## log admin warning messages - may result in some message duplication
LOG_ADMINWARN
-## Amount of minutes that a person has to be AFK before he'll be listed on the "List AFK players" verb
-#LIST_AFK_MINIMUM 5
+## Log admin chat
+LOG_ADMINCHAT
## Amount of minutes that a person has to be AFK before he will be warned by the AFK subsystem. Leave this 0 to prevent the subsystem from activating
-WARN_AFK_MINIMUM 0
+WARN_AFK_MINIMUM 15
## Amount of minutes that a person has to be AFK before he will be cryod by the AFK subsystem. Leave this 0 to prevent the subsystem from activating
-AUTO_CRYO_AFK 0
+AUTO_CRYO_AFK 20
## Amount of minutes that a person has to be AFK before he will be despawned by the AFK subsystem. Leave this 0 to prevent the subsystem from activating
-AUTO_DESPAWN_AFK 0
+AUTO_DESPAWN_AFK 21
## probablities for game modes chosen in "secret" and "random" modes
##
## default probablity is 1, increase to make that mode more likely to be picked
## set to 0 to disable that mode
-PROBABILITY EXTEND-A-TRAITORMONGOUS 3
+PROBABILITY ABDUCTION 0
+PROBABILITY BLOB 1
+PROBABILITY CHANGELING 3
+PROBABILITY CULT 3
+PROBABILITY EXTEND-A-TRAITORMONGOUS 2
+PROBABILITY EXTENDED 3
+PROBABILITY HEIST 0
+PROBABILITY METEOR 0
+PROBABILITY NUCLEAR 2
+PROBABILITY RAGINMAGES 0
+PROBABILITY REVOLUTION 0
+PROBABILITY SHADOWLING 1
+PROBABILITY TRAITOR 2
PROBABILITY TRAITORCHAN 3
PROBABILITY TRAITORVAMP 3
-PROBABILITY REVOLUTION 0
-PROBABILITY SHADOWLING 2
-PROBABILITY CULT 4
-PROBABILITY CHANGELING 3
-PROBABILITY WIZARD 2
-PROBABILITY BLOB 1
-PROBABILITY RAGINMAGES 0
-PROBABILITY METEOR 0
-PROBABILITY HEIST 0
PROBABILITY VAMPIRE 3
-PROBABILITY EXTENDED 2
-PROBABILITY NUCLEAR 3
-PROBABILITY ABDUCTION 0
+PROBABILITY WIZARD 2
-## Maximum cycles shadowlings can remain unhatched before they take damage. 1800 = 60 minutes, 900 = 30 minutes, 0 = feature disabled.
-SHADOWLING_MAX_AGE 0
+## Uncomment to allow free golems on all roundtypes. Otherwise, disabled on cult, wiz, raging mages, blob, and nuclear.
+#UNRESTRICTED_FREE_GOLEMS
+
+## MAXIMUM SECONDS SHADOWLINGS CAN REMAIN UNHATCHED BEFORE THEY TAKE DAMAGE
+SHADOWLING_MAX_AGE 600
## Hash out to disable random events during the round.
ALLOW_RANDOM_EVENTS
@@ -178,9 +176,6 @@ NORESPAWN
## disables calling qdel(src) on newmobs if they logout before spawnin in
# DONT_DEL_NEWMOB
-## set a hosted by name for unix platforms
-# HOSTEDBY Example
-
## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
## Set to 1 to jobban them from those positions, set to 0 to allow them.
GUEST_JOBBAN
@@ -194,7 +189,7 @@ PANIC_BUNKER_THRESHOLD 150
### IPINTEL:
### This allows you to detect likely proxies by checking ips against getipintel.net
## Rating to warn at: (0.90 is good, 1 is 100% likely to be a spammer/proxy, 0.8 is 80%, etc) anything equal to or higher then this number triggers an admin warning
-#IPINTEL_RATING_BAD 0.90
+#IPINTEL_RATING_BAD 0.98
## Contact email, (required to use the service, leaving blank or default disables IPINTEL)
#IPINTEL_EMAIL ch@nge.me
## How long to save good matches (ipintel rate limits to 15 per minute and 500 per day. so this shouldn't be too low, getipintel.net suggests 6 hours, time is in hours) (Your ip will get banned if you go over 500 a day too many times)
@@ -217,40 +212,40 @@ PANIC_BUNKER_THRESHOLD 150
#FORUM_PLAYERINFO_URL https://example.com/info.php?ckey=
## Comment to disable checking for the cid randomizer dll. (disabled if database isn't enabled or connected)
-CHECK_RANDOMIZER
+#CHECK_RANDOMIZER
## the whitelist
-#USEWHITELIST
+USEWHITELIST
## set a server location for world reboot. Don't include the byond://, just give the address and port.
# SERVER server.net:port
## Forum address
-# FORUMURL http://example.org
+FORUMURL https://www.paradisestation.org/forum/
## Wiki address
-# WIKIURL http://example.org
+WIKIURL https://www.paradisestation.org/wiki
## Rules address
-# RULESURL http://example.org
+RULESURL https://www.paradisestation.org/rules
-## GitHub address
-# GITHUBURL http://example.org
+## Github address
+GITHUBURL https://github.com/ParadiseSS13/Paradise
## Discord address
-# DISCORDURL http://example.org
+#DISCORDURL http://example.org
## Discord address (forum-based invite)
-# DISCORDFORUMURL http://example.org
+DISCORDFORUMURL https://www.paradisestation.org/forum/discord/invite/general/
## Donations address
-# DONATIONSURL http://example.org
+DONATIONSURL https://www.patreon.com/ParadiseStation
## Repository address
-# REPOSITORYURL http://example.org
+REPOSITORYURL https://github.com/ParadiseSS13/Paradise
## Ban appeals URL - usually for a forum or wherever people should go to contact your admins
-# BANAPPEALS http://example.org
+BANAPPEALS https://www.paradisestation.org/forum/55-unban-requests/
## In-game features
## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
@@ -279,16 +274,13 @@ SOCKET_TALK 0
#AUTOMUTE_ON
## How long the delay is before the Away Mission gate opens. Default is half an hour.
-GATEWAY_DELAY 6000
+GATEWAY_DELAY 10
## Remove the # to give assistants maint access.
ASSISTANT_MAINT
## Remove the # to enable assistant limiting.
-ASSISTANT_LIMIT
-
-## If you enabled assistant limiting set the ratio of assistants to security members default is 2 assistants to 1 officer
-ASSISTANT_RATIO 2
+#ASSISTANT_LIMIT
# Mins before SSD crew are cryoed.
AUTO_CRYO_SSD_MINS 15
@@ -296,18 +288,21 @@ AUTO_CRYO_SSD_MINS 15
# If enabled, prevents people interacting with SSD players unless they acknowledge they have read the server rules.
SSD_WARNING
+## If you enabled assistant limiting set the ratio of assistants to security members default is 2 assistants to 1 officer
+ASSISTANT_RATIO 2
+
## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked.
## Malf and Rev will let the shuttle be called when the antags/protags are dead.
#CONTINUOUS_ROUNDS
## Uncomment to restrict non-admins from using humanoid alien races
-#USEALIENWHITELIST
+USEALIENWHITELIST
## Comment this to unrestrict the number of alien players allowed in the round. The number represents the number of alien players for every human player.
ALIEN_PLAYER_RATIO 0.2
##Remove the # to let ghosts spin chairs
-GHOST_INTERACTION
+#GHOST_INTERACTION
## Password used for authorizing external tools via world/Topic.
#COMMS_PASSWORD
@@ -326,12 +321,12 @@ EVENT_DELAY_UPPER 15;45;70
## The delay until the first time an event of the given severity runs in minutes.
## Unset setting use the EVENT_DELAY_LOWER and EVENT_DELAY_UPPER values instead.
#EVENT_CUSTOM_START_MINOR 10;15
-#EVENT_CUSTOM_START_MODERATE 30;45
-EVENT_CUSTOM_START_MAJOR 80;100
+EVENT_CUSTOM_START_MODERATE 25;40
+EVENT_CUSTOM_START_MAJOR 55;75
## Starlight for exterior walls and breaches. Uncomment for starlight!
## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting
-#STARLIGHT
+STARLIGHT
## Player rerouting stuff
## If not 0, players can be rerouted to an overflow server after a certain cap is reached
@@ -349,10 +344,10 @@ PLAYER_REROUTE_CAP 0
#DISABLE_SPACE_RUINS
## Minimum number of space ruins levels to generate
-EXTRA_SPACE_RUIN_LEVELS_MIN 4
+EXTRA_SPACE_RUIN_LEVELS_MIN 2
## Maximum number of space ruins levels to generate
-EXTRA_SPACE_RUIN_LEVELS_MAX 8
+EXTRA_SPACE_RUIN_LEVELS_MAX 4
## Uncomment to disable the OOC/LOOC channel by default.
#DISABLE_OOC
@@ -390,7 +385,7 @@ EXTRA_SPACE_RUIN_LEVELS_MAX 8
## Uncomment this to shut down the world any time it would normally reboot
#SHUTDOWN_ON_REBOOT
## A command to run prior to the world shutting down, only used if the above option is enabled
-## This default value will kill Dream Daemon on Windows machines
+## This default value will kill Dream Daemon on Windows machines.
#SHUTDOWN_SHELL_COMMAND taskkill /f /im dreamdaemon.exe
## Uncomment this to disable karma and unlock all karma purchases for players by default
@@ -420,23 +415,24 @@ HIGH_POP_MC_MODE_AMOUNT 65
##Disengage high pop mode if player count drops below this
DISABLE_HIGH_POP_MC_MODE_AMOUNT 60
-##Developer options
-
##Uncomment to enable developer start. Auto starts the server after initialization
-##DEVELOPER_EXPRESS_START
+#DEVELOPER_EXPRESS_START
## Uncomment to disable automatic admin for localhost
#DISABLE_LOCALHOST_ADMIN
+## Add a # infront of this to unlimit the builds used to play. Advised is to keep it atleast 1421 due to the middle mouse button locking exploit
+MINIMUM_CLIENT_BUILD 1421
+
## Uncomment to give a confirmation before hitting start now
#START_NOW_CONFIRMATION
## If uncommented, all gamemodes will respect the number of required players. Defaults to no.
-#ENABLE_GAMEMODE_PLAYER_LIMIT
+ENABLE_GAMEMODE_PLAYER_LIMIT
## BYOND accounts younger than the value below will alert admins when they connect for the first time,
## as well as making the BYOND account age in player panel bold
-BYOND_ACCOUNT_AGE_THRESHOLD 7
+BYOND_ACCOUNT_AGE_THRESHOLD 3
##### DISCORD STUFF #####
@@ -447,7 +443,7 @@ BYOND_ACCOUNT_AGE_THRESHOLD 7
## Role ID to be pinged with administrative events. If unset, all pings to this role will be disabled
## IF YOU ARE DISABLING THIS COMMENT IT OUT ENTIRELY, DONT LEAVE IT BLANK
-#DISCORD_WEBHOOKS_ADMIN_ROLE_ID
+#DISCORD_WEBHOOKS_ADMIN_ROLE_ID 111111111111
## Webhook URLs for the main discord webhook. Separate multiple URLs with a | (EG: https://url1|https://url2)
#DISCORD_WEBHOOKS_MAIN_URL
@@ -471,7 +467,13 @@ BYOND_ACCOUNT_AGE_THRESHOLD 7
CENTCOM_BAN_DB_URL https://centcom.melonmesa.com/ban/search/
## Max amount of CIDs that one ckey can have attached to them before they trip a warning. Set to 0 to disable.
-MAX_CLIENT_CID_HISTORY 2
+MAX_CLIENT_CID_HISTORY 20
## Uncomment to enable automatic performance profiling of rounds
-#ENABLE_AUTO_PROFILER
+ENABLE_AUTO_PROFILER
+
+## Uncomment to enable map voting
+#ENABLE_MAP_VOTING
+
+## Host for a custom 2FA server. Comment to disable. Do not use a trailing slash or https.
+#2FA_HOST http://127.0.0.1:8080
diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt
index 1cf22d60895..ffceb33e7de 100644
--- a/config/example/dbconfig.txt
+++ b/config/example/dbconfig.txt
@@ -5,15 +5,9 @@
## Should SQL be enabled? Uncomment to enable.
#SQL_ENABLED
-## Database version. This value is used if SQL_ENABLED is uncommented
-## This value must be set to the version of the paradise schema in use.
-## If this value does not match, the SQL database will not be loaded and an error will be generated.
-## Roundstart will be delayed.
-DB_VERSION 22
-
## Server the MySQL database can be found at.
# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
-ADDRESS localhost
+ADDRESS 127.0.0.1
## MySQL server port (default is 3306).
PORT 3306
@@ -21,6 +15,11 @@ PORT 3306
## Database for all SQL functions, not just feedback.
FEEDBACK_DATABASE feedback
+## This value must be set to the version of the paradise schema in use.
+## If this value does not match, the SQL database will not be loaded and an error will be generated.
+## Roundstart will be delayed.
+DB_VERSION 24
+
## Prefix to be added to the name of every table, older databases will require this be set to erro_
## If left out defaults to erro_ for legacy reasons, if you want no table prefix, give a blank prefix rather then comment out
## Note, this does not change the table names in the database, you will have to do that yourself.
diff --git a/config/example/game_options.txt b/config/example/game_options.txt
index b05023098a1..0d81a9402c8 100644
--- a/config/example/game_options.txt
+++ b/config/example/game_options.txt
@@ -11,11 +11,11 @@ REVIVAL_POD_PLANTS 1
REVIVAL_CLONING 1
## Amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
-REVIVAL_BRAIN_LIFE -1
+REVIVAL_BRAIN_LIFE 60000
### AUTO TOGGLE OOC DURING ROUND ###
#Uncomment this if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
-#AUTO_TOGGLE_OOC_DURING_ROUND
+AUTO_TOGGLE_OOC_DURING_ROUND
### MOB MOVEMENT ###
## We suggest editing these variabled in-game to find a good speed for your server. To do this you must be a high level admin. Open the 'debug' tab ingame. Select "Debug Controller" and then, in the popup, select "Configuration". These variables should have the same name.
@@ -27,7 +27,7 @@ WALK_SPEED 4
## The variables below affect the movement of specific mob types.
HUMAN_DELAY 1.5
-ROBOT_DELAY 1.5
+ROBOT_DELAY 2.5
MONKEY_DELAY 1.5
ALIEN_DELAY 1.5
SLIME_DELAY 1.5
diff --git a/config/example/jobs.txt b/config/example/jobs.txt
index 44543fca332..6a73ab5f517 100644
--- a/config/example/jobs.txt
+++ b/config/example/jobs.txt
@@ -6,13 +6,13 @@ Research Director=1
Chief Medical Officer=1
Station Engineer=5
-Roboticist=1
+Roboticist=2
Medical Doctor=5
Geneticist=2
Virologist=1
-Scientist=3
+Scientist=6
Chemist=2
Bartender=1
@@ -27,11 +27,11 @@ Detective=1
Security Officer=7
Assistant=-1
-Atmospheric Technician=4
+Atmospheric Technician=3
Cargo Technician=3
Chaplain=1
Lawyer=2
Librarian=1
AI=1
-Cyborg=1
\ No newline at end of file
+Cyborg=1
diff --git a/config/example/jobs_highpop.txt b/config/example/jobs_highpop.txt
index 44543fca332..eaaa50d55a9 100644
--- a/config/example/jobs_highpop.txt
+++ b/config/example/jobs_highpop.txt
@@ -5,33 +5,33 @@ Chief Engineer=1
Research Director=1
Chief Medical Officer=1
-Station Engineer=5
-Roboticist=1
+Station Engineer=6
+Roboticist=2
-Medical Doctor=5
+Medical Doctor=6
Geneticist=2
Virologist=1
-Scientist=3
+Scientist=7
Chemist=2
Bartender=1
Botanist=2
Chef=1
-Janitor=1
+Janitor=2
Quartermaster=1
Shaft Miner=6
Warden=1
Detective=1
-Security Officer=7
+Security Officer=8
Assistant=-1
Atmospheric Technician=4
-Cargo Technician=3
+Cargo Technician=4
Chaplain=1
Lawyer=2
Librarian=1
AI=1
-Cyborg=1
\ No newline at end of file
+Cyborg=1
diff --git a/config/example/lavaRuinBlacklist.txt b/config/example/lavaRuinBlacklist.txt
index c36f9bfcef4..49b70b5e682 100644
--- a/config/example/lavaRuinBlacklist.txt
+++ b/config/example/lavaRuinBlacklist.txt
@@ -15,8 +15,10 @@
##SIN
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
+# Gluttony was blacklisted because its reward is 'become morph'. Unblacklisted as it doesn't seem to generate complaints or be abused - but watch it.
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
-#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
+# Greed blacklisted because its reward (dice) has a 1/20 chance of making you a wizard
+_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
@@ -24,12 +26,14 @@
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm
-#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm
+#re-removed 7/24/2020, I ran a month-long test of hierophant Jun-Jul and the staff was still too strong. https://github.com/ParadiseSS13/Paradise/pull/13542
+_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
##MISC
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
-#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm
+# Cube blacklisted because it contains a wishgranter that gives you hijack on use
+_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hell.dmm"
diff --git a/config/example/rank_colours.txt b/config/example/rank_colours.txt
new file mode 100644
index 00000000000..b35641c39f4
--- /dev/null
+++ b/config/example/rank_colours.txt
@@ -0,0 +1,11 @@
+# Use this file to denote colours for ingame admin ranks, using the following format
+# Rankname - #12A5F4
+# Colours dont have to be in hex, since this colour string is thrown into the style -aa
+Head of Staff - #e74c3c
+Maintainer - #992d22
+Server Dev - #1abc9c
+Community Manager - #e91e63
+Game Admin - #238afa
+Trial Admin - #7fb6fc
+PR Reviewer - #c27c0e
+Mentor - #f1c40f
diff --git a/config/example/rules.html b/config/example/rules.html
deleted file mode 100644
index ef37effcea4..00000000000
--- a/config/example/rules.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Server Rules
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/example/spaceRuinBlacklist.txt b/config/example/spaceRuinBlacklist.txt
index c1780d217d7..7ca7abb4b3a 100644
--- a/config/example/spaceRuinBlacklist.txt
+++ b/config/example/spaceRuinBlacklist.txt
@@ -43,4 +43,4 @@
# The following is a force-spawned ruin consisting mostly of empty space with a shuttle docking port for the free golem shuttle
# Disabling it will lead to the free golem shuttle sometimes being stuck on lavaland.
-#_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm
\ No newline at end of file
diff --git a/config/names/dreams.txt b/config/names/dreams.txt
index 4bd2c2b984e..263b57ace12 100644
--- a/config/names/dreams.txt
+++ b/config/names/dreams.txt
@@ -109,4 +109,4 @@ the AI core
the mining station
the research station
a beaker of strange liquid
-Captain [DREAMER]
+Captain DREAMER
diff --git a/config/names/nightmares.txt b/config/names/nightmares.txt
index 022a0494edd..a71f9d0ba84 100644
--- a/config/names/nightmares.txt
+++ b/config/names/nightmares.txt
@@ -25,4 +25,4 @@ aaaAAAaaaaAAAAAAaa
pApErWork
we SEE yoU
the ceiling
-we have been waiting for you [DREAMER]
\ No newline at end of file
+we have been waiting for you DREAMER
\ No newline at end of file
diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm
index 2006fc601b8..431aa3d90bd 100644
--- a/goon/code/datums/browserOutput.dm
+++ b/goon/code/datums/browserOutput.dm
@@ -185,7 +185,7 @@ var/list/chatResources = list(
var/list/row = connectionHistory[i]
if(!row || row.len < 3 || !(row["ckey"] && row["compid"] && row["ip"]))
return
- if(world.IsBanned(key=row["ckey"], address=row["ip"], computer_id=row["compid"], type=null, check_ipintel=FALSE))
+ if(world.IsBanned(key=row["ckey"], address=row["ip"], computer_id=row["compid"], type=null, check_ipintel=FALSE, check_2fa=FALSE))
found = row
break
CHECK_TICK
@@ -194,7 +194,7 @@ var/list/chatResources = list(
if (found.len > 0)
message_admins("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])")
log_admin("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])")
- new /datum/cookie_record(owner, found["ckey"], found["ip"], found["compid"])
+ new /datum/cookie_record(owner.ckey, found["ckey"], found["ip"], found["compid"])
cookieSent = 1
diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png
index 7b263fe7da1..6732d365843 100644
Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ
diff --git a/icons/am_engine.dmi b/icons/am_engine.dmi
deleted file mode 100644
index a2cd83cec24..00000000000
Binary files a/icons/am_engine.dmi and /dev/null differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index e915ba04139..eb888d9ce47 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi
index e51ce35e3ce..bc011a351c4 100644
Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ
diff --git a/icons/effects/targeted.dmi b/icons/effects/targeted.dmi
index f2e03c7aacf..f0d4b95f64f 100644
Binary files a/icons/effects/targeted.dmi and b/icons/effects/targeted.dmi differ
diff --git a/icons/laptop.dmi b/icons/laptop.dmi
deleted file mode 100644
index 8b5a7f96ce3..00000000000
Binary files a/icons/laptop.dmi and /dev/null differ
diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi
index 63633844b83..76c9a030c1d 100644
Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ
diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi
index 7492b40833d..9c84a030aaf 100644
Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ
diff --git a/icons/mob/cult.dmi b/icons/mob/cult.dmi
new file mode 100644
index 00000000000..b13bfa1b51b
Binary files /dev/null and b/icons/mob/cult.dmi differ
diff --git a/icons/mob/custom_synthetic/custom-synthetic.dmi b/icons/mob/custom_synthetic/custom-synthetic.dmi
index d0e38f40a7d..1ec6ced99cd 100644
Binary files a/icons/mob/custom_synthetic/custom-synthetic.dmi and b/icons/mob/custom_synthetic/custom-synthetic.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 5ff3a9b0fb2..07fc7f4ef9e 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 1c941d4748d..f6912b8334c 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index b6bf817d15d..8350faf7d16 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/inhands/64x64_guns_lefthand.dmi b/icons/mob/inhands/64x64_guns_lefthand.dmi
new file mode 100644
index 00000000000..fa8b012ba29
Binary files /dev/null and b/icons/mob/inhands/64x64_guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/64x64_guns_righthand.dmi b/icons/mob/inhands/64x64_guns_righthand.dmi
new file mode 100644
index 00000000000..4ff026bcbaa
Binary files /dev/null and b/icons/mob/inhands/64x64_guns_righthand.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index 52a1adef4b2..d69dd8a988b 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index 9a1ee42f32b..44968461e65 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 31592dbe262..0564a4b7c7b 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 8a9c2635d76..f9c0a0d13a8 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 79a05bd3b88..86151e74123 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/species/drask/eyes.dmi b/icons/mob/species/drask/eyes.dmi
index 697a8c7fa8d..8c2653cc281 100644
Binary files a/icons/mob/species/drask/eyes.dmi and b/icons/mob/species/drask/eyes.dmi differ
diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/species/grey/eyes.dmi
index 522756904f0..7e0c0c9dc8c 100644
Binary files a/icons/mob/species/grey/eyes.dmi and b/icons/mob/species/grey/eyes.dmi differ
diff --git a/icons/mob/species/vox/eyes.dmi b/icons/mob/species/vox/eyes.dmi
index 4d3e8c984dd..8bf2772bff8 100644
Binary files a/icons/mob/species/vox/eyes.dmi and b/icons/mob/species/vox/eyes.dmi differ
diff --git a/icons/mob/species/vox/helmet.dmi b/icons/mob/species/vox/helmet.dmi
index 52d31674635..968de6b8de8 100644
Binary files a/icons/mob/species/vox/helmet.dmi and b/icons/mob/species/vox/helmet.dmi differ
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi
index 5fd53d8d5c6..6dee942eabb 100644
Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ
diff --git a/icons/mob/sprite_accessories/ipc/ipc_face.dmi b/icons/mob/sprite_accessories/ipc/ipc_face.dmi
index 9339393e386..1c685abeb9f 100644
Binary files a/icons/mob/sprite_accessories/ipc/ipc_face.dmi and b/icons/mob/sprite_accessories/ipc/ipc_face.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 1e185efd9c5..b98c3818b30 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index b1876a7d063..b1303637768 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index b9cc8b8ca2b..cb29615d4c9 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 03bcddbd266..68465a79014 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 718731b8af3..c1b757e2f3e 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 39789326c49..e4d58e11cc2 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi
index 9866fe5a95f..d6038054e3e 100644
Binary files a/icons/obj/crayons.dmi and b/icons/obj/crayons.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 8224123aa5d..c33db99411c 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/doors/doorfireglass.dmi b/icons/obj/doors/doorfireglass.dmi
index 33eec559927..61e7dbb174f 100644
Binary files a/icons/obj/doors/doorfireglass.dmi and b/icons/obj/doors/doorfireglass.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 74f0f92a37d..6d30e966c31 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index ed71b4d3c1d..8a317b9edb0 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index a0c6981f7c8..812b0bfba23 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index b1efd604cb5..891d4b0ee43 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi
index 49444798d61..f23e7c0bc9f 100644
Binary files a/icons/obj/guns/toy.dmi and b/icons/obj/guns/toy.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index dc45f40197c..23c3dcd676c 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi
index 65d9a87c7ed..97eba50512f 100644
Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index f3cff7fbd9a..f9cb6e9ae6c 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/pipe-item.dmi b/icons/obj/pipe-item.dmi
index e4322cc8e98..ac8eca417dd 100644
Binary files a/icons/obj/pipe-item.dmi and b/icons/obj/pipe-item.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 2ee30c21399..027f074a790 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index bedb0238ab6..ef613913f9f 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index ae3d0ff10ee..a7bcb5d44d0 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 223f5ccddd0..7e087e01b7b 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 87d2a7b506e..bd12100904c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -11,7 +11,8 @@
// END_PREFERENCES
// BEGIN_INCLUDE
#include "_maps\__MAP_DEFINES.dm"
-#include "_maps\cyberiad.dm"
+#include "_maps\base_map.dm"
+#include "_maps\map_datums.dm"
#include "code\_compile_options.dm"
#include "code\hub.dm"
#include "code\world.dm"
@@ -805,6 +806,7 @@
#include "code\game\objects\effects\spawners\airlock_spawner.dm"
#include "code\game\objects\effects\spawners\bombspawner.dm"
#include "code\game\objects\effects\spawners\gibspawner.dm"
+#include "code\game\objects\effects\spawners\grouped_spawner.dm"
#include "code\game\objects\effects\spawners\lootdrop.dm"
#include "code\game\objects\effects\spawners\random_barrier.dm"
#include "code\game\objects\effects\spawners\random_spawners.dm"
@@ -1343,6 +1345,7 @@
#include "code\modules\buildmode\submodes\save.dm"
#include "code\modules\buildmode\submodes\throwing.dm"
#include "code\modules\buildmode\submodes\variable_edit.dm"
+#include "code\modules\client\2fa.dm"
#include "code\modules\client\asset_cache.dm"
#include "code\modules\client\client_defines.dm"
#include "code\modules\client\client_procs.dm"
@@ -1675,10 +1678,10 @@
#include "code\modules\lighting\lighting_setup.dm"
#include "code\modules\lighting\lighting_source.dm"
#include "code\modules\lighting\lighting_turf.dm"
-#include "code\modules\map_fluff\cyberiad.dm"
-#include "code\modules\map_fluff\delta.dm"
-#include "code\modules\map_fluff\maps.dm"
-#include "code\modules\map_fluff\metastation.dm"
+#include "code\modules\mapping\base_map_datum.dm"
+#include "code\modules\mapping\cyberiad.dm"
+#include "code\modules\mapping\delta.dm"
+#include "code\modules\mapping\metastation.dm"
#include "code\modules\martial_arts\adminfu.dm"
#include "code\modules\martial_arts\brawling.dm"
#include "code\modules\martial_arts\cqc.dm"
@@ -2489,7 +2492,6 @@
#include "code\modules\world_topic\_topic_base.dm"
#include "code\modules\world_topic\adminmsg.dm"
#include "code\modules\world_topic\announce.dm"
-#include "code\modules\world_topic\hostannounce.dm"
#include "code\modules\world_topic\manifest.dm"
#include "code\modules\world_topic\ping.dm"
#include "code\modules\world_topic\players.dm"
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index e397fe3e0bb..18fcd54a417 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -7,6 +7,6 @@
"glob": "^7.1.4",
"source-map": "^0.7.3",
"stacktrace-parser": "^0.1.7",
- "ws": "^7.1.2"
+ "ws": "^7.4.6"
}
}
diff --git a/tgui/packages/tgui/interfaces/AtmosControl.js b/tgui/packages/tgui/interfaces/AtmosControl.js
index 4ec6d35095e..bb2ccd07811 100644
--- a/tgui/packages/tgui/interfaces/AtmosControl.js
+++ b/tgui/packages/tgui/interfaces/AtmosControl.js
@@ -125,7 +125,7 @@ const AtmosControlMapView = (_properties, context) => {
return (
setZoom(v)}>
- {alarms.filter(a => a.z === 1).map(aa => (
+ {alarms.filter(a => a.z === 2).map(aa => (
// The AA means air alarm, and nothing else
{
")
text = replacetext(text, "\[time\]", "[station_time_timestamp()]") // TO DO
+ text = replacetext(text, "\[date\]", "[GLOB.current_date_string]")
+ text = replacetext(text, "\[station\]", "[SSmapping.map_datum.fluff_name]")
if(!no_font)
if(P)
text = "[text]"
@@ -651,3 +653,79 @@
// return the split html object to the caller
return s
+
+//Used for applying byonds text macros to strings that are loaded at runtime
+/proc/apply_text_macros(string)
+ var/next_backslash = findtext(string, "\\")
+ if(!next_backslash)
+ return string
+
+ var/leng = length(string)
+
+ var/next_space = findtext(string, " ", next_backslash + length(string[next_backslash]))
+ if(!next_space)
+ next_space = leng - next_backslash
+
+ if(!next_space) //trailing bs
+ return string
+
+ var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash)
+ var/macro = lowertext(copytext(string, next_backslash + length(string[next_backslash]), next_space))
+ var/rest = next_backslash > leng ? "" : copytext(string, next_space + length(string[next_space]))
+
+ //See https://secure.byond.com/docs/ref/info.html#/DM/text/macros
+ switch(macro)
+ //prefixes/agnostic
+ if("the")
+ rest = text("\the []", rest)
+ if("a")
+ rest = text("\a []", rest)
+ if("an")
+ rest = text("\an []", rest)
+ if("proper")
+ rest = text("\proper []", rest)
+ if("improper")
+ rest = text("\improper []", rest)
+ if("roman")
+ rest = text("\roman []", rest)
+ //postfixes
+ if("th")
+ base = text("[]\th", rest)
+ if("s")
+ base = text("[]\s", rest)
+ if("he")
+ base = text("[]\he", rest)
+ if("she")
+ base = text("[]\she", rest)
+ if("his")
+ base = text("[]\his", rest)
+ if("himself")
+ base = text("[]\himself", rest)
+ if("herself")
+ base = text("[]\herself", rest)
+ if("hers")
+ base = text("[]\hers", rest)
+
+ . = base
+ if(rest)
+ . += .(rest)
+
+/**
+ * Proc to generate a "rank colour" from a client
+ *
+ * This takes the client and looks at various factors in order, such as patreon status, staff rank, and more
+ * Arguments:
+ * * C - The client were looking up
+ */
+/proc/client2rankcolour(client/C)
+ // First check if end user is an admin
+ if(C.holder)
+ if(C.holder.rank in GLOB.rank_colour_map)
+ // Return their rank colour if they are in here
+ return GLOB.rank_colour_map[C.holder.rank]
+
+ // If they arent an admin, see if they are a patreon. Just accept any level
+ if(C.donator_level)
+ return "#e67e22" // Patreon orange
+ return null
+
diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm
index 74760fd22b4..7b49249690d 100644
--- a/code/__HELPERS/traits.dm
+++ b/code/__HELPERS/traits.dm
@@ -99,7 +99,7 @@
Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
*/
-//mob traits
+//***** MOB TRAITS *****//
#define TRAIT_BLIND "blind"
#define TRAIT_MUTE "mute"
#define TRAIT_DEAF "deaf"
@@ -155,6 +155,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Blowing kisses actually does damage to the victim
#define TRAIT_KISS_OF_DEATH "kiss_of_death"
+//***** ITEM TRAITS *****//
+/// Show what machine/door wires do when held.
+#define TRAIT_SHOW_WIRE_INFO "show_wire_info"
+
//
// common trait sources
#define TRAIT_GENERIC "generic"
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 35388b7b824..5f95d44efc4 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -2072,7 +2072,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return _list
/// Waits at a line of code until X is true
-#define UNTIL(X) while(!(X)) stoplag()
+#define UNTIL(X) while(!(X)) sleep(world.tick_lag)
// Check if the source atom contains another atom
/atom/proc/contains(atom/location)
@@ -2116,6 +2116,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return "White Noise"
if(CHANNEL_AMBIENCE)
return "Ambience"
+ if(CHANNEL_ENGINE)
+ return "Engine Ambience"
/proc/slot_bitfield_to_slot(input_slot_flags) // Kill off this garbage ASAP; slot flags and clothing flags should be IDENTICAL. GOSH DARN IT. Doesn't work with ears or pockets, either.
switch(input_slot_flags)
diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm
index ebdf2017900..b5fd84ef6d6 100644
--- a/code/_globalvars/lists/misc.dm
+++ b/code/_globalvars/lists/misc.dm
@@ -54,4 +54,7 @@ GLOBAL_LIST_INIT(cooking_recipes, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN =
GLOBAL_LIST_INIT(cooking_ingredients, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list()))
GLOBAL_LIST_INIT(cooking_reagents, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list()))
+/// Associative list of admin rank to colour. Set in config/rank_colours.txt
+GLOBAL_LIST_EMPTY(rank_colour_map)
+
#define EGG_LAYING_MESSAGES list("lays an egg.", "squats down and croons.", "begins making a huge racket.", "begins clucking raucously.")
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index ab3bfa85451..4c22d37dc32 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(cell_logs, list())
GLOBAL_LIST_INIT(navigation_computers, list())
GLOBAL_LIST_INIT(all_areas, list())
+GLOBAL_LIST_INIT(all_unique_areas, list()) // List of all unique areas. AKA areas with there_can_be_many = FALSE
GLOBAL_LIST_INIT(machines, list())
GLOBAL_LIST_INIT(rcd_list, list()) //list of Rapid Construction Devices.
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index 1e0a82c1c28..cb953a2a503 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -11,8 +11,6 @@ GLOBAL_VAR(world_qdel_log)
GLOBAL_PROTECT(world_qdel_log)
GLOBAL_VAR(world_href_log)
GLOBAL_PROTECT(world_href_log)
-GLOBAL_VAR(world_asset_log)
-GLOBAL_PROTECT(world_asset_log)
GLOBAL_VAR(runtime_summary_log)
GLOBAL_PROTECT(runtime_summary_log)
GLOBAL_VAR(tgui_log)
diff --git a/code/_globalvars/mapping.dm b/code/_globalvars/mapping.dm
index 2b435e0bede..caf4a2a58bb 100644
--- a/code/_globalvars/mapping.dm
+++ b/code/_globalvars/mapping.dm
@@ -8,9 +8,6 @@ GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, S
GLOBAL_LIST_INIT(alldirs2, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTH, SOUTH, EAST, WEST))
GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
-// This must exist early on or shit breaks bad
-GLOBAL_DATUM_INIT(using_map, /datum/map, new USING_MAP_DATUM)
-
GLOBAL_LIST(global_map) // This is the array of zlevels | list(list(1,5),list(4,3)) | becomes a 2D array of zlevels
//Resulting sector map looks like
//|_1_|_4_|
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index cb8920f30ed..554fa2581a4 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -86,13 +86,9 @@ GLOBAL_VAR_INIT(copier_items_printed, 0)
GLOBAL_VAR_INIT(copier_max_items, 300)
GLOBAL_VAR_INIT(copier_items_printed_logged, FALSE)
-
-GLOBAL_VAR(map_name) // Self explanatory
-
GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) // Station datacore, manifest, etc
GLOBAL_VAR_INIT(panic_bunker_enabled, FALSE) // Is the panic bunker enabled
-GLOBAL_VAR_INIT(pending_server_update, FALSE)
GLOBAL_LIST_EMPTY(ability_verbs) // Create-level abilities
GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE))
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 382303c1212..3d783ece42c 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -57,7 +57,12 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NOGERMS" = TRAIT_NOGERMS,
"TRAIT_NODECAY" = TRAIT_NODECAY,
"TRAIT_NOEXAMINE" = TRAIT_NOEXAMINE,
- "TRAIT_NOPAIN" = TRAIT_NOPAIN)))
+ "TRAIT_NOPAIN" = TRAIT_NOPAIN
+ ),
+ /obj/item = list(
+ "TRAIT_SHOW_WIRE_INFO" = TRAIT_SHOW_WIRE_INFO
+ )
+))
/// value -> trait name, generated on use from trait_by_type global
GLOBAL_LIST(trait_name_map)
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 35c250abc32..180e5a55e64 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -122,12 +122,12 @@
icon_state = "too_much_oxy"
/obj/screen/alert/not_enough_nitro
- name = "Choking (No N)"
+ name = "Choking (No N2)"
desc = "You're not getting enough nitrogen. Find some good air before you pass out!"
icon_state = "not_enough_nitro"
/obj/screen/alert/too_much_nitro
- name = "Choking (N)"
+ name = "Choking (N2)"
desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_nitro"
diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
index 01940be1d8b..c408c1cd7b6 100644
--- a/code/_onclick/hud/blob_overmind.dm
+++ b/code/_onclick/hud/blob_overmind.dm
@@ -132,6 +132,8 @@
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.split_consciousness()
+ if(B.split_used) // Destroys split proc if the split is succesfully used
+ qdel(src)
/datum/hud/blob_overmind/New(mob/user)
..()
@@ -194,6 +196,8 @@
using.screen_loc = ui_storage2
static_inventory += using
- using = new /obj/screen/blob/Split()
- using.screen_loc = ui_acti
- static_inventory += using
+ var/mob/camera/blob/B = user
+ if(!B.is_offspring) // Checks if the blob is an offspring, to not create split button if it is
+ using = new /obj/screen/blob/Split()
+ using.screen_loc = ui_acti
+ static_inventory += using
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index bd1c5210826..c476232387d 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -78,15 +78,6 @@
var/mob/living/silicon/robot/R = usr
R.toggle_ionpulse()
-/obj/screen/robot/panel
- name = "installed modules"
- icon_state = "panel"
-
-/obj/screen/robot/panel/Click()
- if(issilicon(usr))
- var/mob/living/silicon/robot/R = usr
- R.installed_modules()
-
/obj/screen/robot/mov_intent
name = "fast/slow toggle"
icon_state = "running"
@@ -224,16 +215,6 @@
var/x = -4 //Start at CENTER-4,SOUTH+1
var/y = 1
- //Unfortunately adding the emag module to the list of modules has to be here. This is because a borg can
- //be emagged before they actually select a module. - or some situation can cause them to get a new module
- // - or some situation might cause them to get de-emagged or something.
- if(R.emagged || R.weapons_unlock)
- if(!(R.module.emag in R.module.modules))
- R.module.modules.Add(R.module.emag)
- else
- if(R.module.emag in R.module.modules)
- R.module.modules.Remove(R.module.emag)
-
for(var/atom/movable/A in R.module.modules)
if( (A != R.module_state_1) && (A != R.module_state_2) && (A != R.module_state_3) )
//Module is not currently active
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index aa43133d111..2c3d3202a31 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -275,6 +275,12 @@
/// Enable auto profiler of rounds
var/auto_profile = FALSE
+ // Enable map voting
+ var/map_voting_enabled = FALSE
+
+ // 2FA auth host
+ var/_2fa_auth_host = null
+
/datum/configuration/New()
for(var/T in subtypesof(/datum/game_mode))
var/datum/game_mode/M = T
@@ -770,6 +776,10 @@
max_client_cid_history = text2num(value)
if("enable_auto_profiler")
auto_profile = TRUE
+ if("enable_map_voting")
+ map_voting_enabled = TRUE
+ if("2fa_host")
+ _2fa_auth_host = value
else
log_config("Unknown setting in configuration: '[name]'")
@@ -925,3 +935,34 @@
runnable_modes[M] = probabilities[M.config_tag]
// to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]")
return runnable_modes
+
+/datum/configuration/proc/load_rank_colour_map()
+ var/list/lines = file2list("config/rank_colours.txt")
+
+ for(var/line in lines)
+ // Skip newlines
+ if(!length(line))
+ continue
+ // Skip comments
+ if(line[1] == "#")
+ continue
+
+ //Split the line at every " - "
+ var/list/split_holder = splittext(line, " - ")
+ if(!length(split_holder))
+ continue
+
+ // Rank is before the " - "
+ var/rank = split_holder[1]
+ if(!rank)
+ continue
+
+ // Color is after the " - "
+ var/colour = ""
+ if(length(split_holder) >= 2)
+ colour = split_holder[2]
+
+ if(rank && colour)
+ GLOB.rank_colour_map[rank] = colour
+ else
+ stack_trace("Invalid colour for rank '[rank]' in config/rank_colours.txt")
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 1512d8e6e70..acfb7444323 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(blackbox)
sqlversion = versions[FV.key]
var/datum/db_query/query_feedback_save = SSdbcore.NewQuery({"
- INSERT DELAYED IGNORE INTO [format_table_name("feedback")] (datetime, round_id, key_name, key_type, version, json)
+ INSERT IGNORE INTO [format_table_name("feedback")] (datetime, round_id, key_name, key_type, version, json)
VALUES (NOW(), :rid, :keyname, :keytype, :version, :json)"}, list(
"rid" = text2num(GLOB.round_id),
"keyname" = FV.key,
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index 81aab3b0759..4cfe06083e3 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -193,7 +193,7 @@ SUBSYSTEM_DEF(dbcore)
if(!IsConnected())
return
var/datum/db_query/query_round_end = SSdbcore.NewQuery(
- "UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = :game_mode_result, station_name = :station_name WHERE id = :round_id",
+ "UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = :game_mode_result WHERE id = :round_id",
list("game_mode_result" = SSticker.mode_result, "station_name" = station_name(), "round_id" = GLOB.round_id)
)
query_round_end.Execute()
diff --git a/code/controllers/subsystem/http.dm b/code/controllers/subsystem/http.dm
index ad5407bfdca..6c7178a69fa 100644
--- a/code/controllers/subsystem/http.dm
+++ b/code/controllers/subsystem/http.dm
@@ -12,8 +12,11 @@ SUBSYSTEM_DEF(http)
/// Total requests the SS has processed in a round
var/total_requests
-/datum/controller/subsystem/http/Initialize(start_timeofday)
+/datum/controller/subsystem/http/PreInit()
+ . = ..()
rustg_create_async_http_client() // Open the door
+
+/datum/controller/subsystem/http/Initialize(start_timeofday)
active_async_requests = list()
return ..()
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index ac8165aca7a..87846d051f0 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -1,31 +1,51 @@
SUBSYSTEM_DEF(mapping)
- name = "Mapping"
- init_order = INIT_ORDER_MAPPING // 9
- flags = SS_NO_FIRE
+ name = "Mapping"
+ init_order = INIT_ORDER_MAPPING // 9
+ flags = SS_NO_FIRE
+ /// What map datum are we using
+ var/datum/map/map_datum
+ /// What map will be used next round
+ var/datum/map/next_map
+
+// This has to be here because world/New() uses [station_name()], which looks this datum up
+/datum/controller/subsystem/mapping/PreInit()
+ . = ..()
+ if(map_datum) // Dont do this again if we are recovering
+ return
+ if(fexists("data/next_map.txt"))
+ var/list/lines = file2list("data/next_map.txt")
+ // Check its valid
+ try
+ map_datum = text2path(lines[1])
+ map_datum = new map_datum
+ catch
+ map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+ fdel("data/next_map.txt") // Remove to avoid the same map existing forever
+ else
+ map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+
+/datum/controller/subsystem/mapping/Shutdown()
+ if(next_map) // Save map for next round
+ var/F = file("data/next_map.txt")
+ F << next_map.type
/datum/controller/subsystem/mapping/Initialize(timeofday)
// Load all Z level templates
preloadTemplates()
+
+ // Load the station
+ loadStation()
+
+ // Load lavaland
+ loadLavaland()
+
// Pick a random away mission.
if(!config.disable_away_missions)
load_away_mission()
+
// Seed space ruins
if(!config.disable_space_ruins)
- // load in extra levels of space ruins
- var/load_zlevels_timer = start_watch()
- log_startup_progress("Creating random space levels...")
- var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
- for(var/i = 1, i <= num_extra_space, i++)
- GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE, SPAWN_RUINS))
- log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
-
- // Now spawn ruins, random budget between 20 and 30 for all zlevels combined.
- // While this may seem like a high number, the amount of ruin Z levels can be anywhere between 3 and 7.
- // Note that this budget is not split evenly accross all zlevels
- log_startup_progress("Seeding ruins...")
- var/seed_ruins_timer = start_watch()
- seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
- log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
+ handleRuins()
// Makes a blank space level for the sake of randomness
GLOB.space_manager.add_new_zlevel("Empty Area", linkage = CROSSLINKED, traits = list(REACHABLE))
@@ -63,12 +83,6 @@ SUBSYSTEM_DEF(mapping)
GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs)
- // Map name. Break these down into SSmapping controller vars instaed of GLOBs at some point
- if(GLOB.using_map && GLOB.using_map.name)
- GLOB.map_name = "[GLOB.using_map.name]"
- else
- GLOB.map_name = "Unknown"
-
// World name
if(config && config.server_name)
world.name = "[config.server_name]: [station_name()]"
@@ -77,6 +91,56 @@ SUBSYSTEM_DEF(mapping)
return ..()
+// Do not confuse with seedRuins()
+/datum/controller/subsystem/mapping/proc/handleRuins()
+ // load in extra levels of space ruins
+ var/load_zlevels_timer = start_watch()
+ log_startup_progress("Creating random space levels...")
+ var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
+ for(var/i in 1 to num_extra_space)
+ GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE, SPAWN_RUINS))
+ log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
+
+ // Now spawn ruins, random budget between 20 and 30 for all zlevels combined.
+ // While this may seem like a high number, the amount of ruin Z levels can be anywhere between 3 and 7.
+ // Note that this budget is not split evenly accross all zlevels
+ log_startup_progress("Seeding ruins...")
+ var/seed_ruins_timer = start_watch()
+ seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
+ log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
+
+// Loads in the station
+/datum/controller/subsystem/mapping/proc/loadStation()
+ ASSERT(map_datum.map_path)
+ if(!fexists(map_datum.map_path))
+ // Make a VERY OBVIOUS error
+ to_chat(world, "ERROR: The path specified for the map to load is invalid. No station has been loaded!")
+ return
+
+ var/watch = start_watch()
+ log_startup_progress("Loading [map_datum.fluff_name]...")
+ // This should always be Z2, but you never know
+ var/map_z_level = GLOB.space_manager.add_new_zlevel(MAIN_STATION, linkage = CROSSLINKED, traits = list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK))
+ GLOB.maploader.load_map(file(map_datum.map_path), z_offset = map_z_level)
+ log_startup_progress("Loaded [map_datum.fluff_name] in [stop_watch(watch)]s")
+
+ // Save station name in the DB
+ if(!SSdbcore.IsConnected())
+ return
+ var/datum/db_query/query_set_map = SSdbcore.NewQuery(
+ "UPDATE [format_table_name("round")] SET start_datetime=NOW(), map_name=:mapname, station_name=:stationname WHERE id=:round_id",
+ list("mapname" = map_datum.technical_name, "stationname" = map_datum.fluff_name, "round_id" = GLOB.round_id)
+ )
+ query_set_map.Execute(async = FALSE) // This happens during a time of intense server lag, so should be non-async
+ qdel(query_set_map)
+
+// Loads in lavaland
+/datum/controller/subsystem/mapping/proc/loadLavaland()
+ var/watch = start_watch()
+ log_startup_progress("Loading Lavaland...")
+ var/lavaland_z_level = GLOB.space_manager.add_new_zlevel(MINING, linkage = SELFLOOPING, traits = list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK))
+ GLOB.maploader.load_map(file("_maps/map_files/generic/Lavaland.dmm"), z_offset = lavaland_z_level)
+ log_startup_progress("Loaded Lavaland in [stop_watch(watch)]s")
/datum/controller/subsystem/mapping/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins)
if(!z_levels || !z_levels.len)
diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm
index c86f988bcd4..4eb3adc62da 100644
--- a/code/controllers/subsystem/shuttles.dm
+++ b/code/controllers/subsystem/shuttles.dm
@@ -135,8 +135,6 @@ SUBSYSTEM_DEF(shuttle)
to_chat(user, "The emergency shuttle has been disabled by Centcom.")
return
- call_reason = trim(html_encode(call_reason))
-
if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH)
to_chat(user, "Reason is too short. [CALL_SHUTTLE_REASON_LENGTH] character minimum.")
return
diff --git a/code/controllers/subsystem/titlescreen.dm b/code/controllers/subsystem/titlescreen.dm
index 7fe59ec9093..90ea775885e 100644
--- a/code/controllers/subsystem/titlescreen.dm
+++ b/code/controllers/subsystem/titlescreen.dm
@@ -16,8 +16,6 @@ SUBSYSTEM_DEF(title)
else if(L.len > 1)
if(use_rare_screens && lowertext(L[1]) == "rare")
title_screens += S
- else if(GLOB.using_map && (lowertext(L[1]) == lowertext(GLOB.using_map.name)))
- title_screens += S
if(!isemptylist(title_screens))
if(length(title_screens) > 1)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 346297d900f..743d14a3962 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -177,6 +177,16 @@ SUBSYSTEM_DEF(vote)
if("crew_transfer")
if(. == "Initiate Crew Transfer")
init_shift_change(null, 1)
+ if("map")
+ // Find target map.
+ var/datum/map/top_voted_map
+ for(var/x in subtypesof(/datum/map))
+ var/datum/map/M = x
+ // Set top voted map
+ if(. == "[initial(M.fluff_name)] ([initial(M.technical_name)])")
+ top_voted_map = M
+ to_chat(world, "Map for next round: [initial(top_voted_map.fluff_name)] ([initial(top_voted_map.technical_name)])")
+ SSmapping.next_map = new top_voted_map
if(restart)
@@ -197,7 +207,7 @@ SUBSYSTEM_DEF(vote)
return vote
return 0
-/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key)
+/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, code_invoked = FALSE)
if(!mode)
if(started_time != null && !check_rights(R_ADMIN))
var/next_allowed_time = (started_time + config.vote_delay)
@@ -223,6 +233,14 @@ SUBSYSTEM_DEF(vote)
return 0
question = "End the shift?"
choices.Add("Initiate Crew Transfer", "Continue The Round")
+ if("map")
+ if(!(check_rights(R_SERVER) || code_invoked))
+ return FALSE
+ question = "Map for next round"
+ for(var/x in subtypesof(/datum/map))
+ var/datum/map/M = x
+ choices.Add("[initial(M.fluff_name)] ([initial(M.technical_name)])")
+
if("custom")
question = html_encode(input(usr,"What is the vote for?") as text|null)
if(!question) return 0
@@ -248,11 +266,7 @@ SUBSYSTEM_DEF(vote)
Click here or type vote to place your vote.
You have [config.vote_period/10] seconds to vote."})
switch(vote_type)
- if("crew_transfer")
- SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
- if("gamemode")
- SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
- if("custom")
+ if("crew_transfer", "gamemode", "custom", "map")
SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
if(mode == "gamemode" && SSticker.ticker_going)
SSticker.ticker_going = FALSE
@@ -321,6 +335,12 @@ SUBSYSTEM_DEF(vote)
if(admin)
dat += "\t([config.allow_vote_mode?"Allowed":"Disallowed"])"
+ dat += "