diff --git a/README.md b/README.md
index d33438f606..0ce4d8a094 100644
--- a/README.md
+++ b/README.md
@@ -1,147 +1,154 @@
-
-##Citadel Station 13 [html_encode(##message)] ")
+//Write a string `message` to a server log
+#define SERVER_TOOLS_LOG(message) log_world("SERVICE: [##message]")
+//Notify current in-game administrators of a string `event`
+#define SERVER_TOOLS_NOTIFY_ADMINS(event) message_admins(##event)
+#endif
+
+//Required hooks:
+
+//Put this somewhere in /world/New() that is always run
+#define SERVER_TOOLS_ON_NEW ServiceInit()
+//Put this somewhere in /world/Topic(T, Addr, Master, Keys) that is always run before T is modified
+#define SERVER_TOOLS_ON_TOPIC var/service_topic_return = ServiceCommand(params2list(T)); if(service_topic_return) return service_topic_return
+//Put at the beginning of world/Reboot(reason)
+#define SERVER_TOOLS_ON_REBOOT ServiceReboot()
+
+//Optional callable functions:
+
+//Returns the string version of the API
+#define SERVER_TOOLS_API_VERSION ServiceAPIVersion()
+//Returns TRUE if the world was launched under the server tools and the API matches, FALSE otherwise
+//No function below this succeed if this is FALSE
+#define SERVER_TOOLS_PRESENT RunningService()
+//Gets the current version of the service running the server
+#define SERVER_TOOLS_VERSION ServiceVersion()
+//Forces a hard reboot of BYOND by ending the process
+//unlike del(world) clients will try to reconnect
+//If the service has not requested a shutdown, the world will reboot shortly after
+#define SERVER_TOOLS_REBOOT_BYOND world.ServiceEndProcess()
+/*
+ Gets the list of any testmerged github pull requests
+
+ "[PR Number]" => list(
+ "title" -> PR title
+ "commit" -> Full hash of commit merged
+ "author" -> Github username of the author of the PR
+ )
+*/
+#define SERVER_TOOLS_PR_LIST GetTestMerges()
+//Sends a message to connected game chats
+#define SERVER_TOOLS_CHAT_BROADCAST(message) world.ChatBroadcast(message)
+//Sends a message to connected admin chats
+#define SERVER_TOOLS_RELAY_BROADCAST(message) world.AdminBroadcast(message)
+
+//IMPLEMENTATION
+
+#define SERVICE_API_VERSION_STRING "3.1.0.0"
+
#define REBOOT_MODE_NORMAL 0
#define REBOOT_MODE_HARD 1
#define REBOOT_MODE_SHUTDOWN 2
-#define IRC_STATUS_THROTTLE 5
-
-#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
- //This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
-
-//keep these in sync with TGS3
#define SERVICE_WORLD_PARAM "server_service"
#define SERVICE_VERSION_PARAM "server_service_version"
#define SERVICE_PR_TEST_JSON "prtestjob.json"
-#define SERVICE_PR_TEST_JSON_OLD "..\\..\\[SERVICE_PR_TEST_JSON]"
+#define SERVICE_INTERFACE_DLL "TGServiceInterface.dll"
+#define SERVICE_INTERFACE_FUNCTION "DDEntryPoint"
#define SERVICE_CMD_HARD_REBOOT "hard_reboot"
#define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown"
#define SERVICE_CMD_WORLD_ANNOUNCE "world_announce"
-#define SERVICE_CMD_IRC_CHECK "irc_check"
-#define SERVICE_CMD_IRC_STATUS "irc_status"
-#define SERVICE_CMD_ADMIN_MSG "adminmsg"
-#define SERVICE_CMD_NAME_CHECK "namecheck"
-#define SERVICE_CMD_ADMIN_WHO "adminwho"
+#define SERVICE_CMD_LIST_CUSTOM "list_custom_commands"
#define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
#define SERVICE_CMD_PARAM_COMMAND "command"
-#define SERVICE_CMD_PARAM_MESSAGE "message"
-#define SERVICE_CMD_PARAM_TARGET "target"
#define SERVICE_CMD_PARAM_SENDER "sender"
+#define SERVICE_CMD_PARAM_CUSTOM "custom"
+#define SERVICE_CMD_API_COMPATIBLE "api_compat"
+
+#define SERVICE_JSON_PARAM_HELPTEXT "help_text"
+#define SERVICE_JSON_PARAM_ADMINONLY "admin_only"
+#define SERVICE_JSON_PARAM_REQUIREDPARAMETERS "required_parameters"
#define SERVICE_REQUEST_KILL_PROCESS "killme"
#define SERVICE_REQUEST_IRC_BROADCAST "irc"
#define SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE "send2irc"
#define SERVICE_REQUEST_WORLD_REBOOT "worldreboot"
+#define SERVICE_REQUEST_API_VERSION "api_ver"
+
+/*
+The MIT License
+
+Copyright (c) 2011 Dominic Tarr
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 905babe848..5e190ab709 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1364,63 +1364,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return FALSE
return TRUE
-//WHATEVER YOU USE THIS FOR MUST BE SANITIZED TO SHIT, IT USES SHELL
-//It also sleeps
-
-//Set this to TRUE before calling
-//This prevents RCEs from badmins
-//kevinz000 if you touch this I will hunt you down
-GLOBAL_VAR_INIT(valid_HTTPSGet, FALSE)
-GLOBAL_PROTECT(valid_HTTPSGet)
-/proc/HTTPSGet(url) //tgs2 support
- if(findtext(url, "\""))
- GLOB.valid_HTTPSGet = FALSE
-
- if(!GLOB.valid_HTTPSGet)
- if(usr)
- CRASH("[usr.ckey]([usr]) just attempted an invalid HTTPSGet on: [url]!")
- else
- CRASH("Invalid HTTPSGet call on: [url]")
- GLOB.valid_HTTPSGet = FALSE
-
- //"This has got to be the ugliest hack I have ever done"
- //warning, here be dragons
- /*
- | @___oo
- /\ /\ / (__,,,,|
- ) /^\) ^\/ _)
- ) /^\/ _)
- ) _ / / _)
- /\ )/\/ || | )_)
- < > |(,,) )__)
- || / \)___)\
- | \____( )___) )___
- \______(_______;;; __;;;
- */
- var/temp_file = "data/HTTPSGetOutput.txt"
- var/command
- if(world.system_type == MS_WINDOWS)
- command = "powershell -Command \"wget [url] -OutFile [temp_file]\""
- else if(world.system_type == UNIX)
- command = "wget -O [temp_file] [url]"
- else
- CRASH("Invalid world.system_type ([world.system_type])? Yell at Lummox.")
-
- log_world("HTTPSGet: [url]")
- var/result = shell(command)
- if(result != 0)
- log_world("Download failed: shell exited with code: [result]")
- return
-
- var/f = file(temp_file)
- if(!f)
- log_world("Download failed: Temp file not found")
- return
-
- . = file2text(f)
- f = null
- fdel(temp_file)
-
#define UNTIL(X) while(!(X)) stoplag()
/proc/pass()
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 438b3b5142..55f3e83b61 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -1,104 +1,91 @@
-/mob/dead/observer/DblClickOn(var/atom/A, var/params)
- if(client.click_intercept)
- if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
- return
-
- if(can_reenter_corpse && mind && mind.current)
- if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it
- reenter_corpse() // (cloning scanner, body bag, closet, mech, etc)
- return // seems legit.
-
- // Things you might plausibly want to follow
- if(ismovableatom(A))
- ManualFollow(A)
-
- // Otherwise jump
- else if(A.loc)
- loc = get_turf(A)
- update_parallax_contents()
-
-/mob/dead/observer/ClickOn(var/atom/A, var/params)
- if(client.click_intercept)
- if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
- return
-
- var/list/modifiers = params2list(params)
- if(modifiers["shift"] && modifiers["middle"])
- ShiftMiddleClickOn(A)
- return
- if(modifiers["shift"] && modifiers["ctrl"])
- CtrlShiftClickOn(A)
- return
- if(modifiers["middle"])
- MiddleClickOn(A)
- return
- if(modifiers["shift"])
- ShiftClickOn(A)
- return
- if(modifiers["alt"])
- AltClickOn(A)
- return
- if(modifiers["ctrl"])
- CtrlClickOn(A)
- return
-
- if(world.time <= next_move)
- return
- // You are responsible for checking config.ghost_interaction when you override this function
- // Not all of them require checking, see below
- A.attack_ghost(src)
-
-// Oh by the way this didn't work with old click code which is why clicking shit didn't spam you
-/atom/proc/attack_ghost(mob/dead/observer/user)
- if(user.client)
- if(IsAdminGhost(user))
- attack_ai(user)
- if(user.client.prefs.inquisitive_ghost)
- user.examinate(src)
-
-// ---------------------------------------
-// And here are some good things for free:
-// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
-
-/obj/machinery/teleport/hub/attack_ghost(mob/user)
- var/atom/l = loc
- var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z))
- if(com && com.locked)
- user.forceMove(get_turf(com.locked))
-
-/obj/effect/portal/attack_ghost(mob/user)
- if(linked)
- user.forceMove(get_turf(linked))
-
-/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
- if(awaygate)
- user.forceMove(awaygate.loc)
- else
- to_chat(user, "[src] has no destination.")
-
-/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
- if(stationgate)
- user.forceMove(stationgate.loc)
- else
- to_chat(user, "[src] has no destination.")
-
-/obj/item/storage/attack_ghost(mob/user)
- orient2hud(user)
- show_to(user)
-
-/obj/machinery/teleport/hub/attack_ghost(mob/user)
- if(power_station && power_station.engaged && power_station.teleporter_console && power_station.teleporter_console.target)
- user.forceMove(get_turf(power_station.teleporter_console.target))
-
-// -------------------------------------------
-// This was supposed to be used by adminghosts
-// I think it is a *terrible* idea
-// but I'm leaving it here anyway
-// commented out, of course.
-/*
-/atom/proc/attack_admin(mob/user as mob)
- if(!user || !user.client || !user.client.holder)
- return
- attack_hand(user)
-
-*/
+/mob/dead/observer/DblClickOn(var/atom/A, var/params)
+ if(client.click_intercept)
+ if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
+ return
+
+ if(can_reenter_corpse && mind && mind.current)
+ if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it
+ reenter_corpse() // (cloning scanner, body bag, closet, mech, etc)
+ return // seems legit.
+
+ // Things you might plausibly want to follow
+ if(ismovableatom(A))
+ ManualFollow(A)
+
+ // Otherwise jump
+ else if(A.loc)
+ loc = get_turf(A)
+ update_parallax_contents()
+
+/mob/dead/observer/ClickOn(var/atom/A, var/params)
+ if(client.click_intercept)
+ if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
+ return
+
+ var/list/modifiers = params2list(params)
+ if(modifiers["shift"] && modifiers["middle"])
+ ShiftMiddleClickOn(A)
+ return
+ if(modifiers["shift"] && modifiers["ctrl"])
+ CtrlShiftClickOn(A)
+ return
+ if(modifiers["middle"])
+ MiddleClickOn(A)
+ return
+ if(modifiers["shift"])
+ ShiftClickOn(A)
+ return
+ if(modifiers["alt"])
+ AltClickOn(A)
+ return
+ if(modifiers["ctrl"])
+ CtrlClickOn(A)
+ return
+
+ if(world.time <= next_move)
+ return
+ // You are responsible for checking config.ghost_interaction when you override this function
+ // Not all of them require checking, see below
+ A.attack_ghost(src)
+
+// Oh by the way this didn't work with old click code which is why clicking shit didn't spam you
+/atom/proc/attack_ghost(mob/dead/observer/user)
+ if(user.client)
+ if(IsAdminGhost(user))
+ attack_ai(user)
+ if(user.client.prefs.inquisitive_ghost)
+ user.examinate(src)
+
+// ---------------------------------------
+// And here are some good things for free:
+// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
+
+/obj/machinery/teleport/hub/attack_ghost(mob/user)
+ var/atom/l = loc
+ var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z))
+ if(com && com.locked)
+ user.forceMove(get_turf(com.locked))
+
+/obj/effect/portal/attack_ghost(mob/user)
+ if(linked)
+ user.forceMove(get_turf(linked))
+
+/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
+ if(awaygate)
+ user.forceMove(awaygate.loc)
+ else
+ to_chat(user, "[src] has no destination.")
+
+/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
+ if(stationgate)
+ user.forceMove(stationgate.loc)
+ else
+ to_chat(user, "[src] has no destination.")
+
+/obj/item/storage/attack_ghost(mob/user)
+ orient2hud(user)
+ show_to(user)
+
+/obj/machinery/teleport/hub/attack_ghost(mob/user)
+ if(power_station && power_station.engaged && power_station.teleporter_console && power_station.teleporter_console.target)
+ user.forceMove(get_turf(power_station.teleporter_console.target))
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 0c0baccc56..1e4a574e13 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -1,296 +1,156 @@
-//Configuraton defines //TODO: Move all yes/no switches into bitflags
-
-//Used by jobs_have_maint_access
-#define ASSISTANTS_HAVE_MAINT_ACCESS 1
-#define SECURITY_HAS_MAINT_ACCESS 2
-#define EVERYONE_HAS_MAINT_ACCESS 4
-
GLOBAL_VAR_INIT(config_dir, "config/")
GLOBAL_PROTECT(config_dir)
+/datum/controller/configuration
+ name = "Configuration"
+
+ var/hiding_entries_by_type = TRUE //Set for readability, admins can set this to FALSE if they want to debug it
+ var/list/entries
+ var/list/entries_by_type
+
+ var/list/maplist
+ var/datum/map_config/defaultmap
+
+ var/list/modes // allowed modes
+ var/list/gamemode_cache
+ var/list/votable_modes // votable modes
+ var/list/mode_names
+ var/list/mode_reports
+ var/list/mode_false_report_weight
+
+/datum/controller/configuration/New()
+ config = src
+ var/list/config_files = InitEntries()
+ LoadModes()
+ for(var/I in config_files)
+ LoadEntries(I)
+ if(Get(/datum/config_entry/flag/maprotation))
+ loadmaplist(CONFIG_MAPS_FILE)
+
+/datum/controller/configuration/Destroy()
+ entries_by_type.Cut()
+ QDEL_LIST_ASSOC_VAL(entries)
+ QDEL_LIST_ASSOC_VAL(maplist)
+ QDEL_NULL(defaultmap)
+
+ config = null
-/datum/configuration/can_vv_get(var_name)
- var/static/list/banned_gets = list("autoadmin", "autoadmin_rank")
- if (var_name in banned_gets)
- return FALSE
return ..()
-/datum/configuration/vv_edit_var(var_name, var_value)
- var/static/list/banned_edits = list("cross_address", "cross_allowed", "autoadmin", "autoadmin_rank", "invoke_youtubedl")
- if(var_name in banned_edits)
- return FALSE
- return ..()
+/datum/controller/configuration/proc/InitEntries()
+ var/list/_entries = list()
+ entries = _entries
+ var/list/_entries_by_type = list()
+ entries_by_type = _entries_by_type
-/datum/configuration
- var/name = "Configuration" // datum name
+ . = list()
- var/autoadmin = 0
- var/autoadmin_rank = "Game Admin"
+ for(var/I in typesof(/datum/config_entry)) //typesof is faster in this case
+ var/datum/config_entry/E = I
+ if(initial(E.abstract_type) == I)
+ continue
+ E = new I
+ _entries_by_type[I] = E
+ var/esname = E.name
+ var/datum/config_entry/test = _entries[esname]
+ if(test)
+ log_config("Error: [test.type] has the same name as [E.type]: [esname]! Not initializing [E.type]!")
+ qdel(E)
+ continue
+ _entries[esname] = E
+ .[E.resident_file] = TRUE
- var/server_name = null // server name (the name of the game window)
- var/server_sql_name = null // short form server name used for the DB
- var/station_name = null // station name (the name of the station in-game)
- var/lobby_countdown = 120 // In between round countdown.
- var/round_end_countdown = 25 // Post round murder death kill countdown
- var/hub = 0
+/datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE)
+ entries -= CE.name
+ entries_by_type -= CE.type
- var/log_ooc = 0 // log OOC channel
- var/log_access = 0 // log login/logout
- var/log_say = 0 // log client say
- var/log_admin = 0 // log admin actions
- var/log_game = 0 // log game events
- var/log_vote = 0 // log voting
- var/log_whisper = 0 // log client whisper
- var/log_prayer = 0 // log prayers
- var/log_law = 0 // log lawchanges
- var/log_emote = 0 // log emotes
- var/log_attack = 0 // log attack messages
- var/log_adminchat = 0 // log admin chat messages
- var/log_pda = 0 // log pda messages
- var/log_twitter = 0 // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases.
- var/log_world_topic = 0 // log all world.Topic() calls
- var/sql_enabled = 0 // for sql switching
- var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour
- var/allow_vote_restart = 0 // allow votes to restart
- var/allow_vote_mode = 0 // allow votes to change mode
- var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default)
- var/vote_period = 600 // length of voting period (deciseconds, default 1 minute)
- var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi)
- var/vote_no_dead = 0 // dead people can't vote (tbi)
- var/del_new_on_log = 1 // del's new players if they log before they spawn in
- var/allow_Metadata = 0 // Metadata is supported.
- var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
- var/fps = 20
- var/allow_holidays = 0 //toggles whether holiday-specific content should be used
- var/tick_limit_mc_init = TICK_LIMIT_MC_INIT_DEFAULT //SSinitialization throttling
+/datum/controller/configuration/proc/LoadEntries(filename)
+ log_config("Loading config file [filename]...")
+ var/list/lines = world.file2list("[GLOB.config_dir][filename]")
+ var/list/_entries = entries
+ for(var/L in lines)
+ if(!L)
+ continue
- var/hostedby = null
- var/respawn = 1
- var/guest_jobban = 1
- var/usewhitelist = 0
- var/inactivity_period = 3000 //time in ds until a player is considered inactive
- var/afk_period = 6000 //time in ds until a player is considered afk and kickable
- var/kick_inactive = FALSE //force disconnect for inactive players
- var/load_jobs_from_txt = 0
- var/automute_on = 0 //enables automuting/spam prevention
- var/minimal_access_threshold = 0 //If the number of players is larger than this threshold, minimal access will be turned on.
- var/jobs_have_minimal_access = 0 //determines whether jobs use minimal access or expanded access.
- var/jobs_have_maint_access = 0 //Who gets maint access? See defines above.
- var/sec_start_brig = 0 //makes sec start in brig or dept sec posts
+ if(copytext(L, 1, 2) == "#")
+ continue
- var/server
- var/banappeals
- var/wikiurl = "http://www.tgstation13.org/wiki" // Default wiki link.
- var/forumurl = "http://tgstation13.org/phpBB/index.php" //default forums
- var/rulesurl = "http://www.tgstation13.org/wiki/Rules" // default rules
- var/githuburl = "https://www.github.com/tgstation/-tg-station" //default github
- var/githubrepoid
+ var/pos = findtext(L, " ")
+ var/entry = null
+ var/value = null
- var/forbid_singulo_possession = 0
- var/useircbot = 0
+ if(pos)
+ entry = lowertext(copytext(L, 1, pos))
+ value = copytext(L, pos + 1)
+ else
+ entry = lowertext(L)
- var/check_randomizer = 0
+ if(!entry)
+ continue
- var/panic_server_name
- var/panic_address //Reconnect a player this linked server if this server isn't accepting new players
+ var/datum/config_entry/E = _entries[entry]
+ if(!E)
+ log_config("Unknown setting in configuration: '[entry]'")
+ continue
- var/invoke_youtubedl
+ if(filename != E.resident_file)
+ log_config("Found [entry] in [filename] when it should have been in [E.resident_file]! Ignoring.")
+ continue
- //IP Intel vars
- var/ipintel_email
- var/ipintel_rating_bad = 1
- var/ipintel_save_good = 12
- var/ipintel_save_bad = 1
- var/ipintel_domain = "check.getipintel.net"
+ var/validated = E.ValidateAndSet(value)
+ if(!validated)
+ log_config("Failed to validate setting \"[value]\" for [entry]")
+ else if(E.modified && !E.dupes_allowed)
+ log_config("Duplicate setting for [entry] ([value]) detected! Using latest.")
- var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt
- var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt
- var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database
- var/use_account_age_for_jobs = 0 //Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected.
- var/see_own_notes = 0 //Can players see their own admin notes (read-only)? Config option in config.txt
- var/note_fresh_days
- var/note_stale_days
+ if(validated)
+ E.modified = TRUE
- var/use_exp_tracking = FALSE
- var/use_exp_restrictions_heads = FALSE
- var/use_exp_restrictions_heads_hours = 0
- var/use_exp_restrictions_heads_department = FALSE
- var/use_exp_restrictions_other = FALSE
- var/use_exp_restrictions_admin_bypass = FALSE
+/datum/controller/configuration/can_vv_get(var_name)
+ return (var_name != "entries_by_type" || !hiding_entries_by_type) && ..()
- //Population cap vars
- var/soft_popcap = 0
- var/hard_popcap = 0
- var/extreme_popcap = 0
- var/soft_popcap_message = "Be warned that the server is currently serving a high number of users, consider using alternative game servers."
- var/hard_popcap_message = "The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers."
- var/extreme_popcap_message = "The server is currently serving a high number of users, find alternative servers."
+/datum/controller/configuration/vv_edit_var(var_name, var_value)
+ return !(var_name in list("entries_by_type", "entries")) && ..()
- //game_options.txt configs
- var/force_random_names = 0
- var/list/mode_names = list()
- var/list/mode_reports = list()
- var/list/mode_false_report_weight = list()
- var/list/modes = list() // allowed modes
- var/list/votable_modes = list() // votable modes
- var/list/probabilities = list() // relative probability of each mode
- var/list/min_pop = list() // overrides for acceptible player counts in a mode
- var/list/max_pop = list()
- var/list/repeated_mode_adjust = list() // weight adjustments for recent modes
- var/humans_need_surnames = 0
- var/allow_ai = 0 // allow ai job
- var/forbid_secborg = 0 // disallow secborg module to be chosen.
- var/forbid_peaceborg = 0
- var/panic_bunker = 0 // prevents new people it hasn't seen before from connecting
- var/notify_new_player_age = 0 // how long do we notify admins of a new player
- var/notify_new_player_account_age = 0 // how long do we notify admins of a new byond account
- var/irc_first_connection_alert = 0 // do we notify the irc channel when somebody is connecting for the first time?
+/datum/controller/configuration/stat_entry()
+ if(!statclick)
+ statclick = new/obj/effect/statclick/debug(null, "Edit", src)
+ stat("[name]:", statclick)
- var/traitor_scaling_coeff = 6 //how much does the amount of players get divided by to determine traitors
- var/brother_scaling_coeff = 25 //how many players per brother team
- var/changeling_scaling_coeff = 6 //how much does the amount of players get divided by to determine changelings
- var/security_scaling_coeff = 8 //how much does the amount of players get divided by to determine open security officer positions
- var/abductor_scaling_coeff = 15 //how many players per abductor team
+/datum/controller/configuration/proc/Get(entry_type)
+ if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "\ref[src]")
+ log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]")
+ return
+ var/datum/config_entry/E = entry_type
+ var/entry_is_abstract = initial(E.abstract_type) == entry_type
+ if(entry_is_abstract)
+ CRASH("Tried to retrieve an abstract config_entry: [entry_type]")
+ E = entries_by_type[entry_type]
+ if(!E)
+ CRASH("Missing config entry for [entry_type]!")
+ return E.value
- var/traitor_objectives_amount = 2
- var/brother_objectives_amount = 2
- var/protect_roles_from_antagonist = 0 //If security and such can be traitor/cult/other
- var/protect_assistant_from_antagonist = 0 //If assistants can be traitor/cult/other
- var/enforce_human_authority = 0 //If non-human species are barred from joining as a head of staff
- var/allow_latejoin_antagonists = 0 // If late-joining players can be traitor/changeling
- var/list/continuous = list() // which roundtypes continue if all antagonists die
- var/list/midround_antag = list() // which roundtypes use the midround antagonist system
- var/midround_antag_time_check = 60 // How late (in minutes) you want the midround antag system to stay on, setting this to 0 will disable the system
- var/midround_antag_life_check = 0.7 // A ratio of how many people need to be alive in order for the round not to immediately end in midround antagonist
- var/shuttle_refuel_delay = 12000
- var/show_game_type_odds = 0 //if set this allows players to see the odds of each roundtype on the get revision screen
- var/mutant_races = 0 //players can choose their mutant race before joining the game
- var/list/roundstart_races = list() //races you can play as from the get go. If left undefined the game's roundstart var for species is used
- var/mutant_humans = 0 //players can pick mutant bodyparts for humans before joining the game
+/datum/controller/configuration/proc/Set(entry_type, new_val)
+ if(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "\ref[src]")
+ log_admin_private("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]")
+ return
+ var/datum/config_entry/E = entry_type
+ var/entry_is_abstract = initial(E.abstract_type) == entry_type
+ if(entry_is_abstract)
+ CRASH("Tried to retrieve an abstract config_entry: [entry_type]")
+ E = entries_by_type[entry_type]
+ if(!E)
+ CRASH("Missing config entry for [entry_type]!")
+ return E.ValidateAndSet(new_val)
- var/no_summon_guns //No
- var/no_summon_magic //Fun
- var/no_summon_events //Allowed
-
- var/intercept = 1 //Whether or not to send a communications intercept report roundstart. This may be overriden by gamemodes.
- var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
- var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted."
- var/alert_desc_blue_downto = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed."
- var/alert_desc_red_upto = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised."
- var/alert_desc_red_downto = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised."
- var/alert_desc_delta = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill."
-
- var/revival_pod_plants = FALSE
- var/revival_cloning = FALSE
- var/revival_brain_life = -1
-
- var/rename_cyborg = 0
- var/ooc_during_round = 0
- var/emojis = 0
- var/no_credits_round_end = FALSE
-
- //Used for modifying movement speed for mobs.
- //Unversal modifiers
- var/run_speed = 0
- var/walk_speed = 0
-
- //Mob specific modifiers. NOTE: These will affect different mob types in different ways
- var/human_delay = 0
- var/robot_delay = 0
- var/monkey_delay = 0
- var/alien_delay = 0
- var/slime_delay = 0
- var/animal_delay = 0
-
- var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour.
- var/ghost_interaction = 0
-
- var/silent_ai = 0
- var/silent_borg = 0
-
- var/damage_multiplier = 1 //Modifier for damage to all mobs. Impacts healing as well.
-
- var/allowwebclient = 0
- var/webclientmembersonly = 0
-
- var/sandbox_autoclose = FALSE // close the sandbox panel after spawning an item, potentially reducing griff
-
- var/default_laws = 0 //Controls what laws the AI spawns with.
- var/silicon_max_law_amount = 12
- var/list/lawids = list()
-
- var/list/law_weights = list()
-
- var/assistant_cap = -1
-
- var/starlight = 0
- var/generate_minimaps = 0
- var/grey_assistants = 0
-
- var/id_console_jobslot_delay = 30
-
- var/lavaland_budget = 60
- var/space_budget = 16
-
- var/aggressive_changelog = 0
-
- var/reactionary_explosions = 0 //If we use reactionary explosions, explosions that react to walls and doors
-
- var/autoconvert_notes = 0 //if all connecting player's notes should attempt to be converted to the database
-
- var/announce_admin_logout = 0
- var/announce_admin_login = 0
-
- var/list/datum/map_config/maplist = list()
- var/datum/map_config/defaultmap = null
- var/maprotation = 1
- var/maprotatechancedelta = 0.75
- var/allow_map_voting = TRUE
-
- // Enables random events mid-round when set to 1
- var/allow_random_events = 0
-
- // Multipliers for random events minimal starting time and minimal players amounts
- var/events_min_time_mul = 1
- var/events_min_players_mul = 1
-
- // The object used for the clickable stat() button.
- var/obj/effect/statclick/statclick
-
- var/client_warn_version = 0
- var/client_warn_message = "Your version of byond may have issues or be blocked from accessing this server in the future."
- var/client_error_version = 0
- var/client_error_message = "Your version of byond is too old, may have issues, and is blocked from accessing this server."
-
- var/cross_name = "Other server"
- var/cross_address = "byond://"
- var/cross_allowed = FALSE
- var/showircname = 0
-
- var/list/gamemode_cache = null
-
- var/minutetopiclimit
- var/secondtopiclimit
-
- var/error_cooldown = 600 // The "cooldown" time for each occurrence of a unique error
- var/error_limit = 50 // How many occurrences before the next will silence them
- var/error_silence_time = 6000 // How long a unique error will be silenced for
- var/error_msg_delay = 50 // How long to wait between messaging admins about occurrences of a unique error
-
- var/arrivals_shuttle_dock_window = 55 //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station
- var/arrivals_shuttle_require_undocked = FALSE //Require the arrivals shuttle to be undocked before latejoiners can join
- var/arrivals_shuttle_require_safe_latejoin = FALSE //Require the arrivals shuttle to be operational in order for latejoiners to join
-
- var/mice_roundstart = 10 // how many wire chewing rodents spawn at roundstart.
-
- var/irc_announce_new_game = FALSE
-
- var/list/policies = list()
-
- var/debug_admin_hrefs = FALSE //turns off admin href token protection for debugging purposes
-
-/datum/configuration/New()
- gamemode_cache = typecacheof(/datum/game_mode,TRUE)
+/datum/controller/configuration/proc/LoadModes()
+ gamemode_cache = typecacheof(/datum/game_mode, TRUE)
+ modes = list()
+ mode_names = list()
+ mode_reports = list()
+ mode_false_report_weight = list()
+ votable_modes = list()
+ var/list/probabilities = Get(/datum/config_entry/keyed_number_list/probability)
for(var/T in gamemode_cache)
// I wish I didn't have to instance the game modes in order to look up
// their information, but it is the only way (at least that I know of).
@@ -298,7 +158,6 @@ GLOBAL_PROTECT(config_dir)
if(M.config_tag)
if(!(M.config_tag in modes)) // ensure each mode is added only once
- WRITE_FILE(GLOB.config_error_log, "Adding game mode [M.name] ([M.config_tag]) to configuration.")
modes += M.config_tag
mode_names[M.config_tag] = M.name
probabilities[M.config_tag] = M.probability
@@ -309,558 +168,7 @@ GLOBAL_PROTECT(config_dir)
qdel(M)
votable_modes += "secret"
- Reload()
-
-/datum/configuration/proc/Reload()
- load("config.txt")
- load("comms.txt", "comms")
- load("game_options.txt","game_options")
- load("policies.txt", "policies")
- loadsql("dbconfig.txt")
- reload_custom_roundstart_items_list()
- if (maprotation)
- loadmaplist("maps.txt")
-
- // apply some settings from config..
- GLOB.abandon_allowed = respawn
-
-/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
- filename = "[GLOB.config_dir][filename]"
- var/list/Lines = world.file2list(filename)
-
- for(var/t in Lines)
- if(!t)
- continue
-
- t = trim(t)
- if(length(t) == 0)
- continue
- else if(copytext(t, 1, 2) == "#")
- continue
-
- var/pos = findtext(t, " ")
- var/name = null
- var/value = null
-
- if(pos)
- name = lowertext(copytext(t, 1, pos))
- value = copytext(t, pos + 1)
- else
- name = lowertext(t)
-
- if(!name)
- continue
-
- if(type == "config")
- switch(name)
- if("hub")
- hub = 1
- if("admin_legacy_system")
- admin_legacy_system = 1
- if("ban_legacy_system")
- ban_legacy_system = 1
- if("use_age_restriction_for_jobs")
- use_age_restriction_for_jobs = 1
- if("use_account_age_for_jobs")
- use_account_age_for_jobs = 1
- if("use_exp_tracking")
- use_exp_tracking = TRUE
- if("use_exp_restrictions_heads")
- use_exp_restrictions_heads = TRUE
- if("use_exp_restrictions_heads_hours")
- use_exp_restrictions_heads_hours = text2num(value)
- if("use_exp_restrictions_heads_department")
- use_exp_restrictions_heads_department = TRUE
- if("use_exp_restrictions_other")
- use_exp_restrictions_other = TRUE
- if("use_exp_restrictions_admin_bypass")
- use_exp_restrictions_admin_bypass = TRUE
- if("lobby_countdown")
- lobby_countdown = text2num(value)
- if("round_end_countdown")
- round_end_countdown = text2num(value)
- if("log_ooc")
- log_ooc = 1
- if("log_access")
- log_access = 1
- if("log_say")
- log_say = 1
- if("log_admin")
- log_admin = 1
- if("log_prayer")
- log_prayer = 1
- if("log_law")
- log_law = 1
- if("log_game")
- log_game = 1
- if("log_vote")
- log_vote = 1
- if("log_whisper")
- log_whisper = 1
- if("log_attack")
- log_attack = 1
- if("log_emote")
- log_emote = 1
- if("log_adminchat")
- log_adminchat = 1
- if("log_pda")
- log_pda = 1
- if("log_twitter")
- log_twitter = 1
- if("log_world_topic")
- log_world_topic = 1
- if("allow_admin_ooccolor")
- allow_admin_ooccolor = 1
- if("allow_vote_restart")
- allow_vote_restart = 1
- if("allow_vote_mode")
- allow_vote_mode = 1
- if("no_dead_vote")
- vote_no_dead = 1
- if("default_no_vote")
- vote_no_default = 1
- if("vote_delay")
- vote_delay = text2num(value)
- if("vote_period")
- vote_period = text2num(value)
- if("norespawn")
- respawn = 0
- if("servername")
- server_name = value
- if("serversqlname")
- server_sql_name = value
- if("stationname")
- station_name = value
- if("hostedby")
- hostedby = value
- if("server")
- server = value
- if("banappeals")
- banappeals = value
- if("wikiurl")
- wikiurl = value
- if("forumurl")
- forumurl = value
- if("rulesurl")
- rulesurl = value
- if("githuburl")
- githuburl = value
- if("githubrepoid")
- githubrepoid = value
- if("guest_jobban")
- guest_jobban = 1
- if("guest_ban")
- GLOB.guests_allowed = 0
- if("usewhitelist")
- usewhitelist = TRUE
- if("allow_metadata")
- allow_Metadata = 1
- if("id_console_jobslot_delay")
- id_console_jobslot_delay = text2num(value)
- if("inactivity_period")
- inactivity_period = text2num(value) * 10 //documented as seconds in config.txt
- if("afk_period")
- afk_period = text2num(value) * 10 // ^^^
- if("kick_inactive")
- kick_inactive = TRUE
- if("load_jobs_from_txt")
- load_jobs_from_txt = 1
- if("forbid_singulo_possession")
- forbid_singulo_possession = 1
- if("popup_admin_pm")
- popup_admin_pm = 1
- if("allow_holidays")
- allow_holidays = 1
- if("useircbot") //tgs2 support
- useircbot = 1
- if("ticklag")
- var/ticklag = text2num(value)
- if(ticklag > 0)
- fps = 10 / ticklag
- if("tick_limit_mc_init")
- tick_limit_mc_init = text2num(value)
- if("fps")
- fps = text2num(value)
- if("automute_on")
- automute_on = 1
- if("panic_server_name")
- if (value != "\[Put the name here\]")
- panic_server_name = value
- if("panic_server_address")
- if(value != "byond://address:port")
- panic_address = value
- if("invoke_youtubedl")
- invoke_youtubedl = value
- if("show_irc_name")
- showircname = 1
- if("see_own_notes")
- see_own_notes = 1
- if("note_fresh_days")
- note_fresh_days = text2num(value)
- if("note_stale_days")
- note_stale_days = text2num(value)
- if("soft_popcap")
- soft_popcap = text2num(value)
- if("hard_popcap")
- hard_popcap = text2num(value)
- if("extreme_popcap")
- extreme_popcap = text2num(value)
- if("soft_popcap_message")
- soft_popcap_message = value
- if("hard_popcap_message")
- hard_popcap_message = value
- if("extreme_popcap_message")
- extreme_popcap_message = value
- if("panic_bunker")
- panic_bunker = 1
- if("notify_new_player_age")
- notify_new_player_age = text2num(value)
- if("notify_new_player_account_age")
- notify_new_player_account_age = text2num(value)
- if("irc_first_connection_alert")
- irc_first_connection_alert = 1
- if("check_randomizer")
- check_randomizer = 1
- if("ipintel_email")
- if (value != "ch@nge.me")
- ipintel_email = value
- if("ipintel_rating_bad")
- ipintel_rating_bad = text2num(value)
- if("ipintel_domain")
- ipintel_domain = value
- if("ipintel_save_good")
- ipintel_save_good = text2num(value)
- if("ipintel_save_bad")
- ipintel_save_bad = text2num(value)
- if("aggressive_changelog")
- aggressive_changelog = 1
- if("autoconvert_notes")
- autoconvert_notes = 1
- if("allow_webclient")
- allowwebclient = 1
- if("webclient_only_byond_members")
- webclientmembersonly = 1
- if("announce_admin_logout")
- announce_admin_logout = 1
- if("announce_admin_login")
- announce_admin_login = 1
- if("maprotation")
- maprotation = 1
- if("allow_map_voting")
- allow_map_voting = text2num(value)
- if("maprotationchancedelta")
- maprotatechancedelta = text2num(value)
- if("autoadmin")
- autoadmin = 1
- if(value)
- autoadmin_rank = ckeyEx(value)
- if("generate_minimaps")
- generate_minimaps = 1
- if("client_warn_version")
- client_warn_version = text2num(value)
- if("client_warn_message")
- client_warn_message = value
- if("client_error_version")
- client_error_version = text2num(value)
- if("client_error_message")
- client_error_message = value
- if("minute_topic_limit")
- minutetopiclimit = text2num(value)
- if("second_topic_limit")
- secondtopiclimit = text2num(value)
- if("error_cooldown")
- error_cooldown = text2num(value)
- if("error_limit")
- error_limit = text2num(value)
- if("error_silence_time")
- error_silence_time = text2num(value)
- if("error_msg_delay")
- error_msg_delay = text2num(value)
- if("irc_announce_new_game")
- irc_announce_new_game = TRUE
- if("debug_admin_hrefs")
- debug_admin_hrefs = TRUE
- else
-#if DM_VERSION > 511
-#error Replace the line below with WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
-#endif
- HandleCommsConfig(name, value) //TODO: Deprecate this eventually
- else if(type == "comms")
- HandleCommsConfig(name, value)
- else if(type == "game_options")
- switch(name)
- if("damage_multiplier")
- damage_multiplier = text2num(value)
- if("revival_pod_plants")
- revival_pod_plants = TRUE
- if("revival_cloning")
- revival_cloning = TRUE
- if("revival_brain_life")
- revival_brain_life = text2num(value)
- if("rename_cyborg")
- rename_cyborg = 1
- if("ooc_during_round")
- ooc_during_round = 1
- if("emojis")
- emojis = 1
- if("no_credits_round_end")
- no_credits_round_end = TRUE
- if("run_delay")
- run_speed = text2num(value)
- if("walk_delay")
- walk_speed = text2num(value)
- if("human_delay")
- human_delay = text2num(value)
- if("robot_delay")
- robot_delay = text2num(value)
- if("monkey_delay")
- monkey_delay = text2num(value)
- if("alien_delay")
- alien_delay = text2num(value)
- if("slime_delay")
- slime_delay = text2num(value)
- if("animal_delay")
- animal_delay = text2num(value)
- if("alert_red_upto")
- alert_desc_red_upto = value
- if("alert_red_downto")
- alert_desc_red_downto = value
- if("alert_blue_downto")
- alert_desc_blue_downto = value
- if("alert_blue_upto")
- alert_desc_blue_upto = value
- if("alert_green")
- alert_desc_green = value
- if("alert_delta")
- alert_desc_delta = value
- if("no_intercept_report")
- intercept = 0
- if("assistants_have_maint_access")
- jobs_have_maint_access |= ASSISTANTS_HAVE_MAINT_ACCESS
- if("security_has_maint_access")
- jobs_have_maint_access |= SECURITY_HAS_MAINT_ACCESS
- if("everyone_has_maint_access")
- jobs_have_maint_access |= EVERYONE_HAS_MAINT_ACCESS
- if("sec_start_brig")
- sec_start_brig = 1
- if("gateway_delay")
- gateway_delay = text2num(value)
- if("continuous")
- var/mode_name = lowertext(value)
- if(mode_name in modes)
- continuous[mode_name] = 1
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown continuous configuration definition: [mode_name].")
- if("midround_antag")
- var/mode_name = lowertext(value)
- if(mode_name in modes)
- midround_antag[mode_name] = 1
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown midround antagonist configuration definition: [mode_name].")
- if("midround_antag_time_check")
- midround_antag_time_check = text2num(value)
- if("midround_antag_life_check")
- midround_antag_life_check = text2num(value)
- if("min_pop")
- var/pop_pos = findtext(value, " ")
- var/mode_name = null
- var/mode_value = null
-
- if(pop_pos)
- mode_name = lowertext(copytext(value, 1, pop_pos))
- mode_value = copytext(value, pop_pos + 1)
- if(mode_name in modes)
- min_pop[mode_name] = text2num(mode_value)
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown minimum population configuration definition: [mode_name].")
- else
- WRITE_FILE(GLOB.config_error_log, "Incorrect minimum population configuration definition: [mode_name] [mode_value].")
- if("max_pop")
- var/pop_pos = findtext(value, " ")
- var/mode_name = null
- var/mode_value = null
-
- if(pop_pos)
- mode_name = lowertext(copytext(value, 1, pop_pos))
- mode_value = copytext(value, pop_pos + 1)
- if(mode_name in modes)
- max_pop[mode_name] = text2num(mode_value)
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown maximum population configuration definition: [mode_name].")
- else
- WRITE_FILE(GLOB.config_error_log, "Incorrect maximum population configuration definition: [mode_name] [mode_value].")
- if("shuttle_refuel_delay")
- shuttle_refuel_delay = text2num(value)
- if("show_game_type_odds")
- show_game_type_odds = 1
- if("ghost_interaction")
- ghost_interaction = 1
- if("traitor_scaling_coeff")
- traitor_scaling_coeff = text2num(value)
- if("brother_scaling_coeff")
- brother_scaling_coeff = text2num(value)
- if("changeling_scaling_coeff")
- changeling_scaling_coeff = text2num(value)
- if("security_scaling_coeff")
- security_scaling_coeff = text2num(value)
- if("abductor_scaling_coeff")
- abductor_scaling_coeff = text2num(value)
- if("traitor_objectives_amount")
- traitor_objectives_amount = text2num(value)
- if("brother_objectives_amount")
- brother_objectives_amount = text2num(value)
- if("probability")
- var/prob_pos = findtext(value, " ")
- var/prob_name = null
- var/prob_value = null
-
- if(prob_pos)
- prob_name = lowertext(copytext(value, 1, prob_pos))
- prob_value = copytext(value, prob_pos + 1)
- if(prob_name in modes)
- probabilities[prob_name] = text2num(prob_value)
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown game mode probability configuration definition: [prob_name].")
- else
- WRITE_FILE(GLOB.config_error_log, "Incorrect probability configuration definition: [prob_name] [prob_value].")
- if("repeated_mode_adjust")
- if(value)
- repeated_mode_adjust.Cut()
- var/values = splittext(value," ")
- for(var/v in values)
- repeated_mode_adjust += text2num(v)
- else
- WRITE_FILE(GLOB.config_error_log, "Incorrect round weight adjustment configuration definition for [value].")
- if("protect_roles_from_antagonist")
- protect_roles_from_antagonist = 1
- if("protect_assistant_from_antagonist")
- protect_assistant_from_antagonist = 1
- if("enforce_human_authority")
- enforce_human_authority = 1
- if("allow_latejoin_antagonists")
- allow_latejoin_antagonists = 1
- if("allow_random_events")
- allow_random_events = 1
-
- if("events_min_time_mul")
- events_min_time_mul = text2num(value)
- if("events_min_players_mul")
- events_min_players_mul = text2num(value)
-
- if("minimal_access_threshold")
- minimal_access_threshold = text2num(value)
- if("jobs_have_minimal_access")
- jobs_have_minimal_access = 1
- if("humans_need_surnames")
- humans_need_surnames = 1
- if("force_random_names")
- force_random_names = 1
- if("allow_ai")
- allow_ai = 1
- if("disable_secborg")
- forbid_secborg = 1
- if("disable_peaceborg")
- forbid_peaceborg = 1
- if("silent_ai")
- silent_ai = 1
- if("silent_borg")
- silent_borg = 1
- if("sandbox_autoclose")
- sandbox_autoclose = 1
- if("default_laws")
- default_laws = text2num(value)
- if("random_laws")
- var/law_id = lowertext(value)
- lawids += law_id
- if("law_weight")
- // Value is in the form "LAWID,NUMBER"
- var/list/L = splittext(value, ",")
- if(L.len != 2)
- WRITE_FILE(GLOB.config_error_log, "Invalid LAW_WEIGHT: " + t)
- continue
- var/lawid = L[1]
- var/weight = text2num(L[2])
- law_weights[lawid] = weight
-
- if("silicon_max_law_amount")
- silicon_max_law_amount = text2num(value)
- if("join_with_mutant_race")
- mutant_races = 1
- if("roundstart_races")
- var/race_id = lowertext(value)
- for(var/species_id in GLOB.species_list)
- if(species_id == race_id)
- roundstart_races += GLOB.species_list[species_id]
- GLOB.roundstart_species[species_id] = GLOB.species_list[species_id]
- if("join_with_mutant_humans")
- mutant_humans = 1
- if("assistant_cap")
- assistant_cap = text2num(value)
- if("starlight")
- starlight = 1
- if("grey_assistants")
- grey_assistants = 1
- if("lavaland_budget")
- lavaland_budget = text2num(value)
- if("space_budget")
- space_budget = text2num(value)
- if("no_summon_guns")
- no_summon_guns = 1
- if("no_summon_magic")
- no_summon_magic = 1
- if("no_summon_events")
- no_summon_events = 1
- if("reactionary_explosions")
- reactionary_explosions = 1
- if("bombcap")
- var/BombCap = text2num(value)
- if (!BombCap)
- continue
- if (BombCap < 4)
- BombCap = 4
-
- GLOB.MAX_EX_DEVESTATION_RANGE = round(BombCap/4)
- GLOB.MAX_EX_HEAVY_RANGE = round(BombCap/2)
- GLOB.MAX_EX_LIGHT_RANGE = BombCap
- GLOB.MAX_EX_FLASH_RANGE = BombCap
- GLOB.MAX_EX_FLAME_RANGE = BombCap
- if("arrivals_shuttle_dock_window")
- arrivals_shuttle_dock_window = max(PARALLAX_LOOP_TIME, text2num(value))
- if("arrivals_shuttle_require_undocked")
- arrivals_shuttle_require_undocked = TRUE
- if("arrivals_shuttle_require_safe_latejoin")
- arrivals_shuttle_require_safe_latejoin = TRUE
- if("mice_roundstart")
- mice_roundstart = text2num(value)
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
- else if(type == "policies")
- policies[name] = value
-
- fps = round(fps)
- if(fps <= 0)
- fps = initial(fps)
-
-/datum/configuration/proc/HandleCommsConfig(name, value)
- switch(name)
- if("comms_key")
- global.comms_key = value
- if(value != "default_pwd" && length(value) > 6) //It's the default value or less than 6 characters long, warn badmins
- global.comms_allowed = TRUE
- if("cross_server_address")
- cross_address = value
- if(value != "byond:\\address:port")
- cross_allowed = TRUE
- if("cross_comms_name")
- cross_name = value
- if("medal_hub_address")
- global.medal_hub = value
- if("medal_hub_password")
- global.medal_pass = value
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
-
-/datum/configuration/proc/loadmaplist(filename)
+/datum/controller/configuration/proc/loadmaplist(filename)
filename = "[GLOB.config_dir][filename]"
var/list/Lines = world.file2list(filename)
@@ -895,7 +203,7 @@ GLOBAL_PROTECT(config_dir)
if ("map")
currentmap = new ("_maps/[data].json")
if(currentmap.defaulted)
- log_world("Failed to load map config for [data]!")
+ log_config("Failed to load map config for [data]!")
if ("minplayers","minplayer")
currentmap.config_min_users = text2num(data)
if ("maxplayers","maxplayer")
@@ -905,6 +213,7 @@ GLOBAL_PROTECT(config_dir)
if ("default","defaultmap")
defaultmap = currentmap
if ("endmap")
+ LAZYINITLIST(maplist)
maplist[currentmap.map_name] = currentmap
currentmap = null
if ("disabled")
@@ -913,51 +222,7 @@ GLOBAL_PROTECT(config_dir)
WRITE_FILE(GLOB.config_error_log, "Unknown command in map vote config: '[command]'")
-/datum/configuration/proc/loadsql(filename)
- filename = "[GLOB.config_dir][filename]"
- var/list/Lines = world.file2list(filename)
- for(var/t in Lines)
- if(!t)
- continue
-
- t = trim(t)
- if(length(t) == 0)
- continue
- else if(copytext(t, 1, 2) == "#")
- continue
-
- var/pos = findtext(t, " ")
- var/name = null
- var/value = null
-
- if(pos)
- name = lowertext(copytext(t, 1, pos))
- value = copytext(t, pos + 1)
- else
- name = lowertext(t)
-
- if(!name)
- continue
-
- switch(name)
- if("sql_enabled")
- sql_enabled = 1
- if("address")
- global.sqladdress = value
- if("port")
- global.sqlport = value
- if("feedback_database")
- global.sqlfdbkdb = value
- if("feedback_login")
- global.sqlfdbklogin = value
- if("feedback_password")
- global.sqlfdbkpass = value
- if("feedback_tableprefix")
- global.sqlfdbktableprefix = value
- else
- WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
-
-/datum/configuration/proc/pick_mode(mode_name)
+/datum/controller/configuration/proc/pick_mode(mode_name)
// I wish I didn't have to instance the game modes in order to look up
// their information, but it is the only way (at least that I know of).
// ^ This guy didn't try hard enough
@@ -968,8 +233,12 @@ GLOBAL_PROTECT(config_dir)
return new T
return new /datum/game_mode/extended()
-/datum/configuration/proc/get_runnable_modes()
+/datum/controller/configuration/proc/get_runnable_modes()
var/list/datum/game_mode/runnable_modes = new
+ var/list/probabilities = Get(/datum/config_entry/keyed_number_list/probability)
+ var/list/min_pop = Get(/datum/config_entry/keyed_number_list/min_pop)
+ var/list/max_pop = Get(/datum/config_entry/keyed_number_list/max_pop)
+ var/list/repeated_mode_adjust = Get(/datum/config_entry/number_list/repeated_mode_adjust)
for(var/T in gamemode_cache)
var/datum/game_mode/M = new T()
if(!(M.config_tag in modes))
@@ -994,8 +263,11 @@ GLOBAL_PROTECT(config_dir)
runnable_modes[M] = final_weight
return runnable_modes
-/datum/configuration/proc/get_runnable_midround_modes(crew)
+/datum/controller/configuration/proc/get_runnable_midround_modes(crew)
var/list/datum/game_mode/runnable_modes = new
+ var/list/probabilities = Get(/datum/config_entry/keyed_number_list/probability)
+ var/list/min_pop = Get(/datum/config_entry/keyed_number_list/min_pop)
+ var/list/max_pop = Get(/datum/config_entry/keyed_number_list/max_pop)
for(var/T in (gamemode_cache - SSticker.mode.type))
var/datum/game_mode/M = new T()
if(!(M.config_tag in modes))
@@ -1013,9 +285,3 @@ GLOBAL_PROTECT(config_dir)
continue
runnable_modes[M] = probabilities[M.config_tag]
return runnable_modes
-
-/datum/configuration/proc/stat_entry()
- if(!statclick)
- statclick = new/obj/effect/statclick/debug(null, "Edit", src)
-
- stat("[name]:", statclick)
diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm
index cabb6dca27..62919afd06 100644
--- a/code/controllers/configuration/entries/config.dm
+++ b/code/controllers/configuration/entries/config.dm
@@ -229,7 +229,7 @@ CONFIG_DEF(flag/forbid_singulo_possession)
CONFIG_DEF(flag/useircbot) //tgs2 support
protection = CONFIG_ENTRY_LOCKED
-
+
CONFIG_DEF(flag/automute_on) //enables automuting/spam prevention
CONFIG_DEF(string/panic_server_name)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 2a43d7a844..e41b848134 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -89,6 +89,8 @@ SUBSYSTEM_DEF(ticker)
for(var/client/C in GLOB.clients)
window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
to_chat(world, "Welcome to [station_name()]! ")
+ if(CONFIG_GET(flag/irc_announce_new_game))
+ SERVER_TOOLS_CHAT_BROADCAST("New round starting on [SSmapping.config.map_name]!")
current_state = GAME_STATE_PREGAME
//Everyone who wants to be an observer is now spawned
create_observers()
diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
index a96d2cbbc0..8d86507271 100644
--- a/code/datums/ai_laws.dm
+++ b/code/datums/ai_laws.dm
@@ -238,7 +238,7 @@
/datum/ai_laws/proc/pick_weighted_lawset()
var/datum/ai_laws/lawtype
var/list/law_weights = CONFIG_GET(keyed_number_list/law_weight)
- while(!lawtype && law_weights)
+ while(!lawtype && law_weights.len)
var/possible_id = pickweight(law_weights)
lawtype = lawid_to_type(possible_id)
if(!lawtype)
diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm
index 874e6c00f1..83b61e4cda 100644
--- a/code/datums/antagonists/datum_traitor.dm
+++ b/code/datums/antagonists/datum_traitor.dm
@@ -85,7 +85,7 @@
if(owner.assigned_role == "Clown")
var/mob/living/carbon/human/traitor_mob = owner.current
if(traitor_mob&&istype(traitor_mob))
- if(!silent)
+ if(!silent)
to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
traitor_mob.dna.remove_mutation(CLOWNMUT)
@@ -210,10 +210,16 @@
kill_objective.find_target()
add_objective(kill_objective)
else
- var/datum/objective/steal/steal_objective = new
- steal_objective.owner = owner
- steal_objective.find_target()
- add_objective(steal_objective)
+ if(prob(15) && !(locate(/datum/objective/download in owner.objectives)))
+ var/datum/objective/download/download_objective = new
+ download_objective.owner = owner
+ download_objective.gen_amount_goal()
+ add_objective(download_objective)
+ else
+ var/datum/objective/steal/steal_objective = new
+ steal_objective.owner = owner
+ steal_objective.find_target()
+ add_objective(steal_objective)
/datum/antagonist/traitor/AI/forge_single_objective()
.=1
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index b3dc454ecc..7b60070fc7 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -2,25 +2,10 @@
var/originmastercommit
var/commit
var/list/testmerge = list()
- var/has_pr_details = FALSE //tgs2 support
var/date
/datum/getrev/New()
- if(world.RunningService())
- var/file_name
- if(ServiceVersion()) //will return null for versions < 3.0.91.0
- file_name = SERVICE_PR_TEST_JSON_OLD
- else
- file_name = SERVICE_PR_TEST_JSON
- if(fexists(file_name))
- testmerge = json_decode(file2text(file_name))
-#ifdef SERVERTOOLS
- else if(!world.RunningService() && fexists("../prtestjob.lk")) //tgs2 support
- var/list/tmp = world.file2list("..\\prtestjob.lk")
- for(var/I in tmp)
- if(I)
- testmerge |= I
-#endif
+ testmerge = SERVER_TOOLS_PR_LIST
log_world("Running /tg/ revision:")
var/list/logs = world.file2list(".git/logs/HEAD")
if(logs)
@@ -36,53 +21,21 @@
log_world(commit)
for(var/line in testmerge)
if(line)
- if(world.RunningService())
- var/tmcommit = testmerge[line]["commit"]
- log_world("Test merge active of PR #[line] commit [tmcommit]")
- SSblackbox.add_details("testmerged_prs","[line]|[tmcommit]")
- else //tgs2 support
- log_world("Test merge active of PR #[line]")
- SSblackbox.add_details("testmerged_prs","[line]")
+ var/tmcommit = testmerge[line]["commit"]
+ log_world("Test merge active of PR #[line] commit [tmcommit]")
+ SSblackbox.add_details("testmerged_prs","[line]|[tmcommit]")
log_world("Based off origin/master commit [originmastercommit]")
else
log_world(originmastercommit)
-/datum/getrev/proc/DownloadPRDetails()
- var/repo_id = CONFIG_GET(number/githubrepoid)
- if(!repo_id)
- if(testmerge.len)
- log_world("PR details download failed: No github repo config set")
- return
- for(var/line in testmerge)
- if(!isnum(text2num(line)))
- log_world("PR details download failed: Invalid PR number: [line]")
- return
- var/url = "https://api.github.com/repositories/[repo_id]/pulls/[line].json"
- GLOB.valid_HTTPSGet = TRUE
- var/json = HTTPSGet(url)
- if(!json)
- return
-
- testmerge[line] = json_decode(json)
-
- if(!testmerge[line])
- log_world("PR details download failed: null details returned")
- return
- CHECK_TICK
- log_world("PR details successfully downloaded")
- has_pr_details = TRUE
/datum/getrev/proc/GetTestMergeInfo(header = TRUE)
if(!testmerge.len)
return ""
. = header ? "The following pull requests are currently test merged:#[line][details] You can make out the shapes of [contents.len] objects through the fabric. ")
-
-/obj/item/bodybag/bluespace/Destroy()
- for(var/atom/movable/A in contents)
- A.forceMove(get_turf(src))
- if(isliving(A))
- to_chat(A, "You suddenly feel the space around you torn apart! You're free! ")
- return ..()
-
-/obj/item/bodybag/bluespace/deploy_bodybag(mob/user, atom/location)
- var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
- for(var/atom/movable/A in contents)
- A.forceMove(R)
- if(isliving(A))
- to_chat(A, "You suddenly feel air around you! You're free! ")
- R.open(user)
- R.add_fingerprint(user)
- qdel(src)
-
-/obj/item/bodybag/bluespace/container_resist(mob/living/user)
- if(user.incapacitated())
- to_chat(user, "You can't get out while you're restrained like this! ")
- return
- user.changeNext_move(CLICK_CD_BREAKOUT)
- user.last_special = world.time + CLICK_CD_BREAKOUT
- to_chat(user, "You claw at the fabric of [src], trying to tear it open... ")
- to_chat(loc, "Someone starts trying to break free of [src]! ")
- if(!do_after(user, 200, target = src))
- to_chat(loc, "The pressure subsides. It seems that they've stopped resisting... ")
- return
- loc.visible_message("[user] suddenly appears in front of [loc]! ", "[user] breaks free of [src]! ")
- qdel(src)
+/obj/item/bodybag
+ name = "body bag"
+ desc = "A folded bag designed for the storage and transportation of cadavers."
+ icon = 'icons/obj/bodybag.dmi'
+ icon_state = "bodybag_folded"
+ var/unfoldedbag_path = /obj/structure/closet/body_bag
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/bodybag/attack_self(mob/user)
+ deploy_bodybag(user, user.loc)
+
+/obj/item/bodybag/afterattack(atom/target, mob/user, proximity)
+ if(proximity)
+ if(isopenturf(target))
+ deploy_bodybag(user, target)
+
+/obj/item/bodybag/proc/deploy_bodybag(mob/user, atom/location)
+ var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
+ R.open(user)
+ R.add_fingerprint(user)
+ qdel(src)
+
+
+// Bluespace bodybag
+
+/obj/item/bodybag/bluespace
+ name = "bluespace body bag"
+ desc = "A folded bluespace body bag designed for the storage and transportation of cadavers."
+ icon = 'icons/obj/bodybag.dmi'
+ icon_state = "bluebodybag_folded"
+ unfoldedbag_path = /obj/structure/closet/body_bag/bluespace
+ w_class = WEIGHT_CLASS_SMALL
+ flags_2 = NO_MAT_REDEMPTION_2
+ origin_tech = "bluespace=4;materials=4;plasmatech=4"
+
+/obj/item/bodybag/bluespace/examine(mob/user)
+ ..()
+ if(contents.len)
+ to_chat(user, "You can make out the shapes of [contents.len] objects through the fabric. ")
+
+/obj/item/bodybag/bluespace/Destroy()
+ for(var/atom/movable/A in contents)
+ A.forceMove(get_turf(src))
+ if(isliving(A))
+ to_chat(A, "You suddenly feel the space around you torn apart! You're free! ")
+ return ..()
+
+/obj/item/bodybag/bluespace/deploy_bodybag(mob/user, atom/location)
+ var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
+ for(var/atom/movable/A in contents)
+ A.forceMove(R)
+ if(isliving(A))
+ to_chat(A, "You suddenly feel air around you! You're free! ")
+ R.open(user)
+ R.add_fingerprint(user)
+ qdel(src)
+
+/obj/item/bodybag/bluespace/container_resist(mob/living/user)
+ if(user.incapacitated())
+ to_chat(user, "You can't get out while you're restrained like this! ")
+ return
+ user.changeNext_move(CLICK_CD_BREAKOUT)
+ user.last_special = world.time + CLICK_CD_BREAKOUT
+ to_chat(user, "You claw at the fabric of [src], trying to tear it open... ")
+ to_chat(loc, "Someone starts trying to break free of [src]! ")
+ if(!do_after(user, 200, target = src))
+ to_chat(loc, "The pressure subsides. It seems that they've stopped resisting... ")
+ return
+ loc.visible_message("[user] suddenly appears in front of [loc]! ", "[user] breaks free of [src]! ")
+ qdel(src)
+
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index a8bdce5fe9..c0298d8122 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
/*********************MANUALS (BOOKS)***********************/
//Oh god what the fuck I am not good at computer
@@ -883,7 +882,8 @@
..()
/obj/item/book/manual/wiki/proc/initialize_wikibook()
- if(config.wikiurl)
+ var/wikiurl = CONFIG_GET(string/wikiurl)
+ if(wikiurl)
dat = {"
@@ -901,7 +901,7 @@
}
You start skimming through the manual...
-
+
@@ -957,964 +957,3 @@
author = "Engineering Encyclopedia"
title = "Hacking"
page_link = "Hacking"
-=======
-/*********************MANUALS (BOOKS)***********************/
-
-//Oh god what the fuck I am not good at computer
-/obj/item/book/manual
- icon = 'icons/obj/library.dmi'
- due_date = 0 // Game time in 1/10th seconds
- unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
-
-/obj/item/book/manual/engineering_particle_accelerator
- name = "Particle Accelerator User's Guide"
- icon_state ="bookParticleAccelerator"
- author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Particle Accelerator User's Guide"
- dat = {"
-
-
-
-
-
- Experienced user's guide
-
- Setting up
-
-
- Wrench all pieces to the floorAdd wires to all the pieces
- Close all the panels with your screwdriver
-
-
- Use
-
-
- Open the control panel
- Set the speed to 2
- Start firing at the singularity generator
- When the singularity reaches a large enough size so it starts moving on its own set the speed down to 0, but don't shut it off Remember to wear a radiation suit when working with this machine... we did tell you that at the start, right?
-
-
-
- "}
-
-
-/obj/item/book/manual/engineering_singularity_safety
- name = "Singularity Safety in Special Circumstances"
- icon_state ="bookEngineeringSingularitySafety"
- author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Singularity Safety in Special Circumstances"
-//big pile of shit below.
-
- dat = {"
-
-
-
-
- Singularity Safety in Special Circumstances
-
- Power outage
-
- A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps:
-
- Step one: PANIC! Step two: Get your ass over to engineering! QUICKLY!!! Step three: Make sure the SMES is still powering the emitters, if not, setup the generator in secure storage and disconnect the emitters from the SMES.Step four: Next, head over to the APC and swipe it with your ID card - if it doesn't unlock, continue with step 15.Step five: Open the console and disengage the cover lock.Step six: Pry open the APC with a Crowbar. Step seven: Take out the empty power cell. Step eight: Put in the new, full power cell - if you don't have one, continue with step 15.Step nine: Quickly put on a Radiation suit. Step ten: Check if the singularity field generators withstood the down-time - if they didn't, continue with step 15.Step eleven: Since disaster was averted you now have to ensure it doesn't repeat. If it was a powersink which caused it and if the engineering apc is wired to the same powernet, which the powersink is on, you have to remove the piece of wire which links the apc to the powernet. If it wasn't a powersink which caused it, then skip to step 14.Step twelve: Grab your crowbar and pry away the tile closest to the APC.Step thirteen: Use the wirecutters to cut the wire which is conecting the grid to the terminal. Step fourteen: Go to the bar and tell the guys how you saved them all. Stop reading this guide here.Step fifteen: GET THE FUCK OUT OF THERE!!!
-
- Shields get damaged
-
- Step one: GET THE FUCK OUT OF THERE!!! FORGET THE WOMEN AND CHILDREN, SAVE YOURSELF!!! Growing Humans
-
- Why would you want to grow humans? Well I'm expecting most readers to be in the slave trade, but a few might actually
- want to revive fallen comrades. Growing pod people is easy, but prone to disaster.
-
-
- Find a dead person who is in need of cloning.
- Take a blood sample with a syringe.
- Inject a seed pack with the blood sample.
- Plant the seeds.
- Tend to the plants water and nutrition levels until it is time to harvest the cloned human.
-
-
- It really is that easy! Good luck!
-
-
-
- "}
-
-/obj/item/book/manual/medical_cloning
- name = "Cloning techniques of the 26th century"
- icon_state ="bookCloning"
- author = "Medical Journal, volume 3" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Cloning techniques of the 26th century"
-//big pile of shit below.
-
- dat = {"
-
-
-
-
-
- How to Clone People
- So there’s 50 dead people lying on the floor, chairs are spinning like no tomorrow and you haven’t the foggiest idea of what to do? Not to worry! This guide is intended to teach you how to clone people and how to do it right, in a simple step-by-step process! If at any point of the guide you have a mental meltdown, genetics probably isn’t for you and you should get a job-change as soon as possible before you’re sued for malpractice.
-
-
- Acquire body Strip body Put body in cloning machine Scan body Clone body Get clean Structurel Enzymes for the body Put body in morgue Await cloned body Use the clean SW injector Give person clothes back Send person on their way
-
- Step 1: Acquire body
- This is pretty much vital for the process because without a body, you cannot clone it. Usually, bodies will be brought to you, so you do not need to worry so much about this step. If you already have a body, great! Move on to the next step.
-
- Step 2: Strip body
- The cloning machine does not like abiotic items. What this means is you can’t clone anyone if they’re wearing clothes, so take all of it off. If it’s just one person, it’s courteous to put their possessions in the closet. If you have about seven people awaiting cloning, just leave the piles where they are, but don’t mix them around and for God’s sake don’t let the Clown in to steal them.
-
- Step 3: Put body in cloning machine
- Grab the body and then put it inside the DNA modifier. If you cannot do this, then you messed up at Step 2. Go back and check you took EVERYTHING off - a commonly missed item is their headset.
-
- Step 4: Scan body
- Go onto the computer and scan the body by pressing ‘Scan - ’. If you’re successful, they will be added to the records (note that this can be done at any time, even with living people, so that they can be cloned without a body in the event that they are lying dead on port solars and didn‘t turn on their suit sensors)! If not, and it says “Error: Mental interface failure.”, then they have left their bodily confines and are one with the spirits. If this happens, just shout at them to get back in their body, click ‘Refresh‘ and try scanning them again. If there’s no success, threaten them with gibbing. Still no success? Skip over to Step 7 and don‘t continue after it, as you have an unresponsive body and it cannot be cloned. If you got “Error: Unable to locate valid genetic data.“, you are trying to clone a monkey - start over.
-
- Step 5: Clone body
- Now that the body has a record, click ’View Records’, click the subject’s name, and then click ‘Clone’ to start the cloning process. Congratulations! You’re halfway there. Remember not to ‘Eject’ the cloning pod as this will kill the developing clone and you’ll have to start the process again.
-
- Step 6: Get clean SEs for body
- Cloning is a finicky and unreliable process. Whilst it will most certainly bring someone back from the dead, they can have any number of nasty disabilities given to them during the cloning process! For this reason, you need to prepare a clean, defect-free Structural Enzyme (SE) injection for when they’re done. If you’re a competent Geneticist, you will already have one ready on your working computer. If, for any reason, you do not, then eject the body from the DNA modifier (NOT THE CLONING POD) and take it next door to the Genetics research room. Put the body in one of those DNA modifiers and then go onto the console. Go into View/Edit/Transfer Buffer, find an open slot and click “SE“ to save it. Then click ‘Injector’ to get the SEs in syringe form. Put this in your pocket or something for when the body is done.
-
- Step 7: Put body in morgue
- Now that the cloning process has been initiated and you have some clean Structural Enzymes, you no longer need the body! Drag it to the morgue and tell the Chef over the radio that they have some fresh meat waiting for them in there. To put a body in a morgue bed, simply open the tray, grab the body, put it on the open tray, then close the tray again. Use one of the nearby pens to label the bed “CHEF MEAT” in order to avoid confusion.
-
- Step 8: Await cloned body
- Now go back to the lab and wait for your patient to be cloned. It won’t be long now, I promise.
-
- Step 9: Use the clean SE injector on person
- Has your body been cloned yet? Great! As soon as the guy pops out, grab your injector and jab it in them. Once you’ve injected them, they now have clean Structural Enzymes and their defects, if any, will disappear in a short while.
-
- Step 10: Give person clothes back
- Obviously the person will be naked after they have been cloned. Provided you weren’t an irresponsible little shit, you should have protected their possessions from thieves and should be able to give them back to the patient. No matter how cruel you are, it’s simply against protocol to force your patients to walk outside naked.
-
- Step 11: Send person on their way
- Give the patient one last check-over - make sure they don’t still have any defects and that they have all their possessions. Ask them how they died, if they know, so that you can report any foul play over the radio. Once you’re done, your patient is ready to go back to work! Chances are they do not have Medbay access, so you should let them out of Genetics and the Medbay main entrance.
-
- If you’ve gotten this far, congratulations! You have mastered the art of cloning. Now, the real problem is how to resurrect yourself after that traitor had his way with you for cloning his target.
-
-
-
-
-
- "}
-
-
-/obj/item/book/manual/ripley_build_and_repair
- name = "APLU \"Ripley\" Construction and Operation Manual"
- icon_state ="book"
- author = "Weyland-Yutani Corp" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "APLU \"Ripley\" Construction and Operation Manual"
-//big pile of shit below.
-
- dat = {"
-
-
-
-
-
- Weyland-Yutani - Building Better Worlds
- Autonomous Power Loader Unit \"Ripley\"
-
- Specifications:
-
- Class: Autonomous Power LoaderScope: Logistics and ConstructionWeight: 820kg (without operator and with empty cargo compartment)Height: 2.5mWidth: 1.8mTop speed: 5km/hourOperation in vacuum/hostile environment: Possible
- Airtank Volume: 500litersDevices:
-
- Hydraulic Clamp
- High-speed Drill
-
- Propulsion Device: Powercell-powered electro-hydraulic system.Powercell capacity: Varies.
-
- Construction:
-
- Connect all exosuit parts to the chassis frame
- Connect all hydraulic fittings and tighten them up with a wrench
- Adjust the servohydraulics with a screwdriver
- Wire the chassis. (Cable is not included.)
- Use the wirecutters to remove the excess cable if needed.
- Install the central control module (Not included. Use supplied datadisk to create one).
- Secure the mainboard with a screwdriver.
- Install the peripherals control module (Not included. Use supplied datadisk to create one).
- Secure the peripherals control module with a screwdriver
- Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 metal sheets.)
- Secure the internal armor plating with a wrench
- Weld the internal armor plating to the chassis
- Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced metal sheets.)
- Secure the external reinforced armor plating with a wrench
- Weld the external reinforced armor plating to the chassis
- Additional Information:
- The firefighting variation is made in a similar fashion.
- A firesuit must be connected to the Firefighter chassis for heat shielding.
- Internal armor is plasteel for additional strength.
- External armor must be installed in 2 parts, totaling 10 sheets.
- Completed mech is more resiliant against fire, and is a bit more durable overall
- Nanotrasen is determined to the safety of its investments employees.
-
-
-
-
- Operation
- Coming soon...
- "}
-
-/obj/item/book/manual/experimentor
- name = "Mentoring your Experiments"
- icon_state = "rdbook"
- author = "Dr. H.P. Kritz"
- title = "Mentoring your Experiments"
- dat = {"
-
-
-
-
- THE E.X.P.E.R.I-MENTOR
- The Enhanced Xenobiological Period Extraction (and) Restoration Instructor is a machine designed to discover the secrets behind every item in existence.
- With advanced technology, it can process 99.95% of items, and discover their uses and secrets.
- The E.X.P.E.R.I-MENTOR is a Research apparatus that takes items, and through a process of elimination, it allows you to deduce new technological designs from them.
- Due to the volatile nature of the E.X.P.E.R.I-MENTOR, there is a slight chance for malfunction, potentially causing irreparable damage to you or your environment.
- However, upgrading the apparatus has proven to decrease the chances of undesirable, potentially life-threatening outcomes.
- Please note that the E.X.P.E.R.I-MENTOR uses a state-of-the-art random generator, which has a larger entropy than the observable universe,
- therefore it can generate wildly different results each day, therefore it is highly suggested to re-scan objects of interests frequently (e.g. each shift).
-
- BASIC PROCESS
- The usage of the E.X.P.E.R.I-MENTOR is quite simple:
-
- Find an item with a technological background
- Insert the item into the E.X.P.E.R.I-MENTOR
- Cycle through each processing method of the device.
- Stand back, even in case of a successful experiment, as the machine might produce undesired behaviour.
-
-
- ADVANCED USAGE
- The E.X.P.E.R.I-MENTOR has a variety of uses, beyond menial research work. The different results can be used to combat localised events, or even to get special items.
-
- The E.X.P.E.R.I-MENTOR's OBLITERATE function has the added use of transferring the destroyed item's material into a linked lathe.
-
- The IRRADIATE function can be used to transform items into other items, resulting in potential upgrades (or downgrades).
-
- Users should remember to always wear appropriate protection when using the machine, because malfunction can occur at any moment!
-
- EVENTS
- GLOBAL (happens at any time):
-
- DETECTION MALFUNCTION - The machine's onboard sensors have malfunctioned, causing it to redefine the item's experiment type.
- Produces the message: The E.X.P.E.R.I-MENTOR's onboard detection system has malfunctioned!
-
- IANIZATION - The machine's onboard corgi-filter has malfunctioned, causing it to produce a corgi from.. somewhere.
- Produces the message: The E.X.P.E.R.I-MENTOR melts the banana, ian-izing the air around it!
-
- RUNTIME ERROR - The machine's onboard C4T-P processor has encountered a critical error, causing it to produce a cat from.. somewhere.
- Produces the message: The E.X.P.E.R.I-MENTOR encounters a run-time error!
-
- B100DG0D.EXE - The machine has encountered an unknown subroutine, which has been injected into its runtime. It upgrades the held item!
- Produces the message: The E.X.P.E.R.I-MENTOR improves the banana, drawing the life essence of those nearby!
-
- POWERSINK - The machine's PSU has tripped the charging mechanism! It consumes massive amounts of power!
- Produces the message: The E.X.P.E.R.I-MENTOR begins to smoke and hiss, shaking violently!
-
- FAIL:
- This event is produced when the item mismatches the selected experiment.
- Produces a random message similar to: "the Banana rumbles, and shakes, the experiment was a failure!"
-
- POKE:
-
- WILD ARMS - The machine's gryoscopic processors malfunction, causing it to lash out at nearby people with its arms.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions and destroys the banana, lashing its arms out at nearby people!
-
- MISTYPE - The machine's interface has been garbled, and it switches to OBLITERATE.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions!
-
- THROW - The machine's spatial recognition device has shifted several meters across the room, causing it to try and repostion the item there.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, throwing the banana!
-
- IRRADIATE:
-
- RADIATION LEAK - The machine's shield has failed, resulting in a toxic radiation leak.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, melting the banana and leaking radiation!
-
- RADIATION DUMP - The machine's recycling and containment functions have failed, resulting in a dump of toxic waste around it
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, spewing toxic waste!
-
- MUTATION - The machine's radio-isotope level meter has malfunctioned, causing it over-irradiate the item, making it transform.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, transforming the banana!
-
- GAS:
-
- TOXIN LEAK - The machine's filtering and vent systems have failed, resulting in a cloud of toxic gas being expelled.
- Produces the message: The E.X.P.E.R.I-MENTOR destroys the banana, leaking dangerous gas!
-
- GAS LEAK - The machine's vent systems have failed, resulting in a cloud of harmless, but obscuring gas.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, spewing harmless gas!
-
- ELECTROMAGNETIC IONS - The machine's electrolytic scanners have failed, causing a dangerous Electromagnetic reaction.
- Produces the message: The E.X.P.E.R.I-MENTOR melts the banana, ionizing the air around it!
-
- HEAT:
-
- TOASTER - The machine's heating coils have come into contact with the machine's gas storage, causing a large, sudden blast of flame.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, melting the banana and releasing a burst of flame!
-
- SAUNA - The machine's vent loop has sprung a leak, resulting in a large amount of superheated air being dumped around it.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, melting the banana and leaking hot air!
-
- EMERGENCY VENT - The machine's temperature gauge has malfunctioned, resulting in it attempting to cool the area around it, but instead, dumping a cloud of steam.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, activating its emergency coolant systems!
-
- COLD:
-
- FREEZER - The machine's cooling loop has sprung a leak, resulting in a cloud of super-cooled liquid being blasted into the air.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, shattering the banana and releasing a dangerous cloud of coolant!
-
- FRIDGE - The machine's cooling loop has been exposed to the outside air, resulting in a large decrease in temperature.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, shattering the banana and leaking cold air!
-
- SNOWSTORM - The machine's cooling loop has come into contact with the heating coils, resulting in a sudden blast of cool air.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, releasing a flurry of chilly air as the banana pops out!
-
- OBLITERATE:
-
- IMPLOSION - The machine's pressure leveller has malfunctioned, causing it to pierce the space-time momentarily, making everything in the area fly towards it.
- Produces the message: The E.X.P.E.R.I-MENTOR's crusher goes way too many levels too high, crushing right through space-time!
-
- DISTORTION - The machine's pressure leveller has completely disabled, resulting in a momentary space-time distortion, causing everything to fly around.
- Produces the message: The E.X.P.E.R.I-MENTOR's crusher goes one level too high, crushing right into space-time!
-
-
-
- "}
-
-/obj/item/book/manual/research_and_development
- name = "Research and Development 101"
- icon_state = "rdbook"
- author = "Dr. L. Ight"
- title = "Research and Development 101"
- dat = {"
-
-
-
-
-
- Science For Dummies
- So you want to further SCIENCE? Good man/woman/thing! However, SCIENCE is a complicated process even though it's quite easy. For the most part, it's a three step process:
-
- 1) Deconstruct items in the Destructive Analyzer to advance technology or improve the design.
- 2) Build unlocked designs in the Protolathe and Circuit Imprinter
- 3) Repeat!
-
-
- Those are the basic steps to furthing science. What do you do science with, however? Well, you have four major tools: R&D Console, the Destructive Analyzer, the Protolathe, and the Circuit Imprinter.
-
- The R&D Console
- The R&D console is the cornerstone of any research lab. It is the central system from which the Destructive Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controled. More on those systems in their own sections. On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, because if it gets damaged, you'll lose your data! In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database.
- NOTE: The technology list screen, circuit imprinter, and protolathe menus are accessible by non-scientists. This is intended to allow 'public' systems for the plebians to utilize some new devices.
-
- Destructive Analyzer
- This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, you can destroy the object to further those sciences. Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Destructive Analyzer and improve their reliability rather then futher science. If their reliability is high enough ,it'll also advance their related technologies.
-
- Circuit Imprinter
- This machine, along with the Protolathe, is used to actually produce new devices. The Circuit Imprinter takes glass and various chemicals (depends on the design) to produce new circuit boards to build new machines or computers. It can even be used to print AI modules.
-
- Protolathe
- This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid plasma, silver, gold, and diamonds along with a variety of chemicals to produce devices. The downside is that, again, not all devices you make are 100% reliable when you first discover them.
-
- Reliability and You
- As it has been stated, many devices when they're first discovered do not have a 100% reliablity when you first discover them. Instead, the reliablity of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Destructive Analyzer, and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Destructive Analyzer. Once the device reachs a certain minimum reliability, you'll gain tech advancements from it.
-
- Building a Better Machine
- Many machines produces from circuit boards and inserted into a machine frame require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. If you use these parts when constructing something, its attributes may be improved. For example, if you use an advanced matter bin when constructing an autolathe (rather then a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results! Be warned, however: Tier 3 and higher stock parts don't have 100% reliability and their low reliability may affect the reliability of the end machine.
-
-
- "}
-
-
-/obj/item/book/manual/robotics_cyborgs
- name = "Cyborgs for Dummies"
- icon_state = "borgbook"
- author = "XISC"
- title = "Cyborgs for Dummies"
- dat = {"
-
-
-
-
-
- Cyborgs for Dummies
-
- Chapters
-
-
- Cyborg Related Equipment Cyborg Modules Cyborg Construction Cyborg Deconstruction Cyborg Maintenance Cyborg Repairs In Case of Emergency
-
-
-
-
- Exosuit Fabricator
- The Exosuit Fabricator is the most important piece of equipment related to cyborgs. It allows the construction of the core cyborg parts. Without these machines, cyborgs can not be built. It seems that they may also benefit from advanced research techniques.
-
- Cyborg Recharging Station
- This useful piece of equipment will suck power out of the power systems to charge a cyborg's power cell back up to full charge.
-
- Robotics Control Console
- This useful piece of equipment can be used to immobolize or destroy a cyborg. A word of warning: Cyborgs are expensive pieces of equipment, do not destroy them without good reason, or Nanotrasen may see to it that it never happens again.
-
-
-
- When a cyborg is created it picks out of an array of modules to designate its purpose. There are 6 different cyborg modules.
-
- Standard Cyborg
- The standard cyborg module is a multi-purpose cyborg. It is equipped with various modules, allowing it to do basic tasks.Engineering Cyborg
- The Engineering cyborg module comes equipped with various engineering-related tools to help with engineering-related tasks.Mining Cyborg
- The Mining Cyborg module comes equipped with the latest in mining equipment. They are efficient at mining due to no need for oxygen, but their power cells limit their time in the mines.
-
- Security Cyborg
- The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.
-
- Janitor Cyborg
- The Janitor Cyborg module is equipped with various cleaning-facilitating devices.
-
- Service Cyborg
- The service cyborg module comes ready to serve your human needs. It includes various entertainment and refreshment devices. Occasionally some service cyborgs may have been referred to as "Bros"
-
-
- Cyborg construction is a rather easy process, requiring a decent amount of metal and a few other supplies.
- Metal
- Two Flashes
- One Power Cell (Preferrably rated to 15000w)
- Some electrical wires
- One Human Brain
- One Man-Machine Interface
-
- Once you have acquired the materials, you can start on construction of your cyborg.
- Start the Exosuit Fabricators constructing all of the cyborg parts
- While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface
- Once you have a Robot Head, place your two flashes inside the eye sockets
- Once you have your Robot Chest, wire the Robot chest, then insert the power cell
- Attach all of the Robot parts to the Robot frame
- Insert the Man-Machine Interface (With the Brain inside) Into the Robot Body
- Congratulations! You have a new cyborg!
-
-
-
- If you want to deconstruct a cyborg, say to remove its MMI without blowing the Cyborg to pieces , they come apart very quickly, and very safely, in a few simple steps.
-
- Crowbar
- Wrench
- Optional:
- Screwdriver
- Wirecutters
-
-
- Begin by unlocking the Cyborg's access panel using your ID
- Use your crowbar to open the Cyborg's access panel
- Using your bare hands, remove the power cell from the Cyborg
- Lockdown the Cyborg to disengage safety protocols
-
- Option 1: Robotics console
- Use the Robotics console in the RD's office
- Find the entry for your Cyborg
- Press the Lockdown button on the Robotics console
-
-
- Option 2: Lockdown wire
- Use your screwdriver to expose the Cyborg's wiring
- Use your wirecutters to start cutting all of the wires until the lockdown light turns off, cutting all of the wires irregardless of the lockdown light works as well
-
- Use your wrench to unfasten the Cyborg's bolts, the Cyborg will then fall apart onto the floor, the MMI will be there as well
-
-
-
- Occasionally Cyborgs may require maintenance of a couple types, this could include replacing a power cell with a charged one, or possibly maintaining the cyborg's internal wiring.
-
- Replacing a Power Cell
- Replacing a Power cell is a common type of maintenance for cyborgs. It usually involves replacing the cell with a fully charged one, or upgrading the cell with a larger capacity cell.
- Unlock the Cyborg's Interface by swiping your ID on it
- Open the Cyborg's outer panel using a crowbar
- Remove the old power cell
- Insert the new power cell
- Close the Cyborg's outer panel using a crowbar
- Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell
-
-
- Exposing the Internal Wiring
- Exposing the internal wiring of a cyborg is fairly easy to do, and is mainly used for cyborg repairs.
- Follow Steps 1 - 3 of "Replacing a Cyborg's Power Cell"
- Open the cyborg's internal wiring panel by using a screwdriver to unsecure the panel
-
- To re-seal the cyborg's internal wiring:
-
- Use a screwdriver to secure the cyborg's internal panel
- Follow steps 4 - 6 of "Replacing a Cyborg's Power Cell" to close up the cyborg
-
-
-
- Occasionally a Cyborg may become damaged. This could be in the form of impact damage from a heavy or fast-travelling object, or it could be heat damage from high temperatures, or even lasers or Electromagnetic Pulses (EMPs).
-
- Dents
- If a cyborg becomes damaged due to impact from heavy or fast-moving objects, it will become dented. Sure, a dent may not seem like much, but it can compromise the structural integrity of the cyborg, possibly causing a critical failure.
- Dents in a cyborg's frame are rather easy to repair, all you need is to apply a welding tool to the dented area, and the high-tech cyborg frame will repair the dent under the heat of the welder.
-
- Excessive Heat Damage
- If a cyborg becomes damaged due to excessive heat, it is likely that the internal wires will have been damaged. You must replace those wires to ensure that the cyborg remains functioning properly.
- Unlock the Cyborg's Interface by swiping your ID
- Open the Cyborg's External Panel using a crowbar
- Remove the Cyborg's Power Cell
- Using a screwdriver, expose the internal wiring or the Cyborg
- Replace the damaged wires inside the cyborg
- Secure the internal wiring cover using a screwdriver
- Insert the Cyborg's Power Cell
- Close the Cyborg's External Panel using a crowbar
- Lock the Cyborg's Interface by swiping your ID
-
- These repair tasks may seem difficult, but are essential to keep your cyborgs running at peak efficiency.
-
-
- In case of emergency, there are a few steps you can take.
-
- "Rogue" Cyborgs
- If the cyborgs seem to become "rogue", they may have non-standard laws. In this case, use extreme caution.
- To repair the situation, follow these steps:
-
- Locate the nearest robotics console
- Determine which cyborgs are "Rogue"
- Press the lockdown button to immobolize the cyborg
- Locate the cyborg
- Expose the cyborg's internal wiring
- Check to make sure the LawSync and AI Sync lights are lit
- If they are not lit, pulse the LawSync wire using a multitool to enable the cyborg's Law Sync
- Proceed to a cyborg upload console. Nanotrasen usually places these in the same location as AI uplaod consoles.
- Use a "Reset" upload moduleto reset the cyborg's laws
- Proceed to a Robotics Control console
- Remove the lockdown on the cyborg
-
-
- As a last resort
- If all else fails in a case of cyborg-related emergency. There may be only one option. Using a Robotics Control console, you may have to remotely detonate the cyborg.
- WARNING: Do not detonate a borg without an explicit reason for doing so. Cyborgs are expensive pieces of Nanotrasen equipment, and you may be punished for detonating them without reason.
-
-
-
- "}
-
-
-
-/obj/item/book/manual/chef_recipes
- name = "Chef Recipes"
- icon_state = "cooked_book"
- author = "Lord Frenrir Cageth"
- title = "Chef Recipes"
- dat = {"
-
-
-
-
-
- Food for Dummies
- Here is a guide on basic food recipes and also how to not poison your customers accidentally.
-
-
- Basic ingredients preparation:
-
- Dough: 10u water + 15u flour for simple dough.Bowl: Add water to it for soup preparation.Meat: Microwave it, process it, slice it into microwavable cutlets with your knife, or use it raw.Cheese: Add 5u universal enzyme (catalyst) to milk and soy milk to prepare cheese (sliceable) and tofu.Rice: Mix 10u rice with 10u water in a bowl then microwave it.
-
- Custom food:
- Add ingredients to a base item to prepare a custom meal.Table Craft:
- Put ingredients on table, then click and drag the table onto yourself to see what recipes you can prepare.
-
- Microwave:
- Use it to cook or boil food ingredients (meats, doughs, egg, spaghetti, donkpocket, etc...).
- It can cook multiple items at once.
-
- Processor:
- Use it to process certain ingredients (meat into faggot, doughslice into spaghetti, potato into fries,etc...)
-
- Gibber:
- Stuff an animal in it to grind it into meat.
-
- Meat spike:
- Stick an animal on it then begin collecting its meat.
-
-
- Example recipes:
- Vanilla Cake : Microwave cake batter.Burger: 1 bun + 1 meat steakBread: Microwave dough.Waffles: 2 pastry basePopcorn: Microwave corn.Meat Steak: Microwave meat.Meat Pie: 1 plain pie + 1u black pepper + 1u salt + 2 meat cutletsBoiled Spagetti: Microwave spaghetti.Donuts: 1u sugar + 1 pastry baseFries: Process potato.
-
- Sharing your food:
- You can put your meals on your kitchen counter or load them in the snack vending machines.
-
-
- "}
-
-
-/obj/item/book/manual/barman_recipes
- name = "Barman Recipes"
- icon_state = "barbook"
- author = "Sir John Rose"
- title = "Barman Recipes"
- dat = {"
-
-
-
-
-
- Drinks for dummies
- Heres a guide for some basic drinks.
-
- Manly Dorf:
- Mix ale and beer into a glass.
-
- Grog:
- Mix rum and water into a glass.
-
- Black Russian:
- Mix vodka and kahlua into a glass.
-
- Irish Cream:
- Mix cream and whiskey into a glass.
-
- Screwdriver:
- Mix vodka and orange juice into a glass.
-
- Cafe Latte:
- Mix milk and coffee into a glass.
-
- Mead:
- Mix Enzyme, water and sugar into a glass.
-
- Gin Tonic:
- Mix gin and tonic into a glass.
-
- Classic Martini:
- Mix vermouth and gin into a glass.
-
-
-
-
- "}
-
-
-/obj/item/book/manual/detective
- name = "The Film Noir: Proper Procedures for Investigations"
- icon_state ="bookDetective"
- author = "Nanotrasen"
- title = "The Film Noir: Proper Procedures for Investigations"
- dat = {"
-
-
-
-
- Detective Work
-
- Between your bouts of self-narration, and drinking whiskey on the rocks, you might get a case or two to solve.
-
- Go to the crime scene.
- Take your scanner and scan EVERYTHING (Yes, the doors, the tables, even the dog.)
- Once you are reasonably certain you have every scrap of evidence you can use, find all possible entry points and scan them, too.
- Return to your office.
- Using your forensic scanning computer, scan your Scanner to upload all of your evidence into the database.
- Browse through the resulting dossiers, looking for the one that either has the most complete set of prints, or the most suspicious items handled.
- If you have 80% or more of the print (The print is displayed) go to step 10, otherwise continue to step 8.
- Look for clues from the suit fibres you found on your perp, and go about looking for more evidence with this new information, scanning as you go.
- Try to get a fingerprint card of your perp, as if used in the computer, the prints will be completed on their dossier.
- Assuming you have enough of a print to see it, grab the biggest complete piece of the print and search the security records for it.
- Since you now have both your dossier and the name of the person, print both out as evidence, and get security to nab your baddie.
- Give yourself a pat on the back and a bottle of the ships finest vodka, you did it!
-
-
- It really is that easy! Good luck!
-
-
- "}
-
-/obj/item/book/manual/nuclear
- name = "Fission Mailed: Nuclear Sabotage 101"
- icon_state ="bookNuclear"
- author = "Syndicate"
- title = "Fission Mailed: Nuclear Sabotage 101"
- dat = {"
- Nuclear Explosives 101:
Place the nuclear device in the designated detonation zone.
- Extend and anchor the nuclear device from its interface.
- Insert the nuclear authorisation disk into slot.
- Type numeric authorisation code into the keypad. This should have been provided. Note: If you make a mistake press R to reset the device.
- Press the E button to log onto the device.
- You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad.Disk, Code, Safety, Timer, Disk, RUN! You start skimming through the manual...
-
-
-
-
-
- "}
-
-/obj/item/book/manual/wiki/chemistry
- name = "Chemistry Textbook"
- icon_state ="chemistrybook"
- author = "Nanotrasen"
- title = "Chemistry Textbook"
- page_link = "Guide_to_chemistry"
-
-/obj/item/book/manual/wiki/engineering_construction
- name = "Station Repairs and Construction"
- icon_state ="bookEngineering"
- author = "Engineering Encyclopedia"
- title = "Station Repairs and Construction"
- page_link = "Guide_to_construction"
-
-/obj/item/book/manual/wiki/engineering_guide
- name = "Engineering Textbook"
- icon_state ="bookEngineering2"
- author = "Engineering Encyclopedia"
- title = "Engineering Textbook"
- page_link = "Guide_to_engineering"
-
-/obj/item/book/manual/wiki/security_space_law
- name = "Space Law"
- desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations."
- icon_state = "bookSpaceLaw"
- author = "Nanotrasen"
- title = "Space Law"
- page_link = "Space_Law"
-
-/obj/item/book/manual/wiki/infections
- name = "Infections - Making your own pandemic!"
- icon_state = "bookInfections"
- author = "Infections Encyclopedia"
- title = "Infections - Making your own pandemic!"
- page_link = "Infections"
-
-/obj/item/book/manual/wiki/telescience
- name = "Teleportation Science - Bluespace for dummies!"
- icon_state = "book7"
- author = "University of Bluespace"
- title = "Teleportation Science - Bluespace for dummies!"
- page_link = "Guide_to_telescience"
-
-/obj/item/book/manual/wiki/engineering_hacking
- name = "Hacking"
- icon_state ="bookHacking"
- author = "Engineering Encyclopedia"
- title = "Hacking"
- page_link = "Hacking"
->>>>>>> 4178c20... Configuration datum refactor (#30763)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 2290ea91d3..3e9231f562 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -40,6 +40,7 @@
max_w_class = WEIGHT_CLASS_GIGANTIC
max_combined_w_class = 35
resistance_flags = FIRE_PROOF
+ flags_2 = NO_MAT_REDEMPTION_2
var/pshoom = 'sound/items/pshoom.ogg'
var/alt_sound = 'sound/items/pshoom_2.ogg'
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 60, acid = 50)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 8615e1cf8c..638313386e 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -1,381 +1,382 @@
-/*
- * These absorb the functionality of the plant bag, ore satchel, etc.
- * They use the use_to_pickup, quick_gather, and quick_empty functions
- * that were already defined in weapon/storage, but which had been
- * re-implemented in other classes.
- *
- * Contains:
- * Trash Bag
- * Mining Satchel
- * Plant Bag
- * Sheet Snatcher
- * Book Bag
- * Biowaste Bag
- *
- * -Sayu
- */
-
-// Generic non-item
-/obj/item/storage/bag
- allow_quick_gather = 1
- allow_quick_empty = 1
- display_contents_with_number = 1 // should work fine now
- use_to_pickup = 1
- slot_flags = SLOT_BELT
-
-// -----------------------------
-// Trash bag
-// -----------------------------
-/obj/item/storage/bag/trash
- name = "trash bag"
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
- icon = 'icons/obj/janitor.dmi'
- icon_state = "trashbag"
- item_state = "trashbag"
- lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
-
- w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_SMALL
- max_combined_w_class = 30
- storage_slots = 30
- can_hold = list() // any
- cant_hold = list(/obj/item/disk/nuclear)
-
-/obj/item/storage/bag/trash/suicide_act(mob/user)
- user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting! ")
- playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
- return (TOXLOSS)
-
-/obj/item/storage/bag/trash/update_icon()
- if(contents.len == 0)
- icon_state = "[initial(icon_state)]"
- else if(contents.len < 12)
- icon_state = "[initial(icon_state)]1"
- else if(contents.len < 21)
- icon_state = "[initial(icon_state)]2"
- else icon_state = "[initial(icon_state)]3"
-
-/obj/item/storage/bag/trash/cyborg
-
-/obj/item/storage/bag/trash/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
- J.put_in_cart(src, user)
- J.mybag=src
- J.update_icon()
-
-/obj/item/storage/bag/trash/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
- return
-
-/obj/item/storage/bag/trash/bluespace
- name = "trash bag of holding"
- desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage."
- icon_state = "bluetrashbag"
- origin_tech = "materials=4;bluespace=4;engineering=4;plasmatech=3"
- max_combined_w_class = 60
- storage_slots = 60
-
-// -----------------------------
-// Mining Satchel
-// -----------------------------
-
-/obj/item/storage/bag/ore
- name = "mining satchel"
- desc = "This little bugger can be used to store and transport ores."
- icon = 'icons/obj/mining.dmi'
- icon_state = "satchel"
- origin_tech = "engineering=2"
- slot_flags = SLOT_BELT | SLOT_POCKET
- w_class = WEIGHT_CLASS_NORMAL
- storage_slots = 50
- max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
- max_w_class = WEIGHT_CLASS_NORMAL
- can_hold = list(/obj/item/ore)
- var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
-
-/obj/item/storage/bag/ore/cyborg
- name = "cyborg mining satchel"
-
-/obj/item/storage/bag/ore/holding //miners, your messiah has arrived
- name = "mining satchel of holding"
- desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures."
- storage_slots = INFINITY
- max_combined_w_class = INFINITY
- origin_tech = "bluespace=4;materials=3;engineering=3"
- icon_state = "satchel_bspace"
-
-// -----------------------------
-// Plant bag
-// -----------------------------
-
-/obj/item/storage/bag/plants
- name = "plant bag"
- icon = 'icons/obj/hydroponics/equipment.dmi'
- icon_state = "plantbag"
- storage_slots = 100; //the number of plant pieces it can carry.
- max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
- max_w_class = WEIGHT_CLASS_NORMAL
- w_class = WEIGHT_CLASS_TINY
- can_hold = list(/obj/item/reagent_containers/food/snacks/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb)
- resistance_flags = FLAMMABLE
-
-////////
-
-/obj/item/storage/bag/plants/portaseeder
- name = "portable seed extractor"
- desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
- icon_state = "portaseeder"
- origin_tech = "biotech=3;engineering=2"
-
-/obj/item/storage/bag/plants/portaseeder/verb/dissolve_contents()
- set name = "Activate Seed Extraction"
- set category = "Object"
- set desc = "Activate to convert your plants into plantable seeds."
- if(usr.stat || !usr.canmove || usr.restrained())
- return
- for(var/obj/item/O in contents)
- seedify(O, 1)
- close_all()
-
-
-// -----------------------------
-// Sheet Snatcher
-// -----------------------------
-// Because it stacks stacks, this doesn't operate normally.
-// However, making it a storage/bag allows us to reuse existing code in some places. -Sayu
-
-/obj/item/storage/bag/sheetsnatcher
- name = "sheet snatcher"
- desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
- icon = 'icons/obj/mining.dmi'
- icon_state = "sheetsnatcher"
-
- var/capacity = 300; //the number of sheets it can carry.
- w_class = WEIGHT_CLASS_NORMAL
-
- allow_quick_empty = 1 // this function is superceded
-
-/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W, stop_messages = 0)
- if(!istype(W, /obj/item/stack/sheet) || istype(W, /obj/item/stack/sheet/mineral/sandstone) || istype(W, /obj/item/stack/sheet/mineral/wood))
- if(!stop_messages)
- to_chat(usr, "The snatcher does not accept [W].")
- return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu
- var/current = 0
- for(var/obj/item/stack/sheet/S in contents)
- current += S.amount
- if(capacity == current)//If it's full, you're done
- if(!stop_messages)
- to_chat(usr, "The snatcher is full. ")
- return 0
- return 1
-
-
-// Modified handle_item_insertion. Would prefer not to, but...
-/obj/item/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W, prevent_warning = 0)
- var/obj/item/stack/sheet/S = W
- if(!istype(S)) return 0
-
- var/amount
- var/inserted = 0
- var/current = 0
- for(var/obj/item/stack/sheet/S2 in contents)
- current += S2.amount
- if(capacity < current + S.amount)//If the stack will fill it up
- amount = capacity - current
- else
- amount = S.amount
-
- for(var/obj/item/stack/sheet/sheet in contents)
- if(S.type == sheet.type) // we are violating the amount limitation because these are not sane objects
- sheet.amount += amount // they should only be removed through procs in this file, which split them up.
- S.amount -= amount
- inserted = 1
- break
-
- if(!inserted || !S.amount)
- usr.dropItemToGround(S)
- if (usr.client && usr.s_active != src)
- usr.client.screen -= S
- S.dropped(usr)
- if(!S.amount)
- qdel(S)
- else
- if(S.pulledby)
- S.pulledby.stop_pulling()
- S.loc = src
-
- orient2hud(usr)
- if(usr.s_active)
- usr.s_active.show_to(usr)
- update_icon()
- return 1
-
-
-// Sets up numbered display to show the stack size of each stored mineral
-// NOTE: numbered display is turned off currently because it's broken
-/obj/item/storage/bag/sheetsnatcher/orient2hud(mob/user)
- var/adjusted_contents = contents.len
-
- //Numbered contents display
- var/list/datum/numbered_display/numbered_contents
- if(display_contents_with_number)
- numbered_contents = list()
- adjusted_contents = 0
- for(var/obj/item/stack/sheet/I in contents)
- adjusted_contents++
- var/datum/numbered_display/D = new/datum/numbered_display(I)
- D.number = I.amount
- numbered_contents.Add( D )
-
- var/row_num = 0
- var/col_count = min(7,storage_slots) -1
- if (adjusted_contents > 7)
- row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
- src.standard_orient_objs(row_num, col_count, numbered_contents)
- return
-
-
-// Modified quick_empty verb drops appropriate sized stacks
-/obj/item/storage/bag/sheetsnatcher/quick_empty()
- var/location = get_turf(src)
- for(var/obj/item/stack/sheet/S in contents)
- while(S.amount)
- var/obj/item/stack/sheet/N = new S.type(location)
- var/stacksize = min(S.amount,N.max_amount)
- N.amount = stacksize
- S.amount -= stacksize
- if(!S.amount)
- qdel(S)// todo: there's probably something missing here
- orient2hud(usr)
- if(usr.s_active)
- usr.s_active.show_to(usr)
- update_icon()
-
-// Instead of removing
-/obj/item/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W, atom/new_location)
- var/obj/item/stack/sheet/S = W
- if(!istype(S)) return 0
-
- //I would prefer to drop a new stack, but the item/attack_hand code
- // that calls this can't recieve a different object than you clicked on.
- //Therefore, make a new stack internally that has the remainder.
- // -Sayu
-
- if(S.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
-
- return ..(S,new_location)
-
-// -----------------------------
-// Sheet Snatcher (Cyborg)
-// -----------------------------
-
-/obj/item/storage/bag/sheetsnatcher/borg
- name = "sheet snatcher 9000"
- desc = ""
- capacity = 500//Borgs get more because >specialization
-
-
-// -----------------------------
-// Book bag
-// -----------------------------
-
-/obj/item/storage/bag/books
- name = "book bag"
- desc = "A bag for books."
- icon = 'icons/obj/library.dmi'
- icon_state = "bookbag"
- display_contents_with_number = 0 //This would look really stupid otherwise
- storage_slots = 7
- max_combined_w_class = 21
- max_w_class = WEIGHT_CLASS_NORMAL
- w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
- can_hold = list(/obj/item/book, /obj/item/storage/book, /obj/item/spellbook)
- resistance_flags = FLAMMABLE
-
-/*
- * Trays - Agouri
- */
-/obj/item/storage/bag/tray
- name = "tray"
- icon = 'icons/obj/food/containers.dmi'
- icon_state = "tray"
- desc = "A metal tray to lay food on."
- force = 5
- throwforce = 10
- throw_speed = 3
- throw_range = 5
- w_class = WEIGHT_CLASS_BULKY
- flags_1 = CONDUCT_1
- materials = list(MAT_METAL=3000)
- preposition = "on"
-
-/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
- ..()
- // Drop all the things. All of them.
- var/list/obj/item/oldContents = contents.Copy()
- quick_empty()
-
- // Make each item scatter a bit
- for(var/obj/item/I in oldContents)
- spawn()
- for(var/i = 1, i <= rand(1,2), i++)
- if(I)
- step(I, pick(NORTH,SOUTH,EAST,WEST))
- sleep(rand(2,4))
-
- if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
- else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
-
- if(ishuman(M) || ismonkey(M))
- if(prob(10))
- M.Knockdown(40)
-
-/obj/item/storage/bag/tray/proc/rebuild_overlays()
- cut_overlays()
- for(var/obj/item/I in contents)
- add_overlay(mutable_appearance(I.icon, I.icon_state))
-
-/obj/item/storage/bag/tray/remove_from_storage(obj/item/W as obj, atom/new_location)
- ..()
- rebuild_overlays()
-
-/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0)
- add_overlay(mutable_appearance(I.icon, I.icon_state))
- . = ..()
-
-
-/*
- * Chemistry bag
- */
-
-/obj/item/storage/bag/chemistry
- name = "chemistry bag"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bag"
- desc = "A bag for storing pills, patches, and bottles."
- storage_slots = 50
- max_combined_w_class = 200
- w_class = WEIGHT_CLASS_TINY
- preposition = "in"
- can_hold = list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
- resistance_flags = FLAMMABLE
-
-/*
- * Biowaste bag (mostly for xenobiologists)
- */
-
-/obj/item/storage/bag/bio
- name = "bio bag"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "biobag"
- desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
- storage_slots = 25
- max_combined_w_class = 200
- w_class = WEIGHT_CLASS_TINY
- preposition = "in"
- can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube)
- resistance_flags = FLAMMABLE
+/*
+ * These absorb the functionality of the plant bag, ore satchel, etc.
+ * They use the use_to_pickup, quick_gather, and quick_empty functions
+ * that were already defined in weapon/storage, but which had been
+ * re-implemented in other classes.
+ *
+ * Contains:
+ * Trash Bag
+ * Mining Satchel
+ * Plant Bag
+ * Sheet Snatcher
+ * Book Bag
+ * Biowaste Bag
+ *
+ * -Sayu
+ */
+
+// Generic non-item
+/obj/item/storage/bag
+ allow_quick_gather = 1
+ allow_quick_empty = 1
+ display_contents_with_number = 1 // should work fine now
+ use_to_pickup = 1
+ slot_flags = SLOT_BELT
+
+// -----------------------------
+// Trash bag
+// -----------------------------
+/obj/item/storage/bag/trash
+ name = "trash bag"
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
+ icon = 'icons/obj/janitor.dmi'
+ icon_state = "trashbag"
+ item_state = "trashbag"
+ lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
+
+ w_class = WEIGHT_CLASS_BULKY
+ max_w_class = WEIGHT_CLASS_SMALL
+ max_combined_w_class = 30
+ storage_slots = 30
+ can_hold = list() // any
+ cant_hold = list(/obj/item/disk/nuclear)
+
+/obj/item/storage/bag/trash/suicide_act(mob/user)
+ user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting! ")
+ playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
+ return (TOXLOSS)
+
+/obj/item/storage/bag/trash/update_icon()
+ if(contents.len == 0)
+ icon_state = "[initial(icon_state)]"
+ else if(contents.len < 12)
+ icon_state = "[initial(icon_state)]1"
+ else if(contents.len < 21)
+ icon_state = "[initial(icon_state)]2"
+ else icon_state = "[initial(icon_state)]3"
+
+/obj/item/storage/bag/trash/cyborg
+
+/obj/item/storage/bag/trash/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+ J.put_in_cart(src, user)
+ J.mybag=src
+ J.update_icon()
+
+/obj/item/storage/bag/trash/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
+ return
+
+/obj/item/storage/bag/trash/bluespace
+ name = "trash bag of holding"
+ desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage."
+ icon_state = "bluetrashbag"
+ origin_tech = "materials=4;bluespace=4;engineering=4;plasmatech=3"
+ max_combined_w_class = 60
+ storage_slots = 60
+ flags_2 = NO_MAT_REDEMPTION_2
+
+// -----------------------------
+// Mining Satchel
+// -----------------------------
+
+/obj/item/storage/bag/ore
+ name = "mining satchel"
+ desc = "This little bugger can be used to store and transport ores."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "satchel"
+ origin_tech = "engineering=2"
+ slot_flags = SLOT_BELT | SLOT_POCKET
+ w_class = WEIGHT_CLASS_NORMAL
+ storage_slots = 50
+ max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
+ max_w_class = WEIGHT_CLASS_NORMAL
+ can_hold = list(/obj/item/ore)
+ var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
+
+/obj/item/storage/bag/ore/cyborg
+ name = "cyborg mining satchel"
+
+/obj/item/storage/bag/ore/holding //miners, your messiah has arrived
+ name = "mining satchel of holding"
+ desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures."
+ storage_slots = INFINITY
+ max_combined_w_class = INFINITY
+ origin_tech = "bluespace=4;materials=3;engineering=3"
+ icon_state = "satchel_bspace"
+
+// -----------------------------
+// Plant bag
+// -----------------------------
+
+/obj/item/storage/bag/plants
+ name = "plant bag"
+ icon = 'icons/obj/hydroponics/equipment.dmi'
+ icon_state = "plantbag"
+ storage_slots = 100; //the number of plant pieces it can carry.
+ max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
+ max_w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_TINY
+ can_hold = list(/obj/item/reagent_containers/food/snacks/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb)
+ resistance_flags = FLAMMABLE
+
+////////
+
+/obj/item/storage/bag/plants/portaseeder
+ name = "portable seed extractor"
+ desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
+ icon_state = "portaseeder"
+ origin_tech = "biotech=3;engineering=2"
+
+/obj/item/storage/bag/plants/portaseeder/verb/dissolve_contents()
+ set name = "Activate Seed Extraction"
+ set category = "Object"
+ set desc = "Activate to convert your plants into plantable seeds."
+ if(usr.stat || !usr.canmove || usr.restrained())
+ return
+ for(var/obj/item/O in contents)
+ seedify(O, 1)
+ close_all()
+
+
+// -----------------------------
+// Sheet Snatcher
+// -----------------------------
+// Because it stacks stacks, this doesn't operate normally.
+// However, making it a storage/bag allows us to reuse existing code in some places. -Sayu
+
+/obj/item/storage/bag/sheetsnatcher
+ name = "sheet snatcher"
+ desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "sheetsnatcher"
+
+ var/capacity = 300; //the number of sheets it can carry.
+ w_class = WEIGHT_CLASS_NORMAL
+
+ allow_quick_empty = 1 // this function is superceded
+
+/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W, stop_messages = 0)
+ if(!istype(W, /obj/item/stack/sheet) || istype(W, /obj/item/stack/sheet/mineral/sandstone) || istype(W, /obj/item/stack/sheet/mineral/wood))
+ if(!stop_messages)
+ to_chat(usr, "The snatcher does not accept [W].")
+ return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu
+ var/current = 0
+ for(var/obj/item/stack/sheet/S in contents)
+ current += S.amount
+ if(capacity == current)//If it's full, you're done
+ if(!stop_messages)
+ to_chat(usr, "The snatcher is full. ")
+ return 0
+ return 1
+
+
+// Modified handle_item_insertion. Would prefer not to, but...
+/obj/item/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W, prevent_warning = 0)
+ var/obj/item/stack/sheet/S = W
+ if(!istype(S)) return 0
+
+ var/amount
+ var/inserted = 0
+ var/current = 0
+ for(var/obj/item/stack/sheet/S2 in contents)
+ current += S2.amount
+ if(capacity < current + S.amount)//If the stack will fill it up
+ amount = capacity - current
+ else
+ amount = S.amount
+
+ for(var/obj/item/stack/sheet/sheet in contents)
+ if(S.type == sheet.type) // we are violating the amount limitation because these are not sane objects
+ sheet.amount += amount // they should only be removed through procs in this file, which split them up.
+ S.amount -= amount
+ inserted = 1
+ break
+
+ if(!inserted || !S.amount)
+ usr.dropItemToGround(S)
+ if (usr.client && usr.s_active != src)
+ usr.client.screen -= S
+ S.dropped(usr)
+ if(!S.amount)
+ qdel(S)
+ else
+ if(S.pulledby)
+ S.pulledby.stop_pulling()
+ S.loc = src
+
+ orient2hud(usr)
+ if(usr.s_active)
+ usr.s_active.show_to(usr)
+ update_icon()
+ return 1
+
+
+// Sets up numbered display to show the stack size of each stored mineral
+// NOTE: numbered display is turned off currently because it's broken
+/obj/item/storage/bag/sheetsnatcher/orient2hud(mob/user)
+ var/adjusted_contents = contents.len
+
+ //Numbered contents display
+ var/list/datum/numbered_display/numbered_contents
+ if(display_contents_with_number)
+ numbered_contents = list()
+ adjusted_contents = 0
+ for(var/obj/item/stack/sheet/I in contents)
+ adjusted_contents++
+ var/datum/numbered_display/D = new/datum/numbered_display(I)
+ D.number = I.amount
+ numbered_contents.Add( D )
+
+ var/row_num = 0
+ var/col_count = min(7,storage_slots) -1
+ if (adjusted_contents > 7)
+ row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
+ src.standard_orient_objs(row_num, col_count, numbered_contents)
+ return
+
+
+// Modified quick_empty verb drops appropriate sized stacks
+/obj/item/storage/bag/sheetsnatcher/quick_empty()
+ var/location = get_turf(src)
+ for(var/obj/item/stack/sheet/S in contents)
+ while(S.amount)
+ var/obj/item/stack/sheet/N = new S.type(location)
+ var/stacksize = min(S.amount,N.max_amount)
+ N.amount = stacksize
+ S.amount -= stacksize
+ if(!S.amount)
+ qdel(S)// todo: there's probably something missing here
+ orient2hud(usr)
+ if(usr.s_active)
+ usr.s_active.show_to(usr)
+ update_icon()
+
+// Instead of removing
+/obj/item/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W, atom/new_location)
+ var/obj/item/stack/sheet/S = W
+ if(!istype(S)) return 0
+
+ //I would prefer to drop a new stack, but the item/attack_hand code
+ // that calls this can't recieve a different object than you clicked on.
+ //Therefore, make a new stack internally that has the remainder.
+ // -Sayu
+
+ if(S.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
+
+ return ..(S,new_location)
+
+// -----------------------------
+// Sheet Snatcher (Cyborg)
+// -----------------------------
+
+/obj/item/storage/bag/sheetsnatcher/borg
+ name = "sheet snatcher 9000"
+ desc = ""
+ capacity = 500//Borgs get more because >specialization
+
+
+// -----------------------------
+// Book bag
+// -----------------------------
+
+/obj/item/storage/bag/books
+ name = "book bag"
+ desc = "A bag for books."
+ icon = 'icons/obj/library.dmi'
+ icon_state = "bookbag"
+ display_contents_with_number = 0 //This would look really stupid otherwise
+ storage_slots = 7
+ max_combined_w_class = 21
+ max_w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
+ can_hold = list(/obj/item/book, /obj/item/storage/book, /obj/item/spellbook)
+ resistance_flags = FLAMMABLE
+
+/*
+ * Trays - Agouri
+ */
+/obj/item/storage/bag/tray
+ name = "tray"
+ icon = 'icons/obj/food/containers.dmi'
+ icon_state = "tray"
+ desc = "A metal tray to lay food on."
+ force = 5
+ throwforce = 10
+ throw_speed = 3
+ throw_range = 5
+ w_class = WEIGHT_CLASS_BULKY
+ flags_1 = CONDUCT_1
+ materials = list(MAT_METAL=3000)
+ preposition = "on"
+
+/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
+ ..()
+ // Drop all the things. All of them.
+ var/list/obj/item/oldContents = contents.Copy()
+ quick_empty()
+
+ // Make each item scatter a bit
+ for(var/obj/item/I in oldContents)
+ spawn()
+ for(var/i = 1, i <= rand(1,2), i++)
+ if(I)
+ step(I, pick(NORTH,SOUTH,EAST,WEST))
+ sleep(rand(2,4))
+
+ if(prob(50))
+ playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
+ else
+ playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
+
+ if(ishuman(M) || ismonkey(M))
+ if(prob(10))
+ M.Knockdown(40)
+
+/obj/item/storage/bag/tray/proc/rebuild_overlays()
+ cut_overlays()
+ for(var/obj/item/I in contents)
+ add_overlay(mutable_appearance(I.icon, I.icon_state))
+
+/obj/item/storage/bag/tray/remove_from_storage(obj/item/W as obj, atom/new_location)
+ ..()
+ rebuild_overlays()
+
+/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0)
+ add_overlay(mutable_appearance(I.icon, I.icon_state))
+ . = ..()
+
+
+/*
+ * Chemistry bag
+ */
+
+/obj/item/storage/bag/chemistry
+ name = "chemistry bag"
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bag"
+ desc = "A bag for storing pills, patches, and bottles."
+ storage_slots = 50
+ max_combined_w_class = 200
+ w_class = WEIGHT_CLASS_TINY
+ preposition = "in"
+ can_hold = list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
+ resistance_flags = FLAMMABLE
+
+/*
+ * Biowaste bag (mostly for xenobiologists)
+ */
+
+/obj/item/storage/bag/bio
+ name = "bio bag"
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "biobag"
+ desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
+ storage_slots = 25
+ max_combined_w_class = 200
+ w_class = WEIGHT_CLASS_TINY
+ preposition = "in"
+ can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube)
+ resistance_flags = FLAMMABLE
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 225d634a7f..d578b307db 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -26,12 +26,11 @@
return
/obj/structure/lattice/ratvar_act()
- if(IsEven(x + y))
- new /obj/structure/lattice/clockwork(loc)
- else
- new /obj/structure/lattice/clockwork/large(loc)
+ new /obj/structure/lattice/clockwork(loc)
/obj/structure/lattice/attackby(obj/item/C, mob/user, params)
+ if(resistance_flags & INDESTRUCTIBLE)
+ return
if(istype(C, /obj/item/wirecutters))
to_chat(user, "Slicing [name] joints ... ")
deconstruct()
@@ -45,7 +44,6 @@
qdel(src)
/obj/structure/lattice/singularity_pull(S, current_size)
- ..()
if(current_size >= STAGE_FOUR)
deconstruct()
@@ -55,22 +53,22 @@
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
/obj/structure/lattice/clockwork/Initialize(mapload)
+ canSmoothWith += /turf/open/indestructible/clock_spawn_room //list overrides are a terrible thing
. = ..()
ratvar_act()
+ if(z == ZLEVEL_CITYOFCOGS)
+ resistance_flags |= INDESTRUCTIBLE
/obj/structure/lattice/clockwork/ratvar_act()
if(IsOdd(x+y))
- new /obj/structure/lattice/clockwork/large(loc) // deletes old one
-
-/obj/structure/lattice/clockwork/large/Initialize(mapload)
- . = ..()
- icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
- pixel_x = -9
- pixel_y = -9
-
-/obj/structure/lattice/clockwork/large/ratvar_act()
- if(IsEven(x + y))
- new /obj/structure/lattice/clockwork(loc)
+ 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"
@@ -99,11 +97,29 @@
/obj/structure/lattice/catwalk/clockwork
name = "clockwork catwalk"
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
+ canSmoothWith = list(/obj/structure/lattice,
+ /turf/open/floor,
+ /turf/open/indestructible/clock_spawn_room,
+ /turf/closed/wall,
+ /obj/structure/falsewall)
+ smooth = SMOOTH_MORE
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
. = ..()
- new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
- new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
+ ratvar_act()
+ if(!mapload)
+ new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
+ new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
+ if(z == ZLEVEL_CITYOFCOGS)
+ resistance_flags |= INDESTRUCTIBLE
/obj/structure/lattice/catwalk/clockwork/ratvar_act()
- return
+ if(IsOdd(x+y))
+ 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/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 801f34dbff..794b886537 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -142,6 +142,7 @@
name = "clockwork floor"
desc = "Tightly-pressed brass tiles. They emit minute vibration."
icon_state = "plating"
+ baseturf = /turf/open/floor/clockwork
var/uses_overlay = TRUE
var/obj/effect/clockwork/overlay/floor/realappearence
@@ -152,18 +153,16 @@
new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/floor(src)
realappearence.linked = src
- change_construction_value(1)
/turf/open/floor/clockwork/Destroy()
STOP_PROCESSING(SSobj, src)
- if(uses_overlay)
- change_construction_value(-1)
- if(realappearence)
- qdel(realappearence)
- realappearence = null
+ if(uses_overlay && realappearence)
+ QDEL_NULL(realappearence)
return ..()
/turf/open/floor/clockwork/ReplaceWithLattice()
+ if(baseturf == type)
+ return
..()
for(var/obj/structure/lattice/L in src)
L.ratvar_act()
@@ -197,6 +196,8 @@
L.adjustToxLoss(-3, TRUE, TRUE)
/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
+ if(baseturf == type)
+ return
if(istype(I, /obj/item/crowbar))
user.visible_message("[user] begins slowly prying up [src]... ", "You begin painstakingly prying up [src]... ")
playsound(src, I.usesound, 20, 1)
diff --git a/code/game/turfs/simulated/reebe_void.dm b/code/game/turfs/simulated/reebe_void.dm
new file mode 100644
index 0000000000..2e0246df83
--- /dev/null
+++ b/code/game/turfs/simulated/reebe_void.dm
@@ -0,0 +1,47 @@
+/turf/open/indestructible/reebe_void
+ name = "void"
+ icon_state = "reebemap"
+ layer = SPACE_LAYER
+ baseturf = /turf/open/indestructible/reebe_void
+ planetary_atmos = TRUE
+
+/turf/open/indestructible/reebe_void/Initialize(mapload)
+ . = ..()
+ icon_state = "reebegame"
+
+/turf/open/indestructible/reebe_void/spawning
+ icon_state = "reebespawn"
+
+/turf/open/indestructible/reebe_void/spawning/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ for(var/i in 1 to 3)
+ if(prob(1))
+ new /obj/item/clockwork/alloy_shards/large(src)
+ if(prob(2))
+ new /obj/item/clockwork/alloy_shards/medium(src)
+ if(prob(3))
+ new /obj/item/clockwork/alloy_shards/small(src)
+
+/turf/open/indestructible/reebe_void/spawning/lattices
+ icon_state = "reebelattice"
+
+/turf/open/indestructible/reebe_void/spawning/lattices/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ if(prob(2.5))
+ new /obj/structure/lattice/catwalk/clockwork(src)
+ else if(prob(5))
+ new /obj/structure/lattice/clockwork(src)
+
+/turf/open/indestructible/reebe_void/Enter(atom/movable/AM, atom/old_loc)
+ if(!..())
+ return FALSE
+ else
+ if(istype(AM, /obj/structure/window))
+ return FALSE
+ if(istype(AM, /obj/item/projectile))
+ return TRUE
+ if((locate(/obj/structure/lattice) in src))
+ return TRUE
+ return FALSE
diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm
index 280eacf167..e39c791cee 100644
--- a/code/game/turfs/simulated/wall/misc_walls.dm
+++ b/code/game/turfs/simulated/wall/misc_walls.dm
@@ -55,6 +55,7 @@
sheet_type = /obj/item/stack/tile/brass
sheet_amount = 1
girder_type = /obj/structure/destructible/clockwork/wall_gear
+ baseturf = /turf/open/floor/clockwork/reebe
var/obj/effect/clockwork/overlay/wall/realappearence
/turf/closed/wall/clockwork/Initialize()
@@ -63,15 +64,8 @@
new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/wall(src)
realappearence.linked = src
- change_construction_value(5)
-
-/turf/closed/wall/clockwork/examine(mob/user)
- ..()
- if((is_servant_of_ratvar(user) || isobserver(user)))
- to_chat(user, "It is linked to a Tinkerer's Cache, generating components! ")
/turf/closed/wall/clockwork/Destroy()
- change_construction_value(-5)
if(realappearence)
qdel(realappearence)
realappearence = null
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 6eec793c0e..a51030be2b 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -14,6 +14,7 @@
var/global/datum/gas_mixture/immutable/space/space_gas = new
plane = PLANE_SPACE
+ layer = SPACE_LAYER
light_power = 0.25
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
diff --git a/code/game/world.dm b/code/game/world.dm
index 316ed70961..2f54467c95 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,3 +1,6 @@
+#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
+ //This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
+
GLOBAL_VAR(security_mode)
GLOBAL_PROTECT(security_mode)
@@ -19,8 +22,7 @@ GLOBAL_PROTECT(security_mode)
SetupLogs()
- if(!RunningService()) //tgs2 support
- GLOB.revdata.DownloadPRDetails()
+ SERVER_TOOLS_ON_NEW
load_motd()
load_admins()
@@ -33,8 +35,6 @@ GLOBAL_PROTECT(security_mode)
Master.Initialize(10, FALSE)
- if(CONFIG_GET(flag/irc_announce_new_game))
- IRCBroadcast("New round starting on [SSmapping.config.map_name]!")
/world/proc/SetupExternalRSC()
#if (PRELOAD_RSC == 0)
@@ -125,8 +125,8 @@ GLOBAL_PROTECT(security_mode)
if(!pinging && !playing && config && CONFIG_GET(flag/log_world_topic))
WRITE_FILE(GLOB.world_game_log, "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]")
- if(input[SERVICE_CMD_PARAM_KEY])
- return ServiceCommand(input)
+ SERVER_TOOLS_ON_TOPIC //redirect to server tools if necessary
+
var/comms_key = CONFIG_GET(string/comms_key)
var/key_valid = (comms_key && input["key"] == comms_key)
@@ -143,17 +143,6 @@ GLOBAL_PROTECT(security_mode)
n++
return n
- else if("ircstatus" in input) //tgs2 support
- var/static/last_irc_status = 0
- if(world.time - last_irc_status < 50)
- return
- var/list/adm = get_admin_counts()
- var/list/allmins = adm["total"]
- var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). "
- status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode.name]."
- send2irc("Status", status)
- last_irc_status = world.time
-
else if("status" in input)
var/list/s = list()
s["version"] = GLOB.game_version
@@ -211,24 +200,6 @@ GLOBAL_PROTECT(security_mode)
if(input["crossmessage"] == "News_Report")
minor_announce(input["message"], "Breaking Update From [input["message_sender"]]")
- else if("adminmsg" in input) //tgs2 support
- if(!key_valid)
- return "Bad Key"
- else
- return IrcPm(input["adminmsg"],input["msg"],input["sender"])
-
- else if("namecheck" in input) //tgs2 support
- if(!key_valid)
- return "Bad Key"
- else
- log_admin("IRC Name Check: [input["sender"]] on [input["namecheck"]]")
- message_admins("IRC name checking on [input["namecheck"]] from [input["sender"]]")
- return keywords_lookup(input["namecheck"],1)
- else if("adminwho" in input) //tgs2 support
- if(!key_valid)
- return "Bad Key"
- else
- return ircadminwho()
else if("server_hop" in input)
show_server_hop_transfer_screen(input["server_hop"])
@@ -247,7 +218,7 @@ GLOBAL_PROTECT(security_mode)
C.AnnouncePR(final_composed)
/world/Reboot(reason = 0, fast_track = FALSE)
- ServiceReboot() //handles alternative actions if necessary
+ SERVER_TOOLS_ON_REBOOT
if (reason || fast_track) //special reboot, do none of the normal stuff
if (usr)
log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools")
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 881e59204d..a64cd8f40e 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -421,8 +421,8 @@
return
var/list/options = list("Regular Restart", "Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)")
- if(world.RunningService())
- options += "Service Restart (Force restart DD)";
+ if(SERVER_TOOLS_PRESENT)
+ options += "Server Restart (Kill and restart DD)";
var/rebootconfirm
if(SSticker.admin_delay_notice)
@@ -434,16 +434,19 @@
var/result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options
if(result)
SSblackbox.add_details("admin_verb","Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ var/init_by = "Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]."
switch(result)
if("Regular Restart")
- SSticker.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
+ SSticker.Reboot(init_by, "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
if("Hard Restart (No Delay, No Feeback Reason)")
+ to_chat(world, "World reboot - [init_by]")
world.Reboot()
if("Hardest Restart (No actions, just reboot)")
+ to_chat(world, "Hard world reboot - [init_by]")
world.Reboot(fast_track = TRUE)
- if("Service Restart (Force restart DD)")
- GLOB.reboot_mode = REBOOT_MODE_HARD
- world.ServiceReboot()
+ if("Server Restart (Kill and restart DD)")
+ to_chat(world, "Server restart - [init_by]")
+ SERVER_TOOLS_REBOOT_BYOND
/datum/admins/proc/end_round()
set category = "Server"
diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm
new file mode 100644
index 0000000000..e0d7f1315e
--- /dev/null
+++ b/code/modules/admin/chat_commands.dm
@@ -0,0 +1,63 @@
+#define IRC_STATUS_THROTTLE 5
+
+/datum/server_tools_command/ircstatus
+ name = "status"
+ help_text = "Gets the admincount, playercount, gamemode, and true game mode of the server"
+ admin_only = TRUE
+ var/static/last_irc_status = 0
+
+/datum/server_tools_command/ircstatus/Run(sender, params)
+ var/rtod = REALTIMEOFDAY
+ if(rtod - last_irc_status < IRC_STATUS_THROTTLE)
+ return
+ last_irc_status = rtod
+ var/list/adm = get_admin_counts()
+ var/list/allmins = adm["total"]
+ var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). "
+ status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]."
+ return status
+
+/datum/server_tools_command/irccheck
+ name = "check"
+ help_text = "Gets the playercount, gamemode, and address of the server"
+ admin_only = TRUE
+ var/static/last_irc_check = 0
+
+/datum/server_tools_command/irccheck/Run(sender, params)
+ var/rtod = REALTIMEOFDAY
+ if(rtod - last_irc_check < IRC_STATUS_THROTTLE)
+ return
+ last_irc_check = rtod
+ var/server = CONFIG_GET(string/server)
+ return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]"
+
+/datum/server_tools_command/ahelp
+ name = "ahelp"
+ help_text = " |list>>"
+ required_parameters = 2
+ admin_only = TRUE
+
+/datum/server_tools_command/ahelp/Run(sender, params)
+ var/list/all_params = splittext(params, " ")
+ var/target = all_params[1]
+ all_params.Cut(1, 2)
+ return IrcPm(target, all_params.Join(" "), sender)
+
+/datum/server_tools_command/namecheck
+ name = "namecheck"
+ help_text = "Returns info on the specified target"
+ required_parameters = 1
+ admin_only = TRUE
+
+/datum/server_tools_command/namecheck/Run(sender, params)
+ log_admin("IRC Name Check: [sender] on [params]")
+ message_admins("IRC name checking on [params] from [sender]")
+ return keywords_lookup(params, 1)
+
+/datum/server_tools_command/adminwho
+ name = "adminwho"
+ help_text = "Lists administrators currently on the server"
+ admin_only = TRUE
+
+/datum/server_tools_command/adminwho/Run(sender, params)
+ return ircadminwho()
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index a61de11c30..3a343b7f06 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -587,10 +587,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/proc/send2irc(msg,msg2)
- if(world.RunningService())
- world.ExportService("[SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE] [msg] | [msg2]")
- else if(CONFIG_GET(flag/useircbot))
- shell("python nudge.py [msg] [msg2]")
+ if(SERVER_TOOLS_PRESENT)
+ SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]")
/proc/send2otherserver(source,msg,type = "Ahelp")
var/comms_key = CONFIG_GET(string/comms_key)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index c30308223f..cdbdb4a311 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
/client/proc/cmd_admin_drop_everything(mob/M in GLOB.mob_list)
set category = null
set name = "Drop Everything"
@@ -175,7 +174,7 @@
return
if(automute)
- if(!config.automute_on)
+ if(!CONFIG_GET(flag/automute_on))
return
else
if(!check_rights())
@@ -708,8 +707,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!")
return
- if(config.force_random_names)
- config.force_random_names = 0
+ var/frn = CONFIG_GET(flag/force_random_names)
+ if(frn)
+ CONFIG_SET(flag/force_random_names, FALSE)
message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.")
to_chat(usr, "Disabled.")
return
@@ -727,7 +727,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet .")
- config.force_random_names = 1
+ CONFIG_SET(flag/force_random_names, TRUE)
SSblackbox.add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -735,15 +735,15 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Server"
set name = "Toggle random events on/off"
set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
- if(!config.allow_random_events)
- config.allow_random_events = 1
+ var/new_are = !CONFIG_GET(flag/allow_random_events)
+ CONFIG_SET(flag/allow_random_events, new_are)
+ if(new_are)
to_chat(usr, "Random events enabled")
message_admins("Admin [key_name_admin(usr)] has enabled random events.")
else
- config.allow_random_events = 0
to_chat(usr, "Random events disabled")
message_admins("Admin [key_name_admin(usr)] has disabled random events.")
- SSblackbox.add_details("admin_toggle","Toggle Random Events|[config.allow_random_events]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_toggle","Toggle Random Events|[new_are]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/admin_change_sec_level()
@@ -1257,1265 +1257,4 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
to_chat(usr, "ERROR: Unable to update player flags. Please check logs. ")
else
message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
-=======
-/client/proc/cmd_admin_drop_everything(mob/M in GLOB.mob_list)
- set category = null
- set name = "Drop Everything"
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- var/confirm = alert(src, "Make [M] drop everything?", "Message", "Yes", "No")
- if(confirm != "Yes")
- return
-
- for(var/obj/item/W in M)
- if(!M.dropItemToGround(W))
- qdel(W)
- M.regenerate_icons()
-
- log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
- var/msg = "[key_name_admin(usr)] made [key_name_admin(M)] drop everything!"
- message_admins(msg)
- admin_ticket_log(M, msg)
- SSblackbox.add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list)
- set category = "Special Verbs"
- set name = "Subtle Message"
-
- if(!ismob(M))
- return
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- message_admins("[key_name_admin(src)] has started answering [key_name(M.key, 0, 0)]'s prayer.")
- var/msg = input("Message:", text("Subtle PM to [M.key]")) as text
-
- if (!msg)
- message_admins("[key_name_admin(src)] decided not to answer [key_name(M.key, 0, 0)]'s prayer")
- return
- if(usr)
- if (usr.client)
- if(usr.client.holder)
- to_chat(M, "You hear a voice in your head... [msg] ")
-
- log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
- msg = " SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg][key_name_admin(usr)] Sent a global narrate ")
- SSblackbox.add_details("admin_verb","Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/cmd_admin_direct_narrate(mob/M)
- set category = "Special Verbs"
- set name = "Direct Narrate"
-
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- if(!M)
- M = input("Direct narrate to whom?", "Active Players") as null|anything in GLOB.player_list
-
- if(!M)
- return
-
- var/msg = input("Message:", text("Enter the text you wish to appear to your target:")) as text
-
- if( !msg )
- return
-
- to_chat(M, msg)
- log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
- msg = " DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg] LocalNarrate: [key_name_admin(usr)] at [get_area(A)][ADMIN_JMP(A)]: [msg]Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"] ")
-
- log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
- var/msg = "[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]"
- message_admins(msg)
- admin_ticket_log(M, msg)
- SSblackbox.add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/proc/cmd_admin_mute(whom, mute_type, automute = 0)
- if(!whom)
- return
-
- var/muteunmute
- var/mute_string
- var/feedback_string
- switch(mute_type)
- if(MUTE_IC)
- mute_string = "IC (say and emote)"
- feedback_string = "IC"
- if(MUTE_OOC)
- mute_string = "OOC"
- feedback_string = "OOC"
- if(MUTE_PRAY)
- mute_string = "pray"
- feedback_string = "Pray"
- if(MUTE_ADMINHELP)
- mute_string = "adminhelp, admin PM and ASAY"
- feedback_string = "Adminhelp"
- if(MUTE_DEADCHAT)
- mute_string = "deadchat and DSAY"
- feedback_string = "Deadchat"
- if(MUTE_ALL)
- mute_string = "everything"
- feedback_string = "Everything"
- else
- return
-
- var/client/C
- if(istype(whom, /client))
- C = whom
- else if(istext(whom))
- C = GLOB.directory[whom]
- else
- return
-
- var/datum/preferences/P
- if(C)
- P = C.prefs
- else
- P = GLOB.preferences_datums[whom]
- if(!P)
- return
-
- if(automute)
- if(!CONFIG_GET(flag/automute_on))
- return
- else
- if(!check_rights())
- return
-
- if(automute)
- muteunmute = "auto-muted"
- P.muted |= mute_type
- log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(whom)] from [mute_string]")
- message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(whom)] from [mute_string].")
- if(C)
- to_chat(C, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.")
- SSblackbox.add_details("admin_toggle","Auto Mute [feedback_string]|1") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- return
-
- if(P.muted & mute_type)
- muteunmute = "unmuted"
- P.muted &= ~mute_type
- else
- muteunmute = "muted"
- P.muted |= mute_type
-
- log_admin("[key_name(usr)] has [muteunmute] [key_name(whom)] from [mute_string]")
- message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(whom)] from [mute_string].")
- if(C)
- to_chat(C, "You have been [muteunmute] from [mute_string] by [key_name(usr, include_name = FALSE)].")
- SSblackbox.add_details("admin_toggle","Mute [feedback_string]|[P.muted & mute_type]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-//I use this proc for respawn character too. /N
-/proc/create_xeno(ckey)
- if(!ckey)
- var/list/candidates = list()
- for(var/mob/M in GLOB.player_list)
- if(M.stat != DEAD)
- continue //we are not dead!
- if(!(ROLE_ALIEN in M.client.prefs.be_special))
- continue //we don't want to be an alium
- if(M.client.is_afk())
- continue //we are afk
- if(M.mind && M.mind.current && M.mind.current.stat != DEAD)
- continue //we have a live body we are tied to
- candidates += M.ckey
- if(candidates.len)
- ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates
- else
- to_chat(usr, "Error: create_xeno(): no suitable candidates. ")
- if(!istext(ckey))
- return 0
-
- var/alien_caste = input(usr, "Please choose which caste to spawn.","Pick a caste",null) as null|anything in list("Queen","Praetorian","Hunter","Sentinel","Drone","Larva")
- var/obj/effect/landmark/spawn_here = GLOB.xeno_spawn.len ? pick(GLOB.xeno_spawn) : null
- var/mob/living/carbon/alien/new_xeno
- switch(alien_caste)
- if("Queen")
- new_xeno = new /mob/living/carbon/alien/humanoid/royal/queen(spawn_here)
- if("Praetorian")
- new_xeno = new /mob/living/carbon/alien/humanoid/royal/praetorian(spawn_here)
- if("Hunter")
- new_xeno = new /mob/living/carbon/alien/humanoid/hunter(spawn_here)
- if("Sentinel")
- new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(spawn_here)
- if("Drone")
- new_xeno = new /mob/living/carbon/alien/humanoid/drone(spawn_here)
- if("Larva")
- new_xeno = new /mob/living/carbon/alien/larva(spawn_here)
- else
- return 0
- if(!spawn_here)
- SSjob.SendToLateJoin(new_xeno, FALSE)
-
- new_xeno.ckey = ckey
- var/msg = "[key_name_admin(usr)] has spawned [ckey] as a filthy xeno [alien_caste]. "
- message_admins(msg)
- admin_ticket_log(new_xeno, msg)
- return 1
-
-/*
-If a guy was gibbed and you want to revive him, this is a good way to do so.
-Works kind of like entering the game with a new character. Character receives a new mind if they didn't have one.
-Traitors and the like can also be revived with the previous role mostly intact.
-/N */
-/client/proc/respawn_character()
- set category = "Special Verbs"
- set name = "Respawn Character"
- set desc = "Respawn a person that has been gibbed/dusted/killed. They must be a ghost for this to work and preferably should not have a body to go back into."
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
- return
- var/input = ckey(input(src, "Please specify which key will be respawned.", "Key", ""))
- if(!input)
- return
-
- var/mob/dead/observer/G_found
- for(var/mob/dead/observer/G in GLOB.player_list)
- if(G.ckey == input)
- G_found = G
- break
-
- if(!G_found)//If a ghost was not found.
- to_chat(usr, "There is no active key like that in the game or the person is not currently a ghost. ")
- return
-
- if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something
- //Check if they were an alien
- if(G_found.mind.assigned_role=="Alien")
- if(alert("This character appears to have been an alien. Would you like to respawn them as such?",,"Yes","No")=="Yes")
- var/turf/T
- if(GLOB.xeno_spawn.len)
- T = pick(GLOB.xeno_spawn)
-
- var/mob/living/carbon/alien/new_xeno
- switch(G_found.mind.special_role)//If they have a mind, we can determine which caste they were.
- if("Hunter")
- new_xeno = new /mob/living/carbon/alien/humanoid/hunter(T)
- if("Sentinel")
- new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(T)
- if("Drone")
- new_xeno = new /mob/living/carbon/alien/humanoid/drone(T)
- if("Praetorian")
- new_xeno = new /mob/living/carbon/alien/humanoid/royal/praetorian(T)
- if("Queen")
- new_xeno = new /mob/living/carbon/alien/humanoid/royal/queen(T)
- else//If we don't know what special role they have, for whatever reason, or they're a larva.
- create_xeno(G_found.ckey)
- return
-
- if(!T)
- SSjob.SendToLateJoin(new_xeno, FALSE)
-
- //Now to give them their mind back.
- G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use
- new_xeno.key = G_found.key
- to_chat(new_xeno, "You have been fully respawned. Enjoy the game.")
- var/msg = "[key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno. "
- message_admins(msg)
- admin_ticket_log(new_xeno, msg)
- return //all done. The ghost is auto-deleted
-
- //check if they were a monkey
- else if(findtext(G_found.real_name,"monkey"))
- if(alert("This character appears to have been a monkey. Would you like to respawn them as such?",,"Yes","No")=="Yes")
- var/mob/living/carbon/monkey/new_monkey = new
- SSjob.SendToLateJoin(new_monkey)
- G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use
- new_monkey.key = G_found.key
- to_chat(new_monkey, "You have been fully respawned. Enjoy the game.")
- var/msg = "[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno. "
- message_admins(msg)
- admin_ticket_log(new_monkey, msg)
- return //all done. The ghost is auto-deleted
-
-
- //Ok, it's not a xeno or a monkey. So, spawn a human.
- var/mob/living/carbon/human/new_character = new//The mob being spawned.
- SSjob.SendToLateJoin(new_character)
-
- var/datum/data/record/record_found //Referenced to later to either randomize or not randomize the character.
- if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something
- /*Try and locate a record for the person being respawned through GLOB.data_core.
- This isn't an exact science but it does the trick more often than not.*/
- var/id = md5("[G_found.real_name][G_found.mind.assigned_role]")
-
- record_found = find_record("id", id, GLOB.data_core.locked)
-
- if(record_found)//If they have a record we can determine a few things.
- new_character.real_name = record_found.fields["name"]
- new_character.gender = record_found.fields["sex"]
- new_character.age = record_found.fields["age"]
- new_character.hardset_dna(record_found.fields["identity"], record_found.fields["enzymes"], record_found.fields["name"], record_found.fields["blood_type"], record_found.fields["species"], record_found.fields["features"])
- else
- var/datum/preferences/A = new()
- A.copy_to(new_character)
- A.real_name = G_found.real_name
- new_character.dna.update_dna_identity()
-
- new_character.name = new_character.real_name
-
- if(G_found.mind && !G_found.mind.active)
- G_found.mind.transfer_to(new_character) //be careful when doing stuff like this! I've already checked the mind isn't in use
- else
- new_character.mind_initialize()
- if(!new_character.mind.assigned_role)
- new_character.mind.assigned_role = "Assistant"//If they somehow got a null assigned role.
-
- new_character.key = G_found.key
-
- /*
- The code below functions with the assumption that the mob is already a traitor if they have a special role.
- So all it does is re-equip the mob with powers and/or items. Or not, if they have no special role.
- If they don't have a mind, they obviously don't have a special role.
- */
-
- //Two variables to properly announce later on.
- var/admin = key_name_admin(src)
- var/player_key = G_found.key
-
- //Now for special roles and equipment.
- var/datum/antagonist/traitor/traitordatum = new_character.mind.has_antag_datum(ANTAG_DATUM_TRAITOR)
- if(traitordatum)
- SSjob.EquipRank(new_character, new_character.mind.assigned_role, 1)
- traitordatum.equip()
-
-
- switch(new_character.mind.special_role)
- if("Wizard")
- new_character.loc = pick(GLOB.wizardstart)
- //SSticker.mode.learn_basic_spells(new_character)
- SSticker.mode.equip_wizard(new_character)
- if("Syndicate")
- var/obj/effect/landmark/synd_spawn = locate("landmark*Syndicate-Spawn")
- if(synd_spawn)
- new_character.loc = get_turf(synd_spawn)
- call(/datum/game_mode/proc/equip_syndicate)(new_character)
- if("Space Ninja")
- var/list/ninja_spawn = list()
- for(var/obj/effect/landmark/L in GLOB.landmarks_list)
- if(L.name=="carpspawn")
- ninja_spawn += L
- var/datum/antagonist/ninja/ninjadatum = new_character.mind.has_antag_datum(ANTAG_DATUM_NINJA)
- ninjadatum.equip_space_ninja()
- if(ninja_spawn.len)
- var/obj/effect/landmark/ninja_spawn_here = pick(ninja_spawn)
- new_character.loc = ninja_spawn_here.loc
-
- else//They may also be a cyborg or AI.
- switch(new_character.mind.assigned_role)
- if("Cyborg")//More rigging to make em' work and check if they're traitor.
- new_character = new_character.Robotize()
- if("AI")
- new_character = new_character.AIize()
- else
- SSjob.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them.
-
- //Announces the character on all the systems, based on the record.
- if(!issilicon(new_character))//If they are not a cyborg/AI.
- if(!record_found&&new_character.mind.assigned_role!=new_character.mind.special_role)//If there are no records for them. If they have a record, this info is already in there. MODE people are not announced anyway.
- //Power to the user!
- if(alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?",,"No","Yes")=="Yes")
- GLOB.data_core.manifest_inject(new_character)
-
- if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes")
- AnnounceArrival(new_character, new_character.mind.assigned_role)
-
- var/msg = "[admin] has respawned [player_key] as [new_character.real_name]. "
- message_admins(msg)
- admin_ticket_log(new_character, msg)
-
- to_chat(new_character, "You have been fully respawned. Enjoy the game.")
-
- SSblackbox.add_details("admin_verb","Respawn Character") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- return new_character
-
-/client/proc/cmd_admin_add_freeform_ai_law()
- set category = "Fun"
- set name = "Add Custom AI law"
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
- return
- var/input = input(usr, "Please enter anything you want the AI to do. Anything. Serious.", "What?", "") as text|null
- if(!input)
- return
-
- log_admin("Admin [key_name(usr)] has added a new AI law - [input]")
- message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]")
-
- var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
- var/announce_ion_laws = (show_log == "Yes" ? 1 : -1)
-
- var/datum/round_event/ion_storm/add_law_only/ion = new()
- ion.announceEvent = announce_ion_laws
- ion.ionMessage = input
-
- SSblackbox.add_details("admin_verb","Add Custom AI Law") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/cmd_admin_rejuvenate(mob/living/M in GLOB.mob_list)
- set category = "Special Verbs"
- set name = "Rejuvenate"
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
- return
- if(!mob)
- return
- if(!istype(M))
- alert("Cannot revive a ghost")
- return
- M.revive(full_heal = 1, admin_revive = 1)
-
- log_admin("[key_name(usr)] healed / revived [key_name(M)]")
- var/msg = "Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]! "
- message_admins(msg)
- admin_ticket_log(M, msg)
- SSblackbox.add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/cmd_admin_create_centcom_report()
- set category = "Special Verbs"
- set name = "Create Command Report"
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
- return
- var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
- if(!input)
- return
-
- var/confirm = alert(src, "Do you want to announce the contents of the report to the crew?", "Announce", "Yes", "No", "Cancel")
- var/announce_command_report = TRUE
- switch(confirm)
- if("Yes")
- priority_announce(input, null, 'sound/ai/commandreport.ogg')
- announce_command_report = FALSE
- if("Cancel")
- return
-
- print_command_report(input, "[announce_command_report ? "Classified " : ""][command_name()] Update", announce_command_report)
-
- log_admin("[key_name(src)] has created a command report: [input]")
- message_admins("[key_name_admin(src)] has created a command report")
- SSblackbox.add_details("admin_verb","Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/cmd_change_command_name()
- set category = "Special Verbs"
- set name = "Change Command Name"
- if(!holder)
- to_chat(src, "Only administrators may use this command.")
- return
- var/input = input(usr, "Please input a new name for Central Command.", "What?", "") as text|null
- if(!input)
- return
- change_command_name(input)
- message_admins("[key_name_admin(src)] has changed Central Command's name to [input]")
- log_admin("[key_name(src)] has changed the Central Command name to: [input]")
-
-/client/proc/cmd_admin_delete(atom/A as obj|mob|turf in world)
- set category = "Admin"
- set name = "Delete"
-
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- admin_delete(A)
-
-/client/proc/admin_delete(datum/D)
- var/atom/A = D
- var/coords = istype(A) ? " at ([A.x], [A.y], [A.z])" : ""
- if (alert(src, "Are you sure you want to delete:\n[D]\nat[coords]?", "Confirmation", "Yes", "No") == "Yes")
- log_admin("[key_name(usr)] deleted [D][coords]")
- message_admins("[key_name_admin(usr)] deleted [D][coords]")
- SSblackbox.add_details("admin_verb","Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- if(isturf(D))
- var/turf/T = D
- T.ChangeTurf(T.baseturf)
- else
- qdel(D)
-
-/client/proc/cmd_admin_list_open_jobs()
- set category = "Admin"
- set name = "Manage Job Slots"
-
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
- holder.manage_free_slots()
- SSblackbox.add_details("admin_verb","Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world)
- set category = "Special Verbs"
- set name = "Explosion"
-
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- var/devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null
- if(devastation == null) return
- var/heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null
- if(heavy == null) return
- var/light = input("Range of light impact. -1 to none", text("Input")) as num|null
- if(light == null) return
- var/flash = input("Range of flash. -1 to none", text("Input")) as num|null
- if(flash == null) return
- var/flames = input("Range of flames. -1 to none", text("Input")) as num|null
- if(flames == null) return
-
- if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1) || (flames != -1))
- if ((devastation > 20) || (heavy > 20) || (light > 20) || (flames > 20))
- if (alert(src, "Are you sure you want to do this? It will laaag.", "Confirmation", "Yes", "No") == "No")
- return
-
- explosion(O, devastation, heavy, light, flash, null, null,flames)
- log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])")
- message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])")
- SSblackbox.add_details("admin_verb","Explosion") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- return
- else
- return
-
-/client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world)
- set category = "Special Verbs"
- set name = "EM Pulse"
-
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- var/heavy = input("Range of heavy pulse.", text("Input")) as num|null
- if(heavy == null) return
- var/light = input("Range of light pulse.", text("Input")) as num|null
- if(light == null) return
-
- if (heavy || light)
-
- empulse(O, heavy, light)
- log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
- message_admins("[key_name_admin(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
- SSblackbox.add_details("admin_verb","EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
- return
- else
- return
-
-/client/proc/cmd_admin_gib(mob/M in GLOB.mob_list)
- set category = "Special Verbs"
- set name = "Gib"
-
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- var/confirm = alert(src, "Drop a brain?", "Confirm", "Yes", "No","Cancel")
- if(confirm == "Cancel")
- return
- //Due to the delay here its easy for something to have happened to the mob
- if(!M)
- return
-
- log_admin("[key_name(usr)] has gibbed [key_name(M)]")
- message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]")
-
- if(isobserver(M))
- new /obj/effect/gibspawner/generic(get_turf(M))
- return
- if(confirm == "Yes")
- M.gib()
- else
- M.gib(1)
- SSblackbox.add_details("admin_verb","Gib") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/cmd_admin_gib_self()
- set name = "Gibself"
- set category = "Fun"
-
- var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
- if(confirm == "Yes")
- log_admin("[key_name(usr)] used gibself.")
- message_admins("[key_name_admin(usr)] used gibself. ")
- SSblackbox.add_details("admin_verb","Gib Self") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- mob.gib(1, 1, 1)
-
-/client/proc/cmd_admin_check_contents(mob/living/M in GLOB.mob_list)
- set category = "Special Verbs"
- set name = "Check Contents"
-
- var/list/L = M.get_contents()
- for(var/t in L)
- to_chat(usr, "[t]")
- SSblackbox.add_details("admin_verb","Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/toggle_view_range()
- set category = "Special Verbs"
- set name = "Change View Range"
- set desc = "switches between 1x and custom views"
-
- if(view == world.view)
- change_view(input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128))
- else
- change_view(world.view)
-
- log_admin("[key_name(usr)] changed their view range to [view].")
- //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI
-
- SSblackbox.add_details("admin_toggle","Change View Range|[view]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/admin_call_shuttle()
-
- set category = "Admin"
- set name = "Call Shuttle"
-
- if(EMERGENCY_AT_LEAST_DOCKED)
- return
-
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
- if(confirm != "Yes")
- return
-
- SSshuttle.emergency.request()
- SSblackbox.add_details("admin_verb","Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] admin-called the emergency shuttle.")
- message_admins("[key_name_admin(usr)] admin-called the emergency shuttle. ")
- return
-
-/client/proc/admin_cancel_shuttle()
- set category = "Admin"
- set name = "Cancel Shuttle"
- if(!check_rights(0))
- return
- if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes")
- return
-
- if(EMERGENCY_AT_LEAST_DOCKED)
- return
-
- SSshuttle.emergency.cancel()
- SSblackbox.add_details("admin_verb","Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
- message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle. ")
-
- return
-
-/client/proc/everyone_random()
- set category = "Fun"
- set name = "Make Everyone Random"
- set desc = "Make everyone have a random appearance. You can only use this before rounds!"
-
- if(SSticker.HasRoundStarted())
- to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!")
- return
-
- var/frn = CONFIG_GET(flag/force_random_names)
- if(frn)
- CONFIG_SET(flag/force_random_names, FALSE)
- message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.")
- to_chat(usr, "Disabled.")
- return
-
-
- var/notifyplayers = alert(src, "Do you want to notify the players?", "Options", "Yes", "No", "Cancel")
- if(notifyplayers == "Cancel")
- return
-
- log_admin("Admin [key_name(src)] has forced the players to have random appearances.")
- message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.")
-
- if(notifyplayers == "Yes")
- to_chat(world, "Admin [usr.key] has forced the players to have completely random identities! ")
-
- to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet .")
-
- CONFIG_SET(flag/force_random_names, TRUE)
- SSblackbox.add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/proc/toggle_random_events()
- set category = "Server"
- set name = "Toggle random events on/off"
- set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
- var/new_are = !CONFIG_GET(flag/allow_random_events)
- CONFIG_SET(flag/allow_random_events, new_are)
- if(new_are)
- to_chat(usr, "Random events enabled")
- message_admins("Admin [key_name_admin(usr)] has enabled random events.")
- else
- to_chat(usr, "Random events disabled")
- message_admins("Admin [key_name_admin(usr)] has disabled random events.")
- SSblackbox.add_details("admin_toggle","Toggle Random Events|[new_are]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/proc/admin_change_sec_level()
- set category = "Special Verbs"
- set name = "Set Security Level"
- set desc = "Changes the security level. Announcement only, i.e. setting to Delta won't activate nuke"
-
- if (!holder)
- to_chat(src, "Only administrators may use this command.")
- return
-
- var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","red","delta")
- if(level)
- set_security_level(level)
-
- log_admin("[key_name(usr)] changed the security level to [level]")
- message_admins("[key_name_admin(usr)] changed the security level to [level]")
- SSblackbox.add_details("admin_verb","Set Security Level [capitalize(level)]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list)
- set name = "Toggle Nuke"
- set category = "Fun"
- set popup_menu = 0
- if(!check_rights(R_DEBUG))
- return
-
- if(!N.timing)
- var/newtime = input(usr, "Set activation timer.", "Activate Nuke", "[N.timer_set]") as num
- if(!newtime)
- return
- N.timer_set = newtime
- N.set_safety()
- N.set_active()
-
- log_admin("[key_name(usr)] [N.timing ? "activated" : "deactivated"] a nuke at ([N.x],[N.y],[N.z]).")
- message_admins("[ADMIN_LOOKUPFLW(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [ADMIN_COORDJMP(N)].")
- SSblackbox.add_details("admin_toggle","Toggle Nuke|[N.timing]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
-
-/client/proc/create_outfits()
- set category = "Debug"
- set name = "Create Custom Outfit"
-
- if(!check_rights(R_DEBUG))
- return
-
- holder.create_outfit()
-
-/datum/admins/proc/create_outfit()
- var/list/uniforms = typesof(/obj/item/clothing/under)
- var/list/suits = typesof(/obj/item/clothing/suit)
- var/list/gloves = typesof(/obj/item/clothing/gloves)
- var/list/shoes = typesof(/obj/item/clothing/shoes)
- var/list/headwear = typesof(/obj/item/clothing/head)
- var/list/glasses = typesof(/obj/item/clothing/glasses)
- var/list/masks = typesof(/obj/item/clothing/mask)
- var/list/ids = typesof(/obj/item/card/id)
-
- var/uniform_select = "None "
- for(var/path in uniforms)
- uniform_select += "[path] "
- uniform_select += "None "
- for(var/path in suits)
- suit_select += "[path] "
- suit_select += "None "
- for(var/path in gloves)
- gloves_select += "[path] "
- gloves_select += "None "
- for(var/path in shoes)
- shoes_select += "[path] "
- shoes_select += "None "
- for(var/path in headwear)
- head_select += "[path] "
- head_select += "None "
- for(var/path in glasses)
- glasses_select += "[path] "
- glasses_select += "None "
- for(var/path in masks)
- mask_select += "[path] "
- mask_select += "None "
- for(var/path in ids)
- id_select += "[path] "
- id_select += "Create Outfit
-
- "}
- usr << browse(dat, "window=dressup;size=550x600")
-
-/client/proc/toggle_antag_hud()
- set category = "Admin"
- set name = "Toggle AntagHUD"
- set desc = "Toggles the Admin AntagHUD"
-
- if(!holder) return
-
- var/adding_hud = !has_antag_hud()
-
- for(var/datum/atom_hud/H in GLOB.huds)
- if(istype(H, /datum/atom_hud/antag))
- (adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
-
- to_chat(usr, "You toggled your admin antag HUD [adding_hud ? "ON" : "OFF"].")
- message_admins("[key_name_admin(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
- log_admin("[key_name(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].")
- SSblackbox.add_details("admin_toggle","Toggle Antag HUD|[adding_hud]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/has_antag_hud()
- var/datum/atom_hud/A = GLOB.huds[ANTAG_HUD_TRAITOR]
- return A.hudusers[mob]
-
-/client/proc/open_shuttle_manipulator()
- set category = "Admin"
- set name = "Shuttle Manipulator"
- set desc = "Opens the shuttle manipulator UI."
-
- for(var/obj/machinery/shuttle_manipulator/M in GLOB.machines)
- M.ui_interact(usr)
-
-/client/proc/mass_zombie_infection()
- set category = "Fun"
- set name = "Mass Zombie Infection"
- set desc = "Infects all humans with a latent organ that will zombify \
- them on death."
-
- if(!holder)
- return
-
- var/confirm = alert(src, "Please confirm you want to add latent zombie organs in all humans?", "Confirm Zombies", "Yes", "No")
- if(confirm != "Yes")
- return
-
- for(var/mob/living/carbon/human/H in GLOB.mob_list)
- new /obj/item/organ/zombie_infection(H)
-
- message_admins("[key_name_admin(usr)] added a latent zombie infection to all humans.")
- log_admin("[key_name(usr)] added a latent zombie infection to all humans.")
- SSblackbox.add_details("admin_verb","Mass Zombie Infection")
-
-/client/proc/mass_zombie_cure()
- set category = "Fun"
- set name = "Mass Zombie Cure"
- set desc = "Removes the zombie infection from all humans, returning them to normal."
- if(!holder)
- return
-
- var/confirm = alert(src, "Please confirm you want to cure all zombies?", "Confirm Zombie Cure", "Yes", "No")
- if(confirm != "Yes")
- return
-
- for(var/obj/item/organ/zombie_infection/I in GLOB.zombie_infection_list)
- qdel(I)
-
- message_admins("[key_name_admin(usr)] cured all zombies.")
- log_admin("[key_name(usr)] cured all zombies.")
- SSblackbox.add_details("admin_verb","Mass Zombie Cure")
-
-/client/proc/polymorph_all()
- set category = "Fun"
- set name = "Polymorph All"
- set desc = "Applies the effects of the bolt of change to every single mob."
-
- if(!holder)
- return
-
- var/confirm = alert(src, "Please confirm you want polymorph all mobs?", "Confirm Polymorph", "Yes", "No")
- if(confirm != "Yes")
- return
-
- var/list/mobs = shuffle(GLOB.living_mob_list.Copy()) // might change while iterating
- var/who_did_it = key_name_admin(usr)
-
- message_admins("[key_name_admin(usr)] started polymorphed all living mobs.")
- log_admin("[key_name(usr)] polymorphed all living mobs.")
- SSblackbox.add_details("admin_verb","Polymorph All")
-
- for(var/mob/living/M in mobs)
- CHECK_TICK
-
- if(!M)
- continue
-
- M.audible_message("...wabbajack...wabbajack... ")
- playsound(M.loc, 'sound/magic/staff_change.ogg', 50, 1, -1)
-
- wabbajack(M)
-
- message_admins("Mass polymorph started by [who_did_it] is complete.")
-
-
-/client/proc/show_tip()
- set category = "Admin"
- set name = "Show Tip"
- set desc = "Sends a tip (that you specify) to all players. After all \
- you're the experienced player here."
-
- if(!holder)
- return
-
- var/input = input(usr, "Please specify your tip that you want to send to the players.", "Tip", "") as message|null
- if(!input)
- return
-
- if(!SSticker)
- return
-
- SSticker.selected_tip = input
-
- // If we've already tipped, then send it straight away.
- if(SSticker.tipped)
- SSticker.send_tip_of_the_round()
-
-
- message_admins("[key_name_admin(usr)] sent a tip of the round.")
- log_admin("[key_name(usr)] sent \"[input]\" as the Tip of the Round.")
- SSblackbox.add_details("admin_verb","Show Tip")
-
-#define ON_PURRBATION(H) (!(H.dna.features["tail_human"] == "None" && H.dna.features["ears"] == "None"))
-
-/proc/mass_purrbation()
- for(var/M in GLOB.mob_list)
- if(ishumanbasic(M))
- purrbation_apply(M)
- CHECK_TICK
-
-/proc/mass_remove_purrbation()
- for(var/M in GLOB.mob_list)
- if(ishumanbasic(M))
- purrbation_remove(M)
- CHECK_TICK
-
-/proc/purrbation_toggle(mob/living/carbon/human/H)
- if(!ishumanbasic(H))
- return
- if(!ON_PURRBATION(H))
- purrbation_apply(H)
- . = TRUE
- else
- purrbation_remove(H)
- . = FALSE
-
-/proc/purrbation_apply(mob/living/carbon/human/H)
- if(!ishuman(H))
- return
- if(ON_PURRBATION(H))
- return
- to_chat(H, "Something is nya~t right.")
- H.dna.features["tail_human"] = "Cat"
- H.dna.features["ears"] = "Cat"
- H.regenerate_icons()
- playsound(get_turf(H), 'sound/effects/meow1.ogg', 50, 1, -1)
-
-/proc/purrbation_remove(mob/living/carbon/human/H)
- if(!ishuman(H))
- return
- if(!ON_PURRBATION(H))
- return
- to_chat(H, "You are no longer a cat.")
- H.dna.features["tail_human"] = "None"
- H.dna.features["ears"] = "None"
- H.regenerate_icons()
-
-#undef ON_PURRBATION
-
-/client/proc/modify_goals()
- set category = "Debug"
- set name = "Modify goals"
-
- if(!check_rights(R_ADMIN))
- return
-
- holder.modify_goals()
-
-/datum/admins/proc/modify_goals()
- var/dat = ""
- for(var/datum/station_goal/S in SSticker.mode.station_goals)
- dat += "[S.name] - Announce | Remove Add New Goal "
- usr << browse(dat, "window=goals;size=400x400")
-
-
-/client/proc/toggle_hub()
- set category = "Server"
- set name = "Toggle Hub"
-
- world.update_hub_visibility(!GLOB.hub_visibility)
-
- log_admin("[key_name(usr)] has toggled the server's hub status for the round, it is now [(GLOB.hub_visibility?"on":"off")] the hub.")
- message_admins("[key_name_admin(usr)] has toggled the server's hub status for the round, it is now [(GLOB.hub_visibility?"on":"off")] the hub.")
- if (GLOB.hub_visibility && !world.reachable)
- message_admins("WARNING: The server will not show up on the hub because byond is detecting that a filewall is blocking incoming connections.")
-
- SSblackbox.add_details("admin_toggle","Toggled Hub Visibility|[GLOB.hub_visibility]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/smite(mob/living/carbon/human/target as mob)
- set name = "Smite"
- set category = "Fun"
- if(!holder)
- return
-
- var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA)
-
- var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list
-
- if(QDELETED(target) || !punishment)
- return
-
- switch(punishment)
- if(ADMIN_PUNISHMENT_LIGHTNING)
- var/turf/T = get_step(get_step(target, NORTH), NORTH)
- T.Beam(target, icon_state="lightning[rand(1,12)]", time = 5)
- target.adjustFireLoss(75)
- target.electrocution_animation(40)
- to_chat(target, "The gods have punished you for your sins! ")
- if(ADMIN_PUNISHMENT_BRAINDAMAGE)
- target.adjustBrainLoss(75)
- if(ADMIN_PUNISHMENT_GIB)
- target.gib(FALSE)
- if(ADMIN_PUNISHMENT_BSA)
- bluespace_artillery(target)
-
- var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]."
- message_admins(msg)
- admin_ticket_log(target, msg)
- log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].")
-
-
-/client/proc/trigger_centcom_recall()
- if(!holder)
- return
- var/message = pick(GLOB.admiral_messages)
- message = input("Enter message from the on-call admiral to be put in the recall report.", "Admiral Message", message) as text|null
-
- if(!message)
- return
-
- message_admins("[key_name_admin(usr)] triggered a CentCom recall, with the admiral message of: [message]")
- log_game("[key_name(usr)] triggered a CentCom recall, with the message of: [message]")
- SSshuttle.centcom_recall(SSshuttle.emergency.timer, message)
-
-/client/proc/cmd_admin_check_player_exp() //Allows admins to determine who the newer players are.
- set category = "Admin"
- set name = "Player Playtime"
- if(!check_rights(R_ADMIN))
- return
-
- var/list/msg = list()
- msg += "Playtime Report Playtime:ERROR: Client not found. ")
- return
-
- var/list/body = list()
- body += "Playtime for [C.key] Toggle Exempt status "
- body += ""
- usr << browse(body.Join(), "window=playerplaytime[C.ckey];size=550x615")
-
-/datum/admins/proc/toggle_exempt_status(client/C)
- if(!check_rights(R_ADMIN))
- return
- if(!C)
- to_chat(usr, "ERROR: Client not found. ")
- return
-
- if(!C.set_db_player_flags())
- to_chat(usr, "ERROR: Unable read player flags from database. Please check logs. ")
- var/dbflags = C.prefs.db_flags
- var/newstate = FALSE
- if(dbflags & DB_FLAG_EXEMPT)
- newstate = FALSE
- else
- newstate = TRUE
-
- if(C.update_flag_db(DB_FLAG_EXEMPT, newstate))
- to_chat(usr, "ERROR: Unable to update player flags. Please check logs. ")
- else
- message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
->>>>>>> 4178c20... Configuration datum refactor (#30763)
log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
\ No newline at end of file
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ad0e9ba50e..38e0b0bd90 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/preferred_map = null
var/uses_glasses_colour = 0
-
+
var/screenshake = 100
var/damagescreenshake = 2
@@ -571,7 +571,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[features["flavor_text"]]"
else
dat += "[TextPreview(features["flavor_text"])]...Body "
dat += "Gender: [gender == MALE ? "Male" : "Female"] Species: [pref_species.id] [src] devours [P]! ", \
+ "DELICIOUS SOULS ")
+ playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE)
+ narsie_act()
+ P.gib()
+
+/mob/living/simple_animal/pet/dog/corgi/narsie/update_corgi_fluff()
+ ..()
+ speak = list("Tari'karat-pasnar!", "IA! IA!", "BRRUUURGHGHRHR")
+ speak_emote = list("growls", "barks ominously")
+ emote_hear = list("barks echoingly!", "woofs hauntingly!", "yaps in an eldritch manner.", "mutters something unspeakable.")
+ emote_see = list("communes with the unnameable.", "ponders devouring some souls.", "shakes.")
+
+/mob/living/simple_animal/pet/dog/corgi/narsie/narsie_act()
+ adjustBruteLoss(-maxHealth)
/mob/living/simple_animal/pet/dog/corgi/regenerate_icons()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 6357f83286..09d9f66f61 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -33,6 +33,7 @@
icon_state = "parrot_fly"
icon_living = "parrot_fly"
icon_dead = "parrot_dead"
+ var/icon_sit = "parrot_sit"
density = FALSE
health = 80
maxHealth = 80
@@ -284,7 +285,7 @@
return
if(!stat && M.a_intent == INTENT_HARM)
- icon_state = "parrot_fly" //It is going to be flying regardless of whether it flees or attacks
+ icon_state = icon_living //It is going to be flying regardless of whether it flees or attacks
if(parrot_state == PARROT_PERCH)
parrot_sleep_dur = parrot_sleep_max //Reset it's sleep timer if it was perched
@@ -320,7 +321,7 @@
if(M.melee_damage_upper > 0 && !stat)
parrot_interest = M
parrot_state = PARROT_SWOOP | PARROT_ATTACK //Attack other animals regardless
- icon_state = "parrot_fly"
+ icon_state = icon_living
//Mobs with objects
/mob/living/simple_animal/parrot/attackby(obj/item/O, mob/living/user, params)
@@ -335,7 +336,7 @@
parrot_state |= PARROT_ATTACK
else
parrot_state |= PARROT_FLEE
- icon_state = "parrot_fly"
+ icon_state = icon_living
drop_held_item(0)
else if(istype(O, /obj/item/reagent_containers/food/snacks/cracker)) //Poly wants a cracker.
qdel(O)
@@ -358,7 +359,7 @@
parrot_interest = null
parrot_state = PARROT_WANDER | PARROT_FLEE //Been shot and survived! RUN LIKE HELL!
//parrot_been_shot += 5
- icon_state = "parrot_fly"
+ icon_state = icon_living
drop_held_item(0)
return
@@ -371,7 +372,7 @@
//Sprite update for when a parrot gets pulled
if(pulledby && stat == CONSCIOUS)
- icon_state = "parrot_fly"
+ icon_state = icon_living
if(!client)
parrot_state = PARROT_WANDER
return
@@ -400,11 +401,11 @@
if(parrot_perch && parrot_perch.loc != src.loc) //Make sure someone hasnt moved our perch on us
if(parrot_perch in view(src))
parrot_state = PARROT_SWOOP | PARROT_RETURN
- icon_state = "parrot_fly"
+ icon_state = icon_living
return
else
parrot_state = PARROT_WANDER
- icon_state = "parrot_fly"
+ icon_state = icon_living
return
if(--parrot_sleep_dur) //Zzz
@@ -445,7 +446,7 @@
if(parrot_interest)
emote("me", 1, "looks in [parrot_interest]'s direction and takes flight.")
parrot_state = PARROT_SWOOP | PARROT_STEAL
- icon_state = "parrot_fly"
+ icon_state = icon_living
return
//-----WANDERING - This is basically a 'I dont know what to do yet' state
@@ -530,7 +531,7 @@
src.loc = parrot_perch.loc
drop_held_item()
parrot_state = PARROT_PERCH
- icon_state = "parrot_sit"
+ icon_state = icon_sit
return
walk_to(src, parrot_perch, 1, parrot_speed)
@@ -603,8 +604,8 @@
*/
/mob/living/simple_animal/parrot/movement_delay()
- if(client && stat == CONSCIOUS && parrot_state != "parrot_fly")
- icon_state = "parrot_fly"
+ if(client && stat == CONSCIOUS && parrot_state != icon_living)
+ icon_state = icon_living
//Because the most appropriate place to set icon_state is movement_delay(), clearly
return ..()
@@ -797,12 +798,12 @@
if(stat || !client)
return
- if(icon_state == "parrot_fly")
+ if(icon_state == icon_living)
for(var/atom/movable/AM in view(src,1))
for(var/perch_path in desired_perches)
if(istype(AM, perch_path))
src.loc = AM.loc
- icon_state = "parrot_sit"
+ icon_state = icon_sit
return
to_chat(src, "There is no perch nearby to sit on! ")
return
@@ -816,7 +817,7 @@
if(stat || !client)
return
- if(icon_state == "parrot_fly")
+ if(icon_state == icon_living)
for(var/mob/living/carbon/human/H in view(src,1))
if(H.has_buckled_mobs() && H.buckled_mobs.len >= H.max_buckled_mobs) //Already has a parrot, or is being eaten by a slime
continue
@@ -824,7 +825,7 @@
return
to_chat(src, "There is nobody nearby that you can sit on! ")
else
- icon_state = "parrot_fly"
+ icon_state = icon_living
parrot_state = PARROT_WANDER
if(buckled)
to_chat(src, "You are no longer sitting on [buckled]'s shoulder. ")
@@ -842,7 +843,7 @@
H.buckle_mob(src, force=1)
pixel_y = 9
pixel_x = pick(-8,8) //pick left or right shoulder
- icon_state = "parrot_sit"
+ icon_state = icon_sit
parrot_state = PARROT_PERCH
to_chat(src, "You sit on [H]'s shoulder. ")
@@ -961,6 +962,12 @@
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
+/mob/living/simple_animal/parrot/Poly/ratvar_act()
+ playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 75, TRUE)
+ var/mob/living/simple_animal/parrot/clock_hawk/H = new(loc)
+ H.setDir(dir)
+ dust()
+
/mob/living/simple_animal/parrot/Poly/ghost
name = "The Ghost of Poly"
desc = "Doomed to squawk the earth."
@@ -996,4 +1003,23 @@
loc = H
H.ContractDisease(P)
parrot_interest = null
- H.visible_message("[src] dive bombs into [H]'s chest and vanishes! ", "[src] dive bombs into your chest, vanishing! This can't be good! ")
\ No newline at end of file
+ H.visible_message("[src] dive bombs into [H]'s chest and vanishes! ", "[src] dive bombs into your chest, vanishing! This can't be good! ")
+
+
+/mob/living/simple_animal/parrot/clock_hawk
+ name = "clock hawk"
+ desc = "Cbyl jnaan penpxre! Fdhnnnjx!"
+ icon_state = "clock_hawk_fly"
+ icon_living = "clock_hawk_fly"
+ icon_sit = "clock_hawk_sit"
+ speak = list("Penpxre!", "Ratvar vf n qhzo anzr naljnl!")
+ speak_emote = list("squawks rustily", "says crassly", "yells brassly")
+ emote_hear = list("squawks rustily.", "bawks metallically!")
+ emote_see = list("flutters its metal wings.")
+ faction = list("ratvar")
+ gold_core_spawnable = FALSE
+ del_on_death = TRUE
+ death_sound = 'sound/magic/clockwork/anima_fragment_death.ogg'
+
+/mob/living/simple_animal/parrot/clock_hawk/ratvar_act()
+ return
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 802bd738e9..809e8b80d4 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -1,66 +1,66 @@
-/mob/living/simple_animal/shade
- name = "Shade"
- real_name = "Shade"
- desc = "A bound spirit"
- gender = PLURAL
- icon = 'icons/mob/mob.dmi'
- icon_state = "shade"
- icon_living = "shade"
- maxHealth = 50
- health = 50
- healable = 0
- speak_emote = list("hisses")
- emote_hear = list("wails.","screeches.")
- response_help = "puts their hand through"
- response_disarm = "flails at"
- response_harm = "punches"
- speak_chance = 1
- melee_damage_lower = 5
- melee_damage_upper = 15
- attacktext = "metaphysically strikes"
- minbodytemp = 0
- maxbodytemp = INFINITY
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- speed = -1
- stop_automated_movement = 1
- status_flags = 0
- faction = list("cult")
- status_flags = CANPUSH
- movement_type = FLYING
- loot = list(/obj/item/ectoplasm)
- del_on_death = TRUE
- initial_language_holder = /datum/language_holder/construct
-
-/mob/living/simple_animal/shade/death()
- deathmessage = "lets out a contented sigh as [p_their()] form unwinds."
- ..()
-
-/mob/living/simple_animal/shade/canSuicide()
- if(istype(loc, /obj/item/device/soulstone)) //do not suicide inside the soulstone
- return 0
- return ..()
-
-/mob/living/simple_animal/shade/Process_Spacemove(movement_dir = 0)
- return TRUE //this doesn't make much sense; you'd thing TRUE would mean it'd process spacemove but it means it doesn't
-
-/mob/living/simple_animal/shade/attack_animal(mob/living/simple_animal/M)
- if(isconstruct(M))
- var/mob/living/simple_animal/hostile/construct/C = M
- if(!C.can_repair_constructs)
- return
- if(health < maxHealth)
- adjustHealth(-25)
- Beam(M,icon_state="sendbeam",time=4)
- M.visible_message("[M] heals \the [src] . ", \
- "You heal [src] , leaving [src] at [health]/[maxHealth] health. ")
- else
- to_chat(M, "You cannot heal [src] , as [p_they()] [p_are()] unharmed! ")
- else if(src != M)
- return ..()
-
-/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params) //Marker -Agouri
- if(istype(O, /obj/item/device/soulstone))
- var/obj/item/device/soulstone/SS = O
- SS.transfer_soul("SHADE", src, user)
- else
- ..()
+/mob/living/simple_animal/shade
+ name = "Shade"
+ real_name = "Shade"
+ desc = "A bound spirit"
+ gender = PLURAL
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "shade"
+ icon_living = "shade"
+ maxHealth = 50
+ health = 50
+ healable = 0
+ speak_emote = list("hisses")
+ emote_hear = list("wails.","screeches.")
+ response_help = "puts their hand through"
+ response_disarm = "flails at"
+ response_harm = "punches"
+ speak_chance = 1
+ melee_damage_lower = 5
+ melee_damage_upper = 15
+ attacktext = "metaphysically strikes"
+ minbodytemp = 0
+ maxbodytemp = INFINITY
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ speed = -1
+ stop_automated_movement = 1
+ status_flags = 0
+ faction = list("cult")
+ status_flags = CANPUSH
+ movement_type = FLYING
+ loot = list(/obj/item/ectoplasm)
+ del_on_death = TRUE
+ initial_language_holder = /datum/language_holder/construct
+
+/mob/living/simple_animal/shade/death()
+ deathmessage = "lets out a contented sigh as [p_their()] form unwinds."
+ ..()
+
+/mob/living/simple_animal/shade/canSuicide()
+ if(istype(loc, /obj/item/device/soulstone)) //do not suicide inside the soulstone
+ return 0
+ return ..()
+
+/mob/living/simple_animal/shade/Process_Spacemove(movement_dir = 0)
+ return TRUE //this doesn't make much sense; you'd thing TRUE would mean it'd process spacemove but it means it doesn't
+
+/mob/living/simple_animal/shade/attack_animal(mob/living/simple_animal/M)
+ if(isconstruct(M))
+ var/mob/living/simple_animal/hostile/construct/C = M
+ if(!C.can_repair_constructs)
+ return
+ if(health < maxHealth)
+ adjustHealth(-25)
+ Beam(M,icon_state="sendbeam",time=4)
+ M.visible_message("[M] heals \the [src] . ", \
+ "You heal [src] , leaving [src] at [health]/[maxHealth] health. ")
+ else
+ to_chat(M, "You cannot heal [src] , as [p_they()] [p_are()] unharmed! ")
+ else if(src != M)
+ return ..()
+
+/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params) //Marker -Agouri
+ if(istype(O, /obj/item/device/soulstone))
+ var/obj/item/device/soulstone/SS = O
+ SS.transfer_soul("SHADE", src, user)
+ else
+ . = ..()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 5467aad549..4e988c482c 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -271,14 +271,11 @@
/mob/living/simple_animal/movement_delay()
- . = ..()
-
- . = speed
-
var/static/config_animal_delay
if(isnull(config_animal_delay))
config_animal_delay = CONFIG_GET(number/animal_delay)
. += config_animal_delay
+ return ..() + speed + config_animal_delay
/mob/living/simple_animal/Stat()
..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index df99f53e88..447a87af10 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -162,7 +162,7 @@
for(var/mob/M in get_hearers_in_view(range, src))
M.show_message( message, 2, deaf_message, 1)
-/mob/proc/movement_delay()
+/mob/proc/movement_delay() //update /living/movement_delay() if you change this
return 0
/mob/proc/Life()
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 1f2285cdf5..3c8460b57d 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -2,6 +2,7 @@
slot_flags = SLOT_BACK
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+ flags_2 = NO_MAT_REDEMPTION_2
/obj/item/gun/magic/staff/change
name = "staff of change"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index ec34bf833f..f236b83fa3 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -1,161 +1,164 @@
-/obj/item/reagent_containers/hypospray
- name = "hypospray"
- desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
- icon = 'icons/obj/syringe.dmi'
- item_state = "hypo"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- icon_state = "hypo"
- amount_per_transfer_from_this = 5
- volume = 30
- possible_transfer_amounts = list()
- resistance_flags = ACID_PROOF
- container_type = OPENCONTAINER_1
- slot_flags = SLOT_BELT
- var/ignore_flags = 0
- var/infinite = FALSE
-
-/obj/item/reagent_containers/hypospray/attack_paw(mob/user)
- return attack_hand(user)
-
-/obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user)
- if(!reagents.total_volume)
- to_chat(user, "[src] is empty! ")
- return
- if(!iscarbon(M))
- return
-
- if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) // Ignore flag should be checked first or there will be an error message.
- to_chat(M, "You feel a tiny prick! ")
- to_chat(user, "You inject [M] with [src]. ")
-
- var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
- reagents.reaction(M, INJECT, fraction)
- if(M.reagents)
- var/list/injected = list()
- for(var/datum/reagent/R in reagents.reagent_list)
- injected += R.name
- var/trans = 0
- if(!infinite)
- trans = reagents.trans_to(M, amount_per_transfer_from_this)
- else
- trans = reagents.copy_to(M, amount_per_transfer_from_this)
-
- to_chat(user, "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src]. ")
-
- var/contained = english_list(injected)
-
- add_logs(user, M, "injected", src, "([contained])")
-
-/obj/item/reagent_containers/hypospray/CMO
- list_reagents = list("omnizine" = 30)
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-
-/obj/item/reagent_containers/hypospray/combat
- name = "combat stimulant injector"
- desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
- amount_per_transfer_from_this = 10
- icon_state = "combat_hypo"
- volume = 90
- ignore_flags = 1 // So they can heal their comrades.
- list_reagents = list("epinephrine" = 30, "omnizine" = 30, "leporazine" = 15, "atropine" = 15)
-
-/obj/item/reagent_containers/hypospray/combat/nanites
- desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with expensive medical nanites for rapid healing."
- volume = 100
- list_reagents = list("nanites" = 80, "synaptizine" = 20)
-
-/obj/item/reagent_containers/hypospray/magillitis
- name = "experimental autoinjector"
- desc = "A modified air-needle autoinjector with a small single-use reservoir. It contains an experimental serum."
- icon_state = "combat_hypo"
- volume = 5
- container_type = NONE
- list_reagents = list("magillitis" = 5)
-
-//MediPens
-
-/obj/item/reagent_containers/hypospray/medipen
- name = "epinephrine medipen"
- desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
- icon_state = "medipen"
- item_state = "medipen"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- amount_per_transfer_from_this = 10
- volume = 10
- ignore_flags = 1 //so you can medipen through hardsuits
- container_type = DRAWABLE_1
- flags_1 = null
- list_reagents = list("epinephrine" = 10)
-
-/obj/item/reagent_containers/hypospray/medipen/attack(mob/M, mob/user)
- if(!reagents.total_volume)
- to_chat(user, "[src] is empty! ")
- return
- ..()
- if(!iscyborg(user))
- reagents.maximum_volume = 0 //Makes them useless afterwards
- container_type = NONE
- update_icon()
- spawn(80)
- if(iscyborg(user) && !reagents.total_volume)
- var/mob/living/silicon/robot/R = user
- if(R.cell.use(100))
- reagents.add_reagent_list(list_reagents)
- update_icon()
- return
-
-/obj/item/reagent_containers/hypospray/medipen/update_icon()
- if(reagents.total_volume > 0)
- icon_state = initial(icon_state)
- else
- icon_state = "[initial(icon_state)]0"
-
-/obj/item/reagent_containers/hypospray/medipen/examine()
- ..()
- if(reagents && reagents.reagent_list.len)
- to_chat(usr, "It is currently loaded. ")
- else
- to_chat(usr, "It is spent. ")
-
-/obj/item/reagent_containers/hypospray/medipen/stimpack //goliath kiting
- name = "stimpack medipen"
- desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor."
- icon_state = "stimpen"
- volume = 20
- amount_per_transfer_from_this = 20
- list_reagents = list("ephedrine" = 10, "coffee" = 10)
-
-/obj/item/reagent_containers/hypospray/medipen/stimpack/traitor
- desc = "A modified stimulants autoinjector for use in combat situations. Has a mild healing effect."
- list_reagents = list("stimulants" = 10, "omnizine" = 10)
-
-/obj/item/reagent_containers/hypospray/medipen/morphine
- name = "morphine medipen"
- desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though."
- list_reagents = list("morphine" = 10)
-
-/obj/item/reagent_containers/hypospray/medipen/tuberculosiscure
- name = "BVAK autoinjector"
- desc = "Bio Virus Antidote Kit autoinjector. Has a two use system for yourself, and someone else. Inject when infected."
- icon_state = "stimpen"
- volume = 60
- amount_per_transfer_from_this = 30
- list_reagents = list("atropine" = 10, "epinephrine" = 10, "salbutamol" = 20, "spaceacillin" = 20)
-
-/obj/item/reagent_containers/hypospray/medipen/survival
- name = "survival medipen"
- desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. WARNING: Do not inject more than one pen in quick succession."
- icon_state = "stimpen"
- volume = 57
- amount_per_transfer_from_this = 57
- list_reagents = list("salbutamol" = 10, "leporazine" = 15, "tricordrazine" = 15, "epinephrine" = 10, "miningnanites" = 2, "omnizine" = 5)
-
-/obj/item/reagent_containers/hypospray/medipen/species_mutator
- name = "species mutator medipen"
- desc = "Embark on a whirlwind tour of racial insensitivity by \
- literally appropriating other races."
- volume = 1
- amount_per_transfer_from_this = 1
- list_reagents = list("unstablemutationtoxin" = 1)
+/obj/item/reagent_containers/hypospray
+ name = "hypospray"
+ desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
+ icon = 'icons/obj/syringe.dmi'
+ item_state = "hypo"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ icon_state = "hypo"
+ amount_per_transfer_from_this = 5
+ volume = 30
+ possible_transfer_amounts = list()
+ resistance_flags = ACID_PROOF
+ container_type = OPENCONTAINER_1
+ slot_flags = SLOT_BELT
+ var/ignore_flags = 0
+ var/infinite = FALSE
+
+/obj/item/reagent_containers/hypospray/attack_paw(mob/user)
+ return attack_hand(user)
+
+/obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user)
+ if(!reagents.total_volume)
+ to_chat(user, "[src] is empty! ")
+ return
+ if(!iscarbon(M))
+ return
+
+ //Always log attemped injects for admins
+ var/list/injected = list()
+ for(var/datum/reagent/R in reagents.reagent_list)
+ injected += R.name
+ var/contained = english_list(injected)
+ add_logs(user, M, "attempted to inject", src, "([contained])")
+
+ if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) // Ignore flag should be checked first or there will be an error message.
+ to_chat(M, "You feel a tiny prick! ")
+ to_chat(user, "You inject [M] with [src]. ")
+
+ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
+ reagents.reaction(M, INJECT, fraction)
+ if(M.reagents)
+ var/trans = 0
+ if(!infinite)
+ trans = reagents.trans_to(M, amount_per_transfer_from_this)
+ else
+ trans = reagents.copy_to(M, amount_per_transfer_from_this)
+
+ to_chat(user, "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src]. ")
+
+
+ add_logs(user, M, "injected", src, "([contained])")
+
+/obj/item/reagent_containers/hypospray/CMO
+ list_reagents = list("omnizine" = 30)
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+
+/obj/item/reagent_containers/hypospray/combat
+ name = "combat stimulant injector"
+ desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
+ amount_per_transfer_from_this = 10
+ icon_state = "combat_hypo"
+ volume = 90
+ ignore_flags = 1 // So they can heal their comrades.
+ list_reagents = list("epinephrine" = 30, "omnizine" = 30, "leporazine" = 15, "atropine" = 15)
+
+/obj/item/reagent_containers/hypospray/combat/nanites
+ desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with expensive medical nanites for rapid healing."
+ volume = 100
+ list_reagents = list("nanites" = 80, "synaptizine" = 20)
+
+/obj/item/reagent_containers/hypospray/magillitis
+ name = "experimental autoinjector"
+ desc = "A modified air-needle autoinjector with a small single-use reservoir. It contains an experimental serum."
+ icon_state = "combat_hypo"
+ volume = 5
+ container_type = NONE
+ list_reagents = list("magillitis" = 5)
+
+//MediPens
+
+/obj/item/reagent_containers/hypospray/medipen
+ name = "epinephrine medipen"
+ desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
+ icon_state = "medipen"
+ item_state = "medipen"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ amount_per_transfer_from_this = 10
+ volume = 10
+ ignore_flags = 1 //so you can medipen through hardsuits
+ container_type = DRAWABLE_1
+ flags_1 = null
+ list_reagents = list("epinephrine" = 10)
+
+/obj/item/reagent_containers/hypospray/medipen/attack(mob/M, mob/user)
+ if(!reagents.total_volume)
+ to_chat(user, "[src] is empty! ")
+ return
+ ..()
+ if(!iscyborg(user))
+ reagents.maximum_volume = 0 //Makes them useless afterwards
+ container_type = NONE
+ update_icon()
+ spawn(80)
+ if(iscyborg(user) && !reagents.total_volume)
+ var/mob/living/silicon/robot/R = user
+ if(R.cell.use(100))
+ reagents.add_reagent_list(list_reagents)
+ update_icon()
+ return
+
+/obj/item/reagent_containers/hypospray/medipen/update_icon()
+ if(reagents.total_volume > 0)
+ icon_state = initial(icon_state)
+ else
+ icon_state = "[initial(icon_state)]0"
+
+/obj/item/reagent_containers/hypospray/medipen/examine()
+ ..()
+ if(reagents && reagents.reagent_list.len)
+ to_chat(usr, "It is currently loaded. ")
+ else
+ to_chat(usr, "It is spent. ")
+
+/obj/item/reagent_containers/hypospray/medipen/stimpack //goliath kiting
+ name = "stimpack medipen"
+ desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor."
+ icon_state = "stimpen"
+ volume = 20
+ amount_per_transfer_from_this = 20
+ list_reagents = list("ephedrine" = 10, "coffee" = 10)
+
+/obj/item/reagent_containers/hypospray/medipen/stimpack/traitor
+ desc = "A modified stimulants autoinjector for use in combat situations. Has a mild healing effect."
+ list_reagents = list("stimulants" = 10, "omnizine" = 10)
+
+/obj/item/reagent_containers/hypospray/medipen/morphine
+ name = "morphine medipen"
+ desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though."
+ list_reagents = list("morphine" = 10)
+
+/obj/item/reagent_containers/hypospray/medipen/tuberculosiscure
+ name = "BVAK autoinjector"
+ desc = "Bio Virus Antidote Kit autoinjector. Has a two use system for yourself, and someone else. Inject when infected."
+ icon_state = "stimpen"
+ volume = 60
+ amount_per_transfer_from_this = 30
+ list_reagents = list("atropine" = 10, "epinephrine" = 10, "salbutamol" = 20, "spaceacillin" = 20)
+
+/obj/item/reagent_containers/hypospray/medipen/survival
+ name = "survival medipen"
+ desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. WARNING: Do not inject more than one pen in quick succession."
+ icon_state = "stimpen"
+ volume = 57
+ amount_per_transfer_from_this = 57
+ list_reagents = list("salbutamol" = 10, "leporazine" = 15, "tricordrazine" = 15, "epinephrine" = 10, "miningnanites" = 2, "omnizine" = 5)
+
+/obj/item/reagent_containers/hypospray/medipen/species_mutator
+ name = "species mutator medipen"
+ desc = "Embark on a whirlwind tour of racial insensitivity by \
+ literally appropriating other races."
+ volume = 1
+ amount_per_transfer_from_this = 1
+ list_reagents = list("unstablemutationtoxin" = 1)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 324a7d7066..daf955d0ef 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -110,6 +110,13 @@
update_icon()
if(SYRINGE_INJECT)
+ //Always log attemped injections for admins
+ var/list/rinject = list()
+ for(var/datum/reagent/R in reagents.reagent_list)
+ rinject += R.name
+ var/contained = english_list(rinject)
+ add_logs(user, L, "attemped to inject", src, addition="which had [contained]")
+
if(!reagents.total_volume)
to_chat(user, "[src] is empty. ")
return
@@ -137,11 +144,6 @@
L.visible_message("[user] injects [L] with the syringe!", \
"[user] injects [L] with the syringe! ")
- var/list/rinject = list()
- for(var/datum/reagent/R in reagents.reagent_list)
- rinject += R.name
- var/contained = english_list(rinject)
-
if(L != user)
add_logs(user, L, "injected", src, addition="which had [contained]")
else
diff --git a/code/modules/server_tools/st_commands.dm b/code/modules/server_tools/st_commands.dm
new file mode 100644
index 0000000000..9ec87a595c
--- /dev/null
+++ b/code/modules/server_tools/st_commands.dm
@@ -0,0 +1,76 @@
+/datum/server_tools_command
+ var/name = "" //the string to trigger this command on a chat bot. e.g. TGS3_BOT: do_this_command
+ var/help_text = "" //help text for this command
+ var/required_parameters = 0 //number of parameters required for this command
+ var/admin_only = FALSE //set to TRUE if this command should only be usable by registered chat admins
+
+//override to implement command
+//sender is the display name of who sent the command
+//params is the trimmed string following the command name
+/datum/server_tools_command/proc/Run(sender, params)
+ CRASH("[type] has no implementation for Run()")
+
+/world/proc/ListServiceCustomCommands(warnings_only)
+ if(!warnings_only)
+ . = list()
+ var/list/command_name_types = list()
+ var/list/warned_command_names = warnings_only ? list() : null
+ for(var/I in typesof(/datum/server_tools_command) - /datum/server_tools_command)
+ var/datum/server_tools_command/stc = I
+ var/command_name = initial(stc.name)
+ var/static/list/warned_server_tools_names = list()
+ if(!command_name || findtext(command_name, " ") || findtext(command_name, "'") || findtext(command_name, "\""))
+ if(warnings_only && !warned_command_names[command_name])
+ SERVER_TOOLS_LOG("WARNING: Custom command [command_name] can't be used as it is empty or contains illegal characters!")
+ warned_command_names[command_name] = TRUE
+ continue
+
+ if(command_name_types[command_name])
+ if(warnings_only)
+ SERVER_TOOLS_LOG("WARNING: Custom commands [command_name_types[command_name]] and [stc] have the same name, only [command_name_types[command_name]] will be available!")
+ continue
+ command_name_types[stc] = command_name
+
+ if(!warnings_only)
+ .[command_name] = list(SERVICE_JSON_PARAM_HELPTEXT = initial(stc.help_text), SERVICE_JSON_PARAM_ADMINONLY = initial(stc.admin_only), SERVICE_JSON_PARAM_REQUIREDPARAMETERS = initial(stc.required_parameters))
+
+/world/proc/HandleServiceCustomCommand(command, sender, params)
+ var/static/list/cached_custom_server_tools_commands
+ if(!cached_custom_server_tools_commands)
+ cached_custom_server_tools_commands = list()
+ for(var/I in typesof(/datum/server_tools_command) - /datum/server_tools_command)
+ var/datum/server_tools_command/stc = I
+ cached_custom_server_tools_commands[lowertext(initial(stc.name))] = stc
+
+ var/command_type = cached_custom_server_tools_commands[command]
+ if(!command_type)
+ return FALSE
+ var/datum/server_tools_command/stc = new command_type
+ return stc.Run(sender, params) || TRUE
+
+/*
+The MIT License
+
+Copyright (c) 2011 Dominic Tarr
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
diff --git a/code/modules/server_tools/st_interface.dm b/code/modules/server_tools/st_interface.dm
new file mode 100644
index 0000000000..12fb5a85c2
--- /dev/null
+++ b/code/modules/server_tools/st_interface.dm
@@ -0,0 +1,125 @@
+SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(reboot_mode, REBOOT_MODE_NORMAL)
+SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE)
+
+/proc/GetTestMerges()
+ if(RunningService() && fexists(SERVICE_PR_TEST_JSON))
+ . = json_decode(file2text(SERVICE_PR_TEST_JSON))
+ if(.)
+ return
+ return list()
+
+/world/proc/ServiceInit()
+ if(!RunningService(TRUE))
+ return
+ ListServiceCustomCommands(TRUE)
+ ExportService("[SERVICE_REQUEST_API_VERSION] [SERVER_TOOLS_API_VERSION]", TRUE)
+
+/proc/RunningService(skip_compat_check = FALSE)
+ return (skip_compat_check || SERVER_TOOLS_READ_GLOBAL(server_tools_api_compatible)) && world.params[SERVICE_WORLD_PARAM] != null
+
+/proc/ServiceVersion()
+ if(RunningService(TRUE))
+ return world.params[SERVICE_VERSION_PARAM]
+
+/proc/ServiceAPIVersion()
+ return SERVICE_API_VERSION_STRING
+
+/world/proc/ExportService(command, skip_compat_check = FALSE)
+ . = FALSE
+ if(!RunningService(skip_compat_check))
+ return
+ if(skip_compat_check && !fexists(SERVICE_INTERFACE_DLL))
+ CRASH("Service parameter present but no interface DLL detected. This is symptomatic of running a service less than version 3.1! Please upgrade.")
+ call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(command) //trust no retval
+ return TRUE
+
+/world/proc/ChatBroadcast(message)
+ ExportService("[SERVICE_REQUEST_IRC_BROADCAST] [message]")
+
+/world/proc/AdminBroadcast(message)
+ ExportService("[SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE] [message]")
+
+/world/proc/ServiceEndProcess()
+ SERVER_TOOLS_LOG("Sending shutdown request!");
+ sleep(world.tick_lag) //flush the buffers
+ ExportService(SERVICE_REQUEST_KILL_PROCESS)
+
+//called at the exact moment the world is supposed to reboot
+/world/proc/ServiceReboot()
+ switch(SERVER_TOOLS_READ_GLOBAL(reboot_mode))
+ if(REBOOT_MODE_HARD)
+ SERVER_TOOLS_WORLD_ANNOUNCE("Hard reboot triggered, you will automatically reconnect...")
+ ServiceEndProcess()
+ if(REBOOT_MODE_SHUTDOWN)
+ SERVER_TOOLS_WORLD_ANNOUNCE("The server is shutting down...")
+ ServiceEndProcess()
+ else
+ ExportService(SERVICE_REQUEST_WORLD_REBOOT) //just let em know
+
+/world/proc/ServiceCommand(list/params)
+ var/their_sCK = params[SERVICE_CMD_PARAM_KEY]
+ if(!their_sCK || !RunningService(TRUE))
+ return FALSE //continue world/Topic
+
+ var/sCK = world.params[SERVICE_WORLD_PARAM]
+ if(their_sCK != sCK)
+ return "Invalid comms key!";
+
+ var/command = params[SERVICE_CMD_PARAM_COMMAND]
+ if(!command)
+ return "No command!"
+
+ switch(command)
+ if(SERVICE_CMD_API_COMPATIBLE)
+ SERVER_TOOLS_WRITE_GLOBAL(server_tools_api_compatible, TRUE)
+ return "SUCCESS"
+ if(SERVICE_CMD_HARD_REBOOT)
+ if(SERVER_TOOLS_READ_GLOBAL(reboot_mode) != REBOOT_MODE_HARD)
+ SERVER_TOOLS_WRITE_GLOBAL(reboot_mode, REBOOT_MODE_HARD)
+ SERVER_TOOLS_LOG("Hard reboot requested by service")
+ SERVER_TOOLS_NOTIFY_ADMINS("The world will hard reboot at the end of the game. Requested by service.")
+ if(SERVICE_CMD_GRACEFUL_SHUTDOWN)
+ if(SERVER_TOOLS_READ_GLOBAL(reboot_mode) != REBOOT_MODE_SHUTDOWN)
+ SERVER_TOOLS_WRITE_GLOBAL(reboot_mode, REBOOT_MODE_SHUTDOWN)
+ SERVER_TOOLS_LOG("Shutdown requested by service")
+ message_admins("The world will shutdown at the end of the game. Requested by service.")
+ if(SERVICE_CMD_WORLD_ANNOUNCE)
+ var/msg = params["message"]
+ if(!istext(msg) || !msg)
+ return "No message set!"
+ SERVER_TOOLS_WORLD_ANNOUNCE(msg)
+ return "SUCCESS"
+ if(SERVICE_CMD_LIST_CUSTOM)
+ return json_encode(ListServiceCustomCommands(FALSE))
+ else
+ var/custom_command_result = HandleServiceCustomCommand(lowertext(command), params[SERVICE_CMD_PARAM_SENDER], params[SERVICE_CMD_PARAM_CUSTOM])
+ if(custom_command_result)
+ return istext(custom_command_result) ? custom_command_result : "SUCCESS"
+ return "Unknown command: [command]"
+
+/*
+The MIT License
+
+Copyright (c) 2011 Dominic Tarr
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
diff --git a/html/changelogs/AutoChangeLog-pr-2972.yml b/html/changelogs/AutoChangeLog-pr-2972.yml
new file mode 100644
index 0000000000..9f1e5aa596
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2972.yml
@@ -0,0 +1,5 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - rscadd: "Ian has recently communed with unspeakable horrors and may now be warped by their power if Nar-Sie passes near them."
+ - rscadd: "In order to fight back against their ancient foe Ian, Poly has struck a bargain with Ratvar and will be transformed into a machine by their presence."
diff --git a/html/changelogs/AutoChangeLog-pr-2985.yml b/html/changelogs/AutoChangeLog-pr-2985.yml
new file mode 100644
index 0000000000..1a5d0fb559
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2985.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "The syndicate have recently begun sending agents to extract vital research information from Nanotrasen."
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 038514d22a..b860bd8426 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index e852426e62..647781e2b1 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ
diff --git a/icons/obj/smooth_structures/catwalk_clockwork.dmi b/icons/obj/smooth_structures/catwalk_clockwork.dmi
index 483fceee9a..ecef1df389 100644
Binary files a/icons/obj/smooth_structures/catwalk_clockwork.dmi and b/icons/obj/smooth_structures/catwalk_clockwork.dmi differ
diff --git a/icons/obj/smooth_structures/catwalk_clockwork_large.dmi b/icons/obj/smooth_structures/catwalk_clockwork_large.dmi
new file mode 100644
index 0000000000..675ebd91f6
Binary files /dev/null and b/icons/obj/smooth_structures/catwalk_clockwork_large.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 8f3e2e591a..ac04a28f0f 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -28,8 +28,8 @@
#include "code\__DEFINES\atmospherics.dm"
#include "code\__DEFINES\atom_hud.dm"
#include "code\__DEFINES\callbacks.dm"
-#include "code\__DEFINES\citadel_defines.dm"
#include "code\__DEFINES\cinematics.dm"
+#include "code\__DEFINES\citadel_defines.dm"
#include "code\__DEFINES\clockcult.dm"
#include "code\__DEFINES\combat.dm"
#include "code\__DEFINES\components.dm"
@@ -189,21 +189,19 @@
#include "code\citadel\organs\womb.dm"
#include "code\citadel\toys\dildos.dm"
#include "code\controllers\admin.dm"
-#include "code\controllers\configuration.dm"
#include "code\controllers\configuration_citadel.dm"
-#include "code\controllers\configuration\entries\comms.dm"
-#include "code\controllers\configuration\entries\config.dm"
-#include "code\controllers\configuration\entries\dbconfig.dm"
-#include "code\controllers\configuration\entries\game_options.dm"
-#include "code\controllers\configuration\config_entry.dm"
-#include "code\controllers\configuration\configuration.dm"
-#include "code\controllers\admin.dm"
#include "code\controllers\controller.dm"
#include "code\controllers\failsafe.dm"
#include "code\controllers\globals.dm"
#include "code\controllers\hooks.dm"
#include "code\controllers\master.dm"
#include "code\controllers\subsystem.dm"
+#include "code\controllers\configuration\config_entry.dm"
+#include "code\controllers\configuration\configuration.dm"
+#include "code\controllers\configuration\entries\comms.dm"
+#include "code\controllers\configuration\entries\config.dm"
+#include "code\controllers\configuration\entries\dbconfig.dm"
+#include "code\controllers\configuration\entries\game_options.dm"
#include "code\controllers\subsystem\acid.dm"
#include "code\controllers\subsystem\air.dm"
#include "code\controllers\subsystem\assets.dm"
@@ -1040,6 +1038,7 @@
#include "code\game\turfs\simulated\floor.dm"
#include "code\game\turfs\simulated\lava.dm"
#include "code\game\turfs\simulated\minerals.dm"
+#include "code\game\turfs\simulated\reebe_void.dm"
#include "code\game\turfs\simulated\river.dm"
#include "code\game\turfs\simulated\walls.dm"
#include "code\game\turfs\simulated\water.dm"
@@ -1064,6 +1063,7 @@
#include "code\modules\admin\admin_verbs.dm"
#include "code\modules\admin\adminmenu.dm"
#include "code\modules\admin\banjob.dm"
+#include "code\modules\admin\chat_commands.dm"
#include "code\modules\admin\create_mob.dm"
#include "code\modules\admin\create_object.dm"
#include "code\modules\admin\create_poll.dm"
@@ -2140,7 +2140,8 @@
#include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
#include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_levels.dm"
-#include "code\modules\server_tools\server_tools.dm"
+#include "code\modules\server_tools\st_interface.dm"
+#include "code\modules\server_tools\st_commands.dm"
#include "code\modules\shuttle\arrivals.dm"
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\computer.dm"
@@ -2290,9 +2291,9 @@
#include "code\modules\VR\vr_sleeper.dm"
#include "code\modules\zombie\items.dm"
#include "code\modules\zombie\organs.dm"
-#include "modular_citadel\cit_screenshake.dm"
#include "interface\interface.dm"
#include "interface\menu.dm"
#include "interface\stylesheet.dm"
#include "interface\skin.dmf"
+#include "modular_citadel\cit_screenshake.dm"
// END_INCLUDE