Please check database version for recent upstream changes!") diff --git a/code/controllers/master.dm b/code/controllers/master.dm index f64e566e097..fea79c2f7a5 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -62,10 +62,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/static/current_ticklimit = TICK_LIMIT_RUNNING /datum/controller/master/New() - //temporary file used to record errors with loading config, moved to log directory once logging is set up - GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log" - load_configuration() - // Highlander-style: there can only be one! Kill off the old and replace it with the new. if(!random_seed) random_seed = rand(1, 1e9) @@ -73,6 +69,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/list/_subsystems = list() subsystems = _subsystems + // Highlander-style: there can only be one! Kill off the old and replace it with the new. if(Master != src) if(istype(Master)) Recover() @@ -146,7 +143,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new msg = "The [BadBoy.name] subsystem was the last to fire for 2 controller restarts. It will be recovered now and disabled if it happens again." FireHim = TRUE if(3) - msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined." + msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined. The following implications are now in effect: [BadBoy.offline_implications]" BadBoy.flags |= SS_NO_FIRE if(msg) to_chat(GLOB.admins, "[msg]") diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index b8996f2cf89..68ee4bfeace 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -1,7 +1,7 @@ /datum/controller/subsystem // Metadata; you should define these. - name = "fire coderbus" //name of the subsystem + name = "fire codertrain" //name of the subsystem var/init_order = INIT_ORDER_DEFAULT //order of initialization. Higher numbers are initialized first, lower numbers later. Use defines in __DEFINES/subsystems.dm for easy understanding of order. var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. var/priority = FIRE_PRIORITY_DEFAULT //When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep @@ -35,6 +35,8 @@ var/static/list/failure_strikes //How many times we suspect a subsystem type has crashed the MC, 3 strikes and you're out! + var/offline_implications = "None" // What are the implications of this SS being offlined? + //Do not override ///datum/controller/subsystem/New() @@ -179,7 +181,7 @@ var/title = name if(can_fire) - title = "\[[state_letter()]][title]" + title = "[state_colour()]\[[state_letter()]][title]" stat(title, statclick.update(msg)) @@ -196,6 +198,18 @@ if(SS_IDLE) . = " " +/datum/controller/subsystem/proc/state_colour() + switch(state) + if(SS_RUNNING) // If its actively processing, colour it green + . = "" + if(SS_QUEUED) // If its in the running queue, but delayed, colour it orange + . = "" + if(SS_PAUSED, SS_PAUSING) // If its being paused due to lag, colour it red + . = "" + if(SS_SLEEPING) // If fire() slept, colour it blue + . = "" + if(SS_IDLE) // Leave it default if the SS is idle + . = "" //could be used to postpone a costly subsystem for (default one) var/cycles, cycles //for instance, during cpu intensive operations like explosions /datum/controller/subsystem/proc/postpone(cycles = 1) diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm index 40063b00a87..119d82113d7 100644 --- a/code/controllers/subsystem/acid.dm +++ b/code/controllers/subsystem/acid.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(acid) priority = FIRE_PRIORITY_ACID flags = SS_NO_INIT|SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Objects will no longer react to acid. No immediate action is needed." var/list/currentrun = list() var/list/processing = list() diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm index 6ab1d67a816..037b9a2bd0a 100644 --- a/code/controllers/subsystem/afk.dm +++ b/code/controllers/subsystem/afk.dm @@ -1,63 +1,76 @@ -#define AFK_WARNED 1 -#define AFK_CRYOD 2 +#define AFK_WARNED 1 +#define AFK_CRYOD 2 +#define AFK_ADMINS_WARNED 3 SUBSYSTEM_DEF(afk) name = "AFK Watcher" wait = 300 flags = SS_BACKGROUND + offline_implications = "Players will no longer be marked as AFK. No immediate action is needed." var/list/afk_players = list() // Associative list. ckey as key and AFK state as value + var/list/non_cryo_antags /datum/controller/subsystem/afk/Initialize() - if(config.warn_afk_minimum <= 0 || config.auto_cryo_afk <= 0 || config.auto_despawn_afk <= 0) - flags |= SS_NO_FIRE + if(config.warn_afk_minimum <= 0 || config.auto_cryo_afk <= 0 || config.auto_despawn_afk <= 0) + flags |= SS_NO_FIRE + else + non_cryo_antags = list(SPECIAL_ROLE_ABDUCTOR_AGENT, SPECIAL_ROLE_ABDUCTOR_SCIENTIST, \ + SPECIAL_ROLE_SHADOWLING, SPECIAL_ROLE_WIZARD, SPECIAL_ROLE_WIZARD_APPRENTICE, SPECIAL_ROLE_NUKEOPS) + return ..() /datum/controller/subsystem/afk/fire() var/list/toRemove = list() - for(var/mob/living/carbon/human/H in GLOB.living_mob_list) - if(!H.ckey) // Useless non ckey creatures + for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) + if(!H?.ckey) // Useless non ckey creatures continue - - var/turf/T + + var/turf/T // Only players and players with the AFK watch enabled - // No dead, unconcious, restrained, people without jobs, people on other Z levels than the station or antags + // No dead, unconcious, restrained, people without jobs or people on other Z levels than the station if(!H.client || !H.client.prefs.afk_watch || !H.mind || \ - H.stat || H.restrained() || !H.job || H.mind.special_role || \ - !is_station_level((T = get_turf(H)).z)) // Assign the turf as last. Small optimization - if(afk_players[H.ckey]) + H.stat || H.restrained() || !H.job || !is_station_level((T = get_turf(H)).z)) // Assign the turf as last. Small optimization + if(afk_players[H.ckey]) toRemove += H.ckey continue - + var/mins_afk = round(H.client.inactivity / 600) if(mins_afk < config.warn_afk_minimum) if(afk_players[H.ckey]) toRemove += H.ckey continue - + if(!afk_players[H.ckey]) afk_players[H.ckey] = AFK_WARNED warn(H, "You are AFK for [mins_afk] minutes. You will be cryod after [config.auto_cryo_afk] total minutes and fully despawned after [config.auto_despawn_afk] total minutes. Please move or click in game if you want to avoid being despawned.") - else + else var/area/A = T.loc // Turfs loc is the area if(afk_players[H.ckey] == AFK_WARNED) if(mins_afk >= config.auto_cryo_afk && A.can_get_auto_cryod) if(A.fast_despawn) toRemove += H.ckey warn(H, "You are have been despawned after being AFK for [mins_afk] minutes. You have been despawned instantly due to you being in a secure area.") - msg_admins(H, mins_afk, T, "forcefully despawned", "AFK in a fast despawn area") + log_afk_action(H, mins_afk, T, "despawned", "AFK in a fast despawn area") force_cryo_human(H) - else if(cryo_ssd(H)) - afk_players[H.ckey] = AFK_CRYOD - msg_admins(H, mins_afk, T, "put into cryostorage") - warn(H, "You are AFK for [mins_afk] minutes and have been moved to cryostorage. After being AFK for [config.auto_despawn_afk] total minutes you will be fully despawned. Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.") - - else if(mins_afk >= config.auto_despawn_afk) - var/obj/machinery/cryopod/P = H.loc - msg_admins(H, mins_afk, T, "forcefully despawned") + else + if(!(H.mind.special_role in non_cryo_antags)) + if(cryo_ssd(H)) + H.create_log(MISC_LOG, "Put into cryostorage by the AFK subsystem") + afk_players[H.ckey] = AFK_CRYOD + log_afk_action(H, mins_afk, T, "put into cryostorage") + warn(H, "You are AFK for [mins_afk] minutes and have been moved to cryostorage. \ + After being AFK for another [config.auto_despawn_afk] minutes you will be fully despawned. \ + Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.") + else + message_admins("[key_name_admin(H)] at ([get_area(T).name] [ADMIN_JMP(T)]) is AFK for [mins_afk] and can't be automatically cryod due to it's antag status: ([H.mind.special_role]).") + afk_players[H.ckey] = AFK_ADMINS_WARNED + + else if(afk_players[H.ckey] != AFK_ADMINS_WARNED && mins_afk >= config.auto_despawn_afk) + log_afk_action(H, mins_afk, T, "despawned") warn(H, "You are have been despawned after being AFK for [mins_afk] minutes.") toRemove += H.ckey - P.despawn_occupant() - + force_cryo_human(H) + removeFromWatchList(toRemove) /datum/controller/subsystem/afk/proc/warn(mob/living/carbon/human/H, text) @@ -66,9 +79,8 @@ SUBSYSTEM_DEF(afk) if(H.client) window_flash(H.client) -/datum/controller/subsystem/afk/proc/msg_admins(mob/living/carbon/human/H, mins_afk, turf/location, action, info) +/datum/controller/subsystem/afk/proc/log_afk_action(mob/living/carbon/human/H, mins_afk, turf/location, action, info) log_admin("[key_name(H)] has been [action] by the AFK Watcher subsystem after being AFK for [mins_afk] minutes.[info ? " Extra info:" + info : ""]") - message_admins("[key_name_admin(H)] at ([get_area(location).name] [ADMIN_JMP(location)]) has been [action] by the AFK Watcher subsystem after being AFK for [mins_afk] minutes.[info ? " Extra info:" + info : ""]") /datum/controller/subsystem/afk/proc/removeFromWatchList(list/toRemove) for(var/C in toRemove) @@ -79,3 +91,4 @@ SUBSYSTEM_DEF(afk) #undef AFK_WARNED #undef AFK_CRYOD +#undef AFK_ADMINS_WARNED diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 04141f6c3ab..80ce66d13ec 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -14,6 +14,7 @@ SUBSYSTEM_DEF(air) wait = 5 flags = SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Turfs will no longer process atmos, and all atmospheric machines (including cryotubes) will no longer function. Shuttle call recommended." var/cost_turfs = 0 var/cost_groups = 0 var/cost_highpressure = 0 @@ -275,7 +276,7 @@ SUBSYSTEM_DEF(air) if(blockchanges && T.excited_group) T.excited_group.garbage_collect() else - for(var/direction in cardinal) + for(var/direction in GLOB.cardinal) if(!(T.atmos_adjacent_turfs & direction)) continue var/turf/simulated/S = get_step(T, direction) @@ -360,21 +361,21 @@ SUBSYSTEM_DEF(air) return count /datum/controller/subsystem/air/proc/setup_overlays() - plmaster = new /obj/effect/overlay() - plmaster.icon = 'icons/effects/tile_effects.dmi' - plmaster.icon_state = "plasma" - plmaster.mouse_opacity = MOUSE_OPACITY_TRANSPARENT - plmaster.anchored = TRUE // should only appear in vis_contents, but to be safe - plmaster.layer = FLY_LAYER - plmaster.appearance_flags = TILE_BOUND + GLOB.plmaster = new /obj/effect/overlay() + GLOB.plmaster.icon = 'icons/effects/tile_effects.dmi' + GLOB.plmaster.icon_state = "plasma" + GLOB.plmaster.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + GLOB.plmaster.anchored = TRUE // should only appear in vis_contents, but to be safe + GLOB.plmaster.layer = FLY_LAYER + GLOB.plmaster.appearance_flags = TILE_BOUND - slmaster = new /obj/effect/overlay() - slmaster.icon = 'icons/effects/tile_effects.dmi' - slmaster.icon_state = "sleeping_agent" - slmaster.mouse_opacity = MOUSE_OPACITY_TRANSPARENT - slmaster.anchored = TRUE // should only appear in vis_contents, but to be safe - slmaster.layer = FLY_LAYER - slmaster.appearance_flags = TILE_BOUND + GLOB.slmaster = new /obj/effect/overlay() + GLOB.slmaster.icon = 'icons/effects/tile_effects.dmi' + GLOB.slmaster.icon_state = "sleeping_agent" + GLOB.slmaster.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + GLOB.slmaster.anchored = TRUE // should only appear in vis_contents, but to be safe + GLOB.slmaster.layer = FLY_LAYER + GLOB.slmaster.appearance_flags = TILE_BOUND #undef SSAIR_PIPENETS #undef SSAIR_ATMOSMACHINERY diff --git a/code/controllers/subsystem/alarm.dm b/code/controllers/subsystem/alarm.dm index bac32a449de..289adf6de40 100644 --- a/code/controllers/subsystem/alarm.dm +++ b/code/controllers/subsystem/alarm.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(alarms) name = "Alarms" init_order = INIT_ORDER_ALARMS // 2 + offline_implications = "Alarms (Power, camera, fire, etc) will no longer be checked. No immediate action is needed." var/datum/alarm_handler/atmosphere/atmosphere_alarm = new() var/datum/alarm_handler/burglar/burglar_alarm = new() var/datum/alarm_handler/camera/camera_alarm = new() diff --git a/code/controllers/subsystem/changelog.dm b/code/controllers/subsystem/changelog.dm new file mode 100644 index 00000000000..98188599abd --- /dev/null +++ b/code/controllers/subsystem/changelog.dm @@ -0,0 +1,263 @@ +/* + Subsystem core for ParadiseSS13 changelogs + Author: AffectedArc07 + + Basically this SS extracts changelogs from the past 30 days from the database, and cleanly formats them into HTML that the players can see + It only runs the extraction on initialize to ensure that the changelog doesnt change mid round, and to reduce the amount of DB calls that need to be done + The changelog entries are generated from the PHP scripts in tools/githubChangelogProcessor.php + + This SS also handles the checking of player CL dates and informing them if it has changed + +*/ + +SUBSYSTEM_DEF(changelog) + name = "Changelog" + flags = SS_NO_FIRE + var/current_cl_timestamp = "0" // Timestamp is seconds since UNIX epoch (1st January 1970). ITs also a string because BYOND doesnt like big numbers. + var/ss_ready = FALSE // Is the SS ready? We dont want to run procs if we have not generated yet + var/list/startup_clients_button = list() // Clients who connected before initialization who need their button color updating + var/list/startup_clients_open = list() // Clients who connected before initialization who need the CL opening + var/changelogHTML = "" // HTML that the changelog will use to display + +/datum/controller/subsystem/changelog/Initialize() + // This entire subsystem relies on SQL being here. + if(!GLOB.dbcon.IsConnected()) + return ..() + + var/DBQuery/latest_cl_date = GLOB.dbcon.NewQuery("SELECT UNIX_TIMESTAMP(date_merged) AS ut FROM [format_table_name("changelog")] ORDER BY date_merged DESC LIMIT 1") + if(!latest_cl_date.Execute()) + var/err = latest_cl_date.ErrorMsg() + log_game("SQL ERROR during SSchangelog initialization L24. Error: \[[err]\]\n") + message_admins("SQL ERROR during SSchangelog initialization L24. Error: \[[err]\]\n") + // Abort if we cant do this + return ..() + + while(latest_cl_date.NextRow()) + current_cl_timestamp = latest_cl_date.item[1] + + if(!GenerateChangelogHTML()) // if this failed to generate + to_chat(world, "WARNING: Changelog failed to generate. Please inform a coder/server dev") + return ..() + + ss_ready = TRUE + // Now we can alert anyone who wanted to check the changelog + for(var/x in startup_clients_button) + var/client/C = x + UpdatePlayerChangelogButton(C) + + // Now we can alert anyone who wanted to check the changelog + for(var/client/C in startup_clients_open) + OpenChangelog(C) + + return ..() + + +/datum/controller/subsystem/changelog/proc/UpdatePlayerChangelogDate(client/C) + if(!ss_ready) + return // Only return here, we dont have to worry about a queue list because this will be called from ShowChangelog() + // Technically this is only for the date but we can also do the UI button at the same time + var/datum/preferences/P = GLOB.preferences_datums[C.ckey] + if(P.toggles & UI_DARKMODE) + winset(C, "rpane.changelog", "background-color=#40628a;font-color=#ffffff;font-style=none") + else + winset(C, "rpane.changelog", "background-color=none;font-style=none") + C.prefs.lastchangelog = current_cl_timestamp + var/DBQuery/updatePlayerCLTime = GLOB.dbcon.NewQuery("UPDATE [format_table_name("player")] SET lastchangelog='[sanitizeSQL(current_cl_timestamp)]' WHERE ckey='[C.ckey]'") + if(!updatePlayerCLTime.Execute()) + var/err = updatePlayerCLTime.ErrorMsg() + log_game("SQL ERROR during lastchangelog updating. Error: \[[err]\]\n") + message_admins("SQL ERROR during lastchangelog updating. Error: \[[err]\]\n") + to_chat(C, "Couldn't update your last seen changelog, please try again later.") + return FALSE + return TRUE + +/datum/controller/subsystem/changelog/proc/UpdatePlayerChangelogButton(client/C) + // If SQL aint even enabled, just set the button to default style + if(!GLOB.dbcon.IsConnected()) + if(C.prefs.toggles & UI_DARKMODE) + winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") + else + winset(C, "rpane.changelog", "background-color=none;text-color=#000000") + return + + // If SQL is enabled but we aint ready, queue them up, and use the default style + if(!ss_ready) + startup_clients_button |= C + if(C.prefs.toggles & UI_DARKMODE) + winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") + else + winset(C, "rpane.changelog", "background-color=none;text-color=#000000") + return + + // Sanity check to ensure clients still exist (If a client DCs mid startup this would runtime) + if(C && C.prefs) + // If we are ready, process the button style + if(C.prefs.lastchangelog != current_cl_timestamp) + winset(C, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold") + to_chat(C, "Changelog has changed since your last visit.") + else + if(C.prefs.toggles & UI_DARKMODE) + winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") + else + winset(C, "rpane.changelog", "background-color=none;text-color=#000000") + + +/datum/controller/subsystem/changelog/proc/OpenChangelog(client/C) + // If SQL isnt enabled, dont even queue them, just tell them it wont work + if(!GLOB.dbcon.IsConnected()) + to_chat(C, "This server is not running with an SQL backend. Changelog is unavailable.") + return + + // If SQL is enabled but we aint ready, queue them up + if(!ss_ready) + startup_clients_open |= C + to_chat(C, "The changelog system is still initializing. The changelog will open for you once it has initialized.") + return + + UpdatePlayerChangelogDate(C) + UpdatePlayerChangelogButton(C) + + var/datum/browser/cl_popup = new(C.mob, "changelog", "Changelog", 700, 800) + cl_popup.set_content(changelogHTML) + cl_popup.open() + +/client/verb/changes() + set name = "Changelog" + set desc = "View the changelog." + set category = "OOC" + // Just invoke the actual CL thing + SSchangelog.OpenChangelog(src) + +// Helper to turn CL types into a fontawesome icon instead of an image +// The colors are #28a745 for green, #fd7e14 for orange, and #dc3545 for red. +// These colours are from bootstrap and look good with black and white +/datum/controller/subsystem/changelog/proc/Text2Icon(text) + switch(text) + if("FIX") + return "" // Fixes are white because while they are good, they have no negative coutnerpart + if("WIP") + return "" // WIP stuff is orange because new code is good but its not done yet + if("TWEAK") + return "" // Tweaks are white because they could be good or bad, and theres no specific add or remove + if("SOUNDADD") + return "" // Sound additions are green because its something new + if("SOUNDDEL") + return "" // Sound removals are red because something has been removed + if("CODEADD") + return "" // Code additions are green because its something new + if("CODEDEL") + return "" // Code removals are red becuase someting has been removed + if("IMAGEADD") + return "" // Image additions are green because something has been added + if("IMAGEDEL") + return "" // Image removals are red because something has been removed + if("SPELLCHECK") + return "" // Spellcheck is white because theres no dedicated negative to it, so theres no red for it to collate with + if("EXPERIMENT") + return "" // Experimental stuff is orange because while its a new feature, its unstable + else // Just incase the DB somehow breaks + return "" // Same here + +// This proc is the star of the show +/datum/controller/subsystem/changelog/proc/GenerateChangelogHTML() + // Modify the code below to modify the header of the changelog + var/changelog_header = {" + +
Paradise Station Changelog
+ +"
+ // If the github URL in the config has a trailing slash, it doesnt matter here, thankfully github accepts having a double slash: https://github.com/org/repo//pull/1
+ pr_block += "
#[pr_number] by [author] (Merged on [merge_date])" + + while(db_entries.NextRow()) + pr_block += "
[Text2Icon(db_entries.item[1])] [db_entries.item[2]]
" + + pr_block += "" + + changelogHTML += pr_block + + // Make sure we return TRUE so we know it worked + return TRUE + + +// Topic handler so that PRs and forums and stuff open in another window +/datum/controller/subsystem/changelog/Topic(href, href_list) + // Handler to open pages in your browser instead of inside the CL window + // Yes usr.client is gross here but src is the subsystem + // Takes the page to open as an argument + if(href_list["openPage"]) + switch(href_list["openPage"]) + if("forum") + usr.client.forum() + if("wiki") + // Wiki needs snowflake because it has no cancel button + if(config.wikiurl) + if(alert("This will open the wiki in your browser. Are you sure?",,"Yes","No")=="No") + return + usr.client.wiki("") // Blank arg is important here + else + to_chat(usr, "The Wiki URL is not set in the server configuration. Please inform the server host.") + + if("github") + usr.client.github() + // Takes a PR number as argument + if(href_list["openPR"]) + if(config.githuburl) + if(alert("This will open PR #[href_list["openPR"]] in your browser. Are you sure?",,"Yes","No")=="No") + return + var/url = "[config.githuburl]/pull/[href_list["openPR"]]" + usr << link(url) + else + to_chat(usr, "The GitHub URL is not set in the server configuration. PRs cannot be opened from changelog view. Please inform the server host.") + diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm index dbe38634e6a..4eb468a0952 100644 --- a/code/controllers/subsystem/chat.dm +++ b/code/controllers/subsystem/chat.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(chat) wait = 1 priority = FIRE_PRIORITY_CHAT init_order = INIT_ORDER_CHAT + offline_implications = "Chat messages will no longer be cleanly queued. No immediate action is needed." var/list/payload = list() diff --git a/code/controllers/subsystem/dcs.dm b/code/controllers/subsystem/dcs.dm new file mode 100644 index 00000000000..09dea24071f --- /dev/null +++ b/code/controllers/subsystem/dcs.dm @@ -0,0 +1,53 @@ +PROCESSING_SUBSYSTEM_DEF(dcs) + name = "Datum Component System" + flags = SS_NO_INIT + + var/list/elements_by_type = list() + +/datum/controller/subsystem/processing/dcs/Recover() + comp_lookup = SSdcs.comp_lookup + +/datum/controller/subsystem/processing/dcs/proc/GetElement(list/arguments) + var/datum/element/eletype = arguments[1] + var/element_id = eletype + + if(!ispath(eletype, /datum/element)) + CRASH("Attempted to instantiate [eletype] as a /datum/element") + + if(initial(eletype.element_flags) & ELEMENT_BESPOKE) + element_id = GetIdFromArguments(arguments) + + . = elements_by_type[element_id] + if(.) + return + . = elements_by_type[element_id] = new eletype + +/**** + * Generates an id for bespoke elements when given the argument list + * Generating the id here is a bit complex because we need to support named arguments + * Named arguments can appear in any order and we need them to appear after ordered arguments + * We assume that no one will pass in a named argument with a value of null + **/ +/datum/controller/subsystem/processing/dcs/proc/GetIdFromArguments(list/arguments) + var/datum/element/eletype = arguments[1] + var/list/fullid = list("[eletype]") + var/list/named_arguments = list() + for(var/i in initial(eletype.id_arg_index) to length(arguments)) + var/key = arguments[i] + var/value + if(istext(key)) + value = arguments[key] + if(!(istext(key) || isnum(key))) + key = "\ref[key]" + key = "[key]" // Key is stringified so numbers dont break things + if(!isnull(value)) + if(!(istext(value) || isnum(value))) + value = "\ref[value]" + named_arguments["[key]"] = value + else + fullid += "[key]" + + if(length(named_arguments)) + named_arguments = sortList(named_arguments) + fullid += named_arguments + return list2params(fullid) diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 0465f47e152..ad77904bac7 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -2,6 +2,7 @@ SUBSYSTEM_DEF(events) name = "Events" init_order = INIT_ORDER_EVENTS runlevels = RUNLEVEL_GAME + offline_implications = "Random events will no longer happen. No immediate action is needed." // Report events at the end of the rouund var/report_at_round_end = 0 @@ -36,7 +37,7 @@ SUBSYSTEM_DEF(events) E.process() for(var/i = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR) - var/list/datum/event_container/EC = event_containers[i] + var/datum/event_container/EC = event_containers[i] EC.process() /datum/controller/subsystem/events/proc/event_complete(var/datum/event/E) @@ -65,7 +66,7 @@ SUBSYSTEM_DEF(events) log_debug("Event '[EM.name]' has completed at [station_time_timestamp()].") /datum/controller/subsystem/events/proc/delay_events(var/severity, var/delay) - var/list/datum/event_container/EC = event_containers[severity] + var/datum/event_container/EC = event_containers[severity] EC.next_event_time += delay /datum/controller/subsystem/events/proc/Interact(var/mob/living/user) @@ -104,7 +105,7 @@ SUBSYSTEM_DEF(events) html += "Back
" html += "Time till start: [round(event_time / 600, 0.1)]
" html += "
"
- html += ""
html += "Name Weight MinWeight MaxWeight OneShot Enabled CurrWeight Remove "
for(var/datum/event_meta/EM in selected_event_container.available_events)
@@ -145,7 +146,7 @@ SUBSYSTEM_DEF(events)
var/datum/event_container/EC = event_containers[severity]
var/next_event_at = max(0, EC.next_event_time - world.time)
html += ""
- html += "[severity_to_string[severity]] "
+ html += "[GLOB.severity_to_string[severity]] "
html += "[station_time_timestamp("hh:mm:ss", max(EC.next_event_time, world.time))] "
html += "[round(next_event_at / 600, 0.1)] "
html += ""
@@ -172,7 +173,7 @@ SUBSYSTEM_DEF(events)
var/datum/event_container/EC = event_containers[severity]
var/datum/event_meta/EM = EC.next_event
html += " "
- html += "[severity_to_string[severity]] "
+ html += "[GLOB.severity_to_string[severity]] "
html += "[EM ? EM.name : "Random"] "
html += "View "
html += "Clear "
@@ -193,7 +194,7 @@ SUBSYSTEM_DEF(events)
var/ends_in = max(0, round((ends_at - world.time) / 600, 0.1))
var/no_end = E.noAutoEnd
html += " "
- html += "[severity_to_string[EM.severity]] "
+ html += "[GLOB.severity_to_string[EM.severity]] "
html += "[EM.name] "
html += "[no_end ? "N/A" : station_time_timestamp("hh:mm:ss", ends_at)] "
html += "[no_end ? "N/A" : ends_in] "
@@ -216,33 +217,33 @@ SUBSYSTEM_DEF(events)
var/datum/event_container/EC = locate(href_list["event"])
var/decrease = (60 * RaiseToPower(10, text2num(href_list["dec_timer"])))
EC.next_event_time -= decrease
- admin_log_and_message_admins("decreased timer for [severity_to_string[EC.severity]] events by [decrease/600] minute(s).")
+ admin_log_and_message_admins("decreased timer for [GLOB.severity_to_string[EC.severity]] events by [decrease/600] minute(s).")
else if(href_list["inc_timer"])
var/datum/event_container/EC = locate(href_list["event"])
var/increase = (60 * RaiseToPower(10, text2num(href_list["inc_timer"])))
EC.next_event_time += increase
- admin_log_and_message_admins("increased timer for [severity_to_string[EC.severity]] events by [increase/600] minute(s).")
+ admin_log_and_message_admins("increased timer for [GLOB.severity_to_string[EC.severity]] events by [increase/600] minute(s).")
else if(href_list["select_event"])
var/datum/event_container/EC = locate(href_list["select_event"])
var/datum/event_meta/EM = EC.SelectEvent()
if(EM)
- admin_log_and_message_admins("has queued the [severity_to_string[EC.severity]] event '[EM.name]'.")
+ admin_log_and_message_admins("has queued the [GLOB.severity_to_string[EC.severity]] event '[EM.name]'.")
else if(href_list["pause"])
var/datum/event_container/EC = locate(href_list["pause"])
EC.delayed = !EC.delayed
- admin_log_and_message_admins("has [EC.delayed ? "paused" : "resumed"] countdown for [severity_to_string[EC.severity]] events.")
+ admin_log_and_message_admins("has [EC.delayed ? "paused" : "resumed"] countdown for [GLOB.severity_to_string[EC.severity]] events.")
else if(href_list["interval"])
var/delay = input("Enter delay modifier. A value less than one means events fire more often, higher than one less often.", "Set Interval Modifier") as num|null
if(delay && delay > 0)
var/datum/event_container/EC = locate(href_list["interval"])
EC.delay_modifier = delay
- admin_log_and_message_admins("has set the interval modifier for [severity_to_string[EC.severity]] events to [EC.delay_modifier].")
+ admin_log_and_message_admins("has set the interval modifier for [GLOB.severity_to_string[EC.severity]] events to [EC.delay_modifier].")
else if(href_list["stop"])
if(alert("Stopping an event may have unintended side-effects. Continue?","Stopping Event!","Yes","No") != "Yes")
return
var/datum/event/E = locate(href_list["stop"])
var/datum/event_meta/EM = E.event_meta
- admin_log_and_message_admins("has stopped the [severity_to_string[EM.severity]] event '[EM.name]'.")
+ admin_log_and_message_admins("has stopped the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
E.kill()
else if(href_list["view_events"])
selected_event_container = locate(href_list["view_events"])
@@ -264,23 +265,23 @@ SUBSYSTEM_DEF(events)
var/datum/event_meta/EM = locate(href_list["set_weight"])
EM.weight = weight
if(EM != new_event)
- admin_log_and_message_admins("has changed the weight of the [severity_to_string[EM.severity]] event '[EM.name]' to [EM.weight].")
+ admin_log_and_message_admins("has changed the weight of the [GLOB.severity_to_string[EM.severity]] event '[EM.name]' to [EM.weight].")
else if(href_list["toggle_oneshot"])
var/datum/event_meta/EM = locate(href_list["toggle_oneshot"])
EM.one_shot = !EM.one_shot
if(EM != new_event)
- admin_log_and_message_admins("has [EM.one_shot ? "set" : "unset"] the oneshot flag for the [severity_to_string[EM.severity]] event '[EM.name]'.")
+ admin_log_and_message_admins("has [EM.one_shot ? "set" : "unset"] the oneshot flag for the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["toggle_enabled"])
var/datum/event_meta/EM = locate(href_list["toggle_enabled"])
EM.enabled = !EM.enabled
- admin_log_and_message_admins("has [EM.enabled ? "enabled" : "disabled"] the [severity_to_string[EM.severity]] event '[EM.name]'.")
+ admin_log_and_message_admins("has [EM.enabled ? "enabled" : "disabled"] the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["remove"])
if(alert("This will remove the event from rotation. Continue?","Removing Event!","Yes","No") != "Yes")
return
var/datum/event_meta/EM = locate(href_list["remove"])
var/datum/event_container/EC = locate(href_list["EC"])
EC.available_events -= EM
- admin_log_and_message_admins("has removed the [severity_to_string[EM.severity]] event '[EM.name]'.")
+ admin_log_and_message_admins("has removed the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["add"])
if(!new_event.name || !new_event.event_type)
return
@@ -288,12 +289,12 @@ SUBSYSTEM_DEF(events)
return
new_event.severity = selected_event_container.severity
selected_event_container.available_events += new_event
- admin_log_and_message_admins("has added \a [severity_to_string[new_event.severity]] event '[new_event.name]' of type [new_event.event_type] with weight [new_event.weight].")
+ admin_log_and_message_admins("has added \a [GLOB.severity_to_string[new_event.severity]] event '[new_event.name]' of type [new_event.event_type] with weight [new_event.weight].")
new_event = new
else if(href_list["clear"])
var/datum/event_container/EC = locate(href_list["clear"])
if(EC.next_event)
- admin_log_and_message_admins("has dequeued the [severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
+ admin_log_and_message_admins("has dequeued the [GLOB.severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
EC.next_event = null
Interact(usr)
diff --git a/code/controllers/subsystem/fires.dm b/code/controllers/subsystem/fires.dm
index aafc5ed48d5..dc419fffeb5 100644
--- a/code/controllers/subsystem/fires.dm
+++ b/code/controllers/subsystem/fires.dm
@@ -3,6 +3,7 @@ SUBSYSTEM_DEF(fires)
priority = FIRE_PRIOTITY_BURNING
flags = SS_NO_INIT|SS_BACKGROUND
runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ offline_implications = "Objects will no longer react to fires. No immediate action is needed."
var/list/currentrun = list()
var/list/processing = list()
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 4bc3965e6cf..cbf17d05fbf 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -5,6 +5,7 @@ SUBSYSTEM_DEF(garbage)
flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
init_order = INIT_ORDER_GARBAGE
+ offline_implications = "Garbage collection is no longer functional, and objects will not be qdel'd. Immediate server restart recommended."
var/list/collection_timeout = list(0, 2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index 531b6af2e78..289505a153c 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -4,6 +4,7 @@ SUBSYSTEM_DEF(icon_smooth)
wait = 1
priority = FIRE_PRIOTITY_SMOOTHING
flags = SS_TICKER
+ offline_implications = "Objects will no longer smooth together properly. No immediate action is needed."
var/list/smooth_queue = list()
diff --git a/code/controllers/subsystem/idlenpcpool.dm b/code/controllers/subsystem/idlenpcpool.dm
index 42df941e10f..d61b90f1239 100644
--- a/code/controllers/subsystem/idlenpcpool.dm
+++ b/code/controllers/subsystem/idlenpcpool.dm
@@ -4,6 +4,7 @@ SUBSYSTEM_DEF(idlenpcpool)
priority = FIRE_PRIORITY_IDLE_NPC
wait = 60
runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ offline_implications = "Idle simple animals will no longer process. Shuttle call recommended."
var/list/currentrun = list()
var/static/list/idle_mobs_by_zlevel[][]
@@ -39,4 +40,4 @@ SUBSYSTEM_DEF(idlenpcpool)
if(SA.stat != DEAD)
SA.consider_wakeup()
if(MC_TICK_CHECK)
- return
+ return
diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index f379deec72b..9dd6fce1554 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -5,6 +5,7 @@ SUBSYSTEM_DEF(input)
flags = SS_TICKER
priority = FIRE_PRIORITY_INPUT
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
+ offline_implications = "Player input will no longer be recognised. Immediate server restart recommended."
var/list/macro_sets
var/list/movement_keys
@@ -24,7 +25,7 @@ SUBSYSTEM_DEF(input)
// This is for when macro sets are eventualy datumized
/datum/controller/subsystem/input/proc/setup_default_macro_sets()
var/list/static/default_macro_sets
-
+
if(default_macro_sets)
macro_sets = default_macro_sets
return
diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
index 29efa85b8a0..ef89317d0f5 100644
--- a/code/controllers/subsystem/jobs.dm
+++ b/code/controllers/subsystem/jobs.dm
@@ -3,6 +3,7 @@ SUBSYSTEM_DEF(jobs)
init_order = INIT_ORDER_JOBS // 12
wait = 3000 // 5 minutes (Deciseconds)
runlevels = RUNLEVEL_GAME
+ offline_implications = "Job playtime hours will no longer be logged. No immediate action is needed."
//List of all jobs
var/list/occupations = list()
@@ -10,7 +11,7 @@ SUBSYSTEM_DEF(jobs)
var/list/type_occupations = list() //Dict of all jobs, keys are types
var/list/prioritized_jobs = list() // List of jobs set to priority by HoP/Captain
var/list/id_change_records = list() // List of all job transfer records
- var/list/id_change_counter = 1
+ var/id_change_counter = 1
//Players who need jobs
var/list/unassigned = list()
//Debug info
@@ -39,8 +40,6 @@ SUBSYSTEM_DEF(jobs)
var/datum/job/job = new J()
if(!job)
continue
- if(!job.faction in faction)
- continue
occupations += job
name_occupations[job.title] = job
type_occupations[J] = job
@@ -49,7 +48,7 @@ SUBSYSTEM_DEF(jobs)
/datum/controller/subsystem/jobs/proc/Debug(var/text)
- if(!Debug2)
+ if(!GLOB.debug2)
return 0
job_debug.Add(text)
return 1
@@ -138,7 +137,7 @@ SUBSYSTEM_DEF(jobs)
if(flag && !(flag in player.client.prefs.be_special))
Debug("FOC flag failed, Player: [player], Flag: [flag], ")
continue
- if(player.mind && job.title in player.mind.restricted_roles)
+ if(player.mind && (job.title in player.mind.restricted_roles))
Debug("FOC incompatbile with antagonist role, Player: [player]")
continue
if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
@@ -155,10 +154,10 @@ SUBSYSTEM_DEF(jobs)
if(istype(job, GetJob("Civilian"))) // We don't want to give him assistant, that's boring!
continue
- if(job.title in command_positions) //If you want a command position, select it!
+ if(job.title in GLOB.command_positions) //If you want a command position, select it!
continue
- if(job.title in whitelisted_positions) // No random whitelisted job, sorry!
+ if(job.title in GLOB.whitelisted_positions) // No random whitelisted job, sorry!
continue
if(job.admin_only) // No admin positions either.
@@ -180,7 +179,7 @@ SUBSYSTEM_DEF(jobs)
Debug("GRJ player has disability rendering them ineligible for job, Player: [player]")
continue
- if(player.mind && job.title in player.mind.restricted_roles)
+ if(player.mind && (job.title in player.mind.restricted_roles))
Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
continue
@@ -203,7 +202,7 @@ SUBSYSTEM_DEF(jobs)
///This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until it locates a head or runs out of levels to check
/datum/controller/subsystem/jobs/proc/FillHeadPosition()
for(var/level = 1 to 3)
- for(var/command_position in command_positions)
+ for(var/command_position in GLOB.command_positions)
var/datum/job/job = GetJob(command_position)
if(!job)
continue
@@ -231,7 +230,7 @@ SUBSYSTEM_DEF(jobs)
///This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level
/datum/controller/subsystem/jobs/proc/CheckHeadPositions(var/level)
- for(var/command_position in command_positions)
+ for(var/command_position in GLOB.command_positions)
var/datum/job/job = GetJob(command_position)
if(!job)
continue
@@ -357,7 +356,7 @@ SUBSYSTEM_DEF(jobs)
Debug("DO player has disability rendering them ineligible for job, Player: [player], Job:[job.title]")
continue
- if(player.mind && job.title in player.mind.restricted_roles)
+ if(player.mind && (job.title in player.mind.restricted_roles))
Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
continue
@@ -498,13 +497,14 @@ SUBSYSTEM_DEF(jobs)
job.after_spawn(H)
//Gives glasses to the vision impaired
- if(H.disabilities & DISABILITY_FLAG_NEARSIGHTED)
+ if(NEARSIGHTED in H.mutations)
var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), slot_glasses)
if(equipped != 1)
var/obj/item/clothing/glasses/G = H.glasses
if(istype(G) && !G.prescription)
- G.prescription = 1
+ G.prescription = TRUE
G.name = "prescription [G.name]"
+ H.update_nearsighted_effects()
return H
@@ -600,7 +600,7 @@ SUBSYSTEM_DEF(jobs)
// If they're head, give them the account info for their department
if(job && job.head_position)
remembered_info = ""
- var/datum/money_account/department_account = department_accounts[job.department]
+ var/datum/money_account/department_account = GLOB.department_accounts[job.department]
if(department_account)
remembered_info += "Your department's account number is: #[department_account.account_number]
" @@ -622,7 +622,9 @@ SUBSYSTEM_DEF(jobs) if(tgtcard.assignment && tgtcard.assignment == job.title) jobs_to_formats[job.title] = "disabled" // the job they already have is pre-selected else if(!job.would_accept_job_transfer_from_player(M)) - jobs_to_formats[job.title] = "linkDiscourage" // karma jobs they don't have available are discouraged + jobs_to_formats[job.title] = "linkDiscourage" // jobs which are karma-locked and not unlocked for this player are discouraged + else if((job.title in GLOB.command_positions) && istype(M) && M.client && job.available_in_playtime(M.client)) + jobs_to_formats[job.title] = "linkDiscourage" // command jobs which are playtime-locked and not unlocked for this player are discouraged else if(job.total_positions && !job.current_positions && job.title != "Civilian") jobs_to_formats[job.title] = "linkEncourage" // jobs with nobody doing them at all are encouraged else if(job.total_positions >= 0 && job.current_positions >= job.total_positions) @@ -638,7 +640,7 @@ SUBSYSTEM_DEF(jobs) var/datum/job/oldjobdatum = SSjobs.GetJob(oldtitle) var/datum/job/newjobdatum = SSjobs.GetJob(newtitle) if(istype(oldjobdatum) && oldjobdatum.current_positions > 0 && istype(newjobdatum)) - if(!(oldjobdatum.title in command_positions) && !(newjobdatum.title in command_positions)) + if(!(oldjobdatum.title in GLOB.command_positions) && !(newjobdatum.title in GLOB.command_positions)) oldjobdatum.current_positions-- newjobdatum.current_positions++ diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 7441d855f22..3fc92a3346a 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -7,6 +7,7 @@ SUBSYSTEM_DEF(lighting) wait = 2 init_order = INIT_ORDER_LIGHTING flags = SS_TICKER + offline_implications = "Lighting will no longer update. Shuttle call recommended." /datum/controller/subsystem/lighting/stat_entry() ..("L:[GLOB.lighting_update_lights.len]|C:[GLOB.lighting_update_corners.len]|O:[GLOB.lighting_update_objects.len]") diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm index 9a73c1dbabb..7e78e2b9df1 100644 --- a/code/controllers/subsystem/machinery.dm +++ b/code/controllers/subsystem/machinery.dm @@ -6,6 +6,7 @@ SUBSYSTEM_DEF(machines) name = "Machines" init_order = INIT_ORDER_MACHINES flags = SS_KEEP_TIMING + offline_implications = "Machinery will no longer process. Shuttle call recommended." var/list/processing = list() var/list/currentrun = list() diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index af741423526..67e2b5c5e88 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -13,24 +13,109 @@ SUBSYSTEM_DEF(mapping) if(!config.disable_space_ruins) var/timer = start_watch() log_startup_progress("Creating random space levels...") - seedRuins(list(level_name_to_num(EMPTY_AREA)), rand(0, 3), /area/space, space_ruins_templates) + seedRuins(list(level_name_to_num(EMPTY_AREA)), rand(0, 3), /area/space, GLOB.space_ruins_templates) log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.") // load in extra levels of space ruins var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max) for(var/i = 1, i <= num_extra_space, i++) - var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED, traits = list(REACHABLE)) - seedRuins(list(zlev), rand(0, 3), /area/space, space_ruins_templates) + var/zlev = GLOB.space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED, traits = list(REACHABLE)) + seedRuins(list(zlev), rand(0, 3), /area/space, GLOB.space_ruins_templates) // Setup the Z-level linkage - space_manager.do_transition_setup() + GLOB.space_manager.do_transition_setup() // Spawn Lavaland ruins and rivers. - seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates) + seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, GLOB.lava_ruins_templates) spawn_rivers(list(level_name_to_num(MINING))) return ..() + +/datum/controller/subsystem/mapping/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins) + if(!z_levels || !z_levels.len) + WARNING("No Z levels provided - Not generating ruins") + return + + for(var/zl in z_levels) + var/turf/T = locate(1, 1, zl) + if(!T) + WARNING("Z level [zl] does not exist - Not generating ruins") + return + + var/list/ruins = potentialRuins.Copy() + + var/list/forced_ruins = list() //These go first on the z level associated (same random one by default) + var/list/ruins_availible = list() //we can try these in the current pass + var/forced_z //If set we won't pick z level and use this one instead. + + //Set up the starting ruin list + for(var/key in ruins) + var/datum/map_template/ruin/R = ruins[key] + if(R.cost > budget) //Why would you do that + continue + if(R.always_place) + forced_ruins[R] = -1 + if(R.unpickable) + continue + ruins_availible[R] = R.placement_weight + + while(budget > 0 && (ruins_availible.len || forced_ruins.len)) + var/datum/map_template/ruin/current_pick + var/forced = FALSE + if(forced_ruins.len) //We have something we need to load right now, so just pick it + for(var/ruin in forced_ruins) + current_pick = ruin + if(forced_ruins[ruin] > 0) //Load into designated z + forced_z = forced_ruins[ruin] + forced = TRUE + break + else //Otherwise just pick random one + current_pick = pickweight(ruins_availible) + + var/placement_tries = PLACEMENT_TRIES + var/failed_to_place = TRUE + var/z_placed = 0 + while(placement_tries > 0) + placement_tries-- + z_placed = pick(z_levels) + if(!current_pick.try_to_place(forced_z ? forced_z : z_placed,whitelist)) + continue + else + failed_to_place = FALSE + break + + //That's done remove from priority even if it failed + if(forced) + //TODO : handle forced ruins with multiple variants + forced_ruins -= current_pick + forced = FALSE + + if(failed_to_place) + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.id == current_pick.id) + ruins_availible -= R + log_world("Failed to place [current_pick.name] ruin.") + else + budget -= current_pick.cost + if(!current_pick.allow_duplicates) + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.id == current_pick.id) + ruins_availible -= R + if(current_pick.never_spawn_with) + for(var/blacklisted_type in current_pick.never_spawn_with) + for(var/possible_exclusion in ruins_availible) + if(istype(possible_exclusion,blacklisted_type)) + ruins_availible -= possible_exclusion + forced_z = 0 + + //Update the availible list + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.cost > budget) + ruins_availible -= R + + log_world("Ruin loader finished with [budget] left to spend.") + /datum/controller/subsystem/mapping/Recover() flags |= SS_NO_INIT diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index c21b8f0760a..9445dd2717a 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(mobs) priority = FIRE_PRIORITY_MOBS flags = SS_KEEP_TIMING runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Mobs will no longer process. Immediate server restart recommended." var/list/currentrun = list() var/static/list/clients_by_zlevel[][] @@ -10,7 +11,7 @@ SUBSYSTEM_DEF(mobs) var/static/list/cubemonkeys = list() /datum/controller/subsystem/mobs/stat_entry() - ..("P:[GLOB.mob_list.len]") + ..("P:[GLOB.mob_living_list.len]") /datum/controller/subsystem/mobs/Initialize(start_timeofday) clients_by_zlevel = new /list(world.maxz,0) @@ -20,17 +21,17 @@ SUBSYSTEM_DEF(mobs) /datum/controller/subsystem/mobs/fire(resumed = 0) var/seconds = wait * 0.1 if(!resumed) - src.currentrun = GLOB.mob_list.Copy() + src.currentrun = GLOB.mob_living_list.Copy() //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun var/times_fired = src.times_fired while(currentrun.len) - var/mob/M = currentrun[currentrun.len] + var/mob/living/L = currentrun[currentrun.len] currentrun.len-- - if(M) - M.Life(seconds, times_fired) + if(L) + L.Life(seconds, times_fired) else - GLOB.mob_list.Remove(M) + GLOB.mob_living_list.Remove(L) if(MC_TICK_CHECK) return diff --git a/code/controllers/subsystem/nano_mob_hunter.dm b/code/controllers/subsystem/nano_mob_hunter.dm index a634f091013..9094bf9fe2b 100644 --- a/code/controllers/subsystem/nano_mob_hunter.dm +++ b/code/controllers/subsystem/nano_mob_hunter.dm @@ -2,6 +2,7 @@ SUBSYSTEM_DEF(mob_hunt) name = "Nano-Mob Hunter GO Server" init_order = INIT_ORDER_NANOMOB priority = FIRE_PRIORITY_NANOMOB // Low priority, no need for MC_TICK_CHECK due to extremely low performance impact. + offline_implications = "Nano-Mob Hunter will no longer spawn mobs. No immediate action is needed." var/max_normal_spawns = 15 //change this to adjust the number of normal spawns that can exist at one time. trapped spawns (from traitors) don't count towards this var/list/normal_spawns = list() var/max_trap_spawns = 15 //change this to adjust the number of trap spawns that can exist at one time. traps spawned beyond this point clear the oldest traps diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm index c8cbbc62013..ef1b6ee03fe 100644 --- a/code/controllers/subsystem/nanoui.dm +++ b/code/controllers/subsystem/nanoui.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(nanoui) flags = SS_NO_INIT priority = FIRE_PRIORITY_NANOUI runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + offline_implications = "All NanoUIs will no longer process. Shuttle call recommended." var/list/currentrun = list() var/list/open_uis = list() // A list of open UIs, grouped by src_object and ui_key. diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index 4ebe1dceb0e..deffcb6bddf 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(nightshift) priority = FIRE_PRIORITY_NIGHTSHIFT wait = 600 flags = SS_NO_TICK_CHECK + offline_implications = "The game will no longer shift between day and night lighting. No immediate action is needed." var/nightshift_active = FALSE var/nightshift_start_time = 702000 //7:30 PM, station time @@ -25,12 +26,12 @@ SUBSYSTEM_DEF(nightshift) check_nightshift() /datum/controller/subsystem/nightshift/proc/announce(message) - priority_announcement.Announce(message, new_sound = 'sound/misc/notice2.ogg', new_title = "Automated Lighting System Announcement") + GLOB.priority_announcement.Announce(message, new_sound = 'sound/misc/notice2.ogg', new_title = "Automated Lighting System Announcement") /datum/controller/subsystem/nightshift/proc/check_nightshift(check_canfire=FALSE) if(check_canfire && !can_fire) return - var/emergency = security_level >= SEC_LEVEL_RED + var/emergency = GLOB.security_level >= SEC_LEVEL_RED var/announcing = TRUE var/time = station_time() var/night_time = (time < nightshift_end_time) || (time > nightshift_start_time) @@ -41,7 +42,7 @@ SUBSYSTEM_DEF(nightshift) if(!emergency) announce("Restoring night lighting configuration to normal operation.") else - announce("Disabling night lighting: Station is in a state of emergency.") + announce("Disabling night lighting: Station is in a state of emergency.") if(emergency) night_time = FALSE if(nightshift_active != night_time) diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 5eaca5d19c4..79541c199a4 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(npcpool) flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND priority = FIRE_PRIORITY_NPC runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Simple animals will no longer process. Shuttle call recommended." var/list/currentrun = list() diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index c35f1adee65..95b9e925b5d 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(overlays) wait = 1 priority = FIRE_PRIORITY_OVERLAYS init_order = INIT_ORDER_OVERLAY + offline_implications = "Overlays may look strange. No immediate action is needed." var/list/queue var/list/stats diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index 039b6d2b008..9135f62b03f 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(parallax) flags = SS_POST_FIRE_TIMING | SS_BACKGROUND priority = FIRE_PRIORITY_PARALLAX runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + offline_implications = "Space parallax will no longer move around. No immediate action is needed." var/list/currentrun var/planet_x_offset = 128 var/planet_y_offset = 128 diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm index 49b30062786..5a49070bf89 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -54,7 +54,7 @@ SUBSYSTEM_DEF(radio) // If the above switch somehow failed. And it needs the SSradio. part otherwise it fails to compile if(frequency in DEPT_FREQS) return "deptradio" - + // If its none of the others return "radio" diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index da3d91c1de1..247d71d05b8 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -6,6 +6,7 @@ SUBSYSTEM_DEF(shuttle) init_order = INIT_ORDER_SHUTTLE flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME + offline_implications = "Shuttles will no longer function and cargo will not generate points. Immediate server restart recommended." var/list/mobile = list() var/list/stationary = list() var/list/transit = list() @@ -223,11 +224,12 @@ SUBSYSTEM_DEF(shuttle) return 0 //dock successful -/datum/controller/subsystem/shuttle/proc/moveShuttle(shuttleId, dockId, timed) +/datum/controller/subsystem/shuttle/proc/moveShuttle(shuttleId, dockId, timed, mob/user) var/obj/docking_port/mobile/M = getShuttle(shuttleId) var/obj/docking_port/stationary/D = getDock(dockId) if(!M) return 1 + M.last_caller = user // Save the caller of the shuttle for later logging if(timed) if(M.request(D)) return 2 diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm index fcc62a2fa50..d9c46f9c9d7 100644 --- a/code/controllers/subsystem/spacedrift.dm +++ b/code/controllers/subsystem/spacedrift.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(spacedrift) wait = 5 flags = SS_NO_INIT|SS_KEEP_TIMING runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Mobs will no longer respect a lack of gravity. No immediate action is needed." var/list/currentrun = list() var/list/processing = list() diff --git a/code/controllers/subsystem/statistics.dm b/code/controllers/subsystem/statistics.dm new file mode 100644 index 00000000000..3a0bf7e51e2 --- /dev/null +++ b/code/controllers/subsystem/statistics.dm @@ -0,0 +1,28 @@ +SUBSYSTEM_DEF(statistics) + name = "Statistics" + wait = 6000 // 10 minute delay between fires + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME // Only count time actually ingame to avoid logging pre-round dips + offline_implications = "Player count and admin count statistics will no longer be logged to the database. No immediate action is needed." + + +/datum/controller/subsystem/statistics/Initialize(start_timeofday) + if(!config.sql_enabled) + flags |= SS_NO_FIRE // Disable firing if SQL is disabled + return ..() + +/datum/controller/subsystem/statistics/fire(resumed = 0) + sql_poll_players() + +/datum/controller/subsystem/statistics/proc/sql_poll_players() + if(!config.sql_enabled) + return + var/playercount = GLOB.clients.len + var/admincount = GLOB.admins.len + if(!GLOB.dbcon.IsConnected()) + log_game("SQL ERROR during player polling. Failed to connect.") + else + var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") + var/DBQuery/query = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time) VALUES ([playercount], [admincount], '[sqltime]')") + if(!query.Execute()) + var/err = query.ErrorMsg() + log_game("SQL ERROR during playercount polling. Error: \[[err]\]\n") diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm index 6cfb52f2d25..3f8e15df05a 100644 --- a/code/controllers/subsystem/sun.dm +++ b/code/controllers/subsystem/sun.dm @@ -1,19 +1,29 @@ SUBSYSTEM_DEF(sun) name = "Sun" wait = 600 - flags = SS_NO_TICK_CHECK|SS_NO_INIT + flags = SS_NO_TICK_CHECK + init_order = INIT_ORDER_SUN + offline_implications = "Solar panels will no longer rotate. No immediate action is needed." var/angle var/dx var/dy var/rate var/list/solars = list() -/datum/controller/subsystem/sun/PreInit() +/datum/controller/subsystem/sun/Initialize(start_timeofday) + // Lets work out an angle for the "sun" to rotate around the station angle = rand (0,360) // the station position to the sun is randomised at round start rate = rand(50,200)/100 // 50% - 200% of standard rotation if(prob(50)) // same chance to rotate clockwise than counter-clockwise rate = -rate + // Solar consoles need to load after machines init, so this handles that + for(var/obj/machinery/power/solar_control/SC in solars) + SC.setup() + + return ..() + + /datum/controller/subsystem/sun/stat_entry(msg) ..("P:[solars.len]") diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 74dbf4c4d93..04ddf40f442 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -7,6 +7,7 @@ SUBSYSTEM_DEF(throwing) wait = 1 flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Thrown objects may not react properly. Shuttle call recommended." var/list/currentrun var/list/processing = list() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 6366eba7613..228f1a7c528 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -5,6 +5,7 @@ SUBSYSTEM_DEF(ticker) priority = FIRE_PRIORITY_TICKER flags = SS_KEEP_TIMING runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME + offline_implications = "The game is no longer aware of when the round ends. Immediate server restart recommended." var/round_start_time = 0 var/const/restart_timeout = 600 @@ -23,17 +24,15 @@ SUBSYSTEM_DEF(ticker) var/Bible_deity_name var/datum/cult_info/cultdat = null //here instead of cult for adminbus purposes var/random_players = 0 // if set to nonzero, ALL players who latejoin or declare-ready join will have random appearances/genders - var/list/syndicate_coalition = list() // list of traitor-compatible factions - var/list/factions = list() // list of all factions - var/list/availablefactions = list() // list of factions with openings var/tipped = FALSE //Did we broadcast the tip of the day yet? var/selected_tip // What will be the tip of the day? var/pregame_timeleft // This is used for calculations var/delay_end = 0 //if set to nonzero, the round will not restart on it's own var/triai = 0//Global holder for Triumvirate - var/initialtpass = 0 //holder for inital autotransfer vote timer + var/next_autotransfer = 0 //holder for inital autotransfer vote timer var/obj/screen/cinematic = null //used for station explosion cinematic - var/round_end_announced = 0 // Spam Prevention. Announce round end only once.\ + var/round_end_announced = 0 // Spam Prevention. Announce round end only once. + var/ticker_going = TRUE // This used to be in the unused globals, but it turns out its actually used in a load of places. Its now a ticker var because its related to round stuff, -aa /datum/controller/subsystem/ticker/Initialize() login_music = pick(\ @@ -42,10 +41,9 @@ SUBSYSTEM_DEF(ticker) 'sound/music/title1.ogg',\ 'sound/music/title2.ogg',\ 'sound/music/title3.ogg',) - // Map name - if(using_map && using_map.name) - GLOB.map_name = "[using_map.name]" + if(GLOB.using_map && GLOB.using_map.name) + GLOB.map_name = "[GLOB.using_map.name]" else GLOB.map_name = "Unknown" @@ -68,12 +66,12 @@ SUBSYSTEM_DEF(ticker) current_state = GAME_STATE_PREGAME fire() // TG says this is a good idea if(GAME_STATE_PREGAME) - if(!going) + if(!SSticker.ticker_going) // This has to be referenced like this, and I dont know why. If you dont put SSticker. it will break return // This is so we dont have sleeps in controllers, because that is a bad, bad thing if(!delay_end) - pregame_timeleft = max(0,round_start_time - world.time) // Normal lobby countdown when roundstart was not delayed + pregame_timeleft = max(0,round_start_time - world.time) // Normal lobby countdown when roundstart was not delayed else pregame_timeleft = max(0,pregame_timeleft - 20) // If roundstart was delayed, we should resume the countdown where it left off @@ -92,12 +90,17 @@ SUBSYSTEM_DEF(ticker) delay_end = 0 // reset this in case round start was delayed mode.process() mode.process_job_tasks() + + if(world.time > next_autotransfer) + SSvote.autotransfer() + next_autotransfer = world.time + config.vote_autotransfer_interval + var/game_finished = SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || mode.station_was_nuked if(config.continuous_rounds) mode.check_finished() // some modes contain var-changing code in here, so call even if we don't uses result else game_finished |= mode.check_finished() - if(game_finished) + if(game_finished || force_ending) current_state = GAME_STATE_FINISHED if(GAME_STATE_FINISHED) current_state = GAME_STATE_FINISHED @@ -113,36 +116,23 @@ SUBSYSTEM_DEF(ticker) else world.Reboot("Round ended.", "end_proper", "proper completion") - -/datum/controller/subsystem/ticker/proc/votetimer() - var/timerbuffer = 0 - if(initialtpass == 0) - timerbuffer = config.vote_autotransfer_initial - else - timerbuffer = config.vote_autotransfer_interval - spawn(timerbuffer) - SSvote.autotransfer() - initialtpass = 1 - votetimer() - - /datum/controller/subsystem/ticker/proc/setup() cultdat = setupcult() //Create and announce mode - if(master_mode=="secret") + if(GLOB.master_mode=="secret") src.hide_mode = 1 var/list/datum/game_mode/runnable_modes - if((master_mode=="random") || (master_mode=="secret")) + if((GLOB.master_mode=="random") || (GLOB.master_mode=="secret")) runnable_modes = config.get_runnable_modes() if(runnable_modes.len==0) current_state = GAME_STATE_PREGAME Master.SetRunLevel(RUNLEVEL_LOBBY) to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.") return 0 - if(secret_force_mode != "secret") - var/datum/game_mode/M = config.pick_mode(secret_force_mode) + if(GLOB.secret_force_mode != "secret") + var/datum/game_mode/M = config.pick_mode(GLOB.secret_force_mode) if(M.can_start()) - src.mode = config.pick_mode(secret_force_mode) + src.mode = config.pick_mode(GLOB.secret_force_mode) SSjobs.ResetOccupations() if(!src.mode) src.mode = pickweight(runnable_modes) @@ -150,7 +140,7 @@ SUBSYSTEM_DEF(ticker) var/mtype = src.mode.type src.mode = new mtype else - src.mode = config.pick_mode(master_mode) + src.mode = config.pick_mode(GLOB.master_mode) if(!src.mode.can_start()) to_chat(world, "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.") mode = null @@ -167,7 +157,7 @@ SUBSYSTEM_DEF(ticker) if(!can_continue) qdel(mode) current_state = GAME_STATE_PREGAME - to_chat(world, "Error setting up [master_mode]. Reverting to pre-game lobby.") + to_chat(world, "Error setting up [GLOB.master_mode]. Reverting to pre-game lobby.") SSjobs.ResetOccupations() Master.SetRunLevel(RUNLEVEL_LOBBY) return 0 @@ -186,7 +176,7 @@ SUBSYSTEM_DEF(ticker) populate_spawn_points() collect_minds() equip_characters() - data_core.manifest() + GLOB.data_core.manifest() current_state = GAME_STATE_PLAYING Master.SetRunLevel(RUNLEVEL_GAME) @@ -194,7 +184,6 @@ SUBSYSTEM_DEF(ticker) //here to initialize the random events nicely at round start setup_economy() - setupfactions() //shuttle_controller.setup_shuttle_docks() @@ -284,11 +273,8 @@ SUBSYSTEM_DEF(ticker) auto_toggle_ooc(0) // Turn it off round_start_time = world.time - if(config.sql_enabled) - spawn(3000) - statistic_cycle() // Polls population totals regularly and stores them in an SQL DB - - votetimer() + // Sets the auto shuttle vote to happen after the config duration + next_autotransfer = world.time + config.vote_autotransfer_initial for(var/mob/new_player/N in GLOB.mob_list) if(N.client) @@ -309,15 +295,12 @@ SUBSYSTEM_DEF(ticker) cinematic.mouse_opacity = MOUSE_OPACITY_TRANSPARENT cinematic.screen_loc = "1,0" - var/obj/structure/bed/temp_buckle = new(src) if(station_missed) for(var/mob/M in GLOB.mob_list) - M.buckled = temp_buckle //buckles the mob so it can't do anything if(M.client) M.client.screen += cinematic //show every client the cinematic else //nuke kills everyone on z-level 1 to prevent "hurr-durr I survived" for(var/mob/M in GLOB.mob_list) - M.buckled = temp_buckle if(M.stat != DEAD) var/turf/T = get_turf(M) if(T && is_station_level(T.z) && !istype(M.loc, /obj/structure/closet/secure_closet/freezer)) @@ -387,8 +370,6 @@ SUBSYSTEM_DEF(ticker) //Otherwise if its a verb it will continue on afterwards. spawn(300) QDEL_NULL(cinematic) //end the cinematic - if(temp_buckle) - qdel(temp_buckle) //release everybody @@ -442,18 +423,12 @@ SUBSYSTEM_DEF(ticker) if(m) to_chat(world, "Tip of the round: [html_encode(m)]") -/datum/controller/subsystem/ticker/proc/getfactionbyname(var/name) - for(var/datum/faction/F in factions) - if(F.name == name) - return F - - /datum/controller/subsystem/ticker/proc/declare_completion() - nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point. + GLOB.nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point. //Round statistics report var/datum/station_state/end_state = new /datum/station_state() end_state.count() - var/station_integrity = min(round( 100.0 * start_state.score(end_state), 0.1), 100.0) + var/station_integrity = min(round( 100.0 * GLOB.start_state.score(end_state), 0.1), 100.0) to_chat(world, "
[TAB]Shift Duration: [round(ROUND_TIME / 36000)]:[add_zero("[ROUND_TIME / 600 % 60]", 2)]:[ROUND_TIME / 100 % 6][ROUND_TIME / 100 % 10]") to_chat(world, "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]") @@ -518,8 +493,13 @@ SUBSYSTEM_DEF(ticker) //Ask the event manager to print round end information SSevents.RoundEnd() + //make big obvious note in game logs that round ended + log_game("///////////////////////////////////////////////////////") + log_game("///////////////////// ROUND ENDED /////////////////////") + log_game("///////////////////////////////////////////////////////") + // Add AntagHUD to everyone, see who was really evil the whole time! - for(var/datum/atom_hud/antag/H in huds) + for(var/datum/atom_hud/antag/H in GLOB.huds) for(var/m in GLOB.player_list) var/mob/M = m H.add_hud_to(M) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 1caa3d7819a..7bb6a496274 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -9,6 +9,7 @@ SUBSYSTEM_DEF(timer) init_order = INIT_ORDER_TIMER flags = SS_TICKER|SS_NO_INIT + offline_implications = "The game will no longer process timers. Immediate server restart recommended." var/list/second_queue = list() //awe, yes, you've had first queue, but what about second queue? var/list/hashes = list() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 4cb49e8a3f1..b0110258da7 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(vote) wait = 10 flags = SS_KEEP_TIMING|SS_NO_INIT runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + offline_implications = "Votes (Endround shuttle) will no longer function. Shuttle call recommended." var/initiator = null var/started_time = null @@ -90,10 +91,10 @@ SUBSYSTEM_DEF(vote) if(choices["Continue Playing"] >= greatest_votes) greatest_votes = choices["Continue Playing"] else if(mode == "gamemode") - if(master_mode in choices) - choices[master_mode] += non_voters - if(choices[master_mode] >= greatest_votes) - greatest_votes = choices[master_mode] + if(GLOB.master_mode in choices) + choices[GLOB.master_mode] += non_voters + if(choices[GLOB.master_mode] >= greatest_votes) + greatest_votes = choices[GLOB.master_mode] else if(mode == "crew_transfer") var/factor = 0.5 switch(world.time / (10 * 60)) // minutes @@ -164,14 +165,14 @@ SUBSYSTEM_DEF(vote) if(. == "Restart Round") restart = 1 if("gamemode") - if(master_mode != .) + if(GLOB.master_mode != .) world.save_mode(.) if(SSticker && SSticker.mode) restart = 1 else - master_mode = . - if(!going) - going = 1 + GLOB.master_mode = . + if(!SSticker.ticker_going) + SSticker.ticker_going = TRUE to_chat(world, "The round will start soon.") if("crew_transfer") if(. == "Initiate Crew Transfer") @@ -253,8 +254,8 @@ SUBSYSTEM_DEF(vote) world << sound('sound/ambience/alarm4.ogg') if("custom") world << sound('sound/ambience/alarm4.ogg') - if(mode == "gamemode" && going) - going = 0 + if(mode == "gamemode" && SSticker.ticker_going) + SSticker.ticker_going = FALSE to_chat(world, "Round start has been delayed.") if(mode == "crew_transfer" && config.ooc_allowed) auto_muted = 1 diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index ac2f0c59313..bf405444110 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -9,6 +9,7 @@ SUBSYSTEM_DEF(weather) flags = SS_BACKGROUND wait = 10 runlevels = RUNLEVEL_GAME + offline_implications = "Ash storms will no longer trigger. No immediate action is needed." var/list/processing = list() var/list/eligible_zlevels = list() var/list/next_hit_by_zlevel = list() //Used by barometers to know when the next storm is coming @@ -19,7 +20,7 @@ SUBSYSTEM_DEF(weather) var/datum/weather/W = V if(W.aesthetic || W.stage != MAIN_STAGE) continue - for(var/i in GLOB.living_mob_list) + for(var/i in GLOB.mob_living_list) var/mob/living/L = i if(W.can_weather_act(L)) W.weather_act(L) diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index c67e53184a1..3eaed85c303 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -53,10 +53,10 @@ debug_variables(config) feedback_add_details("admin_verb","DConf") if("pAI") - debug_variables(paiController) + debug_variables(GLOB.paiController) feedback_add_details("admin_verb","DpAI") if("Cameras") - debug_variables(cameranet) + debug_variables(GLOB.cameranet) feedback_add_details("admin_verb","DCameras") if("Garbage") debug_variables(SSgarbage) @@ -92,7 +92,7 @@ debug_variables(SSweather) feedback_add_details("admin_verb","DWeather") if("Space") - debug_variables(space_manager) + debug_variables(GLOB.space_manager) feedback_add_details("admin_verb","DSpace") if("Mob Hunt Server") debug_variables(SSmob_hunt) diff --git a/code/datums/action.dm b/code/datums/action.dm index b7af84e9ddf..c1802da47c1 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -339,7 +339,7 @@ /datum/action/item_action/remove_tape/Trigger(attack_self = FALSE) if(..()) - GET_COMPONENT_FROM(DT, /datum/component/ducttape, target) + var/datum/component/ducttape/DT = target.GetComponent(/datum/component/ducttape) DT.remove_tape(target, usr) /datum/action/item_action/toggle_jetpack diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 0a14b0e9476..8e1a9d8bcce 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -62,15 +62,15 @@ if(sorted_laws.len) return - for(var/ion_law in ion_laws) - sorted_laws += ion_law - - for(var/evil_law in devil_laws) - sorted_laws += evil_law - if(zeroth_law) sorted_laws += zeroth_law + for(var/ion_law in ion_laws) + sorted_laws += ion_law + + for(var/evil_law in devil_laws) + sorted_laws += evil_law + var/index = 1 for(var/datum/ai_law/inherent_law in inherent_laws) inherent_law.index = index++ @@ -133,12 +133,12 @@ for(var/datum/ai_law/AL in devil_laws) if(AL.law == law) return - + var/new_law = new/datum/ai_law/sixsixsix(law) devil_laws += new_law if(state_devil.len < devil_laws.len) state_devil += 1 - + sorted_laws.Cut() /datum/ai_laws/proc/add_ion_law(var/law) @@ -209,9 +209,9 @@ /datum/ai_law/ion/delete_law(var/datum/ai_laws/laws) laws.internal_delete_law(laws.ion_laws, laws.state_ion, src) - + /datum/ai_law/sixsixsix/delete_law(var/datum/ai_laws/laws) - laws.internal_delete_law(laws.devil_laws, laws.state_devil, src) + laws.internal_delete_law(laws.devil_laws, laws.state_devil, src) /datum/ai_law/inherent/delete_law(var/datum/ai_laws/laws) laws.internal_delete_law(laws.inherent_laws, laws.state_inherent, src) diff --git a/code/datums/cache/air_alarm.dm b/code/datums/cache/air_alarm.dm index 662b0958d5c..2edc0792a34 100644 --- a/code/datums/cache/air_alarm.dm +++ b/code/datums/cache/air_alarm.dm @@ -1,4 +1,4 @@ -var/global/datum/repository/air_alarm/air_alarm_repository = new() +GLOBAL_DATUM_INIT(air_alarm_repository, /datum/repository/air_alarm, new()) /datum/repository/air_alarm/proc/air_alarm_data(var/list/monitored_alarms, var/refresh = 0, var/obj/machinery/alarm/passed_alarm) var/alarms[0] @@ -11,13 +11,13 @@ var/global/datum/repository/air_alarm/air_alarm_repository = new() if(!refresh) return cache_entry.data - if(SSticker && SSticker.current_state < GAME_STATE_PLAYING && istype(passed_alarm)) // Generating the list for the first time as the game hasn't started - no need to run through the machines list everything every time + if(SSticker && SSticker.current_state < GAME_STATE_PLAYING && istype(passed_alarm)) // Generating the list for the first time as the game hasn't started - no need to run through the machines list everything every time alarms = cache_entry.data // Don't deleate the list if(is_station_contact(passed_alarm.z) && passed_alarm.remote_control) // Still need sanity checks - alarms[++alarms.len] = passed_alarm.get_nano_data_console() + alarms[++alarms.len] = passed_alarm.get_nano_data_console() else for(var/obj/machinery/alarm/alarm in (monitored_alarms ? monitored_alarms : GLOB.air_alarms)) // Generating the whole list again is a bad habit but I can't be bothered to fix it right now - if(!monitored_alarms && !is_station_contact(alarm.z)) + if(!monitored_alarms && !is_station_contact(alarm.z)) continue if(!alarm.remote_control) continue diff --git a/code/datums/cache/apc.dm b/code/datums/cache/apc.dm index 524a8793415..318fd654fe3 100644 --- a/code/datums/cache/apc.dm +++ b/code/datums/cache/apc.dm @@ -1,4 +1,4 @@ -var/global/datum/repository/apc/apc_repository = new() +GLOBAL_DATUM_INIT(apc_repository, /datum/repository/apc, new()) /datum/repository/apc/proc/apc_data(datum/powernet/powernet) var/apcData[0] diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm index b30b5c57889..21ec5ebcc79 100644 --- a/code/datums/cache/crew.dm +++ b/code/datums/cache/crew.dm @@ -1,4 +1,4 @@ -var/global/datum/repository/crew/crew_repository = new() +GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new()) /datum/repository/crew/New() cache_data = list() diff --git a/code/datums/cache/powermonitor.dm b/code/datums/cache/powermonitor.dm index 29394195edf..606dd500eda 100644 --- a/code/datums/cache/powermonitor.dm +++ b/code/datums/cache/powermonitor.dm @@ -1,8 +1,8 @@ -var/global/datum/repository/powermonitor/powermonitor_repository = new() +GLOBAL_DATUM_INIT(powermonitor_repository, /datum/repository/powermonitor, new()) /datum/repository/powermonitor/proc/powermonitor_data(var/refresh = 0) var/pMonData[0] - + var/datum/cache_entry/cache_entry = cache_data if(!cache_entry) cache_entry = new/datum/cache_entry @@ -10,15 +10,15 @@ var/global/datum/repository/powermonitor/powermonitor_repository = new() if(!refresh) return cache_entry.data - + for(var/obj/machinery/computer/monitor/pMon in GLOB.power_monitors) if( !(pMon.stat & (NOPOWER|BROKEN)) && !pMon.is_secret_monitor ) pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]") cache_entry.timestamp = world.time //+ 30 SECONDS - cache_entry.data = pMonData + cache_entry.data = pMonData return pMonData - + /datum/repository/powermonitor/proc/update_cache() return powermonitor_data(refresh = 1) - + diff --git a/code/datums/components/README.md b/code/datums/components/README.md index 9d06a255dd7..03f7d3a5875 100644 --- a/code/datums/components/README.md +++ b/code/datums/components/README.md @@ -2,134 +2,8 @@ ## Concept -Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward it's arguments with a `SEND_SIGNAL` call. Now every component that want's to can also know about this happening. +Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward it's arguments with a `SendSignal()` call. Now every component that want's to can also know about this happening. -### In the code +See [this thread](https://tgstation13.org/phpBB/viewtopic.php?f=5&t=22674) for an introduction to the system as a whole. -#### Slippery things - -At the time of this writing, every object that is slippery overrides atom/Crossed does some checks, then slips the mob. Instead of all those Crossed overrides they could add a slippery component to all these objects. And have the checks in one proc that is run by the Crossed event - -#### Powercells - -A lot of objects have powercells. The `get_cell()` proc was added to give generic access to the cell var if it had one. This is just a specific use case of `GetComponent()` - -#### Radios - -The radio object as it is should not exist, given that more things use the _concept_ of radios rather than the object itself. The actual function of the radio can exist in a component which all the things that use it (Request consoles, actual radios, the SM shard) can add to themselves. - -#### Standos - -Stands have a lot of procs which mimic mob procs. Rather than inserting hooks for all these procs in overrides, the same can be accomplished with signals - -## API - -### Defines - -1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned. This will be noted in the runtime logs - -### Vars - -1. `/datum/var/list/datum_components` (private) - * Lazy associated list of type -> component/list of components. -1. `/datum/var/list/comp_lookup` (private) - * Lazy associated list of signal -> registree/list of registrees -1. `/datum/var/list/signal_procs` (private) - * Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum receives that signal -1. `/datum/var/signal_enabled` (protected, boolean) - * If the datum is signal enabled. If not, it will not react to signals - * `FALSE` by default, set to `TRUE` when a signal is registered -1. `/datum/component/var/dupe_mode` (protected, enum) - * How duplicate component types are handled when added to the datum. - * `COMPONENT_DUPE_HIGHLANDER` (default): Old component will be deleted, new component will first have `/datum/component/proc/InheritComponent(datum/component/old, FALSE)` on it - * `COMPONENT_DUPE_ALLOWED`: The components will be treated as separate, `GetComponent()` will return the first added - * `COMPONENT_DUPE_UNIQUE`: New component will be deleted, old component will first have `/datum/component/proc/InheritComponent(datum/component/new, TRUE)` on it - * `COMPONENT_DUPE_UNIQUE_PASSARGS`: New component will never exist and instead its initialization arguments will be passed on to the old component. -1. `/datum/component/var/dupe_type` (protected, type) - * Definition of a duplicate component type - * `null` means exact match on `type` (default) - * Any other type means that and all subtypes -1. `/datum/component/var/datum/parent` (protected, read-only) - * The datum this component belongs to - * Never `null` in child procs -1. `report_signal_origin` (protected, boolean) - * If `TRUE`, will invoke the callback when signalled with the signal type as the first argument. - * `FALSE` by default. - -### Procs - -1. `/datum/proc/GetComponent(component_type(type)) -> datum/component?` (public, final) - * Returns a reference to a component of component_type if it exists in the datum, null otherwise -1. `/datum/proc/GetComponents(component_type(type)) -> list` (public, final) - * Returns a list of references to all components of component_type that exist in the datum -1. `/datum/proc/GetExactComponent(component_type(type)) -> datum/component?` (public, final) - * Returns a reference to a component whose type MATCHES component_type if that component exists in the datum, null otherwise -1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)` - * Shorthand for `var/component_type/varname = src.GetComponent(component_type)` -1. `SEND_SIGNAL(target, sigtype, ...)` (public, final) - * Use to send signals to target datum - * Extra arguments are to be specified in the signal definition - * Returns a bitflag with signal specific information assembled from all activated components - * Arguments are packaged in a list and handed off to _SendSignal() -1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component` (public, final) - * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call - * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum - * All components a datum owns are deleted with the datum - * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set - * If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it - * Properly handles duplicate situations based on the `dupe_mode` var -1. `/datum/proc/LoadComponent(component_type(type), ...) -> datum/component` (public, final) - * Equivalent to calling `GetComponent(component_type)` where, if the result would be `null`, returns `AddComponent(component_type, ...)` instead -1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract, async) - * Called on a component's `parent` after a signal received causes it to activate. `src` is the parameter - * Will only be called if a component's callback returns `TRUE` -1. `/datum/proc/TakeComponent(datum/component/C)` (public, final) - * Properly transfers ownership of a component from one datum to another - * Signals `COMSIG_COMPONENT_REMOVING` on the parent - * Called on the datum you want to own the component with another datum's component -1. `/datum/proc/_SendSignal(signal, list/arguments)` (private, final) - * Handles most of the actual signaling procedure - * Will runtime if used on datums with an empty component list -1. `/datum/proc/RegisterSignal(datum/target, signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final) - * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments - * Makes the datum listen for the specified `signal` on it's `parent` datum. - * When that signal is received `proc_ref` will be called on the component, along with associated arguments - * Example proc ref: `.proc/OnEvent` - * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this - * These callbacks run asyncronously - * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `SendSignal()` that initiated it -1. `/datum/component/New(datum/parent, ...)` (private, final) - * Runs internal setup for the component - * Extra arguments are passed to `Initialize()` -1. `/datum/component/Initialize(...)` (abstract, no-sleep) - * Called by `New()` with the same argments excluding `parent` - * Component does not exist in `parent`'s `datum_components` list yet, although `parent` is set and may be used - * Signals will not be received while this function is running - * Component may be deleted after this function completes without being attached - * Do not call `qdel(src)` from this function -1. `/datum/component/Destroy(force(bool), silent(bool))` (virtual, no-sleep) - * Sends the `COMSIG_COMPONENT_REMOVING` signal to the parent datum if the `parent` isn't being qdeleted - * Properly removes the component from `parent` and cleans up references - * Setting `force` makes it not check for and remove the component from the parent - * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal -1. `/datum/component/proc/InheritComponent(datum/component/C, i_am_original(boolean))` (abstract, no-sleep) - * Called on a component when a component of the same type was added to the same parent - * See `/datum/component/var/dupe_mode` - * `C`'s type will always be the same of the called component -1. `/datum/component/proc/AfterComponentActivated()` (abstract, async) - * Called on a component that was activated after it's `parent`'s `ComponentActivated()` is called -1. `/datum/component/proc/OnTransfer(datum/new_parent)` (abstract, no-sleep) - * Called before `new_parent` is assigned to `parent` in `TakeComponent()` - * Allows the component to react to ownership transfers -1. `/datum/component/proc/_RemoveFromParent()` (private, final) - * Clears `parent` and removes the component from it's component list -1. `/datum/component/proc/_JoinParent` (private, final) - * Tries to add the component to it's `parent`s `datum_components` list -1. `/datum/component/proc/RegisterWithParent` (abstract, no-sleep) - * Used to register the signals that should be on the `parent` object - * Use this if you plan on the component transfering between parents -1. `/datum/component/proc/UnregisterFromParent` (abstract, no-sleep) - * Counterpart to `RegisterWithParent()` - * Used to unregister the signals that should only be on the `parent` object - -### See/Define signals and their arguments in __DEFINES\components.dm +### See/Define signals and their arguments in [__DEFINES\dcs\signals.dm](../../__DEFINES/dcs/signals.dm) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index e733ca78d2b..f895b8d81b1 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -1,21 +1,87 @@ +/** + * # Component + * + * The component datum + * + * A component should be a single standalone unit + * of functionality, that works by receiving signals from it's parent + * object to provide some single functionality (i.e a slippery component) + * that makes the object it's attached to cause people to slip over. + * Useful when you want shared behaviour independent of type inheritance + */ /datum/component + /** + * Defines how duplicate existing components are handled when added to a datum + * + * See [COMPONENT_DUPE_*][COMPONENT_DUPE_ALLOWED] definitions for available options + */ var/dupe_mode = COMPONENT_DUPE_HIGHLANDER + + /** + * The type to check for duplication + * + * `null` means exact match on `type` (default) + * + * Any other type means that and all subtypes + */ var/dupe_type + + /// The datum this components belongs to var/datum/parent - //only set to true if you are able to properly transfer this component - //At a minimum RegisterWithParent and UnregisterFromParent should be used - //Make sure you also implement PostTransfer for any post transfer handling + + /** + * Only set to true if you are able to properly transfer this component + * + * At a minimum [RegisterWithParent][/datum/component/proc/RegisterWithParent] and [UnregisterFromParent][/datum/component/proc/UnregisterFromParent] should be used + * + * Make sure you also implement [PostTransfer][/datum/component/proc/PostTransfer] for any post transfer handling + */ var/can_transfer = FALSE -/datum/component/New(datum/P, ...) - parent = P - var/list/arguments = args.Copy(2) +/** + * Create a new component. + * + * Additional arguments are passed to [Initialize()][/datum/component/proc/Initialize] + * + * Arguments: + * * datum/P the parent datum this component reacts to signals from + */ +/datum/component/New(list/raw_args) + parent = raw_args[1] + var/list/arguments = raw_args.Copy(2) if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE) + stack_trace("Incompatible [type] assigned to a [parent.type]! args: [json_encode(arguments)]") qdel(src, TRUE, TRUE) - CRASH("Incompatible [type] assigned to a [P.type]! args: [json_encode(arguments)]") + return - _JoinParent(P) + _JoinParent(parent) +/** + * Called during component creation with the same arguments as in new excluding parent. + * + * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead + */ +/datum/component/proc/Initialize(...) + return + +/** + * Properly removes the component from `parent` and cleans up references + * + * Arguments: + * * force - makes it not check for and remove the component from the parent + * * silent - deletes the component without sending a [COMSIG_COMPONENT_REMOVING] signal + */ +/datum/component/Destroy(force=FALSE, silent=FALSE) + if(!force && parent) + _RemoveFromParent() + if(!silent) + SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src) + parent = null + return ..() + +/** + * Internal proc to handle behaviour of components when joining a parent + */ /datum/component/proc/_JoinParent() var/datum/P = parent //lazy init the parent's dc list @@ -51,21 +117,9 @@ RegisterWithParent() -// If you want/expect to be moving the component around between parents, use this to register on the parent for signals -/datum/component/proc/RegisterWithParent() - return - -/datum/component/proc/Initialize(...) - return - -/datum/component/Destroy(force=FALSE, silent=FALSE) - if(!force && parent) - _RemoveFromParent() - if(!silent) - SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src) - parent = null - return ..() - +/** + * Internal proc to handle behaviour when being removed from a parent + */ /datum/component/proc/_RemoveFromParent() var/datum/P = parent var/list/dc = P.datum_components @@ -84,10 +138,41 @@ UnregisterFromParent() +/** + * Register the component with the parent object + * + * Use this proc to register with your parent object + * + * Overridable proc that's called when added to a new parent + */ +/datum/component/proc/RegisterWithParent() + return + +/** + * Unregister from our parent object + * + * Use this proc to unregister from your parent object + * + * Overridable proc that's called when removed from a parent + * * + */ /datum/component/proc/UnregisterFromParent() return -/datum/proc/RegisterSignal(datum/target, sig_type_or_types, proc_or_callback, override = FALSE) +/** + * Register to listen for a signal from the passed in target + * + * This sets up a listening relationship such that when the target object emits a signal + * the source datum this proc is called upon, will recieve a callback to the given proctype + * Return values from procs registered must be a bitfield + * + * Arguments: + * * datum/target The target to listen for signals from + * * sig_type_or_types Either a string signal name, or a list of signal names (strings) + * * proctype The proc to call back when the signal is emitted + * * override If a previous registration exists you must explicitly set this + */ +/datum/proc/RegisterSignal(datum/target, sig_type_or_types, proctype, override = FALSE) if(QDELETED(src) || QDELETED(target)) return @@ -100,15 +185,12 @@ if(!lookup) target.comp_lookup = lookup = list() - if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now - proc_or_callback = CALLBACK(src, proc_or_callback) - var/list/sig_types = islist(sig_type_or_types) ? sig_type_or_types : list(sig_type_or_types) for(var/sig_type in sig_types) if(!override && procs[target][sig_type]) stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning") - procs[target][sig_type] = proc_or_callback + procs[target][sig_type] = proctype if(!lookup[sig_type]) // Nothing has registered here yet lookup[sig_type] = src @@ -122,6 +204,17 @@ signal_enabled = TRUE +/** + * Stop listening to a given signal from target + * + * Breaks the relationship between target and source datum, removing the callback when the signal fires + * + * Doesn't care if a registration exists or not + * + * Arguments: + * * datum/target Datum to stop listening to signals from + * * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically + */ /datum/proc/UnregisterSignal(datum/target, sig_type_or_types) var/list/lookup = target.comp_lookup if(!signal_procs || !signal_procs[target] || !lookup) @@ -129,6 +222,8 @@ if(!islist(sig_type_or_types)) sig_type_or_types = list(sig_type_or_types) for(var/sig in sig_type_or_types) + if(!signal_procs[target][sig]) + continue switch(length(lookup[sig])) if(2) lookup[sig] = (lookup[sig]-src)[1] @@ -151,41 +246,96 @@ if(!signal_procs[target].len) signal_procs -= target +/** + * Called on a component when a component of the same type was added to the same parent + * + * See [/datum/component/var/dupe_mode] + * + * `C`'s type will always be the same of the called component + */ /datum/component/proc/InheritComponent(datum/component/C, i_am_original) return + +/** + * Called on a component when a component of the same type was added to the same parent with [COMPONENT_DUPE_SELECTIVE] + * + * See [/datum/component/var/dupe_mode] + * + * `C`'s type will always be the same of the called component + * + * return TRUE if you are absorbing the component, otherwise FALSE if you are fine having it exist as a duplicate component + */ +/datum/component/proc/CheckDupeComponent(datum/component/C, ...) + return + + +/** + * Callback Just before this component is transferred + * + * Use this to do any special cleanup you might need to do before being deregged from an object + */ /datum/component/proc/PreTransfer() return +/** + * Callback Just after a component is transferred + * + * Use this to do any special setup you need to do after being moved to a new object + * + * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead + */ /datum/component/proc/PostTransfer() return COMPONENT_INCOMPATIBLE //Do not support transfer by default as you must properly support it +/** + * Internal proc to create a list of our type and all parent types + */ /datum/component/proc/_GetInverseTypeList(our_type = type) //we can do this one simple trick var/current_type = parent_type . = list(our_type, current_type) //and since most components are root level + 1, this won't even have to run - while(current_type != /datum/component) + while (current_type != /datum/component) current_type = type2parent(current_type) . += current_type +/** + * Internal proc to handle most all of the signaling procedure + * + * Will runtime if used on datums with an empty component list + * + * Use the [SEND_SIGNAL] define instead + */ /datum/proc/_SendSignal(sigtype, list/arguments) var/target = comp_lookup[sigtype] if(!length(target)) var/datum/C = target if(!C.signal_enabled) return NONE - var/datum/callback/CB = C.signal_procs[src][sigtype] - return CB.InvokeAsync(arglist(arguments)) + var/proctype = C.signal_procs[src][sigtype] + return NONE | CallAsync(C, proctype, arguments) . = NONE for(var/I in target) var/datum/C = I if(!C.signal_enabled) continue - var/datum/callback/CB = C.signal_procs[src][sigtype] - . |= CB.InvokeAsync(arglist(arguments)) + var/proctype = C.signal_procs[src][sigtype] + . |= CallAsync(C, proctype, arguments) -/datum/proc/GetComponent(c_type) +// The type arg is casted so initial works, you shouldn't be passing a real instance into this +/** + * Return any component assigned to this datum of the given type + * + * This will throw an error if it's possible to have more than one component of that type on the parent + * + * Arguments: + * * datum/component/c_type The typepath of the component you want to get a reference to + */ +/datum/proc/GetComponent(datum/component/c_type) + RETURN_TYPE(c_type) + if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE) + stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]") var/list/dc = datum_components if(!dc) return null @@ -193,7 +343,19 @@ if(length(.)) return .[1] -/datum/proc/GetExactComponent(c_type) +// The type arg is casted so initial works, you shouldn't be passing a real instance into this +/** + * Return any component assigned to this datum of the exact given type + * + * This will throw an error if it's possible to have more than one component of that type on the parent + * + * Arguments: + * * datum/component/c_type The typepath of the component you want to get a reference to + */ +/datum/proc/GetExactComponent(datum/component/c_type) + RETURN_TYPE(c_type) + if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE) + stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]") var/list/dc = datum_components if(!dc) return null @@ -205,6 +367,12 @@ return C return null +/** + * Get all components of a given type that are attached to this datum + * + * Arguments: + * * c_type The component type path + */ /datum/proc/GetComponents(c_type) var/list/dc = datum_components if(!dc) @@ -213,7 +381,19 @@ if(!length(.)) return list(.) -/datum/proc/AddComponent(new_type, ...) +/** + * Creates an instance of `new_type` in the datum and attaches to it as parent + * + * Sends the [COMSIG_COMPONENT_ADDED] signal to the datum + * + * Returns the component that was created. Or the old component in a dupe situation where [COMPONENT_DUPE_UNIQUE] was set + * + * If this tries to add a component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it + * + * Properly handles duplicate situations based on the `dupe_mode` var + */ +/datum/proc/_AddComponent(list/raw_args) + var/new_type = raw_args[1] var/datum/component/nt = new_type var/dm = initial(nt.dupe_mode) var/dt = initial(nt.dupe_type) @@ -228,7 +408,7 @@ new_comp = nt nt = new_comp.type - args[1] = src + raw_args[1] = src if(dm != COMPONENT_DUPE_ALLOWED) if(!dt) @@ -239,37 +419,62 @@ switch(dm) if(COMPONENT_DUPE_UNIQUE) if(!new_comp) - new_comp = new nt(arglist(args)) + new_comp = new nt(raw_args) if(!QDELETED(new_comp)) old_comp.InheritComponent(new_comp, TRUE) QDEL_NULL(new_comp) if(COMPONENT_DUPE_HIGHLANDER) if(!new_comp) - new_comp = new nt(arglist(args)) + new_comp = new nt(raw_args) if(!QDELETED(new_comp)) new_comp.InheritComponent(old_comp, FALSE) QDEL_NULL(old_comp) if(COMPONENT_DUPE_UNIQUE_PASSARGS) if(!new_comp) - var/list/arguments = args.Copy(2) - old_comp.InheritComponent(null, TRUE, arguments) + var/list/arguments = raw_args.Copy(2) + arguments.Insert(1, null, TRUE) + old_comp.InheritComponent(arglist(arguments)) else old_comp.InheritComponent(new_comp, TRUE) + if(COMPONENT_DUPE_SELECTIVE) + var/list/arguments = raw_args.Copy() + arguments[1] = new_comp + var/make_new_component = TRUE + for(var/i in GetComponents(new_type)) + var/datum/component/C = i + if(C.CheckDupeComponent(arglist(arguments))) + make_new_component = FALSE + QDEL_NULL(new_comp) + break + if(!new_comp && make_new_component) + new_comp = new nt(raw_args) else if(!new_comp) - new_comp = new nt(arglist(args)) // There's a valid dupe mode but there's no old component, act like normal + new_comp = new nt(raw_args) // There's a valid dupe mode but there's no old component, act like normal else if(!new_comp) - new_comp = new nt(arglist(args)) // Dupes are allowed, act like normal + new_comp = new nt(raw_args) // Dupes are allowed, act like normal if(!old_comp && !QDELETED(new_comp)) // Nothing related to duplicate components happened and the new component is healthy SEND_SIGNAL(src, COMSIG_COMPONENT_ADDED, new_comp) return new_comp return old_comp +/** + * Get existing component of type, or create it and return a reference to it + * + * Use this if the item needs to exist at the time of this call, but may not have been created before now + * + * Arguments: + * * component_type The typepath of the component to create or return + * * ... additional arguments to be passed when creating the component if it does not exist + */ /datum/proc/LoadComponent(component_type, ...) . = GetComponent(component_type) if(!.) - return AddComponent(arglist(args)) + return _AddComponent(args) +/** + * Removes the component from parent, ends up with a null parent + */ /datum/component/proc/RemoveComponent() if(!parent) return @@ -279,6 +484,14 @@ parent = null SEND_SIGNAL(old_parent, COMSIG_COMPONENT_REMOVING, src) +/** + * Transfer this component to another parent + * + * Component is taken from source datum + * + * Arguments: + * * datum/component/target Target datum to transfer to + */ /datum/proc/TakeComponent(datum/component/target) if(!target || target.parent == src) return @@ -295,6 +508,14 @@ if(target == AddComponent(target)) target._JoinParent() +/** + * Transfer all components to target + * + * All components from source datum are taken + * + * Arguments: + * * /datum/target the target to move the components to + */ /datum/proc/TransferComponents(datum/target) var/list/dc = datum_components if(!dc) @@ -309,5 +530,8 @@ if(C.can_transfer) target.TakeComponent(comps) +/** + * Return the object that is the host of any UI's that this component has + */ /datum/component/nano_host() return parent diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm index 6a0f686b13a..876cf0c0507 100644 --- a/code/datums/components/decal.dm +++ b/code/datums/components/decal.dm @@ -7,7 +7,7 @@ var/first_dir // This only stores the dir arg from init -/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description, _alpha=255) +/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable = CLEAN_GOD, _color, _layer = TURF_LAYER, _description, _alpha = 255) if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha)) return COMPONENT_INCOMPATIBLE first_dir = _dir diff --git a/code/datums/components/edit_complainer.dm b/code/datums/components/edit_complainer.dm new file mode 100644 index 00000000000..35bb05ca791 --- /dev/null +++ b/code/datums/components/edit_complainer.dm @@ -0,0 +1,23 @@ +// This is just a bit of fun while making an example for global signal +/datum/component/edit_complainer + var/list/say_lines + +/datum/component/edit_complainer/Initialize(list/text) + if(!ismovableatom(parent)) + return COMPONENT_INCOMPATIBLE + + var/static/list/default_lines = list( + "CentComm's profligacy frays another thread.", + "Another tug at the weave.", + "Who knows when the stresses will finally shatter the form?", + "Even now a light shines through the cracks.", + "CentComm once more twists knowledge beyond its authority.", + "There is an uncertain air in the mansus.", + ) + say_lines = text || default_lines + + RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react) + +/datum/component/edit_complainer/proc/var_edit_react(datum/source, list/arguments) + var/atom/movable/master = parent + master.atom_say(pick(say_lines)) diff --git a/code/datums/components/jestosterone.dm b/code/datums/components/jestosterone.dm deleted file mode 100644 index f37f1f03efb..00000000000 --- a/code/datums/components/jestosterone.dm +++ /dev/null @@ -1,5 +0,0 @@ -/datum/component/jestosterone - var/mind_type //Is the affected mob a clown / mime? - -/datum/component/jestosterone/Initialize(mind_type_arg) - mind_type = mind_type_arg diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm new file mode 100644 index 00000000000..c6d0c595ebb --- /dev/null +++ b/code/datums/components/label.dm @@ -0,0 +1,87 @@ +/** + The label component. + + This component is used to manage labels applied by the hand labeler. + + Atoms can only have one instance of this component, and therefore only one label at a time. + This is to avoid having names like "Backpack (label1) (label2) (label3)". This is annoying and abnoxious to read. + + When a player clicks the atom with a hand labeler to apply a label, this component gets applied to it. + If the labeler is off, the component will be removed from it, and the label will be removed from its name. + */ +/datum/component/label + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS + /// The name of the label the player is applying to the parent. + var/label_name + +/datum/component/label/Initialize(_label_name) + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + + label_name = _label_name + apply_label() + +/datum/component/label/RegisterWithParent() + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackby) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/Examine) + +/datum/component/label/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) + +/** + This proc will fire after the parent is hit by a hand labeler which is trying to apply another label. + Since the parent already has a label, it will remove the old one from the parent's name, and apply the new one. +*/ +/datum/component/label/InheritComponent(datum/component/label/new_comp , i_am_original, _label_name) + remove_label() + if(new_comp) + label_name = new_comp.label_name + else + label_name = _label_name + apply_label() + +/** + This proc will trigger when any object is used to attack the parent. + + If the attacking object is not a hand labeler, it will return. + If the attacking object is a hand labeler it will restore the name of the parent to what it was before this component was added to it, and the component will be deleted. + + Arguments: + * source: The parent. + * attacker: The object that is hitting the parent. + * user: The mob who is wielding the attacking object. +*/ +/datum/component/label/proc/OnAttackby(datum/source, obj/item/attacker, mob/user) + // If the attacking object is not a hand labeler or its mode is 1 (has a label ready to apply), return. + // The hand labeler should be off (mode is 0), in order to remove a label. + var/obj/item/hand_labeler/labeler = attacker + if(!istype(labeler) || labeler.mode) + return + + remove_label() + playsound(parent, 'sound/items/poster_ripped.ogg', 20, TRUE) + to_chat(user, "You remove the label from [parent].") + qdel(src) // Remove the component from the object. + +/** + This proc will trigger when someone examines the parent. + It will attach the text found in the body of the proc to the `examine_list` and display it to the player examining the parent. + + Arguments: + * source: The parent. + * user: The mob exmaining the parent. + * examine_list: The current list of text getting passed from the parent's normal examine() proc. +*/ +/datum/component/label/proc/Examine(datum/source, mob/user, list/examine_list) + examine_list += "It has a label with some words written on it. Use a hand labeler to remove it." + +/// Applies a label to the name of the parent in the format of: "parent_name (label)" +/datum/component/label/proc/apply_label() + var/atom/owner = parent + owner.name += " ([label_name])" + +/// Removes the label from the parent's name +/datum/component/label/proc/remove_label() + var/atom/owner = parent + owner.name = replacetext(owner.name, "([label_name])", "") // Remove the label text from the parent's name, wherever it's located. + owner.name = trim(owner.name) // Shave off any white space from the beginning or end of the parent's name. diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm new file mode 100644 index 00000000000..3e505eb0a8a --- /dev/null +++ b/code/datums/components/slippery.dm @@ -0,0 +1,56 @@ +/** + * # Slip Component + * + * This is a component that can be applied to any movable atom (mob or obj). + * + * While the atom has this component, any human mob that walks over it will have a chance to slip. + * Duration, tiles moved, and so on, depend on what variables are passed in when the component is added. + * + */ +/datum/component/slippery + /// Text that gets displayed in the slip proc, i.e. "user slips on [description]" + var/description + /// The amount of stun to apply after slip. + var/stun + /// The amount of weaken to apply after slip. + var/weaken + /// The chance that walking over the parent will slip you. + var/slip_chance + /// The amount of tiles someone will be moved after slip. + var/slip_tiles + /// TRUE If this slip can be avoided by walking. + var/walking_is_safe + /// TRUE if having no slip shoes makes you immune to this slip. + var/noslip_is_immune + /// The verb that players will see when someone slips on the parent. In the form of "You [slip_verb]ped on". + var/slip_verb + +/datum/component/slippery/Initialize(_description, _stun = 0, _weaken = 0, _slip_chance = 100, _slip_tiles = 0, _walking_is_safe = TRUE, _noslip_is_immune = TRUE, _slip_verb = "slip") + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + + description = _description + stun = max(0, _stun) + weaken = max(0, _weaken) + slip_chance = max(0, _slip_chance) + slip_tiles = max(0, _slip_tiles) + walking_is_safe = _walking_is_safe + noslip_is_immune = _noslip_is_immune + slip_verb = _slip_verb + +/datum/component/slippery/RegisterWithParent() + RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip) + +/datum/component/slippery/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED)) + +/** + Called whenever the parent recieves either the `MOVABLE_CROSSED` signal or the `ATOM_ENTERED` signal. + + Calls the `victim`'s `slip()` proc with the component's variables as arguments. + Additionally calls the parent's `after_slip()` proc on the `victim`. +*/ +/datum/component/slippery/proc/Slip(datum/source, mob/living/carbon/human/victim) + if(istype(victim) && prob(slip_chance) && victim.slip(description, stun, weaken, slip_tiles, walking_is_safe, noslip_is_immune, slip_verb)) + var/atom/movable/owner = parent + owner.after_slip(victim) diff --git a/code/datums/components/waddling.dm b/code/datums/components/waddling.dm deleted file mode 100644 index a1f538e4dd7..00000000000 --- a/code/datums/components/waddling.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/component/waddling - dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS - -/datum/component/waddling/Initialize() - if(!isliving(parent)) - return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Waddle) - -/datum/component/waddling/proc/Waddle() - var/mob/living/L = parent - if(L.incapacitated() || L.lying) - return - animate(L, pixel_z = 4, time = 0) - animate(pixel_z = 0, transform = turn(matrix(), pick(-12, 0, 12)), time=2) - animate(pixel_z = 0, transform = matrix(), time = 0) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index f908685cf09..7bfc79e4e71 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -1,5 +1,5 @@ /hook/startup/proc/createDatacore() - data_core = new /datum/datacore() + GLOB.data_core = new /datum/datacore() return 1 /datum/datacore @@ -34,7 +34,7 @@ "} var/even = 0 // sort mobs - for(var/datum/data/record/t in data_core.general) + for(var/datum/data/record/t in GLOB.data_core.general) var/name = t.fields["name"] var/rank = t.fields["rank"] var/real_rank = t.fields["real_rank"] @@ -48,28 +48,28 @@ else isactive[name] = t.fields["p_stat"] var/department = 0 - if(real_rank in command_positions) + if(real_rank in GLOB.command_positions) heads[name] = rank department = 1 - if(real_rank in security_positions) + if(real_rank in GLOB.security_positions) sec[name] = rank department = 1 - if(real_rank in engineering_positions) + if(real_rank in GLOB.engineering_positions) eng[name] = rank department = 1 - if(real_rank in medical_positions) + if(real_rank in GLOB.medical_positions) med[name] = rank department = 1 - if(real_rank in science_positions) + if(real_rank in GLOB.science_positions) sci[name] = rank department = 1 - if(real_rank in service_positions) + if(real_rank in GLOB.service_positions) ser[name] = rank department = 1 - if(real_rank in supply_positions) + if(real_rank in GLOB.supply_positions) sup[name] = rank department = 1 - if(real_rank in nonhuman_positions) + if(real_rank in GLOB.nonhuman_positions) bot[name] = rank department = 1 if(!department && !(name in heads)) @@ -133,10 +133,10 @@ we'll only update it when it changes. The PDA_Manifest global list is zeroed ou using /datum/datacore/proc/manifest_inject(), or manifest_insert() */ -var/global/list/PDA_Manifest = list() +GLOBAL_LIST_EMPTY(PDA_Manifest) /datum/datacore/proc/get_manifest_json() - if(PDA_Manifest.len) + if(GLOB.PDA_Manifest.len) return var/heads[0] var/sec[0] @@ -147,7 +147,7 @@ var/global/list/PDA_Manifest = list() var/sup[0] var/bot[0] var/misc[0] - for(var/datum/data/record/t in data_core.general) + for(var/datum/data/record/t in GLOB.data_core.general) var/name = sanitize(t.fields["name"]) var/rank = sanitize(t.fields["rank"]) var/real_rank = t.fields["real_rank"] @@ -155,50 +155,50 @@ var/global/list/PDA_Manifest = list() var/isactive = t.fields["p_stat"] var/department = 0 var/depthead = 0 // Department Heads will be placed at the top of their lists. - if(real_rank in command_positions) + if(real_rank in GLOB.command_positions) heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 depthead = 1 if(rank == "Captain" && heads.len != 1) heads.Swap(1, heads.len) - if(real_rank in security_positions) + if(real_rank in GLOB.security_positions) sec[++sec.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && sec.len != 1) sec.Swap(1, sec.len) - if(real_rank in engineering_positions) + if(real_rank in GLOB.engineering_positions) eng[++eng.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && eng.len != 1) eng.Swap(1, eng.len) - if(real_rank in medical_positions) + if(real_rank in GLOB.medical_positions) med[++med.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && med.len != 1) med.Swap(1, med.len) - if(real_rank in science_positions) + if(real_rank in GLOB.science_positions) sci[++sci.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && sci.len != 1) sci.Swap(1, sci.len) - if(real_rank in service_positions) + if(real_rank in GLOB.service_positions) ser[++ser.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && ser.len != 1) ser.Swap(1, ser.len) - if(real_rank in supply_positions) + if(real_rank in GLOB.supply_positions) sup[++sup.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && sup.len != 1) sup.Swap(1, sup.len) - if(real_rank in nonhuman_positions) + if(real_rank in GLOB.nonhuman_positions) bot[++bot.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 @@ -206,7 +206,7 @@ var/global/list/PDA_Manifest = list() misc[++misc.len] = list("name" = name, "rank" = rank, "active" = isactive) - PDA_Manifest = list(\ + GLOB.PDA_Manifest = list(\ "heads" = heads,\ "sec" = sec,\ "eng" = eng,\ @@ -226,12 +226,12 @@ var/global/list/PDA_Manifest = list() manifest_inject(H) /datum/datacore/proc/manifest_modify(name, assignment) - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() var/datum/data/record/foundrecord var/real_title = assignment - for(var/datum/data/record/t in data_core.general) + for(var/datum/data/record/t in GLOB.data_core.general) if(t) if(t.fields["name"] == name) foundrecord = t @@ -250,10 +250,10 @@ var/global/list/PDA_Manifest = list() foundrecord.fields["rank"] = assignment foundrecord.fields["real_rank"] = real_title -var/record_id_num = 1001 +GLOBAL_VAR_INIT(record_id_num, 1001) /datum/datacore/proc/manifest_inject(mob/living/carbon/human/H) - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() if(H.mind && (H.mind.assigned_role != H.mind.special_role)) var/assignment @@ -266,7 +266,7 @@ var/record_id_num = 1001 else assignment = "Unassigned" - var/id = num2hex(record_id_num++, 6) + var/id = num2hex(GLOB.record_id_num++, 6) //General Record @@ -624,7 +624,7 @@ var/record_id_num = 1001 clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) - else if(H.mind && H.mind.assigned_role in get_all_centcom_jobs()) + else if(H.mind && (H.mind.assigned_role in get_all_centcom_jobs())) clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) else diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 00054349e36..6a183987a30 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -5,7 +5,7 @@ /// Status traits attached to this datum var/list/status_traits var/list/comp_lookup - var/list/signal_procs + var/list/list/datum/callback/signal_procs var/signal_enabled = FALSE var/datum_flags = NONE var/var_edited = FALSE //Warranty void if seal is broken diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 1defb9a6afa..b2b09003934 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -31,7 +31,7 @@ /datum/proc/vv_get_var(var_name) switch(var_name) - if("attack_log", "debug_log") + if("attack_log_old", "debug_log") return debug_variable(var_name, vars[var_name], 0, src, sanitize = FALSE) if("vars") return debug_variable(var_name, list(), 0, src) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 63fa3af0605..81312cdfcc4 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -126,11 +126,19 @@ AddDisease(D) +/** + * Forces the mob to contract a virus. If the mob can have viruses. Ignores clothing and other protection + * Returns TRUE if it succeeds. False if it doesn't + * + * Arguments: + * * D - the disease the mob will try to contract + */ //Same as ContractDisease, except never overidden clothes checks /mob/proc/ForceContractDisease(datum/disease/D) if(!CanContractDisease(D)) - return 0 + return FALSE AddDisease(D) + return TRUE /mob/living/carbon/human/CanContractDisease(datum/disease/D) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 84dde0f22e0..6b7c2d89606 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -29,7 +29,7 @@ #define BIOHAZARD "BIOHAZARD THREAT!" -var/list/diseases = subtypesof(/datum/disease) +GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease)) /datum/disease diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index e0711d88e5f..9aeade59a1d 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -6,16 +6,15 @@ If you need help with creating new symptoms or expanding the advance disease, ask for Giacom on #coderbus. */ - -var/list/archive_diseases = list() +GLOBAL_LIST_EMPTY(archive_diseases) // The order goes from easy to cure to hard to cure. -var/list/advance_cures = list( +GLOBAL_LIST_INIT(advance_cures, list( "sodiumchloride", "sugar", "orangejuice", "spaceacillin", "salglu_solution", "ethanol", "teporone", "diphenhydramine", "lipolicide", "silver", "gold" - ) +)) /* @@ -132,7 +131,7 @@ var/list/advance_cures = list( // Generate symptoms. By default, we only choose non-deadly symptoms. var/list/possible_symptoms = list() - for(var/symp in list_symptoms) + for(var/symp in GLOB.list_symptoms) var/datum/symptom/S = new symp if(S.level >= level_min && S.level <= level_max) if(!HasSymptom(S)) @@ -158,13 +157,13 @@ var/list/advance_cures = list( AssignProperties(properties) id = null - if(!archive_diseases[GetDiseaseID()]) + if(!GLOB.archive_diseases[GetDiseaseID()]) if(new_name) AssignName() - archive_diseases[GetDiseaseID()] = src // So we don't infinite loop - archive_diseases[GetDiseaseID()] = new /datum/disease/advance(0, src, 1) + GLOB.archive_diseases[GetDiseaseID()] = src // So we don't infinite loop + GLOB.archive_diseases[GetDiseaseID()] = new /datum/disease/advance(0, src, 1) - var/datum/disease/advance/A = archive_diseases[GetDiseaseID()] + var/datum/disease/advance/A = GLOB.archive_diseases[GetDiseaseID()] AssignName(A.name) //Generate disease properties based on the effects. Returns an associated list. @@ -246,9 +245,9 @@ var/list/advance_cures = list( // Will generate a random cure, the less resistance the symptoms have, the harder the cure. /datum/disease/advance/proc/GenerateCure(list/properties = list()) if(properties && properties.len) - var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) + var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, GLOB.advance_cures.len) // to_chat(world, "Res = [res]") - cures = list(advance_cures[res]) + cures = list(GLOB.advance_cures[res]) // Get the cure name from the cure_id var/datum/reagent/D = GLOB.chemical_reagents_list[cures[1]] @@ -371,7 +370,7 @@ var/list/advance_cures = list( var/list/symptoms = list() symptoms += "Done" - symptoms += list_symptoms.Copy() + symptoms += GLOB.list_symptoms.Copy() do if(user) var/symptom = input(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom") in symptoms @@ -397,7 +396,7 @@ var/list/advance_cures = list( for(var/datum/disease/advance/AD in GLOB.active_diseases) AD.Refresh() - for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list)) + for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list)) if(!is_station_level(H.z)) continue if(!H.HasDisease(D)) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index 1a9bba6961e..a3111478b26 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -33,7 +33,7 @@ Bonus if(3, 4) to_chat(M, "[pick("You hear a ringing in your ear.", "Your ears pop.")]") if(5) - if(!(M.disabilities & DEAF)) + if(!(DEAF in M.mutations)) to_chat(M, "Your ears pop and begin ringing loudly!") M.BecomeDeaf() spawn(200) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index cf39d91a866..5759ab32de6 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -62,4 +62,4 @@ Bonus M.reagents.add_reagent("oculine", 20) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) - to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]") + to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your hearing feels more acute.")]") diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index aa5a3494584..a3346dce800 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -35,7 +35,7 @@ BONUS switch(A.stage) if(5) H.s_tone = -85 - H.update_body(0) + H.update_body() else H.visible_message("[H] looks a bit pale...", "Your skin suddenly appears lighter...") @@ -79,7 +79,7 @@ BONUS switch(A.stage) if(5) H.s_tone = 85 - H.update_body(0) + H.update_body() else H.visible_message("[H] looks a bit dark...", "Your skin suddenly appears darker...") diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index f2c5beee400..8f72de7f599 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -1,6 +1,6 @@ // Symptoms are the effects that engineered advanced diseases do. -var/list/list_symptoms = subtypesof(/datum/symptom) +GLOBAL_LIST_INIT(list_symptoms, subtypesof(/datum/symptom)) /datum/symptom // Buffs/Debuffs the symptom has to the overall engineered disease. @@ -17,7 +17,7 @@ var/list/list_symptoms = subtypesof(/datum/symptom) var/id = "" /datum/symptom/New() - var/list/S = list_symptoms + var/list/S = GLOB.list_symptoms for(var/i = 1; i <= S.len; i++) if(type == S[i]) id = "[i]" diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index cacd229c429..02f36b532d7 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -30,7 +30,7 @@ affected_mob.emote("stare") if(prob(2)) affected_mob.emote("drool") - if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't retard you to death now + if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't brainpain you to death now affected_mob.adjustBrainLoss(2) if(prob(2)) to_chat(affected_mob, "Your try to remember something important...but can't.") @@ -40,7 +40,7 @@ affected_mob.emote("stare") if(prob(2)) affected_mob.emote("drool") - if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't retard you to death now + if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't brainpain you to death now affected_mob.adjustBrainLoss(3) if(prob(2)) to_chat(affected_mob, "Strange buzzing fills your head, removing all thoughts.") diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm index e3ebc2cf905..3afb48ce534 100644 --- a/code/datums/diseases/critical.dm +++ b/code/datums/diseases/critical.dm @@ -6,12 +6,17 @@ if(prob(stage_prob)) stage = min(stage + 1, max_stages) + if(has_cure()) + cure() + return FALSE + return TRUE + +/datum/disease/critical/has_cure() for(var/C_id in cures) if(affected_mob.reagents.has_reagent(C_id)) if(prob(cure_chance)) - cure() - return FALSE - return TRUE + return TRUE + return FALSE /datum/disease/critical/shock name = "Shock" @@ -31,7 +36,7 @@ /datum/disease/critical/shock/stage_act() if(..()) - if(affected_mob.health >= 25) + if(affected_mob.health >= 25 && affected_mob.nutrition >= NUTRITION_LEVEL_HYPOGLYCEMIA) to_chat(affected_mob, "You feel better.") cure() return @@ -134,3 +139,64 @@ if(prob(5) && ishuman(affected_mob)) var/mob/living/carbon/human/H = affected_mob H.set_heartattack(TRUE) + +/datum/disease/critical/hypoglycemia + name = "Hypoglycemia" + form = "Medical Emergency" + max_stages = 3 + spread_flags = SPECIAL + spread_text = "The patient has low blood sugar." + cure_text = "Eating or administration of vitamins or nutrients" + viable_mobtypes = list(/mob/living/carbon/human) + stage_prob = 1 + severity = DANGEROUS + disease_flags = CURABLE + bypasses_immunity = TRUE + virus_heal_resistant = TRUE + +/datum/disease/critical/hypoglycemia/has_cure() + if(ishuman(affected_mob)) + var/mob/living/carbon/human/H = affected_mob + if(NO_HUNGER in H.dna.species.species_traits) + return TRUE + if(ismachine(H)) + return TRUE + return ..() + +/datum/disease/critical/hypoglycemia/stage_act() + if(..()) + if(affected_mob.nutrition > NUTRITION_LEVEL_HYPOGLYCEMIA) + to_chat(affected_mob, "You feel a lot better!") + cure() + return + switch(stage) + if(1) + if(prob(4)) + to_chat(affected_mob, "You feel hungry!") + if(prob(2)) + to_chat(affected_mob, "You have a headache!") + if(prob(2)) + to_chat(affected_mob, "You feel [pick("anxious", "depressed")]!") + if(2) + if(prob(4)) + to_chat(affected_mob, "You feel like everything is wrong with your life!") + if(prob(5)) + affected_mob.Slowed(rand(4, 16)) + to_chat(affected_mob, "You feel [pick("tired", "exhausted", "sluggish")].") + if(prob(5)) + affected_mob.Weaken(6) + affected_mob.Stuttering(10) + to_chat(affected_mob, "You feel [pick("numb", "confused", "dizzy", "lightheaded")].") + affected_mob.emote("collapse") + if(3) + if(prob(8)) + var/datum/disease/D = new /datum/disease/critical/shock + affected_mob.ForceContractDisease(D) + if(prob(12)) + affected_mob.Weaken(6) + affected_mob.Stuttering(10) + to_chat(affected_mob, "You feel [pick("numb", "confused", "dizzy", "lightheaded")].") + affected_mob.emote("collapse") + if(prob(12)) + to_chat(affected_mob, "You feel [pick("tired", "exhausted", "sluggish")].") + affected_mob.Slowed(rand(4, 16)) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 158324e72f1..bb85f62199a 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -9,7 +9,7 @@ viable_mobtypes = list(/mob/living/carbon/human) disease_flags = CAN_CARRY|CAN_RESIST|CURABLE permeability_mod = 0.75 - desc = "Some speculate, that this virus is the cause of Wizard Federation existance. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." + desc = "Some speculate, that this virus is the cause of Wizard Federation existance. Subjects affected show the signs of dementia, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." severity = HARMFUL required_organs = list(/obj/item/organ/external/head) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm new file mode 100644 index 00000000000..46a295f90be --- /dev/null +++ b/code/datums/elements/_element.dm @@ -0,0 +1,55 @@ +/** + * A holder for simple behaviour that can be attached to many different types + * + * Only one element of each type is instanced during game init. + * Otherwise acts basically like a lightweight component. + */ +/datum/element + /// Option flags for element behaviour + var/element_flags = NONE + /** + * The index of the first attach argument to consider for duplicate elements + * + * Is only used when flags contains [ELEMENT_BESPOKE] + * + * This is infinity so you must explicitly set this + */ + var/id_arg_index = INFINITY + +/// Activates the functionality defined by the element on the given target datum +/datum/element/proc/Attach(datum/target) + SHOULD_CALL_PARENT(1) + if(type == /datum/element) + return ELEMENT_INCOMPATIBLE + SEND_SIGNAL(target, COMSIG_ELEMENT_ATTACH, src) + if(element_flags & ELEMENT_DETACH) + RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach, override = TRUE) + +/// Deactivates the functionality defines by the element on the given datum +/datum/element/proc/Detach(datum/source, force) + SEND_SIGNAL(source, COMSIG_ELEMENT_DETACH, src) + SHOULD_CALL_PARENT(1) + UnregisterSignal(source, COMSIG_PARENT_QDELETING) + +/datum/element/Destroy(force) + if(!force) + return QDEL_HINT_LETMELIVE + SSdcs.elements_by_type -= type + return ..() + +//DATUM PROCS + +/// Finds the singleton for the element type given and attaches it to src +/datum/proc/_AddElement(list/arguments) + var/datum/element/ele = SSdcs.GetElement(arguments) + arguments[1] = src + if(ele.Attach(arglist(arguments)) == ELEMENT_INCOMPATIBLE) + CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]") + +/** + * Finds the singleton for the element type given and detaches it from src + * You only need additional arguments beyond the type if you're using [ELEMENT_BESPOKE] + */ +/datum/proc/_RemoveElement(list/arguments) + var/datum/element/ele = SSdcs.GetElement(arguments) + ele.Detach(src) diff --git a/code/datums/elements/waddling.dm b/code/datums/elements/waddling.dm new file mode 100644 index 00000000000..6abe75b3923 --- /dev/null +++ b/code/datums/elements/waddling.dm @@ -0,0 +1,25 @@ +/datum/element/waddling + +/datum/element/waddling/Attach(datum/target) + . = ..() + if(!ismovableatom(target)) + return ELEMENT_INCOMPATIBLE + if(isliving(target)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/LivingWaddle) + else + RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Waddle) + +/datum/element/waddling/Detach(datum/source, force) + . = ..() + UnregisterSignal(source, COMSIG_MOVABLE_MOVED) + +/datum/element/waddling/proc/LivingWaddle(mob/living/target) + if(target.incapacitated() || target.lying) + return + Waddle(target) + +/datum/element/waddling/proc/Waddle(atom/movable/target) + animate(target, pixel_z = 4, time = 0) + var/prev_trans = matrix(target.transform) + animate(pixel_z = 0, transform = turn(target.transform, pick(-12, 0, 12)), time = 2) + animate(pixel_z = 0, transform = prev_trans, time = 0) diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index 35cc970aa67..63b70b512ee 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -645,7 +645,7 @@ What are the archived variables for? ((nitrogen < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen) || (nitrogen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen))) return 0 if((abs(carbon_dioxide-sample.carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && \ - ((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (oxygen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide))) + ((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (carbon_dioxide > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide))) return 0 if((abs(toxins-sample.toxins) > MINIMUM_AIR_TO_SUSPEND) && \ ((toxins < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins) || (toxins > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins))) diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm deleted file mode 100644 index 214045941b5..00000000000 --- a/code/datums/helper_datums/global_iterator.dm +++ /dev/null @@ -1,152 +0,0 @@ -/* -README: - -The global_iterator datum is supposed to provide a simple and robust way to -create some constantly "looping" processes with ability to stop and restart them at will. -Generally, the only thing you want to play with (meaning, redefine) is the process() proc. -It must contain all the things you want done. - -Control functions: - new - used to create datum. First argument (optional) - var list(to use in process() proc) as list, - second (optional) - autostart control. - If autostart == TRUE, the loop will be started immediately after datum creation. - - start(list/arguments) - starts the loop. Takes arguments(optional) as a list, which is then used - by process() proc. Returns null if datum already active, 1 if loop started succesfully and 0 if there's - an error in supplied arguments (not list or empty list). - - stop() - stops the loop. Returns null if datum is already inactive and 1 on success. - - set_delay(new_delay) - sets the delay between iterations. Pretty selfexplanatory. - Returns 0 on error(new_delay is not numerical), 1 otherwise. - - set_process_args(list/arguments) - passes the supplied arguments to the process() proc. - - active() - Returns 1 if datum is active, 0 otherwise. - - toggle() - toggles datum state. Returns new datum state (see active()). - -Misc functions: - - get_last_exec_time() - Returns the time of last iteration. - - get_last_exec_time_as_text() - Returns the time of last iteration as text - - -Control vars: - - delay - delay between iterations - - check_for_null - if equals TRUE, on each iteration the supplied arguments will be checked for nulls. - If some varible equals null (and null only), the loop is stopped. - Usefull, if some var unexpectedly becomes null - due to object deletion, for example. - Of course, you can also check the variables inside process() proc to prevent runtime errors. - -Data storage vars: - - result - stores the value returned by process() proc -*/ - -/datum/global_iterator - var/control_switch = 0 - var/delay = 10 - var/list/arg_list = new - var/last_exec = null - var/check_for_null = 1 - var/forbid_garbage = 0 - var/result - var/state = 0 - -/datum/global_iterator/New(list/arguments=null,autostart=1) - delay = delay>0?(delay):1 - if(forbid_garbage) //prevents garbage collection with tag != null - tag = "\ref[src]" - set_process_args(arguments) - if(autostart) - start() - return - -/datum/global_iterator/proc/main() - state = 1 - while(src && control_switch) - last_exec = world.timeofday - if(check_for_null && has_null_args()) - stop() - return 0 - result = process(arglist(arg_list)) - for(var/sleep_time=delay;sleep_time>0;sleep_time--) //uhh, this is ugly. But I see no other way to terminate sleeping proc. Such disgrace. - if(!control_switch) - return 0 - sleep(1) - return 0 - -/datum/global_iterator/proc/start(list/arguments=null) - if(active()) - return - if(arguments) - if(!set_process_args(arguments)) - return 0 - if(!state_check()) //the main loop is sleeping, wait for it to terminate. - return - control_switch = 1 - spawn() - state = main() - return 1 - -/datum/global_iterator/proc/stop() - if(!active()) - return - control_switch = 0 - spawn(-1) //report termination error but don't wait for state_check(). - state_check() - return 1 - -/datum/global_iterator/proc/state_check() - var/lag = 0 - while(state) - sleep(1) - if(++lag>10) - CRASH("The global_iterator loop \ref[src] failed to terminate in designated timeframe. This may be caused by server lagging.") - return 1 - -/datum/global_iterator/process() - return - -/datum/global_iterator/proc/active() - return control_switch - -/datum/global_iterator/proc/has_null_args() - if(null in arg_list) - return 1 - return 0 - - -/datum/global_iterator/proc/set_delay(new_delay) - if(isnum(new_delay)) - delay = max(1, round(new_delay)) - return 1 - else - return 0 - -/datum/global_iterator/proc/get_last_exec_time() - return (last_exec||0) - -/datum/global_iterator/proc/get_last_exec_time_as_text() - return (time2text(last_exec)||"Wasn't executed yet") - -/datum/global_iterator/proc/set_process_args(list/arguments) - if(arguments && istype(arguments, /list) && arguments.len) - arg_list = arguments - return 1 - else -// to_chat(world, "Invalid arguments supplied for [src.type], ref = \ref[src]") - return 0 - -/datum/global_iterator/proc/toggle_null_checks() - check_for_null = !check_for_null - return check_for_null - -/datum/global_iterator/proc/toggle() - if(!stop()) - start() - return active() diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm index 8a1e7576e7a..a54707842db 100644 --- a/code/datums/helper_datums/map_template.dm +++ b/code/datums/helper_datums/map_template.dm @@ -17,7 +17,7 @@ name = rename /datum/map_template/proc/preload_size(path) - var/bounds = maploader.load_map(file(path), 1, 1, 1, cropMap = 0, measureOnly = 1) + var/bounds = GLOB.maploader.load_map(file(path), 1, 1, 1, cropMap = 0, measureOnly = 1) if(bounds) width = bounds[MAP_MAXX] // Assumes all templates are rectangular, have a single Z level, and begin at 1,1,1 height = bounds[MAP_MAXY] @@ -48,8 +48,8 @@ // This system will metaphorically snap in half (not postpone init everywhere) // if given a multi-z template // it might need to be adapted for that when that time comes - space_manager.add_dirt(placement.z) - var/list/bounds = maploader.load_map(get_file(), min_x, min_y, placement.z, cropMap = 1) + GLOB.space_manager.add_dirt(placement.z) + var/list/bounds = GLOB.maploader.load_map(get_file(), min_x, min_y, placement.z, cropMap = 1) if(!bounds) return 0 if(bot_left == null || top_right == null) @@ -58,7 +58,7 @@ if(ST_bot_left == null || ST_top_right == null) log_runtime(EXCEPTION("One of the smoothing corners is bust"), src) - space_manager.remove_dirt(placement.z) + GLOB.space_manager.remove_dirt(placement.z) late_setup_level( block(bot_left, top_right), block(ST_bot_left, ST_top_right)) @@ -108,7 +108,7 @@ for(var/map in flist(path)) if(cmptext(copytext(map, length(map) - 3), ".dmm")) var/datum/map_template/T = new(path = "[path][map]", rename = "[map]") - map_templates[T.name] = T + GLOB.map_templates[T.name] = T if(!config.disable_space_ruins) // so we don't unnecessarily clutter start-up preloadRuinTemplates() @@ -134,13 +134,13 @@ if(banned.Find(R.mappath)) continue - map_templates[R.name] = R - ruins_templates[R.name] = R + GLOB.map_templates[R.name] = R + GLOB.ruins_templates[R.name] = R if(istype(R, /datum/map_template/ruin/lavaland)) - lava_ruins_templates[R.name] = R + GLOB.lava_ruins_templates[R.name] = R if(istype(R, /datum/map_template/ruin/space)) - space_ruins_templates[R.name] = R + GLOB.space_ruins_templates[R.name] = R /proc/preloadShelterTemplates() for(var/item in subtypesof(/datum/map_template/shelter)) @@ -149,8 +149,8 @@ continue var/datum/map_template/shelter/S = new shelter_type() - shelter_templates[S.shelter_id] = S - map_templates[S.shelter_id] = S + GLOB.shelter_templates[S.shelter_id] = S + GLOB.map_templates[S.shelter_id] = S /proc/preloadShuttleTemplates() for(var/item in subtypesof(/datum/map_template/shuttle)) @@ -160,5 +160,5 @@ var/datum/map_template/shuttle/S = new shuttle_type() - shuttle_templates[S.shuttle_id] = S - map_templates[S.shuttle_id] = S + GLOB.shuttle_templates[S.shuttle_id] = S + GLOB.map_templates[S.shuttle_id] = S diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index b8684072c3f..369c01cce42 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -148,7 +148,6 @@ eye.eye_user = user eye.name = "Camera Eye ([user.name])" user.remote_control = eye - user.remote_view = 1 user.reset_perspective(eye) eye.setLoc(get_turf(H)) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index f204465d7d6..50152c4873d 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -1,8 +1,8 @@ /* HUD DATUMS */ -var/global/list/all_huds = list() +GLOBAL_LIST_EMPTY(all_huds) ///GLOBAL HUD LIST -var/datum/atom_hud/huds = list( \ +GLOBAL_LIST_INIT(huds, list( \ DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/human/security/basic(), \ DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(), \ DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \ @@ -24,7 +24,7 @@ var/datum/atom_hud/huds = list( \ ANTAG_HUD_DEVIL = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_EVENTMISC = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden()\ - ) +)) /datum/atom_hud var/list/atom/hudatoms = list() //list of all atoms which display this hud @@ -33,14 +33,14 @@ var/datum/atom_hud/huds = list( \ /datum/atom_hud/New() - all_huds += src + GLOB.all_huds += src /datum/atom_hud/Destroy() for(var/v in hudusers) remove_hud_from(v) for(var/v in hudatoms) remove_from_hud(v) - all_huds -= src + GLOB.all_huds -= src return ..() /datum/atom_hud/proc/remove_hud_from(mob/M) @@ -99,7 +99,7 @@ var/datum/atom_hud/huds = list( \ serv_huds += serv.thrallhud - for(var/datum/atom_hud/hud in (all_huds|serv_huds))//|gang_huds)) + for(var/datum/atom_hud/hud in (GLOB.all_huds|serv_huds))//|gang_huds)) if(src in hud.hudusers) hud.add_hud_to(src) diff --git a/code/datums/log_record.dm b/code/datums/log_record.dm new file mode 100644 index 00000000000..9b7d52b5390 --- /dev/null +++ b/code/datums/log_record.dm @@ -0,0 +1,37 @@ +/datum/log_record + var/log_type // Type of log + var/raw_time // When did this happen? + var/what // What happened + var/who // Who did it + var/target // Who/what was targeted (can be a string) + var/turf/where // Where did it happen + +/datum/log_record/New(_log_type, _who, _what, _target, _where, _raw_time) + log_type = _log_type + + who = get_subject_text(_who) + what = _what + target = get_subject_text(_target) + if(!_where) + _where = get_turf(_who) + where = _where + if(!_raw_time) + _raw_time = world.time + raw_time = _raw_time + +/datum/log_record/proc/get_subject_text(subject) + if(ismob(subject) || isclient(subject) || istype(subject, /datum/mind)) + return key_name_admin(subject) + if(isatom(subject)) + var/atom/A = subject + return A.name + if(istype(subject, /datum)) + var/datum/D = subject + return D.type + return subject + +/proc/compare_log_record(datum/log_record/A, datum/log_record/B) + var/time_diff = A.raw_time - B.raw_time + if(!time_diff) // Same time + return cmp_text_asc(A.log_type, B.log_type) + return time_diff diff --git a/code/datums/log_viewer.dm b/code/datums/log_viewer.dm new file mode 100644 index 00000000000..67eb3d21d86 --- /dev/null +++ b/code/datums/log_viewer.dm @@ -0,0 +1,235 @@ +#define ALL_LOGS list(ATTACK_LOG, DEFENSE_LOG, CONVERSION_LOG, SAY_LOG, EMOTE_LOG, MISC_LOG) + +/datum/log_viewer + var/time_from = 0 + var/time_to = 4 HOURS // 4 Hours should be enough. INFINITY would screw the UI up + var/list/selected_mobs = list() // The mobs in question + var/list/selected_log_types = list() // The log types being searched for + + var/list/log_records = list() // Found and sorted records + +/datum/log_viewer/proc/clear_all() + selected_mobs.Cut() + selected_log_types.Cut() + time_from = initial(time_from) + time_to = initial(time_to) + log_records.Cut() + return + +/datum/log_viewer/proc/search() + log_records.Cut() // Empty the old results + var/list/invalid_mobs = list() + for(var/i in selected_mobs) + var/mob/M = i + if(!M || QDELETED(M)) + invalid_mobs |= M + continue + for(var/log_type in selected_log_types) + var/list/logs = M.logs[log_type] + var/len_logs = length(logs) + if(len_logs) + var/start_index = get_earliest_log_index(logs) + if(!start_index) // No log found that matches the starting time criteria + continue + var/end_index = get_latest_log_index(logs) + if(!end_index) // No log found that matches the end time criteria + continue + log_records.Add(logs.Copy(start_index, end_index + 1)) + + if(invalid_mobs.len) + to_chat(usr, "The search criteria contained invalid mobs. They have been removed from the criteria.") + for(var/i in invalid_mobs) + selected_mobs -= i // Cleanup + + log_records = sortTim(log_records, /proc/compare_log_record) + +/** Binary search like implementation to find the earliest log + * Returns the index of the earliest log using the time_from value for the given list of logs. + * It will return 0 if no log after time_from is found +*/ +/datum/log_viewer/proc/get_earliest_log_index(list/logs) + if(!time_from) + return 1 + var/start = 1 + var/end = length(logs) + var/mid + do + mid = round_down((end + start) / 2) + var/datum/log_record/L = logs[mid] + if(L.raw_time >= time_from) + end = mid + else + start = mid + while(end - start > 1) + var/datum/log_record/L = logs[end] + if(L.raw_time >= time_from) // Check if there is atleast one valid log + return end + return 0 + +/** Binary search like implementation to find the latest log + * Returns the index of the latest log using the time_to value (1 second is added to prevent rounding weirdness) for the given list of logs. + * It will return 0 if no log before time_to + 10 is found +*/ +/datum/log_viewer/proc/get_latest_log_index(list/logs) + if(world.time < time_to) + return length(logs) + + var/end = length(logs) + var/start = 1 + var/mid + var/max_time = time_to + 10 + do + mid = round((end + start) / 2 + 0.5) + var/datum/log_record/L = logs[mid] + if(L.raw_time >= max_time) + end = mid + else + start = mid + while(end - start > 1) + var/datum/log_record/L = logs[start] + if(L.raw_time < max_time) // Check if there is atleast one valid log + return start + return 0 + +/datum/log_viewer/proc/add_mob(mob/user, mob/M) + if(!M || !user) + return + selected_mobs |= M + + show_ui(user) + +/datum/log_viewer/proc/show_ui(mob/user) + var/all_log_types = ALL_LOGS + var/trStyleTop = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;" + var/trStyle = "border-top:1px solid; border-bottom:1px solid; padding-top: 5px; padding-bottom: 5px;" + var/dat + dat += "" + dat += "
*/
-// What each index means:
-#define DNA_OFF_LOWERBOUND 1 // changed as lists start at 1 not 0
-#define DNA_OFF_UPPERBOUND 2
-#define DNA_ON_LOWERBOUND 3
-#define DNA_ON_UPPERBOUND 4
-
-// Define block bounds (off-low,off-high,on-low,on-high)
-// Used in setupgame.dm
-#define DNA_DEFAULT_BOUNDS list(1,2049,2050,4095)
-#define DNA_HARDER_BOUNDS list(1,3049,3050,4095)
-#define DNA_HARD_BOUNDS list(1,3490,3500,4095)
-
-// UI Indices (can change to mutblock style, if desired)
-#define DNA_UI_HAIR_R 1
-#define DNA_UI_HAIR_G 2
-#define DNA_UI_HAIR_B 3
-#define DNA_UI_HAIR2_R 4
-#define DNA_UI_HAIR2_G 5
-#define DNA_UI_HAIR2_B 6
-#define DNA_UI_BEARD_R 7
-#define DNA_UI_BEARD_G 8
-#define DNA_UI_BEARD_B 9
-#define DNA_UI_BEARD2_R 10
-#define DNA_UI_BEARD2_G 11
-#define DNA_UI_BEARD2_B 12
-#define DNA_UI_SKIN_TONE 13
-#define DNA_UI_SKIN_R 14
-#define DNA_UI_SKIN_G 15
-#define DNA_UI_SKIN_B 16
-#define DNA_UI_HACC_R 17
-#define DNA_UI_HACC_G 18
-#define DNA_UI_HACC_B 19
-#define DNA_UI_HEAD_MARK_R 20
-#define DNA_UI_HEAD_MARK_G 21
-#define DNA_UI_HEAD_MARK_B 22
-#define DNA_UI_BODY_MARK_R 23
-#define DNA_UI_BODY_MARK_G 24
-#define DNA_UI_BODY_MARK_B 25
-#define DNA_UI_TAIL_MARK_R 26
-#define DNA_UI_TAIL_MARK_G 27
-#define DNA_UI_TAIL_MARK_B 28
-#define DNA_UI_EYES_R 29
-#define DNA_UI_EYES_G 30
-#define DNA_UI_EYES_B 31
-#define DNA_UI_GENDER 32
-#define DNA_UI_BEARD_STYLE 33
-#define DNA_UI_HAIR_STYLE 34
-/*#define DNA_UI_BACC_STYLE 23*/
-#define DNA_UI_HACC_STYLE 35
-#define DNA_UI_HEAD_MARK_STYLE 36
-#define DNA_UI_BODY_MARK_STYLE 37
-#define DNA_UI_TAIL_MARK_STYLE 38
-#define DNA_UI_LENGTH 38 // Update this when you add something, or you WILL break shit.
-
-#define DNA_SE_LENGTH 55 // Was STRUCDNASIZE, size 27. 15 new blocks added = 42, plus room to grow.
-
// Defines which values mean "on" or "off".
// This is to make some of the more OP superpowers a larger PITA to activate,
// and to tell our new DNA datum which values to set in order to turn something
// on or off.
-var/global/list/dna_activity_bounds[DNA_SE_LENGTH]
-var/global/list/assigned_gene_blocks[DNA_SE_LENGTH]
+GLOBAL_LIST_INIT(dna_activity_bounds, new(DNA_SE_LENGTH))
+GLOBAL_LIST_INIT(assigned_gene_blocks, new(DNA_SE_LENGTH))
// Used to determine what each block means (admin hax and species stuff on /vg/, mostly)
-var/global/list/assigned_blocks[DNA_SE_LENGTH]
+GLOBAL_LIST_INIT(assigned_blocks, new(DNA_SE_LENGTH))
-var/global/list/datum/dna/gene/dna_genes[0]
+GLOBAL_LIST_EMPTY(dna_genes)
-var/global/list/good_blocks[0]
-var/global/list/bad_blocks[0]
+GLOBAL_LIST_EMPTY(good_blocks)
+GLOBAL_LIST_EMPTY(bad_blocks)
/datum/dna
// READ-ONLY, GETS OVERWRITTEN
// DO NOT FUCK WITH THESE OR BYOND WILL EAT YOUR FACE
- var/uni_identity="" // Encoded UI
- var/struc_enzymes="" // Encoded SE
- var/unique_enzymes="" // MD5 of player name
+ var/uni_identity = "" // Encoded UI
+ var/struc_enzymes = "" // Encoded SE
+ var/unique_enzymes = "" // MD5 of player name
// Original Encoded SE, for use with Ryetalin
- var/struc_enzymes_original="" // Encoded SE
+ var/struc_enzymes_original = "" // Encoded SE
var/list/SE_original[DNA_SE_LENGTH]
// Internal dirtiness checks
- var/dirtyUI=0
- var/dirtySE=0
+ var/dirtyUI = 0
+ var/dirtySE = 0
// Okay to read, but you're an idiot if you do.
// BLOCK = VALUE
@@ -106,10 +50,10 @@ var/global/list/bad_blocks[0]
// USE THIS WHEN COPYING STUFF OR YOU'LL GET CORRUPTION!
/datum/dna/proc/Clone()
var/datum/dna/new_dna = new()
- new_dna.unique_enzymes=unique_enzymes
- new_dna.struc_enzymes_original=struc_enzymes_original // will make clone's SE the same as the original, do we want this?
+ new_dna.unique_enzymes = unique_enzymes
+ new_dna.struc_enzymes_original = struc_enzymes_original // will make clone's SE the same as the original, do we want this?
new_dna.blood_type = blood_type
- new_dna.real_name=real_name
+ new_dna.real_name = real_name
new_dna.species = new species.type
for(var/b=1;b<=DNA_SE_LENGTH;b++)
new_dna.SE[b]=SE[b]
@@ -124,17 +68,17 @@ var/global/list/bad_blocks[0]
///////////////////////////////////////
// Create random UI.
-/datum/dna/proc/ResetUI(var/defer=0)
+/datum/dna/proc/ResetUI(defer = FALSE)
for(var/i=1,i<=DNA_UI_LENGTH,i++)
switch(i)
if(DNA_UI_SKIN_TONE)
- SetUIValueRange(DNA_UI_SKIN_TONE,rand(1,220),220,1) // Otherwise, it gets fucked
+ SetUIValueRange(DNA_UI_SKIN_TONE, rand(1, 220), 220, 1) // Otherwise, it gets fucked
else
UI[i]=rand(0,4095)
if(!defer)
UpdateUI()
-/datum/dna/proc/ResetUIFrom(var/mob/living/carbon/human/character)
+/datum/dna/proc/ResetUIFrom(mob/living/carbon/human/character)
// INITIALIZE!
ResetUI(1)
// Hair
@@ -191,83 +135,90 @@ var/global/list/bad_blocks[0]
UpdateUI()
// Set a DNA UI block's raw value.
-/datum/dna/proc/SetUIValue(var/block,var/value,var/defer=0)
- if(block<=0) return
- ASSERT(value>0)
- ASSERT(value<=4095)
+/datum/dna/proc/SetUIValue(block, value, defer = FALSE)
+ if(block <= 0)
+ return
+ ASSERT(value > 0)
+ ASSERT(value <= 4095)
UI[block]=value
- dirtyUI=1
+ dirtyUI = 1
if(!defer)
UpdateUI()
// Get a DNA UI block's raw value.
-/datum/dna/proc/GetUIValue(var/block)
- if(block<=0) return 0
+/datum/dna/proc/GetUIValue(block)
+ if(block <= 0)
+ return FALSE
return UI[block]
// Set a DNA UI block's value, given a value and a max possible value.
// Used in hair and facial styles (value being the index and maxvalue being the len of the hairstyle list)
-/datum/dna/proc/SetUIValueRange(var/block,var/value,var/maxvalue,var/defer=0)
- if(block<=0)
+/datum/dna/proc/SetUIValueRange(block, value, maxvalue, defer = FALSE)
+ if(block <= 0)
return
if(value == 0)
value = 1
- ASSERT(maxvalue<=4095)
+ ASSERT(maxvalue <= 4095)
var/range = (4095 / maxvalue)
if(value)
- SetUIValue(block,round(value * range),defer)
+ SetUIValue(block,round(value * range), defer)
// Getter version of above.
-/datum/dna/proc/GetUIValueRange(var/block,var/maxvalue)
- if(block<=0) return 0
+/datum/dna/proc/GetUIValueRange(block, maxvalue)
+ if(block <= 0)
+ return FALSE
var/value = GetUIValue(block)
- return round(1 +(value / 4096)*maxvalue)
+ return round(1 + (value / 4096) * maxvalue)
// Is the UI gene "on" or "off"?
// For UI, this is simply a check of if the value is > 2050.
-/datum/dna/proc/GetUIState(var/block)
- if(block<=0) return
+/datum/dna/proc/GetUIState(block)
+ if(block <= 0)
+ return
return UI[block] > 2050
// Set UI gene "on" (1) or "off" (0)
-/datum/dna/proc/SetUIState(var/block,var/on,var/defer=0)
- if(block<=0) return
+/datum/dna/proc/SetUIState(block, on, defer = FALSE)
+ if(block <= 0)
+ return
var/val
if(on)
- val=rand(2050,4095)
+ val = rand(2050, 4095)
else
- val=rand(1,2049)
- SetUIValue(block,val,defer)
+ val=rand(1, 2049)
+ SetUIValue(block, val, defer)
// Get a hex-encoded UI block.
-/datum/dna/proc/GetUIBlock(var/block)
+/datum/dna/proc/GetUIBlock(block)
return EncodeDNABlock(GetUIValue(block))
// Do not use this unless you absolutely have to.
// Set a block from a hex string. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetUIBlock(var/block,var/value,var/defer=0)
- if(block<=0) return
- return SetUIValue(block,hex2num(value),defer)
+/datum/dna/proc/SetUIBlock(block, value, defer = FALSE)
+ if(block <= 0)
+ return
+ return SetUIValue(block, hex2num(value), defer)
// Get a sub-block from a block.
-/datum/dna/proc/GetUISubBlock(var/block,var/subBlock)
- return copytext(GetUIBlock(block),subBlock,subBlock+1)
+/datum/dna/proc/GetUISubBlock(block, subBlock)
+ return copytext(GetUIBlock(block), subBlock, subBlock + 1)
// Do not use this unless you absolutely have to.
// Set a block from a hex string. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetUISubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
- if(block<=0) return
- var/oldBlock=GetUIBlock(block)
- var/newBlock=""
- for(var/i=1, i<=length(oldBlock), i++)
+/datum/dna/proc/SetUISubBlock(block, subBlock, newSubBlock, defer = FALSE)
+ if(block <= 0)
+ return
+ var/oldBlock = GetUIBlock(block)
+ var/newBlock = ""
+ for(var/i = 1, i <= length(oldBlock), i++)
if(i==subBlock)
- newBlock+=newSubBlock
+ newBlock += newSubBlock
else
- newBlock+=copytext(oldBlock,i,i+1)
- SetUIBlock(block,newBlock,defer)
+ newBlock += copytext(oldBlock, i, i + 1)
+ SetUIBlock(block, newBlock, defer)
///////////////////////////////////////
// STRUCTURAL ENZYMES
@@ -276,126 +227,134 @@ var/global/list/bad_blocks[0]
// "Zeroes out" all of the blocks.
/datum/dna/proc/ResetSE()
for(var/i = 1, i <= DNA_SE_LENGTH, i++)
- SetSEValue(i,rand(1,1024),1)
+ SetSEValue(i, rand(1, 1024), 1)
UpdateSE()
// Set a DNA SE block's raw value.
-/datum/dna/proc/SetSEValue(var/block,var/value,var/defer=0)
+/datum/dna/proc/SetSEValue(block, value, defer = FALSE)
- if(block<=0) return
- ASSERT(value>=0)
- ASSERT(value<=4095)
- SE[block]=value
- dirtySE=1
+ if(block<=0)
+ return
+ ASSERT(value >= 0)
+ ASSERT(value <= 4095)
+ SE[block] = value
+ dirtySE = 1
if(!defer)
UpdateSE()
//testing("SetSEBlock([block],[value],[defer]): [value] -> [GetSEValue(block)]")
// Get a DNA SE block's raw value.
-/datum/dna/proc/GetSEValue(var/block)
- if(block<=0) return 0
+/datum/dna/proc/GetSEValue(block)
+ if(block <= 0)
+ return FALSE
return SE[block]
// Set a DNA SE block's value, given a value and a max possible value.
// Might be used for species?
-/datum/dna/proc/SetSEValueRange(var/block,var/value,var/maxvalue)
- if(block<=0) return
- ASSERT(maxvalue<=4095)
+/datum/dna/proc/SetSEValueRange(block, value, maxvalue)
+ if(block <= 0)
+ return
+ ASSERT(maxvalue <= 4095)
var/range = round(4095 / maxvalue)
if(value)
- SetSEValue(block, value * range - rand(1,range-1))
+ SetSEValue(block, value * range - rand(1, range - 1))
// Getter version of above.
-/datum/dna/proc/GetSEValueRange(var/block,var/maxvalue)
- if(block<=0) return 0
+/datum/dna/proc/GetSEValueRange(block, maxvalue)
+ if(block <= 0)
+ return FALSE
var/value = GetSEValue(block)
- return round(1 +(value / 4096)*maxvalue)
+ return round(1 + (value / 4096) * maxvalue)
// Is the block "on" (1) or "off" (0)? (Un-assigned genes are always off.)
-/datum/dna/proc/GetSEState(var/block)
- if(block<=0) return 0
- var/list/BOUNDS=GetDNABounds(block)
- var/value=GetSEValue(block)
+/datum/dna/proc/GetSEState(block)
+ if(block <= 0)
+ return FALSE
+ var/list/BOUNDS = GetDNABounds(block)
+ var/value = GetSEValue(block)
return (value >= BOUNDS[DNA_ON_LOWERBOUND])
// Set a block "on" or "off".
-/datum/dna/proc/SetSEState(var/block,var/on,var/defer=0)
- if(block<=0) return
+/datum/dna/proc/SetSEState(block, on, defer = FALSE)
+ if(block <= 0)
+ return
var/list/BOUNDS=GetDNABounds(block)
var/val
if(on)
- val=rand(BOUNDS[DNA_ON_LOWERBOUND],BOUNDS[DNA_ON_UPPERBOUND])
+ val = rand(BOUNDS[DNA_ON_LOWERBOUND], BOUNDS[DNA_ON_UPPERBOUND])
else
- val=rand(1,BOUNDS[DNA_OFF_UPPERBOUND])
- SetSEValue(block,val,defer)
+ val = rand(1, BOUNDS[DNA_OFF_UPPERBOUND])
+ SetSEValue(block, val, defer)
// Get hex-encoded SE block.
-/datum/dna/proc/GetSEBlock(var/block)
+/datum/dna/proc/GetSEBlock(block)
return EncodeDNABlock(GetSEValue(block))
// Do not use this unless you absolutely have to.
// Set a block from a hex string. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetSEBlock(var/block,var/value,var/defer=0)
- if(block<=0) return
+/datum/dna/proc/SetSEBlock(block, value, defer = FALSE)
+ if(block <= 0)
+ return
var/nval=hex2num(value)
//testing("SetSEBlock([block],[value],[defer]): [value] -> [nval]")
- return SetSEValue(block,nval,defer)
+ return SetSEValue(block, nval, defer)
-/datum/dna/proc/GetSESubBlock(var/block,var/subBlock)
- return copytext(GetSEBlock(block),subBlock,subBlock+1)
+/datum/dna/proc/GetSESubBlock(block, subBlock)
+ return copytext(GetSEBlock(block), subBlock, subBlock + 1)
// Do not use this unless you absolutely have to.
// Set a sub-block from a hex character. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetSESubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
- if(block<=0) return
+/datum/dna/proc/SetSESubBlock(block, subBlock, newSubBlock, defer = FALSE)
+ if(block <= 0)
+ return
var/oldBlock=GetSEBlock(block)
- var/newBlock=""
- for(var/i=1, i<=length(oldBlock), i++)
+ var/newBlock = ""
+ for(var/i = 1, i <= length(oldBlock), i++)
if(i==subBlock)
newBlock+=newSubBlock
else
- newBlock+=copytext(oldBlock,i,i+1)
+ newBlock += copytext(oldBlock, i, i + 1)
//testing("SetSESubBlock([block],[subBlock],[newSubBlock],[defer]): [oldBlock] -> [newBlock]")
- SetSEBlock(block,newBlock,defer)
+ SetSEBlock(block, newBlock, defer)
-/proc/EncodeDNABlock(var/value)
- return add_zero2(num2hex(value,1), 3)
+/proc/EncodeDNABlock(value)
+ return add_zero2(num2hex(value, 1), 3)
/datum/dna/proc/UpdateUI()
- src.uni_identity=""
+ uni_identity = ""
for(var/block in UI)
uni_identity += EncodeDNABlock(block)
//testing("New UI: [uni_identity]")
- dirtyUI=0
+ dirtyUI = 0
/datum/dna/proc/UpdateSE()
//var/oldse=struc_enzymes
- struc_enzymes=""
+ struc_enzymes = ""
for(var/block in SE)
struc_enzymes += EncodeDNABlock(block)
//testing("Old SE: [oldse]")
//testing("New SE: [struc_enzymes]")
- dirtySE=0
+ dirtySE = 0
// BACK-COMPAT!
// Just checks our character has all the crap it needs.
-/datum/dna/proc/check_integrity(var/mob/living/carbon/human/character)
+/datum/dna/proc/check_integrity(mob/living/carbon/human/character)
if(character)
if(UI.len != DNA_UI_LENGTH)
ResetUIFrom(character)
- if(length(struc_enzymes)!= 3*DNA_SE_LENGTH)
+ if(length(struc_enzymes)!= 3 * DNA_SE_LENGTH)
ResetSE()
if(length(unique_enzymes) != 32)
unique_enzymes = md5(character.real_name)
else
- if(length(uni_identity) != 3*DNA_UI_LENGTH)
+ if(length(uni_identity) != 3 * DNA_UI_LENGTH)
uni_identity = "00600200A00E0110148FC01300B0095BD7FD3F4"
- if(length(struc_enzymes)!= 3*DNA_SE_LENGTH)
+ if(length(struc_enzymes)!= 3 * DNA_SE_LENGTH)
struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
// BACK-COMPAT!
@@ -413,7 +372,7 @@ var/global/list/bad_blocks[0]
SE_original = SE.Copy()
unique_enzymes = md5(character.real_name)
- reg_dna[unique_enzymes] = character.real_name
+ GLOB.reg_dna[unique_enzymes] = character.real_name
// Hmm, I wonder how to go about this without a huge convention break
/datum/dna/serialize()
diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm
index 07979f40b7c..16eee549bf2 100644
--- a/code/game/dna/dna2_domutcheck.dm
+++ b/code/game/dna/dna2_domutcheck.dm
@@ -3,8 +3,8 @@
// M: Mob to mess with
// connected: Machine we're in, type unchecked so I doubt it's used beyond monkeying
// flags: See below, bitfield.
-/proc/domutcheck(var/mob/living/M, var/connected=null, var/flags=0)
- for(var/datum/dna/gene/gene in dna_genes)
+/proc/domutcheck(mob/living/M, connected = null, flags = 0)
+ for(var/datum/dna/gene/gene in GLOB.dna_genes)
if(!M || !M.dna)
return
if(!gene.block)
@@ -13,7 +13,7 @@
domutation(gene, M, connected, flags)
// Use this to force a mut check on a single gene!
-/proc/genemutcheck(var/mob/living/M, var/block, var/connected=null, var/flags=0)
+/proc/genemutcheck(mob/living/M, block, connected = null, flags = 0)
if(ishuman(M)) // Would've done this via species instead of type, but the basic mob doesn't have a species, go figure.
var/mob/living/carbon/human/H = M
if(NO_DNA in H.dna.species.species_traits)
@@ -23,13 +23,13 @@
if(block < 0)
return
- var/datum/dna/gene/gene = assigned_gene_blocks[block]
+ var/datum/dna/gene/gene = GLOB.assigned_gene_blocks[block]
domutation(gene, M, connected, flags)
-/proc/domutation(var/datum/dna/gene/gene, var/mob/living/M, var/connected=null, var/flags=0)
+/proc/domutation(datum/dna/gene/gene, mob/living/M, connected = null, flags = 0)
if(!gene || !istype(gene))
- return 0
+ return FALSE
// Current state
var/gene_active = M.dna.GetSEState(gene.block)
@@ -37,7 +37,7 @@
// Sanity checks, don't skip.
if(!gene.can_activate(M,flags) && gene_active)
//testing("[M] - Failed to activate [gene.name] (can_activate fail).")
- return 0
+ return FALSE
var/defaultgenes // Do not mutate inherent species abilities
if(ishuman(M))
diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm
index 9ef5dbfcab0..435133a3796 100644
--- a/code/game/dna/dna2_helpers.dm
+++ b/code/game/dna/dna2_helpers.dm
@@ -9,58 +9,61 @@
t = "0[t]"
temp1 = t
if(length(t) > u)
- temp1 = copytext(t,2,u+1)
+ temp1 = copytext(t, 2, u + 1)
return temp1
// DNA Gene activation boundaries, see dna2.dm.
// Returns a list object with 4 numbers.
-/proc/GetDNABounds(var/block)
- var/list/BOUNDS=dna_activity_bounds[block]
+/proc/GetDNABounds(block)
+ var/list/BOUNDS = GLOB.dna_activity_bounds[block]
if(!istype(BOUNDS))
return DNA_DEFAULT_BOUNDS
return BOUNDS
// Give Random Bad Mutation to M
-/proc/randmutb(var/mob/living/M)
- if(!M || !M.dna) return
+/proc/randmutb(mob/living/M)
+ if(!M || !M.dna)
+ return
M.dna.check_integrity()
- var/block = pick(bad_blocks)
+ var/block = pick(GLOB.bad_blocks)
M.dna.SetSEState(block, 1)
// Give Random Good Mutation to M
-/proc/randmutg(var/mob/living/M)
- if(!M || !M.dna) return
+/proc/randmutg(mob/living/M)
+ if(!M || !M.dna)
+ return
M.dna.check_integrity()
- var/block = pick(good_blocks)
+ var/block = pick(GLOB.good_blocks)
M.dna.SetSEState(block, 1)
// Random Appearance Mutation
-/proc/randmuti(var/mob/living/M)
- if(!M || !M.dna) return
+/proc/randmuti(mob/living/M)
+ if(!M || !M.dna)
+ return
M.dna.check_integrity()
- M.dna.SetUIValue(rand(1,DNA_UI_LENGTH),rand(1,4095))
+ M.dna.SetUIValue(rand(1, DNA_UI_LENGTH), rand(1, 4095))
// Scramble UI or SE.
-/proc/scramble(var/UI, var/mob/M, var/prob)
- if(!M || !M.dna) return
+/proc/scramble(UI, mob/M, prob)
+ if(!M || !M.dna)
+ return
M.dna.check_integrity()
if(UI)
- for(var/i = 1, i <= DNA_UI_LENGTH-1, i++)
+ for(var/i = 1, i <= DNA_UI_LENGTH - 1, i++)
if(prob(prob))
- M.dna.SetUIValue(i,rand(1,4095),1)
+ M.dna.SetUIValue(i, rand(1, 4095), 1)
M.dna.UpdateUI()
M.UpdateAppearance()
else
- for(var/i = 1, i <= DNA_SE_LENGTH-1, i++)
+ for(var/i = 1, i <= DNA_SE_LENGTH - 1, i++)
if(prob(prob))
- M.dna.SetSEValue(i,rand(1,4095),1)
+ M.dna.SetSEValue(i, rand(1, 4095), 1)
M.dna.UpdateSE()
domutcheck(M, null)
- return
// I haven't yet figured out what the fuck this is supposed to do.
-/proc/miniscramble(input,rs,rd)
+/proc/miniscramble(input, rs, rd)
var/output
output = null
if(input == "C" || input == "D" || input == "E" || input == "F")
@@ -79,7 +82,7 @@
// input: YOUR TARGET
// rs: RAD STRENGTH
// rd: DURATION
-/proc/miniscrambletarget(input,rs,rd)
+/proc/miniscrambletarget(input, rs, rd)
var/output = null
switch(input)
if("0")
@@ -124,11 +127,11 @@
// Use mob.UpdateAppearance() instead.
// Simpler. Don't specify UI in order for the mob to use its own.
-/mob/proc/UpdateAppearance(var/list/UI=null)
- if(istype(src, /mob/living/carbon/human))
+/mob/proc/UpdateAppearance(list/UI = null)
+ if(istype(src, /mob/living/carbon/human)) // WHY?!
if(UI!=null)
- src.dna.UI=UI
- src.dna.UpdateUI()
+ dna.UI = UI
+ dna.UpdateUI()
dna.check_integrity()
var/mob/living/carbon/human/H = src
var/obj/item/organ/external/head/head_organ = H.get_organ("head")
@@ -169,9 +172,9 @@
H.regenerate_icons()
- return 1
+ return TRUE
else
- return 0
+ return FALSE
/*
ORGAN WRITING PROCS
@@ -219,9 +222,9 @@
// In absence of eyes, possibly randomize the eye color DNA?
return
- SetUIValueRange(DNA_UI_EYES_R, color2R(eyes_organ.eye_colour), 255, 1)
- SetUIValueRange(DNA_UI_EYES_G, color2G(eyes_organ.eye_colour), 255, 1)
- SetUIValueRange(DNA_UI_EYES_B, color2B(eyes_organ.eye_colour), 255, 1)
+ SetUIValueRange(DNA_UI_EYES_R, color2R(eyes_organ.eye_colour), 255, 1)
+ SetUIValueRange(DNA_UI_EYES_G, color2G(eyes_organ.eye_colour), 255, 1)
+ SetUIValueRange(DNA_UI_EYES_B, color2B(eyes_organ.eye_colour), 255, 1)
/datum/dna/proc/head_traits_to_dna(obj/item/organ/external/head/head_organ)
if(!head_organ)
@@ -241,26 +244,26 @@
head_organ.ha_style = "None"
var/headacc = GLOB.head_accessory_styles_list.Find(head_organ.ha_style)
- SetUIValueRange(DNA_UI_HAIR_R, color2R(head_organ.hair_colour), 255, 1)
- SetUIValueRange(DNA_UI_HAIR_G, color2G(head_organ.hair_colour), 255, 1)
- SetUIValueRange(DNA_UI_HAIR_B, color2B(head_organ.hair_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HAIR_R, color2R(head_organ.hair_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HAIR_G, color2G(head_organ.hair_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HAIR_B, color2B(head_organ.hair_colour), 255, 1)
- SetUIValueRange(DNA_UI_HAIR2_R, color2R(head_organ.sec_hair_colour), 255, 1)
- SetUIValueRange(DNA_UI_HAIR2_G, color2G(head_organ.sec_hair_colour), 255, 1)
- SetUIValueRange(DNA_UI_HAIR2_B, color2B(head_organ.sec_hair_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HAIR2_R, color2R(head_organ.sec_hair_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HAIR2_G, color2G(head_organ.sec_hair_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HAIR2_B, color2B(head_organ.sec_hair_colour), 255, 1)
- SetUIValueRange(DNA_UI_BEARD_R, color2R(head_organ.facial_colour), 255, 1)
- SetUIValueRange(DNA_UI_BEARD_G, color2G(head_organ.facial_colour), 255, 1)
- SetUIValueRange(DNA_UI_BEARD_B, color2B(head_organ.facial_colour), 255, 1)
+ SetUIValueRange(DNA_UI_BEARD_R, color2R(head_organ.facial_colour), 255, 1)
+ SetUIValueRange(DNA_UI_BEARD_G, color2G(head_organ.facial_colour), 255, 1)
+ SetUIValueRange(DNA_UI_BEARD_B, color2B(head_organ.facial_colour), 255, 1)
- SetUIValueRange(DNA_UI_BEARD2_R, color2R(head_organ.sec_facial_colour), 255, 1)
- SetUIValueRange(DNA_UI_BEARD2_G, color2G(head_organ.sec_facial_colour), 255, 1)
- SetUIValueRange(DNA_UI_BEARD2_B, color2B(head_organ.sec_facial_colour), 255, 1)
+ SetUIValueRange(DNA_UI_BEARD2_R, color2R(head_organ.sec_facial_colour), 255, 1)
+ SetUIValueRange(DNA_UI_BEARD2_G, color2G(head_organ.sec_facial_colour), 255, 1)
+ SetUIValueRange(DNA_UI_BEARD2_B, color2B(head_organ.sec_facial_colour), 255, 1)
- SetUIValueRange(DNA_UI_HACC_R, color2R(head_organ.headacc_colour), 255, 1)
- SetUIValueRange(DNA_UI_HACC_G, color2G(head_organ.headacc_colour), 255, 1)
- SetUIValueRange(DNA_UI_HACC_B, color2B(head_organ.headacc_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HACC_R, color2R(head_organ.headacc_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HACC_G, color2G(head_organ.headacc_colour), 255, 1)
+ SetUIValueRange(DNA_UI_HACC_B, color2B(head_organ.headacc_colour), 255, 1)
- SetUIValueRange(DNA_UI_HAIR_STYLE, hair, GLOB.hair_styles_full_list.len, 1)
- SetUIValueRange(DNA_UI_BEARD_STYLE, beard, GLOB.facial_hair_styles_list.len, 1)
- SetUIValueRange(DNA_UI_HACC_STYLE, headacc, GLOB.head_accessory_styles_list.len, 1)
+ SetUIValueRange(DNA_UI_HAIR_STYLE, hair, GLOB.hair_styles_full_list.len, 1)
+ SetUIValueRange(DNA_UI_BEARD_STYLE, beard, GLOB.facial_hair_styles_list.len, 1)
+ SetUIValueRange(DNA_UI_HACC_STYLE, headacc, GLOB.head_accessory_styles_list.len, 1)
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index de42b5b253f..a6ec98e8866 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -10,15 +10,15 @@
//list("data" = null, "owner" = null, "label" = null, "type" = null, "ue" = 0),
/datum/dna2/record
var/datum/dna/dna = null
- var/types=0
- var/name="Empty"
+ var/types = 0
+ var/name = "Empty"
// Stuff for cloners
- var/id=null
- var/implant=null
- var/ckey=null
- var/mind=null
- var/languages=null
+ var/id = null
+ var/implant = null
+ var/ckey = null
+ var/mind = null
+ var/languages = null
/datum/dna2/record/proc/GetData()
var/list/ser=list("data" = null, "owner" = null, "label" = null, "type" = null, "ue" = 0)
@@ -28,7 +28,7 @@
ser["data"] = dna.SE
else
ser["data"] = dna.UI
- ser["owner"] = src.dna.real_name
+ ser["owner"] = dna.real_name
ser["label"] = name
if(types & DNA2_BUF_UI)
ser["type"] = "ui"
@@ -54,13 +54,13 @@
desc = "It scans DNA structures."
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "scanner_open"
- density = 1
- anchored = 1.0
+ density = TRUE
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 50
active_power_usage = 300
interact_offline = 1
- var/locked = 0
+ var/locked = FALSE
var/mob/living/carbon/occupant = null
var/obj/item/reagent_containers/glass/beaker = null
var/opened = 0
@@ -106,27 +106,29 @@
/obj/machinery/dna_scannernew/AllowDrop()
return FALSE
-/obj/machinery/dna_scannernew/relaymove(mob/user as mob)
+/obj/machinery/dna_scannernew/relaymove(mob/user)
if(user.stat)
return
- src.go_out()
- return
+ go_out()
/obj/machinery/dna_scannernew/verb/eject()
set src in oview(1)
set category = null
set name = "Eject DNA Scanner"
- if(usr.stat != 0)
+ if(usr.incapacitated())
return
eject_occupant()
add_fingerprint(usr)
- return
+
+/obj/machinery/dna_scannernew/Destroy()
+ eject_occupant()
+ return ..()
/obj/machinery/dna_scannernew/proc/eject_occupant()
- src.go_out()
+ go_out()
for(var/obj/O in src)
if(!istype(O,/obj/item/circuitboard/clonescanner) && \
!istype(O,/obj/item/stock_parts) && \
@@ -142,14 +144,12 @@
set category = null
set name = "Enter DNA Scanner"
- if(usr.stat != 0)
- return
if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other
return
if(!ishuman(usr)) //Make sure they're a mob that has dna
to_chat(usr, "Try as you might, you can not climb up into the [src].")
return
- if(src.occupant)
+ if(occupant)
to_chat(usr, "The [src] is already occupied!")
return
if(usr.abiotic())
@@ -160,12 +160,11 @@
return
usr.stop_pulling()
usr.forceMove(src)
- src.occupant = usr
- src.icon_state = "scanner_occupied"
- src.add_fingerprint(usr)
- return
+ occupant = usr
+ icon_state = "scanner_occupied"
+ add_fingerprint(usr)
-/obj/machinery/dna_scannernew/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+/obj/machinery/dna_scannernew/MouseDrop_T(atom/movable/O, mob/user)
if(!istype(O))
return
if(O.loc == user) //no you can't pull things out of your ass
@@ -204,27 +203,27 @@
if(user.pulling == L)
user.stop_pulling()
-/obj/machinery/dna_scannernew/attackby(var/obj/item/item as obj, var/mob/user as mob, params)
- if(exchange_parts(user, item))
+/obj/machinery/dna_scannernew/attackby(obj/item/I, mob/user, params)
+ if(exchange_parts(user, I))
return
- else if(istype(item, /obj/item/reagent_containers/glass))
+ else if(istype(I, /obj/item/reagent_containers/glass))
if(beaker)
to_chat(user, "A beaker is already loaded into the machine.")
return
if(!user.drop_item())
- to_chat(user, "\The [item] is stuck to you!")
+ to_chat(user, "\The [I] is stuck to you!")
return
- beaker = item
- item.forceMove(src)
- user.visible_message("[user] adds \a [item] to \the [src]!", "You add \a [item] to \the [src]!")
+ beaker = I
+ I.forceMove(src)
+ user.visible_message("[user] adds \a [I] to \the [src]!", "You add \a [I] to \the [src]!")
return
- if(istype(item, /obj/item/grab))
- var/obj/item/grab/G = item
+ if(istype(I, /obj/item/grab))
+ var/obj/item/grab/G = I
if(!ismob(G.affecting))
return
- if(src.occupant)
+ if(occupant)
to_chat(user, "The scanner is already occupied!")
return
if(G.affecting.abiotic())
@@ -237,7 +236,7 @@
to_chat(usr, "Close the maintenance panel first.")
return
put_in(G.affecting)
- src.add_fingerprint(user)
+ add_fingerprint(user)
qdel(G)
return
return ..()
@@ -245,7 +244,7 @@
/obj/machinery/dna_scannernew/crowbar_act(mob/user, obj/item/I)
if(default_deconstruction_crowbar(user, I))
for(var/obj/thing in contents) // in case there is something in the scanner
- thing.forceMove(src.loc)
+ thing.forceMove(loc)
/obj/machinery/dna_scannernew/screwdriver_act(mob/user, obj/item/I)
if(occupant)
@@ -254,15 +253,15 @@
if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", I))
return TRUE
-/obj/machinery/dna_scannernew/relaymove(mob/user as mob)
+/obj/machinery/dna_scannernew/relaymove(mob/user)
if(user.incapacitated())
- return 0 //maybe they should be able to get out with cuffs, but whatever
+ return FALSE //maybe they should be able to get out with cuffs, but whatever
go_out()
-/obj/machinery/dna_scannernew/proc/put_in(var/mob/M)
+/obj/machinery/dna_scannernew/proc/put_in(mob/M)
M.forceMove(src)
- src.occupant = M
- src.icon_state = "scanner_occupied"
+ occupant = M
+ icon_state = "scanner_occupied"
// search for ghosts, if the corpse is empty and the scanner is connected to a cloner
if(locate(/obj/machinery/computer/cloning, get_step(src, NORTH)) \
@@ -271,20 +270,19 @@
|| locate(/obj/machinery/computer/cloning, get_step(src, WEST)))
occupant.notify_ghost_cloning(source = src)
- return
/obj/machinery/dna_scannernew/proc/go_out()
- if(!src.occupant)
+ if(!occupant)
to_chat(usr, "The scanner is empty!")
return
- if(src.locked)
+ if(locked)
to_chat(usr, "The scanner is locked!")
return
- src.occupant.forceMove(src.loc)
- src.occupant = null
- src.icon_state = "scanner_open"
+ occupant.forceMove(loc)
+ occupant = null
+ icon_state = "scanner_open"
/obj/machinery/dna_scannernew/ex_act(severity)
if(occupant)
@@ -301,18 +299,17 @@
// Checks if occupants can be irradiated/mutated - prevents exploits where wearing full rad protection would still let you gain mutations
/obj/machinery/dna_scannernew/proc/radiation_check()
if(!occupant)
- return 1
+ return TRUE
if(ishuman(occupant))
var/mob/living/carbon/human/H = occupant
if(NO_DNA in H.dna.species.species_traits)
- return 1
+ return TRUE
var/radiation_protection = occupant.run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm.")
if(radiation_protection > NEGATE_MUTATION_THRESHOLD)
- return 1
-
- return 0
+ return TRUE
+ return FALSE
/obj/machinery/computer/scan_consolenew
name = "\improper DNA Modifier access console"
@@ -320,7 +317,7 @@
icon = 'icons/obj/computer.dmi'
icon_screen = "dna"
icon_keyboard = "med_key"
- density = 1
+ density = TRUE
circuit = /obj/item/circuitboard/scan_consolenew
var/selected_ui_block = 1.0
var/selected_ui_subblock = 1.0
@@ -332,22 +329,22 @@
var/radiation_intensity = 1.0
var/list/datum/dna2/record/buffers[3]
var/irradiating = 0
- var/injector_ready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete
+ var/injector_ready = FALSE //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete
var/obj/machinery/dna_scannernew/connected = null
var/obj/item/disk/data/disk = null
var/selected_menu_key = null
- anchored = 1
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 10
active_power_usage = 400
- var/waiting_for_user_input=0 // Fix for #274 (Mash create block injector without answering dialog to make unlimited injectors) - N3X
+ var/waiting_for_user_input = 0 // Fix for #274 (Mash create block injector without answering dialog to make unlimited injectors) - N3X
-/obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob, params)
+/obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/disk/data)) //INSERT SOME diskS
- if(!src.disk)
+ if(!disk)
user.drop_item()
I.forceMove(src)
- src.disk = I
+ disk = I
to_chat(user, "You insert [I].")
SSnanoui.update_uis(src) // update all UIs attached to src()
return
@@ -364,39 +361,30 @@
if(!isnull(connected))
break
spawn(250)
- src.injector_ready = 1
- return
- return
+ injector_ready = TRUE
-/obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(var/list/buffer)
+/obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(list/buffer)
var/list/arr = list()
for(var/i = 1, i <= buffer.len, i++)
arr += "[i]:[EncodeDNABlock(buffer[i])]"
return arr
-/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/dnainjector/I, var/blk, var/datum/dna2/record/buffer)
+/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(obj/item/dnainjector/I, blk, datum/dna2/record/buffer)
var/pos = findtext(blk,":")
- if(!pos) return 0
+ if(!pos)
+ return FALSE
var/id = text2num(copytext(blk,1,pos))
- if(!id) return 0
+ if(!id)
+ return FALSE
I.block = id
I.buf = buffer
- return 1
+ return TRUE
-/*
-/obj/machinery/computer/scan_consolenew/process() //not really used right now
- if(stat & (NOPOWER|BROKEN))
- return
- if(!( src.status )) //remove this
- return
- return
-*/
-
-/obj/machinery/computer/scan_consolenew/attack_ai(user as mob)
- src.add_hiddenprint(user)
+/obj/machinery/computer/scan_consolenew/attack_ai(mob/user)
+ add_hiddenprint(user)
attack_hand(user)
-/obj/machinery/computer/scan_consolenew/attack_hand(user as mob)
+/obj/machinery/computer/scan_consolenew/attack_hand(mob/user)
if(isnull(connected))
for(dir in list(NORTH,EAST,SOUTH,WEST))
connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
@@ -423,7 +411,7 @@
*
* @return nothing
*/
-/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
if(user == connected.occupant)
return
@@ -441,7 +429,7 @@
/obj/machinery/computer/scan_consolenew/ui_data(mob/user, datum/topic_state/state)
var/data[0]
data["selectedMenuKey"] = selected_menu_key
- data["locked"] = src.connected.locked
+ data["locked"] = connected.locked
data["hasOccupant"] = connected.occupant ? 1 : 0
data["isInjectorReady"] = injector_ready
@@ -460,7 +448,7 @@
data["disk"] = diskData
var/list/new_buffers = list()
- for(var/datum/dna2/record/buf in src.buffers)
+ for(var/datum/dna2/record/buf in buffers)
new_buffers += list(buf.GetData())
data["buffers"]=new_buffers
@@ -477,7 +465,7 @@
data["selectedUITargetHex"] = selected_ui_target_hex
var/occupantData[0]
- if(!src.connected.occupant || !src.connected.occupant.dna)
+ if(!connected.occupant || !connected.occupant.dna)
occupantData["name"] = null
occupantData["stat"] = null
occupantData["isViableSubject"] = null
@@ -492,7 +480,7 @@
occupantData["name"] = connected.occupant.dna.real_name
occupantData["stat"] = connected.occupant.stat
occupantData["isViableSubject"] = 1
- if((NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna || (NO_DNA in connected.occupant.dna.species.species_traits))
+ if((NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !connected.occupant.dna || (NO_DNA in connected.occupant.dna.species.species_traits))
occupantData["isViableSubject"] = 0
occupantData["health"] = connected.occupant.health
occupantData["maxHealth"] = connected.occupant.maxHealth
@@ -516,173 +504,173 @@
/obj/machinery/computer/scan_consolenew/Topic(href, href_list)
if(..())
- return 0 // don't update uis
+ return FALSE // don't update uis
if(!istype(usr.loc, /turf))
- return 0 // don't update uis
- if(!src || !src.connected)
- return 0 // don't update uis
+ return FALSE // don't update uis
+ if(!src || !connected)
+ return FALSE // don't update uis
if(irradiating) // Make sure that it isn't already irradiating someone...
- return 0 // don't update uis
+ return FALSE // don't update uis
add_fingerprint(usr)
if(href_list["selectMenuKey"])
selected_menu_key = href_list["selectMenuKey"]
- return 1 // return 1 forces an update to all Nano uis attached to src
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["toggleLock"])
- if((src.connected && src.connected.occupant))
- src.connected.locked = !( src.connected.locked )
- return 1 // return 1 forces an update to all Nano uis attached to src
+ if((connected && connected.occupant))
+ connected.locked = !(connected.locked)
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["pulseRadiation"])
- irradiating = src.radiation_duration
- var/lock_state = src.connected.locked
- src.connected.locked = 1//lock it
+ irradiating = radiation_duration
+ var/lock_state = connected.locked
+ connected.locked = TRUE //lock it
SSnanoui.update_uis(src) // update all UIs attached to src
- sleep(10*src.radiation_duration) // sleep for radiation_duration seconds
+ sleep(10 * radiation_duration) // sleep for radiation_duration seconds
irradiating = 0
- src.connected.locked = lock_state
+ connected.locked = lock_state
- if(!src.connected.occupant)
- return 1 // return 1 forces an update to all Nano uis attached to src
+ if(!connected.occupant)
+ return TRUE // return 1 forces an update to all Nano uis attached to src
- var/radiation = (((src.radiation_intensity*3)+src.radiation_duration*3) / connected.damage_coeff)
- src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
- if(src.connected.radiation_check())
- return 1
+ var/radiation = (((radiation_intensity * 3) + radiation_duration * 3) / connected.damage_coeff)
+ connected.occupant.apply_effect(radiation, IRRADIATE, 0)
+ if(connected.radiation_check())
+ return TRUE
if(prob(95))
if(prob(75))
- randmutb(src.connected.occupant)
+ randmutb(connected.occupant)
else
- randmuti(src.connected.occupant)
+ randmuti(connected.occupant)
else
if(prob(95))
- randmutg(src.connected.occupant)
+ randmutg(connected.occupant)
else
- randmuti(src.connected.occupant)
+ randmuti(connected.occupant)
- return 1 // return 1 forces an update to all Nano uis attached to src
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["radiationDuration"])
if(text2num(href_list["radiationDuration"]) > 0)
- if(src.radiation_duration < 20)
- src.radiation_duration += 2
+ if(radiation_duration < 20)
+ radiation_duration += 2
else
- if(src.radiation_duration > 2)
- src.radiation_duration -= 2
- return 1 // return 1 forces an update to all Nano uis attached to src
+ if(radiation_duration > 2)
+ radiation_duration -= 2
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["radiationIntensity"])
if(text2num(href_list["radiationIntensity"]) > 0)
- if(src.radiation_intensity < 10)
- src.radiation_intensity++
+ if(radiation_intensity < 10)
+ radiation_intensity++
else
- if(src.radiation_intensity > 1)
- src.radiation_intensity--
- return 1 // return 1 forces an update to all Nano uis attached to src
+ if(radiation_intensity > 1)
+ radiation_intensity--
+ return TRUE // return 1 forces an update to all Nano uis attached to src
////////////////////////////////////////////////////////
if(href_list["changeUITarget"] && text2num(href_list["changeUITarget"]) > 0)
- if(src.selected_ui_target < 15)
- src.selected_ui_target++
- src.selected_ui_target_hex = src.selected_ui_target
+ if(selected_ui_target < 15)
+ selected_ui_target++
+ selected_ui_target_hex = selected_ui_target
switch(selected_ui_target)
if(10)
- src.selected_ui_target_hex = "A"
+ selected_ui_target_hex = "A"
if(11)
- src.selected_ui_target_hex = "B"
+ selected_ui_target_hex = "B"
if(12)
- src.selected_ui_target_hex = "C"
+ selected_ui_target_hex = "C"
if(13)
- src.selected_ui_target_hex = "D"
+ selected_ui_target_hex = "D"
if(14)
- src.selected_ui_target_hex = "E"
+ selected_ui_target_hex = "E"
if(15)
- src.selected_ui_target_hex = "F"
+ selected_ui_target_hex = "F"
else
- src.selected_ui_target = 0
- src.selected_ui_target_hex = 0
- return 1 // return 1 forces an update to all Nano uis attached to src
+ selected_ui_target = 0
+ selected_ui_target_hex = 0
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["changeUITarget"] && text2num(href_list["changeUITarget"]) < 1)
- if(src.selected_ui_target > 0)
- src.selected_ui_target--
- src.selected_ui_target_hex = src.selected_ui_target
+ if(selected_ui_target > 0)
+ selected_ui_target--
+ selected_ui_target_hex = selected_ui_target
switch(selected_ui_target)
if(10)
- src.selected_ui_target_hex = "A"
+ selected_ui_target_hex = "A"
if(11)
- src.selected_ui_target_hex = "B"
+ selected_ui_target_hex = "B"
if(12)
- src.selected_ui_target_hex = "C"
+ selected_ui_target_hex = "C"
if(13)
- src.selected_ui_target_hex = "D"
+ selected_ui_target_hex = "D"
if(14)
- src.selected_ui_target_hex = "E"
+ selected_ui_target_hex = "E"
else
- src.selected_ui_target = 15
- src.selected_ui_target_hex = "F"
- return 1 // return 1 forces an update to all Nano uis attached to src
+ selected_ui_target = 15
+ selected_ui_target_hex = "F"
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["selectUIBlock"] && href_list["selectUISubblock"]) // This chunk of code updates selected block / sub-block based on click
var/select_block = text2num(href_list["selectUIBlock"])
var/select_subblock = text2num(href_list["selectUISubblock"])
if((select_block <= DNA_UI_LENGTH) && (select_block >= 1))
- src.selected_ui_block = select_block
+ selected_ui_block = select_block
if((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
- src.selected_ui_subblock = select_subblock
- return 1 // return 1 forces an update to all Nano uis attached to src
+ selected_ui_subblock = select_subblock
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["pulseUIRadiation"])
- var/block = src.connected.occupant.dna.GetUISubBlock(src.selected_ui_block,src.selected_ui_subblock)
+ var/block = connected.occupant.dna.GetUISubBlock(selected_ui_block, selected_ui_subblock)
- irradiating = src.radiation_duration
- var/lock_state = src.connected.locked
- src.connected.locked = 1//lock it
+ irradiating = radiation_duration
+ var/lock_state = connected.locked
+ connected.locked = TRUE //lock it
SSnanoui.update_uis(src) // update all UIs attached to src
- sleep(10*src.radiation_duration) // sleep for radiation_duration seconds
+ sleep(10 * radiation_duration) // sleep for radiation_duration seconds
irradiating = 0
- src.connected.locked = lock_state
+ connected.locked = lock_state
- if(!src.connected.occupant)
- return 1
+ if(!connected.occupant)
+ return TRUE
- if(prob((80 + (src.radiation_duration / 2))))
- var/radiation = (src.radiation_intensity+src.radiation_duration)
- src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
+ if(prob((80 + (radiation_duration / 2))))
+ var/radiation = (radiation_intensity + radiation_duration)
+ connected.occupant.apply_effect(radiation,IRRADIATE,0)
- if(src.connected.radiation_check())
- return 1
+ if(connected.radiation_check())
+ return TRUE
- block = miniscrambletarget(num2text(selected_ui_target), src.radiation_intensity, src.radiation_duration)
- src.connected.occupant.dna.SetUISubBlock(src.selected_ui_block,src.selected_ui_subblock,block)
- src.connected.occupant.UpdateAppearance()
+ block = miniscrambletarget(num2text(selected_ui_target), radiation_intensity, radiation_duration)
+ connected.occupant.dna.SetUISubBlock(selected_ui_block, selected_ui_subblock, block)
+ connected.occupant.UpdateAppearance()
else
- var/radiation = ((src.radiation_intensity*2)+src.radiation_duration)
- src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
- if(src.connected.radiation_check())
- return 1
+ var/radiation = ((radiation_intensity * 2) + radiation_duration)
+ connected.occupant.apply_effect(radiation, IRRADIATE, 0)
+ if(connected.radiation_check())
+ return TRUE
- if(prob(20+src.radiation_intensity))
- randmutb(src.connected.occupant)
- domutcheck(src.connected.occupant,src.connected)
+ if(prob(20 + radiation_intensity))
+ randmutb(connected.occupant)
+ domutcheck(connected.occupant, connected)
else
- randmuti(src.connected.occupant)
- src.connected.occupant.UpdateAppearance()
- return 1 // return 1 forces an update to all Nano uis attached to src
+ randmuti(connected.occupant)
+ connected.occupant.UpdateAppearance()
+ return TRUE // return 1 forces an update to all Nano uis attached to src
////////////////////////////////////////////////////////
if(href_list["injectRejuvenators"])
if(!connected.occupant)
- return 0
+ return FALSE
var/inject_amount = round(text2num(href_list["injectRejuvenators"]), 5) // round to nearest 5
if(inject_amount < 0) // Since the user can actually type the commands himself, some sanity checking
inject_amount = 0
@@ -690,7 +678,7 @@
inject_amount = 50
connected.beaker.reagents.trans_to(connected.occupant, inject_amount)
connected.beaker.reagents.reaction(connected.occupant)
- return 1 // return 1 forces an update to all Nano uis attached to src
+ return TRUE // return 1 forces an update to all Nano uis attached to src
////////////////////////////////////////////////////////
@@ -698,73 +686,73 @@
var/select_block = text2num(href_list["selectSEBlock"])
var/select_subblock = text2num(href_list["selectSESubblock"])
if((select_block <= DNA_SE_LENGTH) && (select_block >= 1))
- src.selected_se_block = select_block
+ selected_se_block = select_block
if((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
- src.selected_se_subblock = select_subblock
+ selected_se_subblock = select_subblock
//testing("User selected block [selected_se_block] (sent [select_block]), subblock [selected_se_subblock] (sent [select_block]).")
- return 1 // return 1 forces an update to all Nano uis attached to src
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["pulseSERadiation"])
- var/block = src.connected.occupant.dna.GetSESubBlock(src.selected_se_block,src.selected_se_subblock)
+ var/block = connected.occupant.dna.GetSESubBlock(selected_se_block, selected_se_subblock)
//var/original_block=block
- //testing("Irradiating SE block [src.selected_se_block]:[src.selected_se_subblock] ([block])...")
+ //testing("Irradiating SE block [selected_se_block]:[selected_se_subblock] ([block])...")
- irradiating = src.radiation_duration
- var/lock_state = src.connected.locked
- src.connected.locked = 1 //lock it
+ irradiating = radiation_duration
+ var/lock_state = connected.locked
+ connected.locked = TRUE //lock it
SSnanoui.update_uis(src) // update all UIs attached to src
- sleep(10*src.radiation_duration) // sleep for radiation_duration seconds
+ sleep(10 * radiation_duration) // sleep for radiation_duration seconds
irradiating = 0
- src.connected.locked = lock_state
+ connected.locked = lock_state
- if(src.connected.occupant)
- if(prob((80 + ((src.radiation_duration / 2) + (connected.precision_coeff ** 3)))))
- var/radiation = ((src.radiation_intensity+src.radiation_duration) / connected.damage_coeff)
- src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
+ if(connected.occupant)
+ if(prob((80 + ((radiation_duration / 2) + (connected.precision_coeff ** 3)))))
+ var/radiation = ((radiation_intensity + radiation_duration) / connected.damage_coeff)
+ connected.occupant.apply_effect(radiation, IRRADIATE, 0)
- if(src.connected.radiation_check())
+ if(connected.radiation_check())
return 1
var/real_SE_block=selected_se_block
- block = miniscramble(block, src.radiation_intensity, src.radiation_duration)
+ block = miniscramble(block, radiation_intensity, radiation_duration)
if(prob(20))
- if(src.selected_se_block > 1 && src.selected_se_block < DNA_SE_LENGTH/2)
+ if(selected_se_block > 1 && selected_se_block < DNA_SE_LENGTH/2)
real_SE_block++
- else if(src.selected_se_block > DNA_SE_LENGTH/2 && src.selected_se_block < DNA_SE_LENGTH)
+ else if(selected_se_block > DNA_SE_LENGTH/2 && selected_se_block < DNA_SE_LENGTH)
real_SE_block--
- //testing("Irradiated SE block [real_SE_block]:[src.selected_se_subblock] ([original_block] now [block]) [(real_SE_block!=selected_se_block) ? "(SHIFTED)":""]!")
- connected.occupant.dna.SetSESubBlock(real_SE_block,selected_se_subblock,block)
- domutcheck(src.connected.occupant,src.connected)
+ //testing("Irradiated SE block [real_SE_block]:[selected_se_subblock] ([original_block] now [block]) [(real_SE_block!=selected_se_block) ? "(SHIFTED)":""]!")
+ connected.occupant.dna.SetSESubBlock(real_SE_block, selected_se_subblock, block)
+ domutcheck(connected.occupant, connected)
else
- var/radiation = (((src.radiation_intensity*2)+src.radiation_duration) / connected.damage_coeff)
- src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
+ var/radiation = (((radiation_intensity * 2) + radiation_duration) / connected.damage_coeff)
+ connected.occupant.apply_effect(radiation, IRRADIATE, 0)
- if(src.connected.radiation_check())
+ if(connected.radiation_check())
return 1
- if(prob(80-src.radiation_duration))
+ if(prob(80 - radiation_duration))
//testing("Random bad mut!")
- randmutb(src.connected.occupant)
- domutcheck(src.connected.occupant,src.connected)
+ randmutb(connected.occupant)
+ domutcheck(connected.occupant, connected)
else
- randmuti(src.connected.occupant)
+ randmuti(connected.occupant)
//testing("Random identity mut!")
- src.connected.occupant.UpdateAppearance()
- return 1 // return 1 forces an update to all Nano uis attached to src
+ connected.occupant.UpdateAppearance()
+ return TRUE // return 1 forces an update to all Nano uis attached to src
if(href_list["ejectBeaker"])
if(connected.beaker)
var/obj/item/reagent_containers/glass/B = connected.beaker
B.forceMove(connected.loc)
connected.beaker = null
- return 1
+ return TRUE
if(href_list["ejectOccupant"])
connected.eject_occupant()
- return 1
+ return TRUE
// Transfer Buffer Management
if(href_list["bufferOption"])
@@ -772,113 +760,113 @@
// These bufferOptions do not require a bufferId
if(bufferOption == "wipeDisk")
- if((isnull(src.disk)) || (src.disk.read_only))
- //src.temphtml = "Invalid disk. Please try again."
- return 0
+ if((isnull(disk)) || (disk.read_only))
+ //temphtml = "Invalid disk. Please try again."
+ return FALSE
- src.disk.buf=null
- //src.temphtml = "Data saved."
- return 1
+ disk.buf = null
+ //temphtml = "Data saved."
+ return TRUE
if(bufferOption == "ejectDisk")
- if(!src.disk)
+ if(!disk)
return
- src.disk.forceMove(get_turf(src))
- src.disk = null
- return 1
+ disk.forceMove(get_turf(src))
+ disk = null
+ return TRUE
// All bufferOptions from here on require a bufferId
if(!href_list["bufferId"])
- return 0
+ return FALSE
var/bufferId = text2num(href_list["bufferId"])
if(bufferId < 1 || bufferId > 3)
- return 0 // Not a valid buffer id
+ return FALSE // Not a valid buffer id
if(bufferOption == "saveUI")
- if(src.connected.occupant && src.connected.occupant.dna)
- var/datum/dna2/record/databuf=new
+ if(connected.occupant && connected.occupant.dna)
+ var/datum/dna2/record/databuf = new
databuf.types = DNA2_BUF_UI // DNA2_BUF_UE
- databuf.dna = src.connected.occupant.dna.Clone()
+ databuf.dna = connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.name
databuf.name = "Unique Identifier"
- src.buffers[bufferId] = databuf
- return 1
+ buffers[bufferId] = databuf
+ return TRUE
if(bufferOption == "saveUIAndUE")
- if(src.connected.occupant && src.connected.occupant.dna)
- var/datum/dna2/record/databuf=new
+ if(connected.occupant && connected.occupant.dna)
+ var/datum/dna2/record/databuf = new
databuf.types = DNA2_BUF_UI|DNA2_BUF_UE
- databuf.dna = src.connected.occupant.dna.Clone()
+ databuf.dna = connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.dna.real_name
databuf.name = "Unique Identifier + Unique Enzymes"
- src.buffers[bufferId] = databuf
- return 1
+ buffers[bufferId] = databuf
+ return TRUE
if(bufferOption == "saveSE")
- if(src.connected.occupant && src.connected.occupant.dna)
- var/datum/dna2/record/databuf=new
+ if(connected.occupant && connected.occupant.dna)
+ var/datum/dna2/record/databuf = new
databuf.types = DNA2_BUF_SE
- databuf.dna = src.connected.occupant.dna.Clone()
+ databuf.dna = connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
- databuf.dna.real_name=connected.occupant.dna.real_name
+ databuf.dna.real_name = connected.occupant.dna.real_name
databuf.name = "Structural Enzymes"
- src.buffers[bufferId] = databuf
- return 1
+ buffers[bufferId] = databuf
+ return TRUE
if(bufferOption == "clear")
- src.buffers[bufferId]=new /datum/dna2/record()
- return 1
+ buffers[bufferId] = new /datum/dna2/record()
+ return TRUE
if(bufferOption == "changeLabel")
- var/datum/dna2/record/buf = src.buffers[bufferId]
+ var/datum/dna2/record/buf = buffers[bufferId]
var/text = sanitize(input(usr, "New Label:", "Edit Label", buf.name) as text|null)
buf.name = text
- src.buffers[bufferId] = buf
- return 1
+ buffers[bufferId] = buf
+ return TRUE
if(bufferOption == "transfer")
- if(!src.connected.occupant || (NOCLONE in src.connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna)
- return 1
+ if(!connected.occupant || (NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !connected.occupant.dna)
+ return TRUE
irradiating = 2
- var/lock_state = src.connected.locked
- src.connected.locked = 1//lock it
+ var/lock_state = connected.locked
+ connected.locked = TRUE //lock it
SSnanoui.update_uis(src) // update all UIs attached to src
sleep(2 SECONDS)
irradiating = 0
- src.connected.locked = lock_state
+ connected.locked = lock_state
var/radiation = (rand(20,50) / connected.damage_coeff)
- src.connected.occupant.apply_effect(radiation,IRRADIATE,0)
+ connected.occupant.apply_effect(radiation, IRRADIATE, 0)
- if(src.connected.radiation_check())
- return 1
+ if(connected.radiation_check())
+ return TRUE
- var/datum/dna2/record/buf = src.buffers[bufferId]
+ var/datum/dna2/record/buf = buffers[bufferId]
if((buf.types & DNA2_BUF_UI))
if((buf.types & DNA2_BUF_UE))
- src.connected.occupant.real_name = buf.dna.real_name
- src.connected.occupant.name = buf.dna.real_name
- src.connected.occupant.UpdateAppearance(buf.dna.UI.Copy())
+ connected.occupant.real_name = buf.dna.real_name
+ connected.occupant.name = buf.dna.real_name
+ connected.occupant.UpdateAppearance(buf.dna.UI.Copy())
else if(buf.types & DNA2_BUF_SE)
- src.connected.occupant.dna.SE = buf.dna.SE.Copy()
- src.connected.occupant.dna.UpdateSE()
- domutcheck(src.connected.occupant,src.connected)
- return 1
+ connected.occupant.dna.SE = buf.dna.SE.Copy()
+ connected.occupant.dna.UpdateSE()
+ domutcheck(connected.occupant, connected)
+ return TRUE
if(bufferOption == "createInjector")
if(injector_ready && !waiting_for_user_input)
var/success = 1
var/obj/item/dnainjector/I = new /obj/item/dnainjector
- var/datum/dna2/record/buf = src.buffers[bufferId]
+ var/datum/dna2/record/buf = buffers[bufferId]
buf = buf.copy()
if(href_list["createBlockInjector"])
waiting_for_user_input=1
@@ -893,35 +881,35 @@
I.buf = buf
waiting_for_user_input = 0
if(success)
- I.forceMove(src.loc)
+ I.forceMove(loc)
I.name += " ([buf.name])"
if(connected)
I.damage_coeff = connected.damage_coeff
- src.injector_ready = 0
+ injector_ready = FALSE
spawn(300)
- src.injector_ready = 1
- return 1
+ injector_ready = TRUE
+ return TRUE
if(bufferOption == "loadDisk")
- if((isnull(src.disk)) || (!src.disk.buf))
- //src.temphtml = "Invalid disk. Please try again."
- return 0
+ if((isnull(disk)) || (!disk.buf))
+ //temphtml = "Invalid disk. Please try again."
+ return FALSE
- src.buffers[bufferId]=src.disk.buf.copy()
- //src.temphtml = "Data loaded."
- return 1
+ buffers[bufferId] = disk.buf.copy()
+ //temphtml = "Data loaded."
+ return TRUE
if(bufferOption == "saveDisk")
- if((isnull(src.disk)) || (src.disk.read_only))
- //src.temphtml = "Invalid disk. Please try again."
- return 0
+ if((isnull(disk)) || (disk.read_only))
+ //temphtml = "Invalid disk. Please try again."
+ return FALSE
- var/datum/dna2/record/buf = src.buffers[bufferId]
+ var/datum/dna2/record/buf = buffers[bufferId]
- src.disk.buf = buf.copy()
- src.disk.name = "data disk - '[buf.dna.real_name]'"
- //src.temphtml = "Data saved."
- return 1
+ disk.buf = buf.copy()
+ disk.name = "data disk - '[buf.dna.real_name]'"
+ //temphtml = "Data saved."
+ return TRUE
/////////////////////////// DNA MACHINES
diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm
index 15e2a9cfff4..8b8a86009b9 100644
--- a/code/game/dna/genes/disabilities.dm
+++ b/code/game/dna/genes/disabilities.dm
@@ -7,114 +7,145 @@
/////////////////////
/datum/dna/gene/disability
- name="DISABILITY"
+ name = "DISABILITY"
// Mutation to give (or 0)
- var/mutation=0
-
- // Disability to give (or 0)
- var/disability=0
+ var/mutation = 0
// Activation message
- var/activation_message=""
+ var/activation_message = ""
// Yay, you're no longer growing 3 arms
- var/deactivation_message=""
+ var/deactivation_message = ""
-/datum/dna/gene/disability/can_activate(var/mob/M,var/flags)
- return 1 // Always set!
+/datum/dna/gene/disability/can_activate(mob/M, flags)
+ return TRUE // Always set!
-/datum/dna/gene/disability/activate(var/mob/living/M, var/connected, var/flags)
+/datum/dna/gene/disability/activate(mob/living/M, connected, flags)
..()
- if(mutation && !(mutation in M.mutations))
- M.mutations.Add(mutation)
- if(disability)
- M.disabilities|=disability
+ M.mutations |= mutation
if(activation_message)
to_chat(M, "[activation_message]")
else
testing("[name] has no activation message.")
-/datum/dna/gene/disability/deactivate(var/mob/living/M, var/connected, var/flags)
+/datum/dna/gene/disability/deactivate(mob/living/M, connected, flags)
..()
- if(mutation && (mutation in M.mutations))
- M.mutations.Remove(mutation)
- if(disability)
- M.disabilities &= ~disability
+ M.mutations.Remove(mutation)
if(deactivation_message)
to_chat(M, "[deactivation_message]")
else
testing("[name] has no deactivation message.")
/datum/dna/gene/disability/hallucinate
- name="Hallucinate"
- activation_message="Your mind says 'Hello'."
- deactivation_message ="Sanity returns. Or does it?"
+ name = "Hallucinate"
+ activation_message = "Your mind says 'Hello'."
+ deactivation_message = "Sanity returns. Or does it?"
instability = -GENE_INSTABILITY_MODERATE
- mutation=HALLUCINATE
+ mutation = HALLUCINATE
/datum/dna/gene/disability/hallucinate/New()
- block=HALLUCINATIONBLOCK
+ ..()
+ block = GLOB.hallucinationblock
+
+/datum/dna/gene/disability/hallucinate/OnMobLife(mob/living/carbon/human/H)
+ if(prob(1))
+ H.Hallucinate(20)
/datum/dna/gene/disability/epilepsy
- name="Epilepsy"
- activation_message="You get a headache."
- deactivation_message ="Your headache is gone, at last."
+ name = "Epilepsy"
+ activation_message = "You get a headache."
+ deactivation_message = "Your headache is gone, at last."
instability = -GENE_INSTABILITY_MODERATE
- disability=EPILEPSY
+ mutation = EPILEPSY
/datum/dna/gene/disability/epilepsy/New()
- block=EPILEPSYBLOCK
+ ..()
+ block = GLOB.epilepsyblock
+
+/datum/dna/gene/disability/epilepsy/OnMobLife(mob/living/carbon/human/H)
+ if((prob(1) && H.paralysis < 1))
+ H.visible_message("[H] starts having a seizure!","You have a seizure!")
+ H.Paralyse(10)
+ H.Jitter(1000)
/datum/dna/gene/disability/cough
- name="Coughing"
- activation_message="You start coughing."
- deactivation_message ="Your throat stops aching."
+ name = "Coughing"
+ activation_message = "You start coughing."
+ deactivation_message = "Your throat stops aching."
instability = -GENE_INSTABILITY_MINOR
- disability=COUGHING
+ mutation = COUGHING
/datum/dna/gene/disability/cough/New()
- block=COUGHBLOCK
+ ..()
+ block = GLOB.coughblock
+
+/datum/dna/gene/disability/cough/OnMobLife(mob/living/carbon/human/H)
+ if((prob(5) && H.paralysis <= 1))
+ H.drop_item()
+ H.emote("cough")
/datum/dna/gene/disability/clumsy
- name="Clumsiness"
- activation_message="You feel lightheaded."
- deactivation_message ="You regain some control of your movements"
+ name = "Clumsiness"
+ activation_message = "You feel lightheaded."
+ deactivation_message = "You regain some control of your movements"
instability = -GENE_INSTABILITY_MINOR
- mutation=CLUMSY
+ mutation = CLUMSY
/datum/dna/gene/disability/clumsy/New()
- block=CLUMSYBLOCK
+ ..()
+ block = GLOB.clumsyblock
/datum/dna/gene/disability/tourettes
- name="Tourettes"
- activation_message="You twitch."
- deactivation_message ="Your mouth tastes like soap."
+ name = "Tourettes"
+ activation_message = "You twitch."
+ deactivation_message = "Your mouth tastes like soap."
instability = -GENE_INSTABILITY_MODERATE
- disability=TOURETTES
+ mutation = TOURETTES
/datum/dna/gene/disability/tourettes/New()
- block=TWITCHBLOCK
+ ..()
+ block = GLOB.twitchblock
+
+/datum/dna/gene/disability/tourettes/OnMobLife(mob/living/carbon/human/H)
+ if((prob(10) && H.paralysis <= 1))
+ H.Stun(10)
+ switch(rand(1, 3))
+ if(1)
+ H.emote("twitch")
+ if(2 to 3)
+ H.say("[prob(50) ? ";" : ""][pick("SHIT", "PISS", "FUCK", "CUNT", "COCKSUCKER", "MOTHERFUCKER", "TITS")]")
+ var/x_offset_old = H.pixel_x
+ var/y_offset_old = H.pixel_y
+ var/x_offset = H.pixel_x + rand(-2, 2)
+ var/y_offset = H.pixel_y + rand(-1, 1)
+ animate(H, pixel_x = x_offset, pixel_y = y_offset, time = 1)
+ animate(H, pixel_x = x_offset_old, pixel_y = y_offset_old, time = 1)
/datum/dna/gene/disability/nervousness
- name="Nervousness"
+ name = "Nervousness"
activation_message="You feel nervous."
deactivation_message ="You feel much calmer."
- disability=NERVOUS
+ mutation = NERVOUS
/datum/dna/gene/disability/nervousness/New()
- block=NERVOUSBLOCK
+ ..()
+ block = GLOB.nervousblock
+/datum/dna/gene/disability/nervousness/OnMobLife(mob/living/carbon/human/H)
+ if(prob(10))
+ H.Stuttering(10)
/datum/dna/gene/disability/blindness
- name="Blindness"
+ name = "Blindness"
activation_message = "You can't seem to see anything."
deactivation_message = "You can see now, in case you didn't notice..."
instability = -GENE_INSTABILITY_MAJOR
- disability = BLIND
+ mutation = BLINDNESS
/datum/dna/gene/disability/blindness/New()
- block = BLINDBLOCK
+ ..()
+ block = GLOB.blindblock
/datum/dna/gene/disability/blindness/activate(mob/M, connected, flags)
..()
@@ -130,51 +161,54 @@
activation_message = "You feel a peculiar prickling in your eyes while your perception of colour changes."
deactivation_message ="Your eyes tingle unsettlingly, though everything seems to become alot more colourful."
instability = -GENE_INSTABILITY_MODERATE
- disability = COLOURBLIND
+ mutation = COLOURBLIND
/datum/dna/gene/disability/colourblindness/New()
- block=COLOURBLINDBLOCK
+ ..()
+ block = GLOB.colourblindblock
-/datum/dna/gene/disability/colourblindness/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/disability/colourblindness/activate(mob/M, connected, flags)
..()
M.update_client_colour() //Handle the activation of the colourblindness on the mob.
M.update_icons() //Apply eyeshine as needed.
-/datum/dna/gene/disability/colourblindness/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/disability/colourblindness/deactivate(mob/M, connected, flags)
..()
M.update_client_colour() //Handle the deactivation of the colourblindness on the mob.
M.update_icons() //Remove eyeshine as needed.
/datum/dna/gene/disability/deaf
- name="Deafness"
+ name = "Deafness"
activation_message="It's kinda quiet."
deactivation_message ="You can hear again!"
instability = -GENE_INSTABILITY_MAJOR
- disability=DEAF
+ mutation = DEAF
/datum/dna/gene/disability/deaf/New()
- block=DEAFBLOCK
+ ..()
+ block = GLOB.deafblock
-/datum/dna/gene/disability/deaf/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/disability/deaf/activate(mob/M, connected, flags)
..()
M.MinimumDeafTicks(1)
/datum/dna/gene/disability/nearsighted
- name="Nearsightedness"
+ name = "Nearsightedness"
activation_message="Your eyes feel weird..."
deactivation_message ="You can see clearly now"
instability = -GENE_INSTABILITY_MODERATE
- disability=NEARSIGHTED
+ mutation = NEARSIGHTED
/datum/dna/gene/disability/nearsighted/New()
- block=GLASSESBLOCK
+ ..()
+ block = GLOB.glassesblock
/datum/dna/gene/disability/nearsighted/activate(mob/living/M, connected, flags)
- . = ..()
+ ..()
M.update_nearsighted_effects()
/datum/dna/gene/disability/nearsighted/deactivate(mob/living/M, connected, flags)
- . = ..()
+ ..()
M.update_nearsighted_effects()
/datum/dna/gene/disability/lisp
@@ -186,9 +220,9 @@
/datum/dna/gene/disability/lisp/New()
..()
- block=LISPBLOCK
+ block = GLOB.lispblock
-/datum/dna/gene/disability/lisp/OnSay(var/mob/M, var/message)
+/datum/dna/gene/disability/lisp/OnSay(mob/M, message)
return replacetext(message,"s","th")
/datum/dna/gene/disability/comic
@@ -196,10 +230,11 @@
desc = "This will only bring death and destruction."
activation_message = "Uh oh!"
deactivation_message = "Well thank god that's over with."
- mutation=COMIC
+ mutation = COMIC
/datum/dna/gene/disability/comic/New()
- block = COMICBLOCK
+ ..()
+ block = GLOB.comicblock
/datum/dna/gene/disability/wingdings
name = "Alien Voice"
@@ -210,9 +245,10 @@
mutation = WINGDINGS
/datum/dna/gene/disability/wingdings/New()
- block = WINGDINGSBLOCK
+ ..()
+ block = GLOB.wingdingsblock
-/datum/dna/gene/disability/wingdings/OnSay(var/mob/M, var/message)
+/datum/dna/gene/disability/wingdings/OnSay(mob/M, message)
var/list/chars = string2charlist(message)
var/garbled_message = ""
for(var/C in chars)
diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm
index f74d0c7d2a0..1509cd098a4 100644
--- a/code/game/dna/genes/gene.dm
+++ b/code/game/dna/genes/gene.dm
@@ -11,63 +11,61 @@
/datum/dna/gene
// Display name
- var/name="BASE GENE"
+ var/name = "BASE GENE"
// Probably won't get used but why the fuck not
var/desc="Oh god who knows what this does."
// Set in initialize()!
// What gene activates this?
- var/block=0
+ var/block = 0
// Any of a number of GENE_ flags.
- var/flags=0
+ var/flags = 0
// Chance of the gene to cause adverse effects when active
- var/instability=0
+ var/instability = 0
/*
* Is the gene active in this mob's DNA?
*/
-/datum/dna/gene/proc/is_active(var/mob/M)
- return M.active_genes && type in M.active_genes
+/datum/dna/gene/proc/is_active(mob/M)
+ return M.active_genes && (type in M.active_genes)
// Return 1 if we can activate.
// HANDLE MUTCHK_FORCED HERE!
-/datum/dna/gene/proc/can_activate(var/mob/M, var/flags)
- return 0
+/datum/dna/gene/proc/can_activate(mob/M, flags)
+ return FALSE
// Called when the gene activates. Do your magic here.
-/datum/dna/gene/proc/activate(var/mob/living/M, var/connected, var/flags)
+/datum/dna/gene/proc/activate(mob/living/M, connected, flags)
M.gene_stability -= instability
- return
/**
* Called when the gene deactivates. Undo your magic here.
* Only called when the block is deactivated.
*/
-/datum/dna/gene/proc/deactivate(var/mob/living/M, var/connected, var/flags)
+/datum/dna/gene/proc/deactivate(mob/living/M, connected, flags)
M.gene_stability += instability
- return
// This section inspired by goone's bioEffects.
/**
* Called in each life() tick.
*/
-/datum/dna/gene/proc/OnMobLife(var/mob/M)
+/datum/dna/gene/proc/OnMobLife(mob/M)
return
/**
* Called when the mob dies
*/
-/datum/dna/gene/proc/OnMobDeath(var/mob/M)
+/datum/dna/gene/proc/OnMobDeath(mob/M)
return
/**
* Called when the mob says shit
*/
-/datum/dna/gene/proc/OnSay(var/mob/M, var/message)
+/datum/dna/gene/proc/OnSay(mob/M, message)
return message
/**
@@ -75,10 +73,9 @@
*
* @params M The subject.
* @params g Gender (m or f)
-* @params fat Fat? (0 or 1)
*/
-/datum/dna/gene/proc/OnDrawUnderlays(var/mob/M, var/g, var/fat)
- return 0
+/datum/dna/gene/proc/OnDrawUnderlays(mob/M, g)
+ return FALSE
/////////////////////
@@ -94,34 +91,34 @@
/datum/dna/gene/basic
- name="BASIC GENE"
+ name = "BASIC GENE"
// Mutation to give
- var/mutation=0
+ var/mutation = 0
// Activation probability
- var/activation_prob=100
+ var/activation_prob = 100
// Possible activation messages
- var/list/activation_messages=list()
+ var/list/activation_messages = list()
// Possible deactivation messages
- var/list/deactivation_messages=list()
+ var/list/deactivation_messages = list()
-/datum/dna/gene/basic/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/basic/can_activate(mob/M, flags)
if(flags & MUTCHK_FORCED)
- return 1
+ return TRUE
// Probability check
return prob(activation_prob)
-/datum/dna/gene/basic/activate(var/mob/M)
+/datum/dna/gene/basic/activate(mob/M, connected, flags)
..()
M.mutations.Add(mutation)
if(activation_messages.len)
var/msg = pick(activation_messages)
to_chat(M, "[msg]")
-/datum/dna/gene/basic/deactivate(var/mob/M)
+/datum/dna/gene/basic/deactivate(mob/living/M, connected, flags)
..()
M.mutations.Remove(mutation)
if(deactivation_messages.len)
diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm
index e6c55f02d11..7615f737cd0 100644
--- a/code/game/dna/genes/goon_disabilities.dm
+++ b/code/game/dna/genes/goon_disabilities.dm
@@ -13,13 +13,13 @@
activation_message = "You feel unable to express yourself at all."
deactivation_message = "You feel able to speak freely again."
instability = -GENE_INSTABILITY_MODERATE
- disability = MUTE
+ mutation = MUTE
/datum/dna/gene/disability/mute/New()
..()
- block=MUTEBLOCK
+ block = GLOB.muteblock
-/datum/dna/gene/disability/mute/OnSay(var/mob/M, var/message)
+/datum/dna/gene/disability/mute/OnSay(mob/M, message)
return ""
////////////////////////////////////////
@@ -36,30 +36,29 @@
/datum/dna/gene/disability/radioactive/New()
..()
- block=RADBLOCK
+ block = GLOB.radblock
-/datum/dna/gene/disability/radioactive/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/disability/radioactive/can_activate(mob/M, flags)
if(!..())
- return 0
+ return FALSE
if(ishuman(M))
var/mob/living/carbon/human/H = M
if((RADIMMUNE in H.dna.species.species_traits) && !(flags & MUTCHK_FORCED))
- return 0
- return 1
+ return FALSE
+ return TRUE
-/datum/dna/gene/disability/radioactive/OnMobLife(var/mob/living/owner)
- var/radiation_amount = abs(min(owner.radiation - 20,0))
- owner.apply_effect(radiation_amount, IRRADIATE)
- for(var/mob/living/L in range(1, owner))
- if(L == owner)
+/datum/dna/gene/disability/radioactive/OnMobLife(mob/living/carbon/human/H)
+ var/radiation_amount = abs(min(H.radiation - 20,0))
+ H.apply_effect(radiation_amount, IRRADIATE)
+ for(var/mob/living/L in range(1, H))
+ if(L == H)
continue
- to_chat(L, "You are enveloped by a soft green glow emanating from [owner].")
+ to_chat(L, "You are enveloped by a soft green glow emanating from [H].")
L.apply_effect(5, IRRADIATE)
- return
-/datum/dna/gene/disability/radioactive/OnDrawUnderlays(var/mob/M,var/g,var/fat)
- return "rads[fat]_s"
+/datum/dna/gene/disability/radioactive/OnDrawUnderlays(mob/M, g)
+ return "rads_s"
////////////////////////////////////////
// Other disabilities
@@ -76,7 +75,7 @@
/datum/dna/gene/disability/fat/New()
..()
- block=FATBLOCK
+ block = GLOB.fatblock
// WAS: /datum/bioEffect/chav
/datum/dna/gene/disability/speech/chav
@@ -88,9 +87,9 @@
/datum/dna/gene/disability/speech/chav/New()
..()
- block=CHAVBLOCK
+ block = GLOB.chavblock
-/datum/dna/gene/disability/speech/chav/OnSay(var/mob/M, var/message)
+/datum/dna/gene/disability/speech/chav/OnSay(mob/M, message)
// THIS ENTIRE THING BEGS FOR REGEX
message = replacetext(message,"dick","prat")
message = replacetext(message,"comdom","knob'ead")
@@ -127,9 +126,9 @@
/datum/dna/gene/disability/speech/swedish/New()
..()
- block=SWEDEBLOCK
+ block = GLOB.swedeblock
-/datum/dna/gene/disability/speech/swedish/OnSay(var/mob/M, var/message)
+/datum/dna/gene/disability/speech/swedish/OnSay(mob/M, message)
// svedish
message = replacetextEx(message,"W","V")
message = replacetextEx(message,"w","v")
@@ -157,10 +156,10 @@
/datum/dna/gene/disability/unintelligable/New()
..()
- block=SCRAMBLEBLOCK
+ block = GLOB.scrambleblock
-/datum/dna/gene/disability/unintelligable/OnSay(var/mob/M, var/message)
- var/prefix=copytext(message,1,2)
+/datum/dna/gene/disability/unintelligable/OnSay(mob/M, message)
+ var/prefix = copytext(message,1,2)
if(prefix == ";")
message = copytext(message,2)
else if(prefix in list(":","#"))
@@ -175,7 +174,7 @@
var/cword = pick(words)
words.Remove(cword)
var/suffix = copytext(cword,length(cword)-1,length(cword))
- while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
+ while(length(cword)>0 && (suffix in list(".",",",";","!",":","?")))
cword = copytext(cword,1 ,length(cword)-1)
suffix = copytext(cword,length(cword)-1,length(cword) )
if(length(cword))
@@ -197,7 +196,7 @@
/datum/dna/gene/disability/strong/New()
..()
- block=STRONGBLOCK
+ block = GLOB.strongblock
// WAS: /datum/bioEffect/horns
/datum/dna/gene/disability/horns
@@ -209,9 +208,9 @@
/datum/dna/gene/disability/horns/New()
..()
- block=HORNSBLOCK
+ block = GLOB.hornsblock
-/datum/dna/gene/disability/horns/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+/datum/dna/gene/disability/horns/OnDrawUnderlays(mob/M, g)
return "horns_s"
////////////////////////////////////////////////////////////////////////
@@ -223,11 +222,11 @@
deactivation_messages = list("You no longer feel uncomfortably hot.")
mutation = IMMOLATE
- spelltype=/obj/effect/proc_holder/spell/targeted/immolate
+ spelltype = /obj/effect/proc_holder/spell/targeted/immolate
/datum/dna/gene/basic/grant_spell/immolate/New()
..()
- block = IMMOLATEBLOCK
+ block = GLOB.immolateblock
/obj/effect/proc_holder/spell/targeted/immolate
name = "Incendiary Mitochondria"
diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm
index f49a250b0fa..87bbdf97c5c 100644
--- a/code/game/dna/genes/goon_powers.dm
+++ b/code/game/dna/genes/goon_powers.dm
@@ -2,26 +2,28 @@
// WAS: /datum/bioEffect/alcres
/datum/dna/gene/basic/sober
- name="Sober"
- activation_messages=list("You feel unusually sober.")
+ name = "Sober"
+ activation_messages = list("You feel unusually sober.")
deactivation_messages = list("You feel like you could use a stiff drink.")
- mutation=SOBER
+ mutation = SOBER
/datum/dna/gene/basic/sober/New()
- block=SOBERBLOCK
+ ..()
+ block = GLOB.soberblock
//WAS: /datum/bioEffect/psychic_resist
/datum/dna/gene/basic/psychic_resist
- name="Psy-Resist"
+ name = "Psy-Resist"
desc = "Boosts efficiency in sectors of the brain commonly associated with meta-mental energies."
activation_messages = list("Your mind feels closed.")
deactivation_messages = list("You feel oddly exposed.")
- mutation=PSY_RESIST
+ mutation = PSY_RESIST
/datum/dna/gene/basic/psychic_resist/New()
- block=PSYRESISTBLOCK
+ ..()
+ block = GLOB.psyresistblock
/////////////////////////
// Stealth Enhancers
@@ -30,16 +32,16 @@
/datum/dna/gene/basic/stealth
instability = GENE_INSTABILITY_MODERATE
-/datum/dna/gene/basic/stealth/can_activate(var/mob/M, var/flags)
+/datum/dna/gene/basic/stealth/can_activate(mob/M, flags)
// Can only activate one of these at a time.
if(is_type_in_list(/datum/dna/gene/basic/stealth,M.active_genes))
testing("Cannot activate [type]: /datum/dna/gene/basic/stealth in M.active_genes.")
- return 0
- return ..(M,flags)
+ return FALSE
+ return ..()
-/datum/dna/gene/basic/stealth/deactivate(var/mob/M)
- ..(M)
- M.alpha=255
+/datum/dna/gene/basic/stealth/deactivate(mob/living/M, connected, flags)
+ ..()
+ M.alpha = 255
// WAS: /datum/bioEffect/darkcloak
/datum/dna/gene/basic/stealth/darkcloak
@@ -47,13 +49,14 @@
desc = "Enables the subject to bend low levels of light around themselves, creating a cloaking effect."
activation_messages = list("You begin to fade into the shadows.")
deactivation_messages = list("You become fully visible.")
- activation_prob=25
+ activation_prob = 25
mutation = CLOAK
/datum/dna/gene/basic/stealth/darkcloak/New()
- block=SHADOWBLOCK
+ ..()
+ block = GLOB.shadowblock
-/datum/dna/gene/basic/stealth/darkcloak/OnMobLife(var/mob/M)
+/datum/dna/gene/basic/stealth/darkcloak/OnMobLife(mob/M)
var/turf/simulated/T = get_turf(M)
if(!istype(T))
return
@@ -69,13 +72,14 @@
desc = "The subject becomes able to subtly alter light patterns to become invisible, as long as they remain still."
activation_messages = list("You feel one with your surroundings.")
deactivation_messages = list("You feel oddly visible.")
- activation_prob=25
+ activation_prob = 25
mutation = CHAMELEON
/datum/dna/gene/basic/stealth/chameleon/New()
- block=CHAMELEONBLOCK
+ ..()
+ block = GLOB.chameleonblock
-/datum/dna/gene/basic/stealth/chameleon/OnMobLife(var/mob/M)
+/datum/dna/gene/basic/stealth/chameleon/OnMobLife(mob/M)
if((world.time - M.last_movement) >= 30 && !M.stat && M.canmove && !M.restrained())
M.alpha -= 25
else
@@ -86,27 +90,27 @@
/datum/dna/gene/basic/grant_spell
var/obj/effect/proc_holder/spell/spelltype
-/datum/dna/gene/basic/grant_spell/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/grant_spell/activate(mob/M, connected, flags)
M.AddSpell(new spelltype(null))
..()
- return 1
+ return TRUE
-/datum/dna/gene/basic/grant_spell/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/grant_spell/deactivate(mob/M, connected, flags)
for(var/obj/effect/proc_holder/spell/S in M.mob_spell_list)
if(istype(S, spelltype))
M.RemoveSpell(S)
..()
- return 1
+ return TRUE
/datum/dna/gene/basic/grant_verb
var/verbtype
-/datum/dna/gene/basic/grant_verb/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/grant_verb/activate(mob/M, connected, flags)
..()
M.verbs += verbtype
- return 1
+ return TRUE
-/datum/dna/gene/basic/grant_verb/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/grant_verb/deactivate(mob/M, connected, flags)
..()
M.verbs -= verbtype
@@ -123,7 +127,7 @@
/datum/dna/gene/basic/grant_spell/cryo/New()
..()
- block = CRYOBLOCK
+ block = GLOB.cryoblock
/obj/effect/proc_holder/spell/targeted/cryokinesis
name = "Cryokinesis"
@@ -183,8 +187,6 @@
new/obj/effect/self_deleting(C.loc, icon('icons/effects/genetics.dmi', "cryokinesis"))
- return
-
/obj/effect/self_deleting
density = 0
opacity = 0
@@ -193,12 +195,11 @@
desc = ""
//layer = 15
-/obj/effect/self_deleting/New(var/atom/location, var/icon/I, var/duration = 20, var/oname = "something")
- src.name = oname
+/obj/effect/self_deleting/New(atom/location, icon/I, duration = 20, oname = "something")
+ name = oname
loc=location
- src.icon = I
- spawn(duration)
- qdel(src)
+ icon = I
+ QDEL_IN(src, duration)
///////////////////////////////////////////////////////////////////////////////////////////
@@ -215,7 +216,7 @@
/datum/dna/gene/basic/grant_spell/mattereater/New()
..()
- block = EATBLOCK
+ block = GLOB.eatblock
/obj/effect/proc_holder/spell/targeted/eat
name = "Eat"
@@ -255,7 +256,7 @@
/obj/item/implant
)
-/obj/effect/proc_holder/spell/targeted/eat/proc/doHeal(var/mob/user)
+/obj/effect/proc_holder/spell/targeted/eat/proc/doHeal(mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
for(var/name in H.bodyparts_by_name)
@@ -300,12 +301,12 @@
perform(targets, user = user)
/obj/effect/proc_holder/spell/targeted/eat/proc/check_mouth(mob/user = usr)
- var/can_eat = 1
+ var/can_eat = TRUE
if(iscarbon(user))
var/mob/living/carbon/C = user
if((C.head && (C.head.flags_cover & HEADCOVERSMOUTH)) || (C.wear_mask && (C.wear_mask.flags_cover & MASKCOVERSMOUTH) && !C.wear_mask.mask_adjusted))
to_chat(C, "Your mouth is covered, preventing you from eating!")
- can_eat = 0
+ can_eat = FALSE
return can_eat
/obj/effect/proc_holder/spell/targeted/eat/cast(list/targets, mob/user = usr)
@@ -320,17 +321,17 @@
if(!istype(limb))
to_chat(user, "You can't eat this part of them!")
revert_cast()
- return 0
+ return FALSE
if(istype(limb,/obj/item/organ/external/head))
// Bullshit, but prevents being unable to clone someone.
to_chat(user, "You try to put \the [limb] in your mouth, but [the_item.p_their()] ears tickle your throat!")
revert_cast()
- return 0
+ return FALSE
if(istype(limb,/obj/item/organ/external/chest))
// Bullshit, but prevents being able to instagib someone.
to_chat(user, "You try to put [the_item.p_their()] [limb] in your mouth, but it's too big to fit!")
revert_cast()
- return 0
+ return FALSE
user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [user.p_their()] gaping maw!")
var/oldloc = H.loc
if(!do_mob(user,H,EAT_MOB_DELAY))
@@ -350,7 +351,6 @@
playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0)
qdel(the_item)
doHeal(user)
- return
////////////////////////////////////////////////////////////////////////
@@ -368,7 +368,7 @@
/datum/dna/gene/basic/grant_spell/jumpy/New()
..()
- block = JUMPBLOCK
+ block = GLOB.jumpblock
/obj/effect/proc_holder/spell/targeted/leap
name = "Jump"
@@ -387,7 +387,7 @@
action_icon_state = "genetic_jump"
/obj/effect/proc_holder/spell/targeted/leap/cast(list/targets, mob/user = usr)
- var/failure = 0
+ var/failure = FALSE
if(istype(user.loc,/mob/) || user.lying || user.stunned || user.buckled || user.stat)
to_chat(user, "You can't jump right now!")
return
@@ -397,7 +397,7 @@
for(var/mob/M in range(user, 1))
if(M.pulling == user)
if(!M.restrained() && M.stat == 0 && M.canmove && user.Adjacent(M))
- failure = 1
+ failure = TRUE
else
M.stop_pulling()
@@ -409,12 +409,12 @@
user.visible_message("[user] attempts to leap away but is slammed back down to the ground!",
"You attempt to leap away but are suddenly slammed back down to the ground!",
"You hear the flexing of powerful muscles and suddenly a crash as a body hits the floor.")
- return 0
+ return FALSE
var/prevLayer = user.layer
var/prevFlying = user.flying
user.layer = 9
- user.flying = 1
+ user.flying = TRUE
for(var/i=0, i<10, i++)
step(user, user.dir)
if(i < 5) user.pixel_y += 8
@@ -463,7 +463,7 @@
/datum/dna/gene/basic/grant_spell/polymorph/New()
..()
- block = POLYMORPHBLOCK
+ block = GLOB.polymorphblock
/obj/effect/proc_holder/spell/targeted/polymorph
name = "Polymorph"
@@ -508,11 +508,11 @@
activation_messages = list("You suddenly notice more about others than you did before.")
deactivation_messages = list("You no longer feel able to sense intentions.")
instability = GENE_INSTABILITY_MINOR
- mutation=EMPATH
+ mutation = EMPATH
/datum/dna/gene/basic/grant_spell/empath/New()
..()
- block = EMPATHBLOCK
+ block = GLOB.empathblock
/obj/effect/proc_holder/spell/targeted/empath
name = "Read Mind"
@@ -614,4 +614,3 @@
to_chat(M, "You sense [user.name] reading your mind.")
else if(prob(5) || M.mind.assigned_role=="Chaplain")
to_chat(M, "You sense someone intruding upon your thoughts...")
- return
diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm
index 9be8256eebe..583b2c75836 100644
--- a/code/game/dna/genes/monkey.dm
+++ b/code/game/dna/genes/monkey.dm
@@ -1,10 +1,11 @@
/datum/dna/gene/monkey
- name="Monkey"
+ name = "Monkey"
/datum/dna/gene/monkey/New()
- block=MONKEYBLOCK
+ ..()
+ block = GLOB.monkeyblock
-/datum/dna/gene/monkey/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/monkey/can_activate(mob/M, flags)
return ishuman(M)
/datum/dna/gene/monkey/activate(mob/living/carbon/human/H, connected, flags)
@@ -21,7 +22,7 @@
H.regenerate_icons()
H.SetStunned(1)
- H.canmove = 0
+ H.canmove = FALSE
H.icon = null
H.invisibility = 101
var/has_primitive_form = H.dna.species.primitive_form // cache this
diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm
index f8b231372dc..d893c64565c 100644
--- a/code/game/dna/genes/powers.dm
+++ b/code/game/dna/genes/powers.dm
@@ -3,109 +3,121 @@
///////////////////////////////////
/datum/dna/gene/basic/nobreath
- name="No Breathing"
- activation_messages=list("You feel no need to breathe.")
- deactivation_messages=list("You feel the need to breathe, once more.")
+ name = "No Breathing"
+ activation_messages = list("You feel no need to breathe.")
+ deactivation_messages = list("You feel the need to breathe, once more.")
instability = GENE_INSTABILITY_MODERATE
mutation = BREATHLESS
- activation_prob=25
+ activation_prob = 25
/datum/dna/gene/basic/nobreath/New()
- block = BREATHLESSBLOCK
+ ..()
+ block = GLOB.breathlessblock
/datum/dna/gene/basic/regenerate
- name="Regenerate"
- activation_messages=list("Your wounds start healing.")
- deactivation_messages=list("Your regenerative powers feel like they've vanished.")
+ name = "Regenerate"
+ activation_messages = list("Your wounds start healing.")
+ deactivation_messages = list("Your regenerative powers feel like they've vanished.")
instability = GENE_INSTABILITY_MINOR
- mutation=REGEN
+ mutation = REGEN
/datum/dna/gene/basic/regenerate/New()
- block=REGENERATEBLOCK
+ ..()
+ block = GLOB.regenerateblock
+
+/datum/dna/gene/basic/regenerate/OnMobLife(mob/living/carbon/human/H)
+ H.adjustBruteLoss(-0.1, FALSE)
+ H.adjustFireLoss(-0.1)
/datum/dna/gene/basic/increaserun
- name="Super Speed"
- activation_messages=list("You feel swift and unencumbered.")
- deactivation_messages=list("You feel slow.")
+ name = "Super Speed"
+ activation_messages = list("You feel swift and unencumbered.")
+ deactivation_messages = list("You feel slow.")
instability = GENE_INSTABILITY_MINOR
- mutation=RUN
+ mutation = RUN
/datum/dna/gene/basic/increaserun/New()
- block=INCREASERUNBLOCK
+ ..()
+ block = GLOB.increaserunblock
-/datum/dna/gene/basic/increaserun/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/basic/increaserun/can_activate(mob/M, flags)
if(!..())
- return 0
+ return FALSE
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.dna.species && H.dna.species.speed_mod && !(flags & MUTCHK_FORCED))
- return 0
- return 1
+ return FALSE
+ return TRUE
/datum/dna/gene/basic/heat_resist
- name="Heat Resistance"
- activation_messages=list("Your skin is icy to the touch.")
- deactivation_messages=list("Your skin no longer feels icy to the touch.")
+ name = "Heat Resistance"
+ activation_messages = list("Your skin is icy to the touch.")
+ deactivation_messages = list("Your skin no longer feels icy to the touch.")
instability = GENE_INSTABILITY_MODERATE
mutation = HEATRES
/datum/dna/gene/basic/heat_resist/New()
- block=COLDBLOCK
+ ..()
+ block = GLOB.coldblock
-/datum/dna/gene/basic/heat_resist/OnDrawUnderlays(var/mob/M,var/g,var/fat)
- return "cold[fat]_s"
+/datum/dna/gene/basic/heat_resist/OnDrawUnderlays(mob/M, g)
+ return "cold_s"
/datum/dna/gene/basic/cold_resist
- name="Cold Resistance"
- activation_messages=list("Your body is filled with warmth.")
- deactivation_messages=list("Your body is no longer filled with warmth.")
+ name = "Cold Resistance"
+ activation_messages = list("Your body is filled with warmth.")
+ deactivation_messages = list("Your body is no longer filled with warmth.")
instability = GENE_INSTABILITY_MODERATE
mutation = COLDRES
/datum/dna/gene/basic/cold_resist/New()
- block=FIREBLOCK
+ ..()
+ block = GLOB.fireblock
-/datum/dna/gene/basic/cold_resist/OnDrawUnderlays(var/mob/M,var/g,var/fat)
- return "fire[fat]_s"
+/datum/dna/gene/basic/cold_resist/OnDrawUnderlays(mob/M, g)
+ return "fire_s"
/datum/dna/gene/basic/noprints
- name="No Prints"
- activation_messages=list("Your fingers feel numb.")
- deactivation_messages=list("your fingers no longer feel numb.")
+ name = "No Prints"
+ activation_messages = list("Your fingers feel numb.")
+ deactivation_messages = list("your fingers no longer feel numb.")
instability = GENE_INSTABILITY_MINOR
- mutation=FINGERPRINTS
+ mutation = FINGERPRINTS
/datum/dna/gene/basic/noprints/New()
- block=NOPRINTSBLOCK
+ ..()
+ block = GLOB.noprintsblock
/datum/dna/gene/basic/noshock
- name="Shock Immunity"
- activation_messages=list("Your skin feels dry and unreactive.")
- deactivation_messages=list("Your skin no longer feels dry and unreactive.")
+ name = "Shock Immunity"
+ activation_messages = list("Your skin feels dry and unreactive.")
+ deactivation_messages = list("Your skin no longer feels dry and unreactive.")
instability = GENE_INSTABILITY_MODERATE
- mutation=NO_SHOCK
+ mutation = NO_SHOCK
/datum/dna/gene/basic/noshock/New()
- block=SHOCKIMMUNITYBLOCK
+ ..()
+ block = GLOB.shockimmunityblock
/datum/dna/gene/basic/midget
- name="Midget"
- activation_messages=list("Everything around you seems bigger now...")
+ name = "Midget"
+ activation_messages = list("Everything around you seems bigger now...")
deactivation_messages = list("Everything around you seems to shrink...")
instability = GENE_INSTABILITY_MINOR
- mutation=DWARF
+ mutation = DWARF
/datum/dna/gene/basic/midget/New()
- block=SMALLSIZEBLOCK
+ ..()
+ block = GLOB.smallsizeblock
-/datum/dna/gene/basic/midget/activate(var/mob/M, var/connected, var/flags)
- ..(M,connected,flags)
+/datum/dna/gene/basic/midget/activate(mob/M, connected, flags)
+ ..()
M.pass_flags |= PASSTABLE
M.resize = 0.8
M.update_transform()
-/datum/dna/gene/basic/midget/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/midget/deactivate(mob/M, connected, flags)
..()
M.pass_flags &= ~PASSTABLE
M.resize = 1.25
@@ -113,55 +125,54 @@
// OLD HULK BEHAVIOR
/datum/dna/gene/basic/hulk
- name="Hulk"
- activation_messages=list("Your muscles hurt.")
- deactivation_messages=list("Your muscles shrink.")
+ name = "Hulk"
+ activation_messages = list("Your muscles hurt.")
+ deactivation_messages = list("Your muscles shrink.")
instability = GENE_INSTABILITY_MAJOR
- mutation=HULK
- activation_prob=15
+ mutation = HULK
+ activation_prob = 15
/datum/dna/gene/basic/hulk/New()
- block=HULKBLOCK
+ ..()
+ block = GLOB.hulkblock
-/datum/dna/gene/basic/hulk/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/hulk/activate(mob/M, connected, flags)
..()
var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
M.status_flags &= ~status
-/datum/dna/gene/basic/hulk/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/hulk/deactivate(mob/M, connected, flags)
..()
M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH
-/datum/dna/gene/basic/hulk/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+/datum/dna/gene/basic/hulk/OnDrawUnderlays(mob/M, g)
if(HULK in M.mutations)
- if(fat)
- return "hulk_[fat]_s"
- else
- return "hulk_[g]_s"
- return 0
+ return "hulk_[g]_s"
+ return FALSE
-/datum/dna/gene/basic/hulk/OnMobLife(var/mob/living/carbon/human/M)
+/datum/dna/gene/basic/hulk/OnMobLife(mob/living/carbon/human/M)
if(!istype(M))
return
if((HULK in M.mutations) && M.health <= 0)
M.mutations.Remove(HULK)
- M.dna.SetSEState(HULKBLOCK,0)
- genemutcheck(M, HULKBLOCK,null,MUTCHK_FORCED)
+ M.dna.SetSEState(GLOB.hulkblock,0)
+ genemutcheck(M, GLOB.hulkblock,null,MUTCHK_FORCED)
M.update_mutations() //update our mutation overlays
M.update_body()
M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved.
to_chat(M, "You suddenly feel very weak.")
/datum/dna/gene/basic/xray
- name="X-Ray Vision"
- activation_messages=list("The walls suddenly disappear.")
- deactivation_messages=list("the walls around you re-appear.")
+ name = "X-Ray Vision"
+ activation_messages = list("The walls suddenly disappear.")
+ deactivation_messages = list("the walls around you re-appear.")
instability = GENE_INSTABILITY_MAJOR
- mutation=XRAY
- activation_prob=15
+ mutation = XRAY
+ activation_prob = 15
/datum/dna/gene/basic/xray/New()
- block=XRAYBLOCK
+ ..()
+ block = GLOB.xrayblock
/datum/dna/gene/basic/xray/activate(mob/living/M, connected, flags)
..()
@@ -174,15 +185,16 @@
M.update_icons() //Remove eyeshine as needed.
/datum/dna/gene/basic/tk
- name="Telekenesis"
+ name = "Telekenesis"
activation_messages = list("You feel smarter.")
deactivation_messages = list("You feel dumber.")
instability = GENE_INSTABILITY_MAJOR
- mutation=TK
- activation_prob=15
+ mutation = TK
+ activation_prob = 15
/datum/dna/gene/basic/tk/New()
- block=TELEBLOCK
+ ..()
+ block = GLOB.teleblock
-/datum/dna/gene/basic/tk/OnDrawUnderlays(var/mob/M,var/g,var/fat)
- return "telekinesishead[fat]_s"
+/datum/dna/gene/basic/tk/OnDrawUnderlays(mob/M, g)
+ return "telekinesishead_s"
diff --git a/code/game/dna/genes/vg_disabilities.dm b/code/game/dna/genes/vg_disabilities.dm
index 79f1ca16411..c2ad1559b6a 100644
--- a/code/game/dna/genes/vg_disabilities.dm
+++ b/code/game/dna/genes/vg_disabilities.dm
@@ -8,11 +8,11 @@
/datum/dna/gene/disability/speech/loud/New()
..()
- block=LOUDBLOCK
+ block = GLOB.loudblock
-/datum/dna/gene/disability/speech/loud/OnSay(var/mob/M, var/message)
+/datum/dna/gene/disability/speech/loud/OnSay(mob/M, message)
message = replacetext(message,".","!")
message = replacetext(message,"?","?!")
message = replacetext(message,"!","!!")
@@ -28,15 +28,15 @@
/datum/dna/gene/disability/dizzy/New()
..()
- block=DIZZYBLOCK
+ block = GLOB.dizzyblock
-/datum/dna/gene/disability/dizzy/OnMobLife(var/mob/living/carbon/human/M)
+/datum/dna/gene/disability/dizzy/OnMobLife(mob/living/carbon/human/M)
if(!istype(M))
return
if(DIZZY in M.mutations)
M.Dizzy(300)
/datum/dna/gene/disability/dizzy/deactivate(mob/living/M, connected, flags)
- . = ..()
+ ..()
M.SetDizzy(0)
diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm
index 506ef5714f8..9092448e398 100644
--- a/code/game/dna/genes/vg_powers.dm
+++ b/code/game/dna/genes/vg_powers.dm
@@ -4,14 +4,14 @@
name = "Morphism"
desc = "Enables the subject to reconfigure their appearance to that of any human."
spelltype =/obj/effect/proc_holder/spell/targeted/morph
- activation_messages=list("Your body feels if can alter its appearance.")
+ activation_messages = list("Your body feels if can alter its appearance.")
deactivation_messages = list("Your body doesn't feel capable of altering its appearance.")
instability = GENE_INSTABILITY_MINOR
- mutation=MORPH
+ mutation = MORPH
/datum/dna/gene/basic/grant_spell/morph/New()
..()
- block = MORPHBLOCK
+ block = GLOB.morphblock
/obj/effect/proc_holder/spell/targeted/morph
name = "Morph"
@@ -29,7 +29,8 @@
action_icon_state = "genetic_morph"
/obj/effect/proc_holder/spell/targeted/morph/cast(list/targets, mob/user = usr)
- if(!ishuman(user)) return
+ if(!ishuman(user))
+ return
if(istype(user.loc,/mob/))
to_chat(user, "You can't change your appearance right now!")
@@ -173,24 +174,24 @@
M.update_dna()
- M.visible_message("[src] morphs and changes [p_their()] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
+ M.visible_message("[M] morphs and changes [M.p_their()] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
/datum/dna/gene/basic/grant_spell/remotetalk
- name="Telepathy"
- activation_messages=list("You feel you can project your thoughts.")
- deactivation_messages=list("You no longer feel you can project your thoughts.")
+ name = "Telepathy"
+ activation_messages = list("You feel you can project your thoughts.")
+ deactivation_messages = list("You no longer feel you can project your thoughts.")
instability = GENE_INSTABILITY_MINOR
- mutation=REMOTE_TALK
+ mutation = REMOTE_TALK
spelltype =/obj/effect/proc_holder/spell/targeted/remotetalk
/datum/dna/gene/basic/grant_spell/remotetalk/New()
..()
- block=REMOTETALKBLOCK
+ block = GLOB.remotetalkblock
-/datum/dna/gene/basic/grant_spell/remotetalk/activate(mob/user)
+/datum/dna/gene/basic/grant_spell/remotetalk/activate(mob/living/M, connected, flags)
..()
- user.AddSpell(new /obj/effect/proc_holder/spell/targeted/mindscan(null))
+ M.AddSpell(new /obj/effect/proc_holder/spell/targeted/mindscan(null))
/datum/dna/gene/basic/grant_spell/remotetalk/deactivate(mob/user)
..()
@@ -336,22 +337,23 @@
return ..()
/datum/dna/gene/basic/grant_spell/remoteview
- name="Remote Viewing"
- activation_messages=list("Your mind can see things from afar.")
- deactivation_messages=list("Your mind can no longer can see things from afar.")
+ name = "Remote Viewing"
+ activation_messages = list("Your mind can see things from afar.")
+ deactivation_messages = list("Your mind can no longer can see things from afar.")
instability = GENE_INSTABILITY_MINOR
- mutation=REMOTE_VIEW
+ mutation = REMOTE_VIEW
spelltype =/obj/effect/proc_holder/spell/targeted/remoteview
/datum/dna/gene/basic/grant_spell/remoteview/New()
- block=REMOTEVIEWBLOCK
+ ..()
+ block = GLOB.remoteviewblock
/obj/effect/proc_holder/spell/targeted/remoteview
name = "Remote View"
desc = "Spy on people from any range!"
- charge_max = 600
+ charge_max = 100
clothes_req = 0
stat_allowed = 0
@@ -363,18 +365,23 @@
/obj/effect/proc_holder/spell/targeted/remoteview/choose_targets(mob/user = usr)
var/list/targets = list()
- var/list/remoteviewers = new /list()
- for(var/mob/M in GLOB.living_mob_list)
+ var/list/remoteviewers = list()
+ for(var/mob/M in GLOB.alive_mob_list)
+ if(M == user)
+ continue
if(PSY_RESIST in M.mutations)
continue
if(REMOTE_VIEW in M.mutations)
remoteviewers += M
- if(!remoteviewers.len || remoteviewers.len == 1)
+ if(!LAZYLEN(remoteviewers))
to_chat(user, "No valid targets with remote view were found!")
start_recharge()
return
- targets += input("Choose the target to spy on.", "Targeting") as mob in remoteviewers
-
+ targets += input("Choose the target to spy on.", "Targeting") as null|anything in remoteviewers
+ if(!targets)
+ to_chat(user, "You decide against remote viewing.")
+ start_recharge()
+ return
perform(targets, user = user)
/obj/effect/proc_holder/spell/targeted/remoteview/cast(list/targets, mob/user = usr)
@@ -386,15 +393,15 @@
var/mob/target
- if(istype(H.l_hand, /obj/item/tk_grab) || istype(H.r_hand, /obj/item/tk_grab/))
+ if(istype(H.l_hand, /obj/item/tk_grab) || istype(H.r_hand, /obj/item/tk_grab))
to_chat(H, "Your mind is too busy with that telekinetic grab.")
H.remoteview_target = null
- H.reset_perspective(0)
+ H.reset_perspective()
return
if(H.client.eye != user.client.mob)
H.remoteview_target = null
- H.reset_perspective(0)
+ H.reset_perspective()
return
for(var/mob/living/L in targets)
@@ -405,4 +412,4 @@
H.reset_perspective(target)
else
H.remoteview_target = null
- H.reset_perspective(0)
+ H.reset_perspective()
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index ab34122ba90..a11e5d922ba 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -1,7 +1,7 @@
//Few global vars to track the blob
-var/list/blobs = list()
-var/list/blob_cores = list()
-var/list/blob_nodes = list()
+GLOBAL_LIST_EMPTY(blobs)
+GLOBAL_LIST_EMPTY(blob_cores)
+GLOBAL_LIST_EMPTY(blob_nodes)
/datum/game_mode
var/list/blob_overminds = list()
@@ -196,16 +196,16 @@ var/list/blob_nodes = list()
send_intercept(1)
declared = 1
if(1)
- event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
+ GLOB.event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
if(2)
send_intercept(2)
/datum/game_mode/proc/update_blob_icons_added(datum/mind/mob_mind)
- var/datum/atom_hud/antag/antaghud = huds[ANTAG_HUD_BLOB]
+ var/datum/atom_hud/antag/antaghud = GLOB.huds[ANTAG_HUD_BLOB]
antaghud.join_hud(mob_mind.current)
set_antag_hud(mob_mind.current, "hudblob")
/datum/game_mode/proc/update_blob_icons_removed(datum/mind/mob_mind)
- var/datum/atom_hud/antag/antaghud = huds[ANTAG_HUD_BLOB]
+ var/datum/atom_hud/antag/antaghud = GLOB.huds[ANTAG_HUD_BLOB]
antaghud.leave_hud(mob_mind.current)
set_antag_hud(mob_mind.current, null)
diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm
index 66131cfc9f9..b1ef70f6b4f 100644
--- a/code/game/gamemodes/blob/blob_finish.dm
+++ b/code/game/gamemodes/blob/blob_finish.dm
@@ -1,15 +1,15 @@
/datum/game_mode/blob/check_finished()
if(infected_crew.len > burst)//Some blobs have yet to burst
return 0
- if(blobwincount <= blobs.len)//Blob took over
+ if(blobwincount <= GLOB.blobs.len)//Blob took over
return 1
- if(!blob_cores.len) // blob is dead
+ if(!GLOB.blob_cores.len) // blob is dead
return 1
return ..()
/datum/game_mode/blob/declare_completion()
- if(blobwincount <= blobs.len)
+ if(blobwincount <= GLOB.blobs.len)
feedback_set_details("round_end_result","blob win - blob took over")
to_chat(world, "The blob has taken over the station!")
to_chat(world, "The entire station was eaten by the Blob")
@@ -21,7 +21,7 @@
to_chat(world, "Directive 7-12 has been successfully carried out preventing the Blob from spreading.")
log_game("Blob mode completed with a tie (station destroyed).")
- else if(!blob_cores.len)
+ else if(!GLOB.blob_cores.len)
feedback_set_details("round_end_result","blob loss - blob eliminated")
to_chat(world, "The staff has won!")
to_chat(world, "The alien organism has been eradicated from the station")
diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm
index 4f667c51d61..6128c22f66d 100644
--- a/code/game/gamemodes/blob/blob_report.dm
+++ b/code/game/gamemodes/blob/blob_report.dm
@@ -3,7 +3,6 @@
var/interceptname = ""
switch(report)
if(0)
- ..()
return
if(1)
interceptname = "Level 5-6 Biohazard Response Procedures"
@@ -42,7 +41,7 @@
to_chat(aiPlayer, "Laws Updated: [law]")
print_command_report(intercepttext, interceptname)
- event_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg', from = "[command_name()] Update")
+ GLOB.event_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg', from = "[command_name()] Update")
/datum/station_state
var/floor = 0
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index fb26ce91698..b7bcd737dfd 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -51,7 +51,8 @@
speak_emote = list("pulses")
var/obj/structure/blob/factory/factory = null
var/list/human_overlays = list()
- var/is_zombie = 0
+ var/mob/living/carbon/human/oldguy
+ var/is_zombie = FALSE
/mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
@@ -102,6 +103,7 @@
human_overlays = H.overlays
update_icons()
H.forceMove(src)
+ oldguy = H
visible_message("The corpse of [H.name] suddenly rises!")
/mob/living/simple_animal/hostile/blob/blobspore/death(gibbed)
@@ -130,9 +132,9 @@
if(factory)
factory.spores -= src
factory = null
- if(contents)
- for(var/mob/M in contents)
- M.loc = get_turf(src)
+ if(oldguy)
+ oldguy.forceMove(get_turf(src))
+ oldguy = null
return ..()
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index 8c3af0be2ca..672ab037cc5 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -13,7 +13,7 @@
var/selecting = 0
/obj/structure/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring)
- blob_cores += src
+ GLOB.blob_cores += src
START_PROCESSING(SSobj, src)
GLOB.poi_list |= src
adjustcolors(color) //so it atleast appears
@@ -38,7 +38,7 @@
/obj/structure/blob/core/Destroy()
- blob_cores -= src
+ GLOB.blob_cores -= src
if(overmind)
overmind.blob_core = null
overmind = null
@@ -75,7 +75,7 @@
else
for(var/i = 1; i < 8; i += i)
Pulse(0, i, color)
- for(var/b_dir in alldirs)
+ for(var/b_dir in GLOB.alldirs)
if(!prob(5))
continue
var/obj/structure/blob/normal/B = locate() in get_step(src, b_dir)
diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm
index b84e0a7a84c..d8fe4943586 100644
--- a/code/game/gamemodes/blob/blobs/node.dm
+++ b/code/game/gamemodes/blob/blobs/node.dm
@@ -7,7 +7,7 @@
point_return = 18
/obj/structure/blob/node/New(loc, var/h = 100)
- blob_nodes += src
+ GLOB.blob_nodes += src
START_PROCESSING(SSobj, src)
..(loc, h)
@@ -21,7 +21,7 @@
src.overlays += C
/obj/structure/blob/node/Destroy()
- blob_nodes -= src
+ GLOB.blob_nodes -= src
STOP_PROCESSING(SSobj, src)
return ..()
diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm
index 74ed59d2469..0c2342328a2 100644
--- a/code/game/gamemodes/blob/overmind.dm
+++ b/code/game/gamemodes/blob/overmind.dm
@@ -35,11 +35,15 @@
color = blob_reagent_datum.complementary_color
..()
+ START_PROCESSING(SSobj, src)
-/mob/camera/blob/Life(seconds, times_fired)
+/mob/camera/blob/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/mob/camera/blob/process()
if(!blob_core)
qdel(src)
- ..()
/mob/camera/blob/Login()
..()
diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm
index 548f2759ba0..6f2eed39499 100644
--- a/code/game/gamemodes/blob/powers.dm
+++ b/code/game/gamemodes/blob/powers.dm
@@ -22,10 +22,10 @@
set name = "Jump to Node"
set desc = "Transport back to a selected node."
- if(blob_nodes.len)
+ if(GLOB.blob_nodes.len)
var/list/nodes = list()
- for(var/i = 1; i <= blob_nodes.len; i++)
- var/obj/structure/blob/node/B = blob_nodes[i]
+ for(var/i = 1; i <= GLOB.blob_nodes.len; i++)
+ var/obj/structure/blob/node/B = GLOB.blob_nodes[i]
nodes["Blob Node #[i] ([get_location_name(B)])"] = B
var/node_name = input(src, "Choose a node to jump to.", "Node Jump") in nodes
var/obj/structure/blob/node/chosen_node = nodes[node_name]
@@ -357,7 +357,7 @@
if(!surrounding_turfs.len)
return
- for(var/mob/living/simple_animal/hostile/blob/blobspore/BS in GLOB.living_mob_list)
+ for(var/mob/living/simple_animal/hostile/blob/blobspore/BS in GLOB.alive_mob_list)
if(isturf(BS.loc) && get_dist(BS, T) <= 35)
BS.LoseTarget()
BS.Goto(pick(surrounding_turfs), BS.move_to_delay)
@@ -463,7 +463,7 @@
color = blob_reagent_datum.complementary_color
- for(var/obj/structure/blob/BL in blobs)
+ for(var/obj/structure/blob/BL in GLOB.blobs)
BL.adjustcolors(blob_reagent_datum.color)
for(var/mob/living/simple_animal/hostile/blob/BLO)
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index b97c8311507..886975a2c92 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -18,8 +18,8 @@
/obj/structure/blob/New(loc)
..()
- blobs += src
- setDir(pick(cardinal))
+ GLOB.blobs += src
+ setDir(pick(GLOB.cardinal))
update_icon()
if(atmosblock)
air_update_turf(1)
@@ -29,8 +29,8 @@
if(atmosblock)
atmosblock = FALSE
air_update_turf(1)
- blobs -= src
- if(isturf(loc)) //Necessary because Expand() is retarded and spawns a blob and then deletes it
+ GLOB.blobs -= src
+ if(isturf(loc)) //Necessary because Expand() is screwed up and spawns a blob and then deletes it
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
return ..()
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index afad318a517..91dd553fe0d 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -2,7 +2,7 @@
#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead.
#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob
-var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")
+GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega"))
/datum/game_mode
var/list/datum/mind/changelings = list()
@@ -162,12 +162,12 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
update_change_icons_removed(changeling_mind)
/datum/game_mode/proc/update_change_icons_added(datum/mind/changeling)
- var/datum/atom_hud/antag/linghud = huds[ANTAG_HUD_CHANGELING]
+ var/datum/atom_hud/antag/linghud = GLOB.huds[ANTAG_HUD_CHANGELING]
linghud.join_hud(changeling.current)
set_antag_hud(changeling.current, "hudchangeling")
/datum/game_mode/proc/update_change_icons_removed(datum/mind/changeling)
- var/datum/atom_hud/antag/linghud = huds[ANTAG_HUD_CHANGELING]
+ var/datum/atom_hud/antag/linghud = GLOB.huds[ANTAG_HUD_CHANGELING]
linghud.leave_hud(changeling.current)
set_antag_hud(changeling.current, null)
@@ -253,9 +253,9 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
honorific = "Ms."
else
honorific = "Mr."
- if(possible_changeling_IDs.len)
- changelingID = pick(possible_changeling_IDs)
- possible_changeling_IDs -= changelingID
+ if(GLOB.possible_changeling_IDs.len)
+ changelingID = pick(GLOB.possible_changeling_IDs)
+ GLOB.possible_changeling_IDs -= changelingID
changelingID = "[honorific] [changelingID]"
else
changelingID = "[honorific] [rand(1,999)]"
diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm
index b6a0213f82f..9c33ffaaca5 100644
--- a/code/game/gamemodes/changeling/evolution_menu.dm
+++ b/code/game/gamemodes/changeling/evolution_menu.dm
@@ -1,4 +1,4 @@
-var/list/sting_paths
+GLOBAL_LIST_EMPTY(sting_paths)
// totally stolen from the new player panel. YAYY
/datum/action/changeling/evolution_menu
@@ -12,8 +12,8 @@ var/list/sting_paths
return
var/datum/changeling/changeling = usr.mind.changeling
- if(!sting_paths)
- sting_paths = init_subtypes(/datum/action/changeling)
+ if(!GLOB.sting_paths || !GLOB.sting_paths.len)
+ GLOB.sting_paths = init_subtypes(/datum/action/changeling)
var/dat = create_menu(changeling)
usr << browse(dat, "window=powers;size=600x700")//900x480
@@ -230,7 +230,7 @@ var/list/sting_paths
"}
var/i = 1
- for(var/datum/action/changeling/cling_power in sting_paths)
+ for(var/datum/action/changeling/cling_power in GLOB.sting_paths)
if(cling_power.dna_cost <= 0) //Let's skip the crap we start with. Keeps the evolution menu uncluttered.
continue
diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index 4663fef8b97..34a2d67b58b 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -49,7 +49,7 @@
/obj/item/organ/internal/cyberimp/eyes/shield/ling/on_life()
..()
var/obj/item/organ/internal/eyes/E = owner.get_int_organ(/obj/item/organ/internal/eyes)
- if(owner.eye_blind || owner.eye_blurry || (owner.disabilities & BLIND) || (owner.disabilities & NEARSIGHTED) || (E.damage > 0))
+ if(owner.eye_blind || owner.eye_blurry || (BLINDNESS in owner.mutations) || (NEARSIGHTED in owner.mutations) || (E.damage > 0))
owner.reagents.add_reagent("oculine", 1)
/obj/item/organ/internal/cyberimp/eyes/shield/ling/prepare_eat()
diff --git a/code/game/gamemodes/changeling/powers/chameleon_skin.dm b/code/game/gamemodes/changeling/powers/chameleon_skin.dm
index 7de16801153..4b53e5ce082 100644
--- a/code/game/gamemodes/changeling/powers/chameleon_skin.dm
+++ b/code/game/gamemodes/changeling/powers/chameleon_skin.dm
@@ -11,19 +11,19 @@
var/mob/living/carbon/human/H = user //SHOULD always be human, because req_human = 1
if(!istype(H)) // req_human could be done in can_sting stuff.
return
- if(H.dna.GetSEState(CHAMELEONBLOCK))
- H.dna.SetSEState(CHAMELEONBLOCK, 0)
- genemutcheck(H, CHAMELEONBLOCK, null, MUTCHK_FORCED)
+ if(H.dna.GetSEState(GLOB.chameleonblock))
+ H.dna.SetSEState(GLOB.chameleonblock, 0)
+ genemutcheck(H, GLOB.chameleonblock, null, MUTCHK_FORCED)
else
- H.dna.SetSEState(CHAMELEONBLOCK, 1)
- genemutcheck(H, CHAMELEONBLOCK, null, MUTCHK_FORCED)
+ H.dna.SetSEState(GLOB.chameleonblock, 1)
+ genemutcheck(H, GLOB.chameleonblock, null, MUTCHK_FORCED)
feedback_add_details("changeling_powers","CS")
return TRUE
/datum/action/changeling/chameleon_skin/Remove(mob/user)
var/mob/living/carbon/C = user
- if(C.dna.GetSEState(CHAMELEONBLOCK))
- C.dna.SetSEState(CHAMELEONBLOCK, 0)
- genemutcheck(C, CHAMELEONBLOCK, null, MUTCHK_FORCED)
+ if(C.dna.GetSEState(GLOB.chameleonblock))
+ C.dna.SetSEState(GLOB.chameleonblock, 0)
+ genemutcheck(C, GLOB.chameleonblock, null, MUTCHK_FORCED)
..()
diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm
index d403059b0c7..61882b85287 100644
--- a/code/game/gamemodes/changeling/powers/fakedeath.dm
+++ b/code/game/gamemodes/changeling/powers/fakedeath.dm
@@ -16,11 +16,8 @@
user.emote("deathgasp")
user.timeofdeath = world.time
user.status_flags |= FAKEDEATH //play dead
- user.update_stat("fakedeath sting")
+ user.updatehealth("fakedeath sting")
user.update_canmove()
- user.med_hud_set_health()
- user.handle_hud_icons_health()
- user.med_hud_set_status()
user.mind.changeling.regenerating = TRUE
addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME)
diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm
index af375cad368..98336608da4 100644
--- a/code/game/gamemodes/changeling/powers/hivemind.dm
+++ b/code/game/gamemodes/changeling/powers/hivemind.dm
@@ -23,7 +23,7 @@
return
// HIVE MIND UPLOAD/DOWNLOAD DNA
-var/list/datum/dna/hivemind_bank = list()
+GLOBAL_LIST_EMPTY(hivemind_bank)
/datum/action/changeling/hivemind_upload
name = "Hive Channel DNA"
@@ -36,7 +36,7 @@ var/list/datum/dna/hivemind_bank = list()
var/datum/changeling/changeling = user.mind.changeling
var/list/names = list()
for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna))
- if(!(DNA in hivemind_bank))
+ if(!(DNA in GLOB.hivemind_bank))
names += DNA.real_name
if(names.len <= 0)
@@ -51,7 +51,7 @@ var/list/datum/dna/hivemind_bank = list()
if(!chosen_dna)
return
- hivemind_bank += chosen_dna
+ GLOB.hivemind_bank += chosen_dna
to_chat(user, "We channel the DNA of [chosen_name] to the air.")
feedback_add_details("changeling_powers","HU")
return 1
@@ -75,7 +75,7 @@ var/list/datum/dna/hivemind_bank = list()
/datum/action/changeling/hivemind_download/sting_action(var/mob/user)
var/datum/changeling/changeling = user.mind.changeling
var/list/names = list()
- for(var/datum/dna/DNA in hivemind_bank)
+ for(var/datum/dna/DNA in GLOB.hivemind_bank)
if(!(DNA in changeling.absorbed_dna))
names[DNA.real_name] = DNA
diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm
index f9b214c513c..1f90f7eb702 100644
--- a/code/game/gamemodes/changeling/powers/humanform.dm
+++ b/code/game/gamemodes/changeling/powers/humanform.dm
@@ -24,8 +24,8 @@
if(!user)
return 0
to_chat(user, "We transform our appearance.")
- user.dna.SetSEState(MONKEYBLOCK,0,1)
- genemutcheck(user,MONKEYBLOCK,null,MUTCHK_FORCED)
+ user.dna.SetSEState(GLOB.monkeyblock,0,1)
+ genemutcheck(user,GLOB.monkeyblock,null,MUTCHK_FORCED)
if(istype(user))
user.set_species(chosen_dna.species.type)
user.dna = chosen_dna.Clone()
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index d225ac6886a..ce62242ca0f 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -95,8 +95,8 @@
user.unEquip(user.head)
user.unEquip(user.wear_suit)
- user.equip_to_slot_if_possible(new suit_type(user), slot_wear_suit, 1, 1, 1)
- user.equip_to_slot_if_possible(new helmet_type(user), slot_head, 1, 1, 1)
+ user.equip_to_slot_if_possible(new suit_type(user), slot_wear_suit, TRUE, TRUE)
+ user.equip_to_slot_if_possible(new helmet_type(user), slot_head, TRUE, TRUE)
var/datum/changeling/changeling = user.mind.changeling
changeling.chem_recharge_slowdown += recharge_slowdown
diff --git a/code/game/gamemodes/changeling/powers/spiders.dm b/code/game/gamemodes/changeling/powers/spiders.dm
index 82b2db6ac7b..778ec768e55 100644
--- a/code/game/gamemodes/changeling/powers/spiders.dm
+++ b/code/game/gamemodes/changeling/powers/spiders.dm
@@ -1,7 +1,7 @@
/datum/action/changeling/spiders
name = "Spread Infestation"
desc = "Our form divides, creating arachnids which will grow into deadly beasts."
- helptext = "The spiders are thoughtless creatures, and may attack their creators when fully grown. Requires at least 5 DNA absorptions."
+ helptext = "The spiders are thoughtless creatures, and may attack their creators when fully grown. Requires at least 5 stored DNA."
button_icon_state = "spread_infestation"
chemical_cost = 45
dna_cost = 1
diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm
index e0fc1107729..0e02df12d88 100644
--- a/code/game/gamemodes/changeling/powers/swap_form.dm
+++ b/code/game/gamemodes/changeling/powers/swap_form.dm
@@ -18,7 +18,7 @@
if((NOCLONE || SKELETON || HUSK) in target.mutations)
to_chat(user, "DNA of [target] is ruined beyond usability!")
return
- if(!istype(target) || issmall(target) || NO_DNA in target.dna.species.species_traits)
+ if(!istype(target) || issmall(target) || (NO_DNA in target.dna.species.species_traits))
to_chat(user, "[target] is not compatible with this ability.")
return
if(target.mind.changeling)
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 2a42d531f0f..1a9dd15c65e 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -1,4 +1,4 @@
-var/global/list/all_cults = list()
+GLOBAL_LIST_EMPTY(all_cults)
/datum/game_mode
var/list/datum/mind/cult = list()
@@ -110,11 +110,11 @@ var/global/list/all_cults = list()
modePlayer += cult
acolytes_needed = acolytes_needed + round((num_players_started() / 10))
- if(!summon_spots.len)
- while(summon_spots.len < SUMMON_POSSIBILITIES)
- var/area/summon = pick(return_sorted_areas() - summon_spots)
+ if(!GLOB.summon_spots.len)
+ while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES)
+ var/area/summon = pick(return_sorted_areas() - GLOB.summon_spots)
if(summon && is_station_level(summon.z) && summon.valid_territory)
- summon_spots += summon
+ GLOB.summon_spots += summon
for(var/datum/mind/cult_mind in cult)
SEND_SOUND(cult_mind.current, 'sound/ambience/antag/bloodcult.ogg')
@@ -146,7 +146,7 @@ var/global/list/all_cults = list()
else
explanation = "Free objective."
if("eldergod")
- explanation = "Summon [SSticker.cultdat.entity_name] by invoking the 'Tear Reality' rune.The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin."
+ explanation = "Summon [SSticker.cultdat.entity_name] by invoking the 'Tear Reality' rune.The summoning can only be accomplished in [english_list(GLOB.summon_spots)] - where the veil is weak enough for the ritual to begin."
to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]")
cult_mind.memory += "Objective #[obj_count]: [explanation]
"
- if(occupant.disabilities & BLIND)
+ if(BLINDNESS in occupant.mutations)
dat += "Cataracts detected.
" - if(occupant.disabilities & COLOURBLIND) + if(COLOURBLIND in occupant.mutations) dat += "Photoreceptor abnormalities detected.
" - if(occupant.disabilities & NEARSIGHTED) + if(NEARSIGHTED in occupant.mutations) dat += "Retinal misalignment detected.
" else dat += "[src] is empty." diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 24b8bb27735..446004f345b 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -227,7 +227,7 @@ if(SSradio) SSradio.remove_object(src, frequency) radio_connection = null - air_alarm_repository.update_cache(src) + GLOB.air_alarm_repository.update_cache(src) QDEL_NULL(wires) if(alarm_area && alarm_area.master_air_alarm == src) alarm_area.master_air_alarm = null @@ -241,7 +241,7 @@ if(name == "alarm") name = "[alarm_area.name] Air Alarm" apply_preset(1) // Don't cycle. - air_alarm_repository.update_cache(src) + GLOB.air_alarm_repository.update_cache(src) /obj/machinery/alarm/Initialize() ..() @@ -658,7 +658,7 @@ data["danger"] = danger return data -/obj/machinery/alarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/alarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/href_list = state.href_list(user) @@ -774,7 +774,7 @@ return thresholds -/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) +/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "air_alarm.tmpl", name, 570, 410, state = state) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 6d54135946b..442d1fac8a0 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -357,7 +357,7 @@ if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) return O:id_tag in sensors -/obj/machinery/computer/general_air_control/linkWith(mob/user, obj/O, link/context) +/obj/machinery/computer/general_air_control/linkWith(mob/user, obj/O, context) sensors[O:id_tag] = reject_bad_name(clean_input(user, "Choose a sensor label:", "Sensor Label"), allow_numbers=1) return 1 diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index efcdada302d..d91fba5fa5c 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -40,8 +40,7 @@ list("name" = "High temperature canister", "icon" = "hot"), list("name" = "Plasma containing canister", "icon" = "plasma") ) - -var/datum/canister_icons/canister_icon_container = new() +GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) /obj/machinery/portable_atmospherics/canister name = "canister" @@ -97,19 +96,19 @@ var/datum/canister_icons/canister_icon_container = new() //passed to the ui to render the color lists colorcontainer = list( "prim" = list( - "options" = canister_icon_container.possiblemaincolor, + "options" = GLOB.canister_icon_container.possiblemaincolor, "name" = "Primary color", ), "sec" = list( - "options" = canister_icon_container.possibleseccolor, + "options" = GLOB.canister_icon_container.possibleseccolor, "name" = "Secondary color", ), "ter" = list( - "options" = canister_icon_container.possibletertcolor, + "options" = GLOB.canister_icon_container.possibletertcolor, "name" = "Tertiary color", ), "quart" = list( - "options" = canister_icon_container.possiblequartcolor, + "options" = GLOB.canister_icon_container.possiblequartcolor, "name" = "Quaternary color", ) ) @@ -127,7 +126,7 @@ var/datum/canister_icons/canister_icon_container = new() possibledecals = list() var/i - var/list/L = canister_icon_container.possibledecals + var/list/L = GLOB.canister_icon_container.possibledecals for(i=1;i<=L.len;i++) var/list/LL = L[i] LL = LL.Copy() //make sure we don't edit the datum list @@ -220,25 +219,25 @@ update_flag //template modification exploit prevention, used in Topic() /obj/machinery/portable_atmospherics/canister/proc/is_a_color(var/inputVar, var/checkColor = "all") if(checkColor == "prim" || checkColor == "all") - for(var/list/L in canister_icon_container.possiblemaincolor) + for(var/list/L in GLOB.canister_icon_container.possiblemaincolor) if(L["icon"] == inputVar) return 1 if(checkColor == "sec" || checkColor == "all") - for(var/list/L in canister_icon_container.possibleseccolor) + for(var/list/L in GLOB.canister_icon_container.possibleseccolor) if(L["icon"] == inputVar) return 1 if(checkColor == "ter" || checkColor == "all") - for(var/list/L in canister_icon_container.possibletertcolor) + for(var/list/L in GLOB.canister_icon_container.possibletertcolor) if(L["icon"] == inputVar) return 1 if(checkColor == "quart" || checkColor == "all") - for(var/list/L in canister_icon_container.possiblequartcolor) + for(var/list/L in GLOB.canister_icon_container.possiblequartcolor) if(L["icon"] == inputVar) return 1 return 0 /obj/machinery/portable_atmospherics/canister/proc/is_a_decal(var/inputVar) - for(var/list/L in canister_icon_container.possibledecals) + for(var/list/L in GLOB.canister_icon_container.possibledecals) if(L["icon"] == inputVar) return 1 return 0 @@ -354,7 +353,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) return src.ui_interact(user) -/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.physical_state) if(src.destroyed) return diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index e4bdef2f147..0144a7f93c2 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -115,7 +115,7 @@ /obj/machinery/portable_atmospherics/pump/attack_hand(var/mob/user as mob) ui_interact(user) -/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.physical_state) // update the ui if it exists, returns null if no ui is passed/found ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -127,7 +127,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/portable_atmospherics/pump/ui_data(mob/user, ui_key = "main", datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/pump/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.physical_state) var/data[0] data["portConnected"] = connected_port ? 1 : 0 data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 1016e270f6d..36e340d1a12 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -116,7 +116,7 @@ ui_interact(user) return -/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.physical_state) // update the ui if it exists, returns null if no ui is passed/found ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -128,7 +128,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/portable_atmospherics/scrubber/ui_data(mob/user, ui_key = "main", datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/scrubber/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.physical_state) var/data[0] data["portConnected"] = connected_port ? 1 : 0 data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 9d9db841b1e..7a0c2483b40 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -38,7 +38,7 @@ var/list/categories = list("Tools", "Electronics", "Construction", "Communication", "Security", "Machinery", "Medical", "Miscellaneous", "Dinnerware", "Imported") /obj/machinery/autolathe/New() - AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert)) + AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), _show_on_examine=TRUE, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert)) ..() component_parts = list() component_parts += new /obj/item/circuitboard/autolathe(null) @@ -66,7 +66,7 @@ /obj/machinery/autolathe/Destroy() QDEL_NULL(wires) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.retrieve_all() return ..() @@ -86,8 +86,8 @@ ui = new(user, src, ui_key, "autolathe.tmpl", name, 800, 550) ui.open() -/obj/machinery/autolathe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) - GET_COMPONENT(materials, /datum/component/material_container) +/obj/machinery/autolathe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/data[0] data["screen"] = screen data["total_amount"] = materials.total_amount @@ -138,7 +138,7 @@ /obj/machinery/autolathe/proc/design_cost_data(datum/design/D) var/list/data = list() var/coeff = get_coeff(D) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/has_metal = 1 if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] / coeff))) has_metal = 0 @@ -152,7 +152,7 @@ return data /obj/machinery/autolathe/proc/queue_data(list/data) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/temp_metal = materials.amount(MAT_METAL) var/temp_glass = materials.amount(MAT_GLASS) data["processing"] = being_built.len ? get_processing_line() : null @@ -288,7 +288,7 @@ //multiplier checks : only stacks can have one and its value is 1, 10 ,25 or max_multiplier var/multiplier = text2num(href_list["multiplier"]) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/max_multiplier = min(design_last_ordered.maxstack, design_last_ordered.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/design_last_ordered.materials[MAT_METAL]):INFINITY,design_last_ordered.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/design_last_ordered.materials[MAT_GLASS]):INFINITY) var/is_stack = ispath(design_last_ordered.build_path, /obj/item/stack) @@ -342,7 +342,7 @@ for(var/obj/item/stock_parts/matter_bin/MB in component_parts) tot_rating += MB.rating tot_rating *= 25000 - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.max_amount = tot_rating * 3 for(var/obj/item/stock_parts/manipulator/M in component_parts) prod_coeff += M.rating - 1 @@ -355,7 +355,7 @@ desc = initial(desc)+"\nIt's building \a [initial(D.name)]." var/is_stack = ispath(D.build_path, /obj/item/stack) var/coeff = get_coeff(D) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/metal_cost = D.materials[MAT_METAL] var/glass_cost = D.materials[MAT_GLASS] var/power = max(2000, (metal_cost+glass_cost)*multiplier/5) @@ -387,7 +387,7 @@ return 0 var/coeff = get_coeff(D) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/metal_amount = materials.amount(MAT_METAL) if(custom_metal) metal_amount = custom_metal diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index c097a19f4f8..24ffb494422 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -34,20 +34,16 @@ var/in_use_lights = 0 // TO BE IMPLEMENTED var/toggle_sound = 'sound/items/wirecutter.ogg' - -/obj/machinery/camera/New() - ..() +/obj/machinery/camera/Initialize() + . = ..() wires = new(src) assembly = new(src) assembly.state = 4 assembly.anchored = 1 assembly.update_icon() - cameranet.cameras += src - cameranet.addCamera(src) - -/obj/machinery/camera/Initialize() - ..() + GLOB.cameranet.cameras += src + GLOB.cameranet.addCamera(src) if(is_station_level(z) && prob(3) && !start_active) toggle_cam(null, FALSE) wires.CutAll() @@ -61,8 +57,8 @@ bug.current = null bug = null QDEL_NULL(wires) - cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that - cameranet.cameras -= src + GLOB.cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that + GLOB.cameranet.cameras -= src var/area/ai_monitored/A = get_area(src) if(istype(A)) A.motioncamera = null @@ -77,7 +73,7 @@ update_icon() var/list/previous_network = network network = list() - cameranet.removeCamera(src) + GLOB.cameranet.removeCamera(src) stat |= EMPED set_light(0) emped = emped+1 //Increase the number of consecutive EMP's @@ -91,7 +87,7 @@ stat &= ~EMPED update_icon() if(can_use()) - cameranet.addCamera(src) + GLOB.cameranet.addCamera(src) emped = 0 //Resets the consecutive EMP count spawn(100) if(!QDELETED(src)) @@ -116,7 +112,7 @@ /obj/machinery/camera/proc/setViewRange(num = 7) view_range = num - cameranet.updateVisibility(src, 0) + GLOB.cameranet.updateVisibility(src, 0) /obj/machinery/camera/singularity_pull(S, current_size) if (status && current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects and the camera is still active, turn off the camera as it gets ripped off the wall. @@ -285,11 +281,11 @@ /obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE) status = !status if(can_use()) - cameranet.addCamera(src) + GLOB.cameranet.addCamera(src) else set_light(0) - cameranet.removeCamera(src) - cameranet.updateChunk(x, y, z) + GLOB.cameranet.removeCamera(src) + GLOB.cameranet.updateChunk(x, y, z) var/change_msg = "deactivates" if(status) change_msg = "reactivates" @@ -376,7 +372,7 @@ return null /obj/machinery/camera/proc/Togglelight(on = FALSE) - for(var/mob/living/silicon/ai/A in ai_list) + for(var/mob/living/silicon/ai/A in GLOB.ai_list) for(var/obj/machinery/camera/cam in A.lit_cameras) if(cam == src) return @@ -428,6 +424,6 @@ assembly.update_icon() /obj/machinery/camera/portable/process() //Updates whenever the camera is moved. - if(cameranet && get_turf(src) != prev_turf) - cameranet.updatePortableCamera(src) + if(GLOB.cameranet && get_turf(src) != prev_turf) + GLOB.cameranet.updatePortableCamera(src) prev_turf = get_turf(src) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 98f84cb75ec..c7d95370613 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -92,7 +92,7 @@ C.network = uniquelist(tempnetwork) tempnetwork = difflist(C.network,GLOB.restricted_camera_networks) if(!tempnetwork.len) // Camera isn't on any open network - remove its chunk from AI visibility. - cameranet.removeCamera(C) + GLOB.cameranet.removeCamera(C) C.c_tag = input diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 85b83b88c06..c0949fb3c9d 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -2,8 +2,8 @@ // EMP -/obj/machinery/camera/emp_proof/New() - ..() +/obj/machinery/camera/emp_proof/Initialize() + . = ..() upgradeEmpProof() // X-RAY @@ -11,20 +11,20 @@ /obj/machinery/camera/xray icon_state = "xraycam" // Thanks to Krutchen for the icons. -/obj/machinery/camera/xray/New() - ..() +/obj/machinery/camera/xray/Initialize() + . = ..() upgradeXRay() // MOTION -/obj/machinery/camera/motion/New() - ..() +/obj/machinery/camera/motion/Initialize() + . = ..() upgradeMotion() // ALL UPGRADES -/obj/machinery/camera/all/New() - ..() +/obj/machinery/camera/all/Initialize() + . = ..() upgradeEmpProof() upgradeXRay() upgradeMotion() @@ -74,7 +74,7 @@ assembly.upgrades.Add(new /obj/item/analyzer(assembly)) setPowerUsage() //Update what it can see. - cameranet.updateVisibility(src, 0) + GLOB.cameranet.updateVisibility(src, 0) // If you are upgrading Motion, and it isn't in the camera's New(), add it to the machines list. /obj/machinery/camera/proc/upgradeMotion() diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 5e6bd1640fb..1c247b23c03 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -17,7 +17,7 @@ return var/list/L = list() - for(var/obj/machinery/camera/C in cameranet.cameras) + for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) L.Add(C) camera_sort(L) @@ -226,9 +226,9 @@ return 0 if(isrobot(M)) var/mob/living/silicon/robot/R = M - if(!(R.camera && R.camera.can_use()) && !cameranet.checkCameraVis(M)) + if(!(R.camera && R.camera.can_use()) && !GLOB.cameranet.checkCameraVis(M)) return 0 - else if(!cameranet.checkCameraVis(M)) + else if(!GLOB.cameranet.checkCameraVis(M)) return 0 return 1 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 721162c0794..c622b12c94c 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -4,7 +4,19 @@ //Potential replacement for genetics revives or something I dunno (?) #define CLONE_BIOMASS 150 -#define BIOMASS_MEAT_AMOUNT 50 + +#define BIOMASS_BASE_AMOUNT 50 // How much biomass a BIOMASSABLE item gives the cloning pod + +// Not a comprehensive list: Further PRs should add appropriate items here. +// Meat as usual, monstermeat covers goliath, xeno, spider, bear meat +GLOBAL_LIST_INIT(cloner_biomass_items, list(\ +/obj/item/reagent_containers/food/snacks/meat,\ +/obj/item/reagent_containers/food/snacks/monstermeat, +/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/catfishmeat, +/obj/item/reagent_containers/food/snacks/tofurkey)) + #define MINIMUM_HEAL_LEVEL 40 #define CLONE_INITIAL_DAMAGE 190 #define BRAIN_INITIAL_DAMAGE 90 // our minds are too feeble for 190 @@ -15,8 +27,9 @@ desc = "An electronically-lockable pod for growing organic tissue." density = 1 icon = 'icons/obj/cloning.dmi' - icon_state = "pod_0" + icon_state = "pod_idle" req_access = list(ACCESS_GENETICS) //For premature unlocking. + var/mob/living/carbon/human/occupant var/heal_level //The clone is released once its health reaches this level. var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. @@ -153,7 +166,7 @@ for(var/i=new_SE.len;i<=DNA_SE_LENGTH;i++) new_SE += rand(1,1024) buf.dna.SE=new_SE - buf.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF) + buf.dna.SetSEValueRange(GLOB.monkeyblock,0xDAC, 0xFFF) //Disk stuff. /obj/item/disk/data/New() @@ -302,13 +315,14 @@ attempting = 0 return 1 -//Grow clones to maturity then kick them out. FREELOADERS +//Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() - var/show_message = 0 - for(var/obj/item/reagent_containers/food/snacks/meat/meat in range(1, src)) - qdel(meat) - biomass += BIOMASS_MEAT_AMOUNT - show_message = 1 + var/show_message = FALSE + for(var/obj/item/item in range(1, src)) + if(is_type_in_list(item, GLOB.cloner_biomass_items)) + qdel(item) + biomass += BIOMASS_BASE_AMOUNT + show_message = TRUE if(show_message) visible_message("[src] sucks in and processes the nearby biomass.") @@ -381,11 +395,11 @@ to_chat(user, "You force an emergency ejection.") go_out() -//Removing cloning pod biomass - else if(istype(I, /obj/item/reagent_containers/food/snacks/meat)) +// A user can feed in biomass sources manually. + else if(is_type_in_list(I, GLOB.cloner_biomass_items)) if(user.drop_item()) to_chat(user, "[src] processes [I].") - biomass += BIOMASS_MEAT_AMOUNT + biomass += BIOMASS_BASE_AMOUNT qdel(I) else return ..() @@ -405,7 +419,9 @@ /obj/machinery/clonepod/screwdriver_act(mob/user, obj/item/I) . = TRUE - default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", I) + // These icon states don't really matter since we need to call update_icon() to handle panel open/closed overlays anyway. + default_deconstruction_screwdriver(user, null, null, I) + update_icon() /obj/machinery/clonepod/wrench_act(mob/user, obj/item/I) . = TRUE @@ -531,11 +547,17 @@ /obj/machinery/clonepod/update_icon() ..() - icon_state = "pod_0" + cut_overlays() + + if(panel_open) + add_overlay("panel_open") + if(occupant && !(stat & NOPOWER)) - icon_state = "pod_1" - else if(mess && !panel_open) - icon_state = "pod_g" + icon_state = "pod_cloning" + else if(mess) + icon_state = "pod_mess" + else + icon_state = "pod_idle" /obj/machinery/clonepod/relaymove(mob/user) if(user.stat == CONSCIOUS) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index ad11d6fb7c5..21fddce64b7 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -61,7 +61,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/operating/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/operating/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/mob/living/carbon/human/occupant if(table) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index d53903857ef..ba139e50855 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -158,7 +158,7 @@ var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) if(open_for_latejoin) - empty_playable_ai_cores += D + GLOB.empty_playable_ai_cores += D else if(brain.brainmob.mind) SSticker.mode.remove_cultist(brain.brainmob.mind, 1) @@ -248,8 +248,8 @@ circuit = new(src) /obj/structure/AIcore/deactivated/Destroy() - if(src in empty_playable_ai_cores) - empty_playable_ai_cores -= src + if(src in GLOB.empty_playable_ai_cores) + GLOB.empty_playable_ai_cores -= src return ..() /client/proc/empty_ai_core_toggle_latejoin() @@ -269,11 +269,11 @@ var/obj/structure/AIcore/deactivated/D = cores[id] if(!D) return - if(D in empty_playable_ai_cores) - empty_playable_ai_cores -= D + if(D in GLOB.empty_playable_ai_cores) + GLOB.empty_playable_ai_cores -= D to_chat(src, "\The [id] is now not available for latejoining AIs.") else - empty_playable_ai_cores += D + GLOB.empty_playable_ai_cores += D to_chat(src, "\The [id] is now available for latejoining AIs.") diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index f8c2979e043..123cee3ae4e 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -1,5 +1,5 @@ -var/global/list/priority_air_alarms = list() -var/global/list/minor_air_alarms = list() +GLOBAL_LIST_EMPTY(priority_air_alarms) +GLOBAL_LIST_EMPTY(minor_air_alarms) /obj/machinery/computer/atmos_alert @@ -12,7 +12,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/New() ..() - SSalarms.atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/update_icon) + SSalarms.atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/.proc/update_icon) /obj/machinery/computer/atmos_alert/Destroy() SSalarms.atmosphere_alarm.unregister(src) @@ -67,12 +67,11 @@ var/global/list/minor_air_alarms = list() var/obj/machinery/alarm/air_alarm = alarm_source.source if(istype(air_alarm)) var/list/new_ref = list("atmos_reset" = 1) - air_alarm.Topic(href, new_ref, state = air_alarm_topic) + air_alarm.Topic(href, new_ref, state = GLOB.air_alarm_topic) update_icon() return 1 - -var/datum/topic_state/air_alarm_topic/air_alarm_topic = new() +GLOBAL_DATUM_INIT(air_alarm_topic, /datum/topic_state/air_alarm_topic, new) /datum/topic_state/air_alarm_topic/href_list(var/mob/user) var/list/extra_href = list() diff --git a/code/game/machinery/computer/brigcells.dm b/code/game/machinery/computer/brigcells.dm index 378c10d9783..a391bfa4021 100644 --- a/code/game/machinery/computer/brigcells.dm +++ b/code/game/machinery/computer/brigcells.dm @@ -30,7 +30,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/brigcells/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/brigcells/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/timers = list() for(var/obj/machinery/door_timer/T in GLOB.celltimers_list) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 2f8321b57bb..993a1c5cbaa 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -45,7 +45,6 @@ var/list/req_components = null var/powernet = null var/list/records = null - var/frame_desc = null var/contain_parts = 1 toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' @@ -64,7 +63,7 @@ var/atom/A = B if(!ispath(A)) continue - nice_list += list("[req_components[A]] [initial(A.name)]") + nice_list += list("[req_components[A]] [initial(A.name)]\s") . += "Required components: [english_list(nice_list)]." /obj/item/circuitboard/message_monitor @@ -296,19 +295,6 @@ name = "Circuit board (Operating Computer)" build_path = /obj/machinery/computer/operating origin_tech = "programming=2;biotech=3" -/obj/item/circuitboard/comm_monitor - name = "Circuit board (Telecommunications Monitor)" - build_path = /obj/machinery/computer/telecomms/monitor - origin_tech = "programming=3;magnets=3;bluespace=2" -/obj/item/circuitboard/comm_server - name = "Circuit board (Telecommunications Server Monitor)" - build_path = /obj/machinery/computer/telecomms/server - origin_tech = "programming=3;magnets=3;bluespace=2" -/obj/item/circuitboard/comm_traffic - name = "Circuitboard (Telecommunications Traffic Control)" - build_path = /obj/machinery/computer/telecomms/traffic - origin_tech = "programming=3;magnets=3;bluespace=2" - /obj/item/circuitboard/shuttle name = "circuit board (Shuttle)" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index f67158f82b0..3f8fc080bf8 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -53,6 +53,9 @@ return TRUE /obj/machinery/computer/security/check_eye(mob/user) + if((stat & (NOPOWER|BROKEN)) || user.incapacitated() || !user.has_vision()) + user.unset_machine() + return if(!(user in watchers)) user.unset_machine() return @@ -65,8 +68,6 @@ return if(!can_access_camera(C, user)) user.unset_machine() - return - return 1 /obj/machinery/computer/security/on_unset_machine(mob/user) watchers.Remove(user) @@ -113,7 +114,7 @@ access = get_all_accesses() // Assume captain level access when emagged else if(ishuman(user)) access = user.get_access() - else if((isAI(user) || isrobot(user)) && CanUseTopic(user, default_state) == STATUS_INTERACTIVE) + else if((isAI(user) || isrobot(user)) && CanUseTopic(user, GLOB.default_state) == STATUS_INTERACTIVE) access = get_all_accesses() // Assume captain level access when AI else if(user.can_admin_interact()) access = get_all_accesses() @@ -131,11 +132,11 @@ ui.open() -/obj/machinery/computer/security/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/security/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/cameras = list() - for(var/obj/machinery/camera/C in cameranet.cameras) + for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) if(isCameraFarAway(C)) continue if(!can_access_camera(C, user)) @@ -183,7 +184,7 @@ return 1 if(href_list["switchTo"]) - var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras + var/obj/machinery/camera/C = locate(href_list["switchTo"]) in GLOB.cameranet.cameras if(!C) return 1 @@ -209,7 +210,7 @@ // Check if camera is accessible when jumping /obj/machinery/computer/security/proc/can_access_camera(var/obj/machinery/camera/C, var/mob/M) - if(CanUseTopic(M, default_state) != STATUS_INTERACTIVE || M.incapacitated() || !M.has_vision()) + if(CanUseTopic(M, GLOB.default_state) != STATUS_INTERACTIVE || M.incapacitated() || !M.has_vision()) return 0 if(isrobot(M)) @@ -302,7 +303,7 @@ T = get_step(T, direct) console.jump_on_click(src, T) return - return ..(n,direct) + return ..() // Other computer monitors. /obj/machinery/computer/security/telescreen diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index b70addea909..bc1bfe6135b 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -37,17 +37,14 @@ eyeobj.RemoveImages() eyeobj.eye_user = null user.remote_control = null - user.remote_view = FALSE current_user = null user.unset_machine() playsound(src, 'sound/machines/terminal_off.ogg', 25, 0) /obj/machinery/computer/camera_advanced/check_eye(mob/user) - if((stat & (NOPOWER|BROKEN)) || !Adjacent(user) || !user.has_vision() || user.incapacitated()) + if((stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || !user.has_vision() || user.incapacitated()) user.unset_machine() - return 0 - return 1 /obj/machinery/computer/camera_advanced/Destroy() if(current_user) @@ -75,7 +72,7 @@ if(!eyeobj.eye_initialized) var/camera_location - for(var/obj/machinery/camera/C in cameranet.cameras) + for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) if(!C.can_use()) continue if(C.network&networks) @@ -99,8 +96,6 @@ current_user = user eyeobj.eye_user = user eyeobj.name = "Camera Eye ([user.name])" - // This should be able to be excised once the full view refactor rolls out - user.remote_view = 1 user.remote_control = eyeobj user.reset_perspective(eyeobj) @@ -139,7 +134,7 @@ T = get_turf(T) loc = T if(use_static) - cameranet.visibility(src, GetViewerClient()) + GLOB.cameranet.visibility(src, GetViewerClient()) if(visible_icon) if(eye_user.client) eye_user.client.images -= user_image @@ -189,7 +184,7 @@ var/list/L = list() - for(var/obj/machinery/camera/cam in cameranet.cameras) + for(var/obj/machinery/camera/cam in GLOB.cameranet.cameras) L.Add(cam) camera_sort(L) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 07ab3f5d62b..978ba25b8d3 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -1,6 +1,6 @@ //Keeps track of the time for the ID console. Having it as a global variable prevents people from dismantling/reassembling it to //increase the slots of many jobs. -var/time_last_changed_position = 0 +GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card name = "identification computer" @@ -25,7 +25,8 @@ var/time_last_changed_position = 0 /datum/job/ntnavyofficer, /datum/job/ntspecops, /datum/job/civilian, - /datum/job/syndicateofficer + /datum/job/syndicateofficer, + /datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work ) // Jobs that appear in the list, and you can prioritize, but not open/close slots for var/list/blacklisted_partial = list( @@ -133,7 +134,7 @@ var/time_last_changed_position = 0 if(!istype(id_card)) return ..() - if(!scan && ACCESS_CHANGE_IDS in id_card.access) + if(!scan && (ACCESS_CHANGE_IDS in id_card.access)) user.drop_item() id_card.loc = src scan = id_card @@ -160,7 +161,7 @@ var/time_last_changed_position = 0 if(job) if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE)) if((job.total_positions <= GLOB.player_list.len * (max_relative_positions / 100))) - var/delta = (world.time / 10) - time_last_changed_position + var/delta = (world.time / 10) - GLOB.time_last_changed_position if((change_position_cooldown < delta) || (opened_positions[job.title] < 0)) return 1 return -2 @@ -172,7 +173,7 @@ var/time_last_changed_position = 0 if(job) if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE)) if(job.total_positions > job.current_positions && !(job in SSjobs.prioritized_jobs)) - var/delta = (world.time / 10) - time_last_changed_position + var/delta = (world.time / 10) - GLOB.time_last_changed_position if((change_position_cooldown < delta) || (opened_positions[job.title] > 0)) return 1 return -2 @@ -236,13 +237,13 @@ var/time_last_changed_position = 0 ui = new(user, src, ui_key, "identification_computer.tmpl", src.name, 775, 700) ui.open() -/obj/machinery/computer/card/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/card/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["src"] = UID() data["station_name"] = station_name() data["mode"] = mode data["printing"] = printing - data["manifest"] = data_core ? data_core.get_manifest(0) : null + data["manifest"] = GLOB.data_core ? GLOB.data_core.get_manifest(0) : null data["target_name"] = modify ? modify.name : "-----" data["target_owner"] = modify && modify.registered_name ? modify.registered_name : "-----" data["target_rank"] = get_target_rank() @@ -260,19 +261,19 @@ var/time_last_changed_position = 0 var/list/job_formats = SSjobs.format_jobs_for_id_computer(modify) data["top_jobs"] = format_jobs(list("Captain", "Custom"), data["target_rank"], job_formats) - data["engineering_jobs"] = format_jobs(engineering_positions, data["target_rank"], job_formats) - data["medical_jobs"] = format_jobs(medical_positions, data["target_rank"], job_formats) - data["science_jobs"] = format_jobs(science_positions, data["target_rank"], job_formats) - data["security_jobs"] = format_jobs(security_positions, data["target_rank"], job_formats) - data["support_jobs"] = format_jobs(support_positions, data["target_rank"], job_formats) - data["civilian_jobs"] = format_jobs(civilian_positions, data["target_rank"], job_formats) - data["special_jobs"] = format_jobs(whitelisted_positions, data["target_rank"], job_formats) + data["engineering_jobs"] = format_jobs(GLOB.engineering_positions, data["target_rank"], job_formats) + data["medical_jobs"] = format_jobs(GLOB.medical_positions, data["target_rank"], job_formats) + data["science_jobs"] = format_jobs(GLOB.science_positions, data["target_rank"], job_formats) + data["security_jobs"] = format_jobs(GLOB.security_positions, data["target_rank"], job_formats) + data["support_jobs"] = format_jobs(GLOB.support_positions, data["target_rank"], job_formats) + data["civilian_jobs"] = format_jobs(GLOB.civilian_positions, data["target_rank"], job_formats) + data["special_jobs"] = format_jobs(GLOB.whitelisted_positions, data["target_rank"], job_formats) data["centcom_jobs"] = format_jobs(get_all_centcom_jobs(), data["target_rank"], job_formats) data["card_skins"] = format_card_skins(get_station_card_skins()) data["job_slots"] = format_job_slots() - var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - time_last_changed_position), 1) + var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1) var/mins = round(time_to_wait / 60) var/seconds = time_to_wait - (60*mins) data["cooldown_mins"] = mins @@ -321,7 +322,7 @@ var/time_last_changed_position = 0 switch(href_list["choice"]) if("modify") if(modify) - data_core.manifest_modify(modify.registered_name, modify.assignment) + GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment) modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])") if(ishuman(usr)) modify.forceMove(get_turf(src)) @@ -480,7 +481,7 @@ var/time_last_changed_position = 0 P.name = "crew manifest ([station_time_timestamp()])" P.info = {"
- [data_core ? data_core.get_manifest(0) : ""] + [GLOB.data_core ? GLOB.data_core.get_manifest(0) : ""] "} else if(modify && !mode) P.name = "access report" @@ -544,7 +545,7 @@ var/time_last_changed_position = 0 if(can_open_job(j) != 1) return 0 if(opened_positions[edit_job_target] >= 0) - time_last_changed_position = world.time / 10 + GLOB.time_last_changed_position = world.time / 10 j.total_positions++ opened_positions[edit_job_target]++ log_game("[key_name(usr)] has opened a job slot for job \"[j]\".") @@ -564,7 +565,7 @@ var/time_last_changed_position = 0 return 0 //Allow instant closing without cooldown if a position has been opened before if(opened_positions[edit_job_target] <= 0) - time_last_changed_position = world.time / 10 + GLOB.time_last_changed_position = world.time / 10 j.total_positions-- opened_positions[edit_job_target]-- log_game("[key_name(usr)] has closed a job slot for job \"[j]\".") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index c06cbb32a04..3091caa82a2 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -129,7 +129,7 @@ ui = new(user, src, ui_key, "cloning_console.tmpl", "Cloning Console UI", 640, 520) ui.open() -/obj/machinery/computer/cloning/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/cloning/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["menu"] = src.menu data["scanner"] = sanitize("[src.scanner]") @@ -358,35 +358,37 @@ return if(scan_brain && !can_brainscan()) return - if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (NO_SCAN in subject.dna.species.species_traits)) - scantemp = "Error: Unable to locate valid genetic data." - SSnanoui.update_uis(src) - return + if(isnull(subject) || (!(ishuman(subject))) || (!subject.dna)) + if(isalien(subject)) + scantemp = "Error: Xenomorphs are not scannable." + SSnanoui.update_uis(src) + return + // can add more conditions for specific non-human messages here + else + scantemp = "Error: Subject species is not scannable." + SSnanoui.update_uis(src) + return if(subject.get_int_organ(/obj/item/organ/internal/brain)) var/obj/item/organ/internal/brain/Brn = subject.get_int_organ(/obj/item/organ/internal/brain) if(istype(Brn)) if(NO_SCAN in Brn.dna.species.species_traits) - scantemp = "Error: Subject's brain is incompatible." + scantemp = "Error: [Brn.dna.species.name_plural] are not scannable." SSnanoui.update_uis(src) return if(!subject.get_int_organ(/obj/item/organ/internal/brain)) - scantemp = "Error: No signs of intelligence detected." + scantemp = "Error: No brain detected in subject." SSnanoui.update_uis(src) return if(subject.suiciding) - scantemp = "Error: Subject's brain is not responding to scanning stimuli." + scantemp = "Error: Subject has committed suicide and is not scannable." SSnanoui.update_uis(src) return if((!subject.ckey) || (!subject.client)) - scantemp = "Error: Mental interface failure." + scantemp = "Error: Subject's brain is not responding. Further attempts after a short delay may succeed." SSnanoui.update_uis(src) return if((NOCLONE in subject.mutations) && src.scanner.scan_level < 2) - scantemp = "Error: Mental interface failure." - SSnanoui.update_uis(src) - return - if(scan_brain && !subject.get_int_organ(/obj/item/organ/internal/brain)) - scantemp = "Error: No brain found." + scantemp = "Error: Subject has incompatible genetic mutations." SSnanoui.update_uis(src) return if(!isnull(find_record(subject.ckey))) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 3b663bbe549..9a1fd08d289 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -54,16 +54,16 @@ /obj/machinery/computer/communications/proc/change_security_level(var/new_level) tmp_alertlevel = new_level - var/old_level = security_level + var/old_level = GLOB.security_level if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this set_security_level(tmp_alertlevel) - if(security_level != old_level) + if(GLOB.security_level != old_level) //Only notify the admins if an actual change happened log_game("[key_name(usr)] has changed the security level to [get_security_level()].") message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") - switch(security_level) + switch(GLOB.security_level) if(SEC_LEVEL_GREEN) feedback_inc("alert_comms_green",1) if(SEC_LEVEL_BLUE) @@ -237,7 +237,7 @@ Nuke_request(input, usr) to_chat(usr, "Request sent.") log_game("[key_name(usr)] has requested the nuclear codes from Centcomm") - priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg') + GLOB.priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg') centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown centcomm_message_cooldown = 0 @@ -299,8 +299,8 @@ to_chat(usr, "Nano-Mob Hunter GO! game server is offline for extended maintenance. Contact your Central Command administrators for more info if desired.") if("ToggleATC") - atc.squelched = !atc.squelched - to_chat(usr, "ATC traffic is now: [atc.squelched ? "Disabled" : "Enabled"].") + GLOB.atc.squelched = !GLOB.atc.squelched + to_chat(usr, "ATC traffic is now: [GLOB.atc.squelched ? "Disabled" : "Enabled"].") SSnanoui.update_uis(src) return 1 @@ -337,7 +337,7 @@ // open the new ui window ui.open() -/obj/machinery/computer/communications/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/communications/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["is_ai"] = isAI(user) || isrobot(user) data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state @@ -364,7 +364,7 @@ ) ) - data["security_level"] = security_level + data["security_level"] = GLOB.security_level data["str_security_level"] = capitalize(get_security_level()) data["levels"] = list( list("id" = SEC_LEVEL_GREEN, "name" = "Green"), @@ -395,7 +395,7 @@ data["shuttle"] = shuttle - data["atcSquelched"] = atc.squelched + data["atcSquelched"] = GLOB.atc.squelched return data @@ -427,7 +427,7 @@ /proc/enable_prison_shuttle(var/mob/user); /proc/call_shuttle_proc(var/mob/user, var/reason) - if(sent_strike_team == 1) + if(GLOB.sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return @@ -456,7 +456,7 @@ to_chat(user, "Central Command does not currently have a shuttle available in your sector. Please try again later.") return - if(sent_strike_team == 1) + if(GLOB.sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return @@ -499,7 +499,6 @@ if(!frequency) return var/datum/signal/status_signal = new - status_signal.source = src status_signal.transmission_method = 1 status_signal.data["command"] = command @@ -507,13 +506,13 @@ if("message") status_signal.data["msg1"] = data1 status_signal.data["msg2"] = data2 - log_admin("STATUS: [user] set status screen message with [src]: [data1] [data2]") + log_admin("STATUS: [user] set status screen message: [data1] [data2]") //message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") if("alert") status_signal.data["picture_state"] = data1 spawn(0) - frequency.post_signal(src, status_signal) + frequency.post_signal(null, status_signal) /obj/machinery/computer/communications/Destroy() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index a3828af6be1..9464c43b107 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -52,7 +52,7 @@ ui = new(user, src, ui_key, "med_data.tmpl", name, 800, 380) ui.open() -/obj/machinery/computer/med_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/med_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -61,15 +61,15 @@ if(authenticated) switch(screen) if(MED_DATA_R_LIST) - if(!isnull(data_core.general)) + if(!isnull(GLOB.data_core.general)) var/list/records = list() data["records"] = records - for(var/datum/data/record/R in sortRecord(data_core.general)) + for(var/datum/data/record/R in sortRecord(GLOB.data_core.general)) records[++records.len] = list("ref" = "\ref[R]", "id" = R.fields["id"], "name" = R.fields["name"]) if(MED_DATA_RECORD) var/list/general = list() data["general"] = general - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) var/list/fields = list() general["fields"] = fields fields[++fields.len] = list("field" = "Name:", "value" = active1.fields["name"], "edit" = null) @@ -90,7 +90,7 @@ var/list/medical = list() data["medical"] = medical - if(istype(active2, /datum/data/record) && data_core.medical.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.medical.Find(active2)) var/list/fields = list() medical["fields"] = fields fields[++fields.len] = list("field" = "Blood Type:", "value" = active2.fields["blood_type"], "edit" = "blood_type", "line_break" = 0) @@ -144,9 +144,9 @@ if(..()) return 1 - if(!data_core.general.Find(active1)) + if(!GLOB.data_core.general.Find(active1)) active1 = null - if(!data_core.medical.Find(active2)) + if(!GLOB.data_core.medical.Find(active2)) active2 = null if(href_list["temp"]) @@ -157,7 +157,7 @@ var/temp_href = splittext(href_list["temp_action"], "=") switch(temp_href[1]) if("del_all2") - for(var/datum/data/record/R in data_core.medical) + for(var/datum/data/record/R in GLOB.data_core.medical) qdel(R) setTemp("
[t1]" + active2.fields["comments"] += "Made by [authenticated] ([rank]) on [GLOB.current_date_string] [station_time_timestamp()]
[t1]" if(href_list["del_c"]) var/index = min(max(text2num(href_list["del_c"]) + 1, 1), length(active2.fields["comments"])) @@ -473,13 +473,13 @@ active1 = null active2 = null t1 = lowertext(t1) - for(var/datum/data/record/R in data_core.medical) + for(var/datum/data/record/R in GLOB.data_core.medical) if(t1 == lowertext(R.fields["name"]) || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])) active2 = R if(!active2) setTemp("Medical Record
" - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]]
\nSex: [active1.fields["sex"]]
\nAge: [active1.fields["age"]] @@ -500,7 +500,7 @@
\nMental Status: [active1.fields["m_stat"]]
"} else P.info += "General Record Lost!
" - if(istype(active2, /datum/data/record) && data_core.medical.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.medical.Find(active2)) P.info += {"
\nMedical Data
\nBlood Type: [active2.fields["blood_type"]]
\nDNA: [active2.fields["b_dna"]]
\n @@ -532,7 +532,7 @@ if(stat & (BROKEN|NOPOWER)) return ..(severity) - for(var/datum/data/record/R in data_core.medical) + for(var/datum/data/record/R in GLOB.data_core.medical) if(prob(10/severity)) switch(rand(1,6)) if(1) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 55107809ce3..f2e4c5a7a52 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -18,7 +18,7 @@ var/noserver = "ALERT: No server detected." var/incorrectkey = "ALERT: Incorrect decryption key!" var/defaultmsg = "Welcome. Please select an option." - var/rebootmsg = "%$&(£: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit! "
+ var/rebootmsg = "%$&(�: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit! "
//Computer properties
var/screen = 0 // 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message
var/hacking = 0 // Is it being hacked into by the AI/Cyborg
@@ -54,7 +54,7 @@
MK.loc = src.loc
playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
// Will help make emagging the console not so easy to get away with.
- MK.info += "
£%@%(*$%&(£&?*(%&£/{}" + MK.info += "
�%@%(*$%&(�&?*(%&�/{}" update_icon() spawn(100*length(src.linkedServer.decryptkey)) UnmagConsole() @@ -75,8 +75,8 @@ ..() //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. if(!linkedServer) - if(message_servers && message_servers.len > 0) - linkedServer = message_servers[1] + if(GLOB.message_servers && GLOB.message_servers.len > 0) + linkedServer = GLOB.message_servers[1] return /obj/machinery/computer/message_monitor/attack_hand(var/mob/user as mob) @@ -288,11 +288,11 @@ if(auth) linkedServer.active = !linkedServer.active //Find a server if(href_list["find"]) - if(message_servers && message_servers.len > 1) - src.linkedServer = input(usr,"Please select a server.", "Select a server.", null) as null|anything in message_servers + if(GLOB.message_servers && GLOB.message_servers.len > 1) + src.linkedServer = input(usr,"Please select a server.", "Select a server.", null) as null|anything in GLOB.message_servers message = "NOTICE: Server selected." - else if(message_servers && message_servers.len > 0) - linkedServer = message_servers[1] + else if(GLOB.message_servers && GLOB.message_servers.len > 0) + linkedServer = GLOB.message_servers[1] message = "NOTICE: Only Single Server Detected - Server selected." else message = noserver @@ -396,13 +396,13 @@ if("Recepient") //Get out list of viable PDAs var/list/obj/item/pda/sendPDAs = list() - for(var/obj/item/pda/P in PDAs) + for(var/obj/item/pda/P in GLOB.PDAs) var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) if(!PM || !PM.can_receive()) continue sendPDAs += P - if(PDAs && PDAs.len > 0) + if(GLOB.PDAs && GLOB.PDAs.len > 0) customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortAtom(sendPDAs) else customrecepient = null @@ -436,7 +436,7 @@ return src.attack_hand(usr) var/obj/item/pda/PDARec = null - for(var/obj/item/pda/P in PDAs) + for(var/obj/item/pda/P in GLOB.PDAs) var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) if(!PM || !PM.can_receive()) @@ -486,11 +486,11 @@ /obj/item/paper/monitorkey/New() ..() spawn(10) - if(message_servers) - for(var/obj/machinery/message_server/server in message_servers) + if(GLOB.message_servers) + for(var/obj/machinery/message_server/server in GLOB.message_servers) if(!isnull(server)) if(!isnull(server.decryptkey)) - info = "
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." + info = "
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." info_links = info overlays += "paper_words" break diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index cd6450c700c..c4a6d5d440b 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -20,7 +20,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/podtracker/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/podtracker/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/pods[0] for(var/obj/item/spacepod_equipment/misc/tracker/TR in world) diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index fce315a1db0..bb38e59c800 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -26,18 +26,18 @@ /obj/machinery/computer/monitor/Initialize() ..() - powermonitor_repository.update_cache() + GLOB.powermonitor_repository.update_cache() powernet = find_powernet() /obj/machinery/computer/monitor/Destroy() GLOB.power_monitors -= src - powermonitor_repository.update_cache() + GLOB.powermonitor_repository.update_cache() QDEL_NULL(power_monitor) return ..() /obj/machinery/computer/monitor/power_change() ..() - powermonitor_repository.update_cache() + GLOB.powermonitor_repository.update_cache() /obj/machinery/computer/monitor/proc/find_powernet() var/obj/structure/cable/attached = null diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 8ecd463bc35..6134860733a 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -36,7 +36,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/robotics/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/robotics/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/robots = get_cyborgs(user) if(robots.len) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index cb5e799b89e..8c815198d31 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -54,7 +54,7 @@ ui = new(user, src, ui_key, "secure_data.tmpl", name, 800, 800) ui.open() -/obj/machinery/computer/secure_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/secure_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -63,26 +63,32 @@ if(authenticated) switch(screen) if(SEC_DATA_R_LIST) - if(!isnull(data_core.general)) - for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) + if(!isnull(GLOB.data_core.general)) + for(var/datum/data/record/R in sortRecord(GLOB.data_core.general, sortBy, order)) var/crimstat = "null" - for(var/datum/data/record/E in data_core.security) + for(var/datum/data/record/E in GLOB.data_core.security) if(E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]) crimstat = E.fields["criminal"] break var/background = "''" switch(crimstat) - if("*Execute*") + if(SEC_RECORD_STATUS_EXECUTE) background = "'background-color:#5E0A1A'" - if("*Arrest*") + if(SEC_RECORD_STATUS_ARREST) background = "'background-color:#890E26'" - if("Incarcerated") + if(SEC_RECORD_STATUS_SEARCH) + background = "'background-color:#999900'" + if(SEC_RECORD_STATUS_MONITOR) + background = "'background-color:#004C99'" + if(SEC_RECORD_STATUS_DEMOTE) + background = "'background-color:#C2A111'" + if(SEC_RECORD_STATUS_INCARCERATED) background = "'background-color:#743B03'" - if("Parolled") + if(SEC_RECORD_STATUS_PAROLLED) background = "'background-color:#743B03'" - if("Released") + if(SEC_RECORD_STATUS_RELEASED) background = "'background-color:#216489'" - if("None") + if(SEC_RECORD_STATUS_NONE) background = "'background-color:#007f47'" if("null") crimstat = "No record." @@ -90,7 +96,7 @@ if(SEC_DATA_RECORD) var/list/general = list() data["general"] = general - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) var/list/fields = list() general["fields"] = fields fields[++fields.len] = list("field" = "Name:", "value" = active1.fields["name"], "edit" = "name") @@ -112,7 +118,7 @@ var/list/security = list() data["security"] = security - if(istype(active2, /datum/data/record) && data_core.security.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2)) var/list/fields = list() security["fields"] = fields fields[++fields.len] = list("field" = "Criminal Status:", "value" = active2.fields["criminal"], "edit" = "criminal", "line_break" = 1) @@ -133,9 +139,9 @@ if(..()) return 1 - if(!data_core.general.Find(active1)) + if(!GLOB.data_core.general.Find(active1)) active1 = null - if(!data_core.security.Find(active2)) + if(!GLOB.data_core.security.Find(active2)) active2 = null if(href_list["temp"]) @@ -145,7 +151,7 @@ var/temp_href = splittext(href_list["temp_action"], "=") switch(temp_href[1]) if("del_all2") - for(var/datum/data/record/R in data_core.security) + for(var/datum/data/record/R in GLOB.data_core.security) qdel(R) update_all_mob_security_hud() setTemp("Security Record
" - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]]
\nSex: [active1.fields["sex"]]
\nAge: [active1.fields["age"]] @@ -332,7 +338,7 @@
\nMental Status: [active1.fields["m_stat"]]
"} else P.info += "General Record Lost!
" - if(istype(active2, /datum/data/record) && data_core.security.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2)) P.info += {"
\nSecurity Data
\nCriminal Status: [active2.fields["criminal"]]
\n
\nMinor Crimes: [active2.fields["mi_crim"]] @@ -384,7 +390,7 @@ var/t1 = copytext(trim(sanitize(input("Add Comment:", "Secure. records", null, null) as message)), 1, MAX_MESSAGE_LEN) if(!t1 || ..() || active2 != a2) return 1 - active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [station_time_timestamp()]
[t1]" + active2.fields["comments"] += "Made by [authenticated] ([rank]) on [GLOB.current_date_string] [station_time_timestamp()]
[t1]" else if(href_list["del_c"]) var/index = min(max(text2num(href_list["del_c"]) + 1, 1), length(active2.fields["comments"])) @@ -464,12 +470,15 @@ if("criminal") if(istype(active2, /datum/data/record)) var/list/buttons = list() - buttons[++buttons.len] = list("name" = "None", "icon" = "unlock", "href" = "criminal=none", "status" = (active2.fields["criminal"] == "None" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "*Arrest*", "icon" = "lock", "href" = "criminal=arrest", "status" = (active2.fields["criminal"] == "*Arrest*" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "Incarcerated", "icon" = "lock", "href" = "criminal=incarcerated", "status" = (active2.fields["criminal"] == "Incarcerated" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "*Execute*", "icon" = "lock", "href" = "criminal=execute", "status" = (active2.fields["criminal"] == "*Execute*" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "Parolled", "icon" = "unlock-alt", "href" = "criminal=parolled", "status" = (active2.fields["criminal"] == "Parolled" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "Released", "icon" = "unlock", "href" = "criminal=released", "status" = (active2.fields["criminal"] == "Released" ? "selected" : null)) + buttons[++buttons.len] = list("name" = "None", "icon" = "unlock", "href" = "criminal=none", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_NONE ? "selected" : null)) + buttons[++buttons.len] = list("name" = "*Arrest*", "icon" = "lock", "href" = "criminal=arrest", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_ARREST ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Search", "icon" = "lock", "href" = "criminal=search", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_SEARCH ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Monitor", "icon" = "unlock", "href" = "criminal=monitor", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_MONITOR ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Demote", "icon" = "lock", "href" = "criminal=demote", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_DEMOTE ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Incarcerated", "icon" = "lock", "href" = "criminal=incarcerated", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_INCARCERATED ? "selected" : null)) + buttons[++buttons.len] = list("name" = "*Execute*", "icon" = "lock", "href" = "criminal=execute", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_EXECUTE ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Parolled", "icon" = "unlock-alt", "href" = "criminal=parolled", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_PAROLLED ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Released", "icon" = "unlock", "href" = "criminal=released", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_RELEASED ? "selected" : null)) setTemp("Employment Record
" - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]]
\nSex: [active1.fields["sex"]]
\nAge: [active1.fields["age"]] @@ -300,7 +300,7 @@ ..(severity) return - for(var/datum/data/record/R in data_core.security) + for(var/datum/data/record/R in GLOB.data_core.security) if(prob(10/severity)) switch(rand(1,6)) if(1) @@ -310,7 +310,7 @@ if(3) R.fields["age"] = rand(5, 85) if(4) - R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released") + R.fields["criminal"] = pick(SEC_RECORD_STATUS_NONE, SEC_RECORD_STATUS_ARREST, SEC_RECORD_STATUS_INCARCERATED, SEC_RECORD_STATUS_PAROLLED, SEC_RECORD_STATUS_RELEASED) if(5) R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") if(6) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 23658a3e939..f509ee42d34 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -4,12 +4,12 @@ #define SPECOPS_DOCK_AREATYPE "/area/shuttle/specops/centcom" //Type of the spec ops shuttle area for dock #define SPECOPS_RETURN_DELAY 6000 //Time between the shuttle is capable of moving. -var/specops_shuttle_moving_to_station = 0 -var/specops_shuttle_moving_to_centcom = 0 -var/specops_shuttle_at_station = 0 -var/specops_shuttle_can_send = 1 -var/specops_shuttle_time = 0 -var/specops_shuttle_timeleft = 0 +GLOBAL_VAR_INIT(specops_shuttle_moving_to_station, 0) +GLOBAL_VAR_INIT(specops_shuttle_moving_to_centcom, 0) +GLOBAL_VAR_INIT(specops_shuttle_at_station, 0) +GLOBAL_VAR_INIT(specops_shuttle_can_send, 1) +GLOBAL_VAR_INIT(specops_shuttle_time, 0) +GLOBAL_VAR_INIT(specops_shuttle_timeleft, 0) /obj/machinery/computer/specops_shuttle name = "\improper Spec. Ops. shuttle console" @@ -33,16 +33,16 @@ var/specops_shuttle_timeleft = 0 if(announcer) announcer.autosay(message, "A.L.I.C.E.", "Response Team", list(1,2)) - while(specops_shuttle_time - world.timeofday > 0) - var/ticksleft = specops_shuttle_time - world.timeofday + while(GLOB.specops_shuttle_time - world.timeofday > 0) + var/ticksleft = GLOB.specops_shuttle_time - world.timeofday if(ticksleft > 1e5) - specops_shuttle_time = world.timeofday + 10 // midnight rollover - specops_shuttle_timeleft = (ticksleft / 10) + GLOB.specops_shuttle_time = world.timeofday + 10 // midnight rollover + GLOB.specops_shuttle_timeleft = (ticksleft / 10) //All this does is announce the time before launch. if(announcer) - var/rounded_time_left = round(specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. + var/rounded_time_left = round(GLOB.specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. if(rounded_time_left in message_tracker)//If that time is in the list for message announce. message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" if(rounded_time_left==0) @@ -53,10 +53,10 @@ var/specops_shuttle_timeleft = 0 sleep(5) - specops_shuttle_moving_to_station = 0 - specops_shuttle_moving_to_centcom = 0 + GLOB.specops_shuttle_moving_to_station = 0 + GLOB.specops_shuttle_moving_to_centcom = 0 - specops_shuttle_at_station = 1 + GLOB.specops_shuttle_at_station = 1 var/area/start_location = locate(/area/shuttle/specops/station) var/area/end_location = locate(/area/shuttle/specops/centcom) @@ -91,7 +91,7 @@ var/specops_shuttle_timeleft = 0 var/mob/M = locate(/mob) in T to_chat(M, "You have arrived at Central Command. Operation has ended!") - specops_shuttle_at_station = 0 + GLOB.specops_shuttle_at_station = 0 for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -110,16 +110,16 @@ var/specops_shuttle_timeleft = 0 //message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" //announcer.autosay(message, "A.L.I.C.E.", "Response Team") - while(specops_shuttle_time - world.timeofday > 0) - var/ticksleft = specops_shuttle_time - world.timeofday + while(GLOB.specops_shuttle_time - world.timeofday > 0) + var/ticksleft = GLOB.specops_shuttle_time - world.timeofday if(ticksleft > 1e5) - specops_shuttle_time = world.timeofday + 10 // midnight rollover - specops_shuttle_timeleft = (ticksleft / 10) + GLOB.specops_shuttle_time = world.timeofday + 10 // midnight rollover + GLOB.specops_shuttle_timeleft = (ticksleft / 10) //All this does is announce the time before launch. if(announcer) - var/rounded_time_left = round(specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. + var/rounded_time_left = round(GLOB.specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. if(rounded_time_left in message_tracker)//If that time is in the list for message announce. message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" if(rounded_time_left==0) @@ -130,11 +130,11 @@ var/specops_shuttle_timeleft = 0 sleep(5) - specops_shuttle_moving_to_station = 0 - specops_shuttle_moving_to_centcom = 0 + GLOB.specops_shuttle_moving_to_station = 0 + GLOB.specops_shuttle_moving_to_centcom = 0 - specops_shuttle_at_station = 1 - if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return + GLOB.specops_shuttle_at_station = 1 + if(GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return if(!specops_can_move()) to_chat(usr, "The Special Operations shuttle is unable to leave.") @@ -239,7 +239,7 @@ var/specops_shuttle_timeleft = 0 qdel(announcer) /proc/specops_can_move() - if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) + if(GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return 0 for(var/obj/machinery/computer/specops_shuttle/S in world) if(world.timeofday <= S.specops_shuttle_timereset) @@ -275,8 +275,8 @@ var/specops_shuttle_timeleft = 0 dat = temp else dat += {"
Special Operations Shuttle
- \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] + \nLocation: [GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([GLOB.specops_shuttle_timeleft] seconds.)":GLOB.specops_shuttle_at_station ? "Station":"Dock"]
+ [GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":GLOB.specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -291,7 +291,7 @@ var/specops_shuttle_timeleft = 0 usr.machine = src if(href_list["sendtodock"]) - if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return + if(!GLOB.specops_shuttle_at_station|| GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return if(!specops_can_move()) to_chat(usr, "Central Command will not allow the Special Operations shuttle to return yet.") @@ -306,13 +306,13 @@ var/specops_shuttle_timeleft = 0 temp += "Shuttle departing.
OK" updateUsrDialog() - specops_shuttle_moving_to_centcom = 1 - specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME + GLOB.specops_shuttle_moving_to_centcom = 1 + GLOB.specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME spawn(0) specops_return() else if(href_list["sendtostation"]) - if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return + if(GLOB.specops_shuttle_at_station || GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return if(!specops_can_move()) to_chat(usr, "The Special Operations shuttle is unable to leave.") @@ -326,9 +326,9 @@ var/specops_shuttle_timeleft = 0 var/area/centcom/specops/special_ops = locate() if(special_ops) special_ops.readyalert()//Trigger alarm for the spec ops area. - specops_shuttle_moving_to_station = 1 + GLOB.specops_shuttle_moving_to_station = 1 - specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME + GLOB.specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME spawn(0) specops_process() diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index fb630d7a251..607918442ea 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -20,7 +20,7 @@ /obj/machinery/computer/station_alert/New() ..() alarm_monitor = new monitor_type(src) - alarm_monitor.register(src, /obj/machinery/computer/station_alert/update_icon) + alarm_monitor.register(src, /obj/machinery/computer/station_alert/.proc/update_icon) /obj/machinery/computer/station_alert/Destroy() alarm_monitor.unregister(src) diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index f49d91c53b3..856e2322f71 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -102,11 +102,11 @@ th.cost.toomuch {background:maroon;} "} - for(var/datum/storeitem/item in centcomm_store.items) + for(var/datum/storeitem/item in GLOB.centcomm_store.items) var/cost_class="affordable" if(item.cost>balance) cost_class="toomuch" - var/itemID=centcomm_store.items.Find(item) + var/itemID=GLOB.centcomm_store.items.Find(item) var/row_color="light" if(itemID%2 == 0) row_color="dark" @@ -143,7 +143,7 @@ th.cost.toomuch {background:maroon;} if(href_list["buy"]) var/itemID = text2num(href_list["buy"]) - var/datum/storeitem/item = centcomm_store.items[itemID] + var/datum/storeitem/item = GLOB.centcomm_store.items[itemID] var/sure = alert(usr,"Are you sure you wish to purchase [item.name] for $[item.cost]?","You sure?","Yes","No") in list("Yes","No") if(!Adjacent(usr)) to_chat(usr, "You are not close enough to do that.") @@ -151,7 +151,7 @@ th.cost.toomuch {background:maroon;} if(sure=="No") updateUsrDialog() return - if(!centcomm_store.PlaceOrder(usr,itemID)) + if(!GLOB.centcomm_store.PlaceOrder(usr,itemID)) to_chat(usr, "Unable to charge your account.") else to_chat(usr, "You've successfully purchased the item. It should be in your hands or on the floor.") diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index aefeaaa864b..0a65b6be408 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -3,12 +3,12 @@ #define SYNDICATE_ELITE_STATION_AREATYPE "/area/shuttle/syndicate_elite/station" //Type of the spec ops shuttle area for station #define SYNDICATE_ELITE_DOCK_AREATYPE "/area/shuttle/syndicate_elite/mothership" //Type of the spec ops shuttle area for dock -var/syndicate_elite_shuttle_moving_to_station = 0 -var/syndicate_elite_shuttle_moving_to_mothership = 0 -var/syndicate_elite_shuttle_at_station = 0 -var/syndicate_elite_shuttle_can_send = 1 -var/syndicate_elite_shuttle_time = 0 -var/syndicate_elite_shuttle_timeleft = 0 +GLOBAL_VAR_INIT(syndicate_elite_shuttle_moving_to_station, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_moving_to_mothership, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_at_station, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_can_send, 1) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_time, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_timeleft, 0) /obj/machinery/computer/syndicate_elite_shuttle name = "\improper Elite Syndicate Squad shuttle console" @@ -33,16 +33,16 @@ var/syndicate_elite_shuttle_timeleft = 0 // message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" // announcer.say(message) - while(syndicate_elite_shuttle_time - world.timeofday > 0) - var/ticksleft = syndicate_elite_shuttle_time - world.timeofday + while(GLOB.syndicate_elite_shuttle_time - world.timeofday > 0) + var/ticksleft = GLOB.syndicate_elite_shuttle_time - world.timeofday if(ticksleft > 1e5) - syndicate_elite_shuttle_time = world.timeofday // midnight rollover - syndicate_elite_shuttle_timeleft = (ticksleft / 10) + GLOB.syndicate_elite_shuttle_time = world.timeofday // midnight rollover + GLOB.syndicate_elite_shuttle_timeleft = (ticksleft / 10) //All this does is announce the time before launch. if(announcer) - var/rounded_time_left = round(syndicate_elite_shuttle_timeleft)//Round time so that it will report only once, not in fractions. + var/rounded_time_left = round(GLOB.syndicate_elite_shuttle_timeleft)//Round time so that it will report only once, not in fractions. if(rounded_time_left in message_tracker)//If that time is in the list for message announce. message = "ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN" if(rounded_time_left==0) @@ -53,11 +53,11 @@ var/syndicate_elite_shuttle_timeleft = 0 sleep(5) - syndicate_elite_shuttle_moving_to_station = 0 - syndicate_elite_shuttle_moving_to_mothership = 0 + GLOB.syndicate_elite_shuttle_moving_to_station = 0 + GLOB.syndicate_elite_shuttle_moving_to_mothership = 0 - syndicate_elite_shuttle_at_station = 1 - if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return + GLOB.syndicate_elite_shuttle_at_station = 1 + if(GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return if(!syndicate_elite_can_move()) to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") @@ -174,7 +174,7 @@ var/syndicate_elite_shuttle_timeleft = 0 to_chat(M, "You have arrived to [station_name()]. Commence operation!") /proc/syndicate_elite_can_move() - if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 + if(GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return 0 else return 1 /obj/machinery/computer/syndicate_elite_shuttle/attack_ai(var/mob/user as mob) @@ -205,8 +205,8 @@ var/syndicate_elite_shuttle_timeleft = 0 dat = temp else dat = {"
Special Operations Shuttle
- \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
- [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"] + \nLocation: [GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([GLOB.syndicate_elite_shuttle_timeleft] seconds.)":GLOB.syndicate_elite_shuttle_at_station ? "Station":"Dock"]
+ [GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":GLOB.syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -221,13 +221,13 @@ var/syndicate_elite_shuttle_timeleft = 0 usr.set_machine(src) if(href_list["sendtodock"]) - if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return + if(!GLOB.syndicate_elite_shuttle_at_station|| GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return to_chat(usr, "The Syndicate will not allow the Elite Squad shuttle to return.") return else if(href_list["sendtostation"]) - if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return + if(GLOB.syndicate_elite_shuttle_at_station || GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return if(!specops_can_move()) to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") @@ -241,9 +241,9 @@ var/syndicate_elite_shuttle_timeleft = 0 var/area/syndicate_mothership/elite_squad/elite_squad = locate() if(elite_squad) elite_squad.readyalert()//Trigger alarm for the spec ops area. - syndicate_elite_shuttle_moving_to_station = 1 + GLOB.syndicate_elite_shuttle_moving_to_station = 1 - syndicate_elite_shuttle_time = world.timeofday + SYNDICATE_ELITE_MOVETIME + GLOB.syndicate_elite_shuttle_time = world.timeofday + SYNDICATE_ELITE_MOVETIME spawn(0) syndicate_elite_process() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index efee10767ba..96863c3e54d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -218,7 +218,7 @@ //Machine Frame Circuit Boards /*Common Parts: Parts List: Ignitor, Timer, Infra-red laser, Infra-red sensor, t_scanner, Capacitor, Valve, sensor unit, -micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. +micro-manipulator, glass sheets, beaker, Microlaser, matter bin, power cells. Note: Once everything is added to the public areas, will add MAT_METAL and MAT_GLASS to circuit boards since autolathe won't be able to destroy them and players will be able to make replacements. */ @@ -226,7 +226,6 @@ to destroy them and players will be able to make replacements. name = "circuit board (Booze-O-Mat Vendor)" board_type = "machine" origin_tech = "programming=1" - frame_desc = "Requires 1 Resupply Canister." build_path = /obj/machinery/vending/boozeomat req_components = list(/obj/item/vending_refill/boozeomat = 1) @@ -282,7 +281,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/power/smes board_type = "machine" origin_tech = "programming=3;powerstorage=3;engineering=3" - frame_desc = "Requires 5 pieces of cable, 5 Power Cells and 1 Capacitor." req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/cell = 5, @@ -321,7 +319,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer board_type = "machine" origin_tech = "programming=3;plasmatech=3" - frame_desc = "Requires 2 Matter Bins, 2 Micro Lasers, 1 piece of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/micro_laser = 2, @@ -346,7 +343,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/recharger board_type = "machine" origin_tech = "powerstorage=3;materials=2" - frame_desc = "Requires 1 Capacitor" req_components = list(/obj/item/stock_parts/capacitor = 1) /obj/item/circuitboard/snow_machine @@ -354,7 +350,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/snow_machine board_type = "machine" origin_tech = "programming=2;materials=2" - frame_desc = "Requires 1 Matter Bin and 1 Micro Laser." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/micro_laser = 1) @@ -364,7 +359,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/biogenerator board_type = "machine" origin_tech = "programming=2;biotech=3;materials=3" - frame_desc = "Requires 1 Matter Bin, 1 Manipulator, 1 piece of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -376,7 +370,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/plantgenes board_type = "machine" origin_tech = "programming=3;biotech=3" - frame_desc = "Requires 1 Manipulator, 1 Micro Laser, 1 Console Screen, and 1 Scanning Module." req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/micro_laser = 1, @@ -390,7 +383,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/seed_extractor board_type = "machine" origin_tech = "programming=1" - frame_desc = "Requires 1 Matter Bin and 1 Manipulator." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1) @@ -400,7 +392,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/hydroponics/constructable board_type = "machine" origin_tech = "programming=1;biotech=2" - frame_desc = "Requires 2 Matter Bins, 1 Manipulator, and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -411,7 +402,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/microwave board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 1 Micro Laser, 2 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 1, /obj/item/stack/cable_coil = 2, @@ -422,7 +412,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/oven board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 2 Micro Lasers, 5 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stack/cable_coil = 5, @@ -433,7 +422,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/grill board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 2 Micro Lasers, 5 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stack/cable_coil = 5, @@ -444,7 +432,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/candy_maker board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 1 Manipulator, 5 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stack/cable_coil = 5, @@ -455,7 +442,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/cooker/deepfryer board_type = "machine" origin_tech = "programming=1" - frame_desc = "Requires 2 Micro Lasers and 5 pieces of cable." req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stack/cable_coil = 5) @@ -568,7 +554,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/chem_dispenser board_type = "machine" origin_tech = "materials=4;programming=4;plasmatech=4;biotech=3" - frame_desc = "Requires 2 Matter Bins, 1 Capacitor, 1 Manipulator, 1 Console Screen, and 1 Power Cell." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/manipulator = 1, @@ -609,7 +594,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/chem_heater board_type = "machine" origin_tech = "programming=2;engineering=2;biotech=2" - frame_desc = "Requires 1 Micro Laser and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 1, /obj/item/stack/sheet/glass = 1) @@ -619,7 +603,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/reagentgrinder/empty board_type = "machine" origin_tech = "materials=2;engineering=2;biotech=2" - frame_desc = "Requires 2 Manipulators and 1 Matter Bin." req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/matter_bin = 1) @@ -640,7 +623,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/destructive_analyzer board_type = "machine" origin_tech = "magnets=2;engineering=2;programming=2" - frame_desc = "Requires 1 Scanning Module, 1 Manipulator, and 1 Micro-Laser." req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/manipulator = 1, @@ -651,7 +633,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/autolathe board_type = "machine" origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 3 Matter Bins, 1 Manipulator, and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 3, /obj/item/stock_parts/manipulator = 1, @@ -662,7 +643,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/protolathe board_type = "machine" origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 2 Matter Bins, 2 Manipulators, and 2 Beakers." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2, @@ -681,7 +661,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/circuit_imprinter board_type = "machine" origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 1 Matter Bin, 1 Manipulator, and 2 Beakers." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -692,7 +671,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/power/port_gen/pacman board_type = "machine" origin_tech = "programming=2;powerstorage=3;plasmatech=3;engineering=3" - frame_desc = "Requires 1 Matter Bin, 1 Micro-Laser, 2 Pieces of Cable, and 1 Capacitor." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/micro_laser = 1, @@ -714,7 +692,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/server board_type = "machine" origin_tech = "programming=3" - frame_desc = "Requires 2 pieces of cable, and 1 Scanning Module." req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/scanning_module = 1) @@ -724,7 +701,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/mecha_part_fabricator board_type = "machine" origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Matter Bins, 1 Manipulator, 1 Micro-Laser and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -736,7 +712,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/mecha_part_fabricator/spacepod board_type = "machine" origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Matter Bins, 1 Manipulators, 1 Micro-Lasers, and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -749,7 +724,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/clonepod board_type = "machine" origin_tech = "programming=2;biotech=2" - frame_desc = "Requires 2 Manipulator, 2 Scanning Module, 2 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/scanning_module = 2, @@ -761,7 +735,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/dna_scannernew board_type = "machine" origin_tech = "programming=2;biotech=2" - frame_desc = "Requires 1 Scanning Module, 1 Manipulator, 1 Micro-Laser, 2 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/manipulator = 1, @@ -774,7 +747,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/mech_bay_recharge_port board_type = "machine" origin_tech = "programming=3;powerstorage=3;engineering=3" - frame_desc = "Requires 1 piece of cable and 5 Capacitors." req_components = list( /obj/item/stack/cable_coil = 1, /obj/item/stock_parts/capacitor = 5) @@ -784,7 +756,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/teleport/hub board_type = "machine" origin_tech = "programming=3;engineering=4;bluespace=4;materials=4" - frame_desc = "Requires 3 Bluespace Crystals and 1 Matter Bin." req_components = list( /obj/item/stack/ore/bluespace_crystal = 3, /obj/item/stock_parts/matter_bin = 1) @@ -794,7 +765,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/teleport/station board_type = "machine" origin_tech = "programming=4;engineering=4;bluespace=4;plasmatech=3" - frame_desc = "Requires 2 Bluespace Crystals, 2 Capacitors and 1 Console Screen." req_components = list( /obj/item/stack/ore/bluespace_crystal = 2, /obj/item/stock_parts/capacitor = 2, @@ -805,7 +775,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/teleport/perma board_type = "machine" origin_tech = "programming=3;engineering=4;bluespace=4;materials=4" - frame_desc = "Requires 3 Bluespace Crystals and 1 Matter Bin." req_components = list( /obj/item/stack/ore/bluespace_crystal = 3, /obj/item/stock_parts/matter_bin = 1) @@ -825,7 +794,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/telepad board_type = "machine" origin_tech = "programming=4;engineering=3;plasmatech=4;bluespace=4" - frame_desc = "Requires 2 Bluespace Crystals, 1 Capacitor, 1 piece of cable and 1 Console Screen." req_components = list( /obj/item/stack/ore/bluespace_crystal = 2, /obj/item/stock_parts/capacitor = 1, @@ -837,7 +805,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/quantumpad board_type = "machine" origin_tech = "programming=3;engineering=3;plasmatech=3;bluespace=4" - frame_desc = "Requires 1 Bluespace Crystal, 1 Capacitor, 1 piece of cable and 1 Manipulator." req_components = list( /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/stock_parts/capacitor = 1, @@ -849,7 +816,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/sleeper board_type = "machine" origin_tech = "programming=3;biotech=2;engineering=3" - frame_desc = "Requires 1 Matter Bin, 1 Manipulator, 1 piece of cable and 2 Console Screens." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -870,7 +836,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/bodyscanner board_type = "machine" origin_tech = "programming=3;biotech=2;engineering=3" - frame_desc = "Requires 1 Scanning Module, 2 pieces of cable and 2 Console Screens." req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stack/cable_coil = 2, @@ -881,7 +846,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/atmospherics/unary/cryo_cell board_type = "machine" origin_tech = "programming=4;biotech=3;engineering=4;plasmatech=3" - frame_desc = "Requires 1 Matter Bin, 1 piece of cable and 4 Console Screens." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 1, @@ -892,96 +856,26 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/recharge_station board_type = "machine" origin_tech = "powerstorage=3;engineering=3" - frame_desc = "Requires 2 Capacitors, 1 Power Cell and 1 Manipulator." req_components = list( /obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/cell = 1, /obj/item/stock_parts/manipulator = 1) // Telecomms circuit boards: -/obj/item/circuitboard/telecomms/receiver - name = "Circuit Board (Subspace Receiver)" - build_path = /obj/machinery/telecomms/receiver - board_type = "machine" - origin_tech = "programming=2;engineering=2;bluespace=1" - frame_desc = "Requires 1 Subspace Ansible, 1 Hyperwave Filter, 2 Manipulators, and 1 Micro-Laser." - req_components = list( - /obj/item/stock_parts/subspace/ansible = 1, - /obj/item/stock_parts/subspace/filter = 1, - /obj/item/stock_parts/manipulator = 2, - /obj/item/stock_parts/micro_laser = 1) - -/obj/item/circuitboard/telecomms/hub - name = "Circuit Board (Hub Mainframe)" - build_path = /obj/machinery/telecomms/hub - board_type = "machine" - origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filter." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/subspace/filter = 2) - -/obj/item/circuitboard/telecomms/relay - name = "Circuit Board (Relay Mainframe)" - build_path = /obj/machinery/telecomms/relay +/obj/item/circuitboard/tcomms/relay + name = "Circuit Board (Telecommunications Relay)" + build_path = /obj/machinery/tcomms/relay board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=2" - frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filters." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/subspace/filter = 2) + req_components = list(/obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2) -/obj/item/circuitboard/telecomms/bus - name = "Circuit Board (Bus Mainframe)" - build_path = /obj/machinery/telecomms/bus +/obj/item/circuitboard/tcomms/core + name = "Circuit Board (Telecommunications Core)" + build_path = /obj/machinery/tcomms/core board_type = "machine" origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/subspace/filter = 1) - -/obj/item/circuitboard/telecomms/processor - name = "Circuit Board (Processor Unit)" - build_path = /obj/machinery/telecomms/processor - board_type = "machine" - origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 3 Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier." - req_components = list( - /obj/item/stock_parts/manipulator = 3, - /obj/item/stock_parts/subspace/filter = 1, - /obj/item/stock_parts/subspace/treatment = 2, - /obj/item/stock_parts/subspace/analyzer = 1, - /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/subspace/amplifier = 1) - -/obj/item/circuitboard/telecomms/server - name = "Circuit Board (Telecommunication Server)" - build_path = /obj/machinery/telecomms/server - board_type = "machine" - origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/subspace/filter = 1) - -/obj/item/circuitboard/telecomms/broadcaster - name = "Circuit Board (Subspace Broadcaster)" - build_path = /obj/machinery/telecomms/broadcaster - board_type = "machine" - origin_tech = "programming=2;engineering=2;bluespace=1" - frame_desc = "Requires 2 Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal and 2 High-Powered Micro-Lasers. " - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/subspace/filter = 1, - /obj/item/stock_parts/subspace/crystal = 1, - /obj/item/stock_parts/micro_laser/high = 2) - + req_components = list(/obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2) +// End telecomms circuit boards /obj/item/circuitboard/ore_redemption name = "circuit board (Ore Redemption)" build_path = /obj/machinery/mineral/ore_redemption @@ -1050,7 +944,6 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1" //This stuff is pretty much the absolute basis of programming, so it's mostly useless for research req_components = list(/obj/item/stack/cable_coil = 1) - var/list/names_paths = list( "NOT Gate" = /obj/machinery/logic_gate/not, "OR Gate" = /obj/machinery/logic_gate/or, diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 3ce6a8702f5..c7dc139446a 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -1,3 +1,6 @@ +#define AUTO_EJECT_DEAD (1<<0) +#define AUTO_EJECT_HEALTHY (1<<1) + /obj/machinery/atmospherics/unary/cryo_cell name = "cryo cell" desc = "Lowers the body temperature so certain medications may take effect." @@ -10,11 +13,12 @@ interact_offline = 1 max_integrity = 350 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30) - var/on = 0 + var/on = FALSE var/temperature_archived var/mob/living/carbon/occupant = null var/obj/item/reagent_containers/glass/beaker = null - var/autoeject = 0 + /// Holds two bitflags, AUTO_EJECT_DEAD and AUTO_EJECT_HEALTHY. Used to determine if the cryo cell will auto-eject dead and/or completely health patients. + var/auto_eject_prefs = NONE var/next_trans = 0 var/current_heat_capacity = 50 @@ -68,7 +72,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/atmos_init() ..() if(node) return - for(var/cdir in cardinal) + for(var/cdir in GLOB.cardinal) node = findConnecting(cdir) if(node) break @@ -139,18 +143,20 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() - if(autoeject) - if(occupant) - if(!occupant.has_organic_damage() && !occupant.has_mutated_organs()) - on = 0 - go_out() - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + if(!occupant) + return + + if((auto_eject_prefs & AUTO_EJECT_DEAD) && occupant.stat == DEAD) + auto_eject(AUTO_EJECT_DEAD) + return + if((auto_eject_prefs & AUTO_EJECT_HEALTHY) && !occupant.has_organic_damage() && !occupant.has_mutated_organs()) + auto_eject(AUTO_EJECT_HEALTHY) + return if(air_contents) - if(occupant) - process_occupant() + process_occupant() - return 1 + return TRUE /obj/machinery/atmospherics/unary/cryo_cell/process_atmos() ..() @@ -208,13 +214,13 @@ if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 420) + ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 480) // open the new ui window ui.open() // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/atmospherics/unary/cryo_cell/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/atmospherics/unary/cryo_cell/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["isOperating"] = on data["hasOccupant"] = occupant ? 1 : 0 @@ -249,7 +255,8 @@ for(var/datum/reagent/R in beaker.reagents.reagent_list) data["beakerVolume"] += R.volume - data["autoeject"] = autoeject + data["auto_eject_healthy"] = (auto_eject_prefs & AUTO_EJECT_HEALTHY) ? TRUE : FALSE + data["auto_eject_dead"] = (auto_eject_prefs & AUTO_EJECT_DEAD) ? TRUE : FALSE return data /obj/machinery/atmospherics/unary/cryo_cell/Topic(href, href_list) @@ -260,18 +267,24 @@ return 0 // don't update UIs attached to this object if(href_list["switchOn"]) - on = 1 + on = TRUE update_icon() if(href_list["switchOff"]) - on = 0 + on = FALSE update_icon() - if(href_list["autoejectOn"]) - autoeject = 1 + if(href_list["auto_eject_healthy_on"]) + auto_eject_prefs |= AUTO_EJECT_HEALTHY - if(href_list["autoejectOff"]) - autoeject = 0 + if(href_list["auto_eject_healthy_off"]) + auto_eject_prefs &= ~AUTO_EJECT_HEALTHY + + if(href_list["auto_eject_dead_on"]) + auto_eject_prefs |= AUTO_EJECT_DEAD + + if(href_list["auto_eject_dead_off"]) + auto_eject_prefs &= ~AUTO_EJECT_DEAD if(href_list["ejectBeaker"]) if(beaker) @@ -430,6 +443,16 @@ for(var/atom/movable/A in contents - component_parts - list(beaker)) A.forceMove(get_step(loc, SOUTH)) +/// Called when either the occupant is dead and the AUTO_EJECT_DEAD flag is present, OR the occupant is alive, has no external damage, and the AUTO_EJECT_HEALTHY flag is present. +/obj/machinery/atmospherics/unary/cryo_cell/proc/auto_eject(eject_flag) + on = FALSE + go_out() + switch(eject_flag) + if(AUTO_EJECT_HEALTHY) + playsound(loc, 'sound/machines/ding.ogg', 50, 1) + if(AUTO_EJECT_DEAD) + playsound(loc, 'sound/machines/buzz-sigh.ogg', 40) + /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if(!istype(M)) to_chat(usr, "The cryo cell cannot handle such a lifeform!") @@ -510,8 +533,17 @@ /datum/data/function/proc/display() return -/obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user) +/obj/machinery/atmospherics/unary/cryo_cell/get_remote_view_fullscreens(mob/user) user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) -/obj/machinery/atmospherics/components/unary/cryo_cell/update_remote_sight(mob/living/user) +/obj/machinery/atmospherics/unary/cryo_cell/update_remote_sight(mob/living/user) return //we don't see the pipe network while inside cryo. + +/obj/machinery/atmospherics/unary/cryo_cell/can_crawl_through() + return // can't ventcrawl in or out of cryo. + +/obj/machinery/atmospherics/unary/cryo_cell/can_see_pipes() + return FALSE // you can't see the pipe network when inside a cryo cell. + +#undef AUTO_EJECT_HEALTHY +#undef AUTO_EJECT_DEAD diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index b1a78f2825f..49b75588468 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -40,7 +40,7 @@ /obj/machinery/computer/cryopod/New() ..() - for(var/T in potential_theft_objectives) + for(var/T in GLOB.potential_theft_objectives) theft_cache += new T /obj/machinery/computer/cryopod/attack_ai() @@ -275,6 +275,12 @@ return control_computer != null +// So the user can use movement keys to get out of the cryopod +/obj/machinery/cryopod/relaymove(mob/user) + if(user.incapacitated()) + return FALSE + go_out() + /obj/machinery/cryopod/proc/check_occupant_allowed(mob/M) var/correct_type = 0 for(var/type in allow_occupant_types) @@ -416,15 +422,15 @@ // Delete them from datacore. var/announce_rank = null - if(PDA_Manifest.len) - PDA_Manifest.Cut() - for(var/datum/data/record/R in data_core.medical) + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() + for(var/datum/data/record/R in GLOB.data_core.medical) if((R.fields["name"] == occupant.real_name)) qdel(R) - for(var/datum/data/record/T in data_core.security) + for(var/datum/data/record/T in GLOB.data_core.security) if((T.fields["name"] == occupant.real_name)) qdel(T) - for(var/datum/data/record/G in data_core.general) + for(var/datum/data/record/G in GLOB.data_core.general) if((G.fields["name"] == occupant.real_name)) announce_rank = G.fields["rank"] qdel(G) @@ -438,7 +444,7 @@ control_computer.frozen_crew += "[occupant.real_name]" var/ailist[] = list() - for(var/mob/living/silicon/ai/A in GLOB.living_mob_list) + for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list) ailist += A if(ailist.len) var/mob/living/silicon/ai/announcer = pick(ailist) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 1fb2dfc422d..baf32ab742c 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -400,7 +400,7 @@ while(time) sleep(speed) for(var/i in 1 to speed) - M.setDir(pick(cardinal)) + M.setDir(pick(GLOB.cardinal)) M.resting = !M.resting M.update_canmove() time-- diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm index 738fc115734..9ee32716e53 100644 --- a/code/game/machinery/defib_mount.dm +++ b/code/game/machinery/defib_mount.dm @@ -15,6 +15,9 @@ var/obj/item/defibrillator/defib //this mount's defibrillator var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps +/obj/machinery/defibrillator_mount/attack_ai() + return + /obj/machinery/defibrillator_mount/get_cell() if(defib) return defib.get_cell() @@ -45,7 +48,7 @@ . = ..() if(defib) . += "There is a defib unit hooked up. Alt-click to remove it." - if(security_level >= SEC_LEVEL_RED) + if(GLOB.security_level >= SEC_LEVEL_RED) . += "Due to a security situation, its locking clamps can be toggled by swiping any ID." else . += "Its locking clamps can be [clamps_locked ? "dis" : ""]engaged by swiping an ID with access." @@ -100,7 +103,7 @@ return var/obj/item/card/id = I.GetID() if(id) - if(check_access(id) || security_level >= SEC_LEVEL_RED) //anyone can toggle the clamps in red alert! + if(check_access(id) || GLOB.security_level >= SEC_LEVEL_RED) //anyone can toggle the clamps in red alert! if(!defib) to_chat(user, "You can't engage the clamps on a defibrillator that isn't there.") return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 1d97056912f..94a3219c159 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -30,6 +30,8 @@ new stacktype(get_turf(src), drop_amount) /obj/structure/barricade/welder_act(mob/user, obj/item/I) + if(bar_material != METAL) + return if(obj_integrity >= max_integrity) to_chat(user, "[src] does not need repairs.") return @@ -71,6 +73,7 @@ bar_material = WOOD stacktype = /obj/item/stack/sheet/wood + /obj/structure/barricade/wooden/attackby(obj/item/I, mob/user) if(istype(I,/obj/item/stack/sheet/wood)) var/obj/item/stack/sheet/wood/W = I diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5ba3885faff..73d0e9281e1 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -38,7 +38,7 @@ #define AIRLOCK_DAMAGE_DEFLECTION_N 21 // Normal airlock damage deflection #define AIRLOCK_DAMAGE_DEFLECTION_R 30 // Reinforced airlock damage deflection -var/list/airlock_overlays = list() +GLOBAL_LIST_EMPTY(airlock_overlays) /obj/machinery/door/airlock name = "airlock" @@ -276,6 +276,7 @@ About the new airlock wires panel: if(usr) shockedby += text("\[[time_stamp()]\] - [usr](ckey:[usr.ckey])") usr.create_attack_log("Electrified the [name] at [x] [y] [z]") + add_attack_logs(usr, src, "Electrified", ATKLOG_ALL) else shockedby += text("\[[time_stamp()]\] - EMP)") message = "The door is now electrified [duration == -1 ? "permanently" : "for [duration] second\s"]." @@ -288,8 +289,8 @@ About the new airlock wires panel: // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise // The preceding comment was borrowed from the grille's shock script -/obj/machinery/door/airlock/shock(mob/user, prb) - if(!arePowerSystemsOn()) +/obj/machinery/door/airlock/shock(mob/living/user, prb) + if(!istype(user) || !arePowerSystemsOn()) return FALSE if(shockCooldown > world.time) return FALSE //Already shocked someone recently? @@ -483,10 +484,10 @@ About the new airlock wires panel: /proc/get_airlock_overlay(icon_state, icon_file) var/iconkey = "[icon_state][icon_file]" - if(airlock_overlays[iconkey]) - return airlock_overlays[iconkey] - airlock_overlays[iconkey] = image(icon_file, icon_state) - return airlock_overlays[iconkey] + if(GLOB.airlock_overlays[iconkey]) + return GLOB.airlock_overlays[iconkey] + GLOB.airlock_overlays[iconkey] = image(icon_file, icon_state) + return GLOB.airlock_overlays[iconkey] /obj/machinery/door/airlock/do_animate(animation) switch(animation) @@ -550,7 +551,7 @@ About the new airlock wires panel: ui.open() ui.set_auto_update(1) -/obj/machinery/door/airlock/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/door/airlock/ui_data(mob/user, datum/topic_state/state = GLOB.default_state) var/data[0] data["main_power_loss"] = round(main_power_lost_until > 0 ? max(main_power_lost_until - world.time, 0) / 10 : main_power_lost_until, 1) @@ -763,6 +764,7 @@ About the new airlock wires panel: else if(activate) //electrify door for 30 seconds shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.create_attack_log("Electrified the [name] at [x] [y] [z]") + add_attack_logs(usr, src, "Electrified", ATKLOG_ALL) to_chat(usr, "The door is now electrified for thirty seconds.") electrify(30) if("electrify_permanently") @@ -774,6 +776,7 @@ About the new airlock wires panel: else if(activate) shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.create_attack_log("Electrified the [name] at [x] [y] [z]") + add_attack_logs(usr, src, "Electrified", ATKLOG_ALL) to_chat(usr, "The door is now electrified.") electrify(-1) if("open") @@ -861,7 +864,7 @@ About the new airlock wires panel: update_icon() return - else if(istype(C, /obj/item/assembly/signaler)) + if(istype(C, /obj/item/assembly/signaler)) return interact_with_panel(user) else if(istype(C, /obj/item/pai_cable)) // -- TLE var/obj/item/pai_cable/cable = C @@ -946,7 +949,7 @@ About the new airlock wires panel: if(note) remove_airlock_note(user, TRUE) else - return interact_with_panel(user) + interact_with_panel(user) /obj/machinery/door/airlock/multitool_act(mob/user, obj/item/I) if(!headbutt_shock_check(user)) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 260d26493c0..660c6df683e 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -29,12 +29,12 @@ t1 += " Unrestricted Access Settings
" var/list/Directions = list("North","South",,"East",,,,"West") - for(var/direction in cardinal) + for(var/direction in GLOB.cardinal) if (unres_direction && unres_direction == direction) t1 += "[Directions[direction]]
" else t1 += "[Directions[direction]]
" - + t1 += "
" t1 += "Access requirement is set to " t1 += one_access ? "ONE
" : "ALL
" @@ -74,7 +74,7 @@ if(href_list["access"]) toggle_access(href_list["access"]) - + if(href_list["unres_direction"]) unres_direction = text2num(href_list["unres_direction"]) if (unres_sides == unres_direction) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index dbc76ade250..8d842179db5 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -2,6 +2,7 @@ #define FONT_SIZE "5pt" #define FONT_COLOR "#09f" #define FONT_STYLE "Small Fonts" +#define CELL_NONE "None" /////////////////////////////////////////////////////////////////////////////////////////////// // Brig Door control displays. @@ -31,10 +32,13 @@ maptext_height = 26 maptext_width = 32 maptext_y = -1 - var/occupant = "None" - var/crimes = "None" + var/occupant = CELL_NONE + var/crimes = CELL_NONE var/time = 0 - var/officer = "None" + var/officer = CELL_NONE + var/prisoner_name = "" + var/prisoner_charge = "" + var/prisoner_time = "" /obj/machinery/door_timer/New() GLOB.celltimers_list += src @@ -45,33 +49,29 @@ return ..() /obj/machinery/door_timer/proc/print_report() - var/logname = input(usr, "Name of the guilty?","[id] log name") - var/logcharges = stripped_multiline_input(usr, "What have they been charged with?","[id] log charges") - - if(!logname || !logcharges) + if(occupant == CELL_NONE || crimes == CELL_NONE) return 0 - occupant = logname - crimes = logcharges + time = timetoset officer = usr.name for(var/obj/machinery/computer/prisoner/C in GLOB.prisoncomputer_list) var/obj/item/paper/P = new /obj/item/paper(C.loc) - P.name = "[id] log - [logname] [station_time_timestamp()]" + P.name = "[id] log - [occupant] [station_time_timestamp()]" P.info = "[id] - Brig record
" P.info += {"[station_name()] - Security Department
Admission data:
Log generated at: [station_time_timestamp()]
- Detainee: [logname]
+ Detainee: [occupant]
Duration: [seconds_to_time(timetoset / 10)]
- Charge(s): [logcharges]
+ Charge(s): [crimes]
Arresting Officer: [usr.name]
This log file was generated automatically upon activation of a cell timer."} playsound(C.loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) GLOB.cell_logs += P - var/datum/data/record/G = find_record("name", logname, data_core.general) + var/datum/data/record/G = find_record("name", occupant, GLOB.data_core.general) var/prisoner_drank = "unknown" var/prisoner_trank = "unknown" if(G) @@ -80,9 +80,9 @@ if(G.fields["real_rank"]) // Ignore alt job titles - necessary for lookups prisoner_trank = G.fields["real_rank"] - var/datum/data/record/R = find_security_record("name", logname) + var/datum/data/record/R = find_security_record("name", occupant) - var/announcetext = "Detainee [logname] ([prisoner_drank]) has been incarcerated for [seconds_to_time(timetoset / 10)] for the charges of, '[logcharges]'. \ + var/announcetext = "Detainee [occupant] ([prisoner_drank]) has been incarcerated for [seconds_to_time(timetoset / 10)] for the charges of: '[crimes]'. \ Arresting Officer: [usr.name].[R ? "" : " Detainee record not found, manual record update required."]" Radio.autosay(announcetext, name, "Security", list(z)) @@ -91,7 +91,7 @@ if(R) prisoner = R - R.fields["criminal"] = "Incarcerated" + R.fields["criminal"] = SEC_RECORD_STATUS_INCARCERATED var/mob/living/carbon/human/M = usr var/rank = "UNKNOWN RANK" if(istype(M) && M.wear_id) @@ -99,7 +99,7 @@ rank = I.assignment if(!R.fields["comments"] || !islist(R.fields["comments"])) //copied from security computer code because apparently these need to be initialized R.fields["comments"] = list() - R.fields["comments"] += "Autogenerated by [name] on [current_date_string] [station_time_timestamp()]
Sentenced to [timetoset/10] seconds for the charges of \"[logcharges]\" by [rank] [usr.name]." + R.fields["comments"] += "Autogenerated by [name] on [GLOB.current_date_string] [station_time_timestamp()]
Sentenced to [timetoset/10] seconds for the charges of \"[crimes]\" by [rank] [usr.name]." update_all_mob_security_hud() return 1 @@ -118,7 +118,7 @@ var/boss_title = brigged_job.department_head[1] var/obj/item/pda/target_pda - for(var/obj/item/pda/check_pda in PDAs) + for(var/obj/item/pda/check_pda in GLOB.PDAs) if(check_pda.ownrank == boss_title) target_pda = check_pda if(!target_pda) @@ -175,12 +175,10 @@ if(timing) if(timeleft() <= 0) Radio.autosay("Timer has expired. Releasing prisoner.", name, "Security", list(z)) - occupant = "None" + occupant = CELL_NONE timer_end() // open doors, reset timer, clear status screen timing = 0 . = PROCESS_KILL - - updateUsrDialog() update_icon() else timer_end() @@ -203,8 +201,8 @@ if(!printed) if(!print_report()) - timing = 0 - return 0 + timing = FALSE + return FALSE // Set releasetime releasetime = world.timeofday + timetoset @@ -237,14 +235,14 @@ return 0 // Reset vars - occupant = "None" - crimes = "None" + occupant = CELL_NONE + crimes = CELL_NONE time = 0 - officer = "None" + officer = CELL_NONE releasetime = 0 printed = 0 if(prisoner) - prisoner.fields["criminal"] = "Released" + prisoner.fields["criminal"] = SEC_RECORD_STATUS_RELEASED update_all_mob_security_hud() prisoner = null @@ -290,10 +288,11 @@ //Allows AIs to use door_timer, see human attack_hand function below /obj/machinery/door_timer/attack_ai(mob/user) - interact(user) + attack_hand(user) + ui_interact(user) /obj/machinery/door_timer/attack_ghost(mob/user) - interact(user) + ui_interact(user) //Allows humans to use door_timer //Opens dialog window when someone clicks on door timer @@ -302,98 +301,71 @@ /obj/machinery/door_timer/attack_hand(mob/user) if(..()) return - interact(user) + ui_interact(user) -/obj/machinery/door_timer/interact(mob/user) - // Used for the 'time left' display - var/second = round(timeleft() % 60) - var/minute = round((timeleft() - second) / 60) +/obj/machinery/door_timer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "brig_timer.tmpl", "Brig Timer", 500, 400) + ui.open() + ui.set_auto_update(TRUE) - // Used for 'set timer' - var/setsecond = round((timetoset / 10) % 60) - var/setminute = round(((timetoset / 10) - setsecond) / 60) +/obj/machinery/door_timer/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) + var/data[0] + data["cell_id"] = name + data["occupant"] = occupant + data["crimes"] = crimes + data["brigged_by"] = officer + data["time_set"] = seconds_to_clock(time / 10) + data["time_left"] = seconds_to_clock(timeleft()) + data["timing"] = timing + data["isAllowed"] = allowed(user) + data["prisoner_name"] = prisoner_name + data["prisoner_charge"] = prisoner_charge + data["prisoner_time"] = prisoner_time - user.set_machine(src) + return data - // dat - var/dat = "
Timer System:" - dat += " Door [id] controls
" - - // Start/Stop timer - if(timing) - dat += "Stop Timer and open door
" - else - dat += "Activate Timer and close door
" - - // Time Left display (uses releasetime) - dat += "Time Left: [(minute ? text("[minute]:") : null)][second]
" - dat += "
" - - // Set Timer display (uses timetoset) - if(timing) - dat += "Set Timer: [(setminute ? text("[setminute]:") : null)][setsecond] Set
" - else - dat += "Set Timer: [(setminute ? text("[setminute]:") : null)][setsecond]
" - - // Controls - dat += "Input Time" - - // Mounted flash controls - for(var/obj/machinery/flasher/F in targets) - if(F.last_flash && (F.last_flash + 150) > world.time) - dat += "
Flash Charging" - else - dat += "
Activate Flash" - - dat += "
Close" - - var/datum/browser/popup = new(user, "door_timer", name, 400, 500) - popup.set_content(dat) - popup.open() - - -//Function for using door_timer dialog input, checks if user has permission -// href_list to -// "timing" turns on timer -// "tp" value to modify timer -// "fc" activates flasher -// "change" resets the timer to the timetoset amount while the timer is counting down -// Also updates dialog window and timer icon /obj/machinery/door_timer/Topic(href, href_list) - if(..()) - return 1 - if(!allowed(usr) && !usr.can_admin_interact()) return 1 - usr.set_machine(src) - - if(href_list["timing"]) - timing = text2num(href_list["timing"]) - - if(timing) - timer_start() - else - timer_end() - if(!isobserver(usr)) //spooky admin ghosts are in your brig, releasing your prisoners - Radio.autosay("Timer stopped manually by [usr.name].", name, "Security", list(z)) - - else - if(href_list["settime"]) - var/time = min(max(round(return_time_input(usr)), 0), 3600) - timeset(time) - - if(href_list["fc"]) - for(var/obj/machinery/flasher/F in targets) + if(href_list["flash"]) + for(var/obj/machinery/flasher/F in targets) + if(F.last_flash && (F.last_flash + 150) > world.time) + to_chat(usr, "Flash still charging.") + else F.flash() - if(href_list["change"]) - printed = 1 - timer_start() + if(href_list["release"]) + if(timing) + timer_end() + Radio.autosay("Timer stopped manually from cell control.", name, "Security", list(z)) + ui_interact(usr) - add_fingerprint(usr) - updateUsrDialog() - update_icon() + if(href_list["prisoner_name"]) + prisoner_name = input("Prisoner Name:", name, prisoner_name) as text|null + + if(href_list["prisoner_charge"]) + prisoner_charge = input("Prisoner Charge:", name, prisoner_charge) as text|null + + if(href_list["prisoner_time"]) + prisoner_time = input("Prisoner Time (in minutes):", name, prisoner_time) as num|null + prisoner_time = min(max(round(prisoner_time), 0), 60) + + if(href_list["set_timer"]) + if(!prisoner_name || !prisoner_charge || !prisoner_time) + return + timeset(prisoner_time * 60) + occupant = prisoner_name + crimes = prisoner_charge + prisoner_name = "" + prisoner_charge = "" + prisoner_time = "" + timing = TRUE + timer_start() + ui_interact(usr) + update_icon() //icon update function @@ -502,3 +474,4 @@ #undef FONT_COLOR #undef FONT_STYLE #undef CHARS_PER_LINE +#undef CELL_NONE diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index d7f66f4630b..7884e3be989 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -12,5 +12,5 @@ for(var/obj/machinery/door/D in locate(x,y,z)) if(!istype(D, /obj/machinery/door/window) && D.density) return 0 - //There are no false wall checks because that would be fucking retarded + //There are no false wall checks because that would be foolish return 1 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 718efdb414c..2d6fac3bb81 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -204,7 +204,7 @@ . = TRUE if(operating) return - if(!I.use_tool(src, user, 0, volume = I.tool_volume)) + if(!I.use_tool(src, user, 0, volume = 0)) return try_to_crowbar(user, I) @@ -352,8 +352,8 @@ addtimer(CALLBACK(src, .proc/autoclose), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE) /obj/machinery/door/proc/update_freelook_sight() - if(!glass && cameranet) - cameranet.updateVisibility(src, 0) + if(!glass && GLOB.cameranet) + GLOB.cameranet.updateVisibility(src, 0) /obj/machinery/door/BlockSuperconductivity() // All non-glass airlocks block heat, this is intended. if(opacity || heat_proof) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 6f4a84a7535..c0dce817189 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -59,9 +59,18 @@ /obj/machinery/door/poddoor/try_to_activate_door(mob/user) return -/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user) +/obj/machinery/door/poddoor/try_to_crowbar(mob/user, obj/item/I) + if(!density) + return if(!hasPower()) - open() + to_chat(user, "You start forcing [src] open...") + if(do_after(user, 50 * I.toolspeed, target = src)) + if(!hasPower()) + open() + else + to_chat(user, "[src] resists your efforts to force it!") + else + to_chat(user, "[src] resists your efforts to force it!") // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. - Unknown // Wise words. - Bxil diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 7af8ebe88f3..05198a7a55f 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -1,4 +1,4 @@ -var/list/doppler_arrays = list() +GLOBAL_LIST_EMPTY(doppler_arrays) /obj/machinery/doppler_array name = "tachyon-doppler array" @@ -28,12 +28,12 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/New() ..() - doppler_arrays += src + GLOB.doppler_arrays += src explosion_target = rand(8, 20) toxins_tech = new /datum/tech/toxins(src) /obj/machinery/doppler_array/Destroy() - doppler_arrays -= src + GLOB.doppler_arrays -= src logged_explosions.Cut() return ..() @@ -95,7 +95,7 @@ var/list/doppler_arrays = list() to_chat(user, "[src] is already printing something, please wait.") return atom_say("Printing explosive log. Standby...") - addtimer(CALLBACK(src, .print), 50) + addtimer(CALLBACK(src, .proc/print), 50) /obj/machinery/doppler_array/proc/print() visible_message("[src] prints a piece of paper!") @@ -183,7 +183,7 @@ var/list/doppler_arrays = list() ui.open() ui.set_auto_update(1) -/obj/machinery/doppler_array/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/doppler_array/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/explosion_data = list() for(var/D in logged_explosions) diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index b1a6f96e2eb..32924690d97 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -27,7 +27,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data = list( @@ -98,7 +98,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data = list( @@ -160,7 +160,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data = list( diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 7ae268fca46..9beba3f4789 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -236,14 +236,14 @@ FIRE ALARM ui_interact(user) -/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) +/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "firealarm.tmpl", name, 400, 400, state = state) ui.open() ui.set_auto_update(1) -/obj/machinery/firealarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/firealarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/area/A = get_area(src) @@ -318,7 +318,7 @@ FIRE ALARM pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 if(is_station_contact(z) && show_alert_level) - if(security_level) + if(GLOB.security_level) overlays += image('icons/obj/monitors.dmi', "overlay_[get_security_level()]") else overlays += image('icons/obj/monitors.dmi', "overlay_green") diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index b7b7e35eef6..57057ad510a 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -58,6 +58,8 @@ playsound(loc, 'sound/weapons/flash.ogg', 100, 1) flick("[base_state]_flash", src) + set_light(2, 1, COLOR_WHITE) + addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2) last_flash = world.time use_power(1000) diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 2c37a3274c7..165c8dbe4cb 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -193,5 +193,5 @@ /obj/machinery/computer/guestpass/hop/get_changeable_accesses() . = ..() - if(. && ACCESS_CHANGE_IDS in .) + if(. && (ACCESS_CHANGE_IDS in .)) return get_all_accesses() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 03b28423830..fcd6de4020c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -33,7 +33,7 @@ Possible to do for anyone motivated enough: #define HOLOPAD_MODE RANGE_BASED -var/list/holopads = list() +GLOBAL_LIST_EMPTY(holopads) /obj/machinery/hologram/holopad name = "holopad" @@ -61,7 +61,7 @@ var/list/holopads = list() /obj/machinery/hologram/holopad/New() ..() - holopads += src + GLOB.holopads += src component_parts = list() component_parts += new /obj/item/circuitboard/holopad(null) component_parts += new /obj/item/stock_parts/capacitor(null) @@ -77,7 +77,7 @@ var/list/holopads = list() for(var/I in masters) clear_holo(I) - holopads -= src + GLOB.holopads -= src return ..() /obj/machinery/hologram/holopad/power_change() @@ -192,7 +192,7 @@ var/list/holopads = list() temp = "You requested an AI's presence.
" temp += "Main Menu" var/area/area = get_area(src) - for(var/mob/living/silicon/ai/AI in ai_list) + for(var/mob/living/silicon/ai/AI in GLOB.ai_list) if(!AI.client) continue to_chat(AI, "Your presence is requested at \the [area].") @@ -210,7 +210,7 @@ var/list/holopads = list() temp += "Main Menu" if(usr.loc == loc) var/list/callnames = list() - for(var/I in holopads) + for(var/I in GLOB.holopads) var/area/A = get_area(I) if(A) LAZYADD(callnames[A], I) @@ -297,7 +297,7 @@ var/list/holopads = list() /obj/machinery/hologram/holopad/proc/transfer_to_nearby_pad(turf/T, mob/holo_owner) if(!isAI(holo_owner)) return - for(var/pad in holopads) + for(var/pad in GLOB.holopads) var/obj/machinery/hologram/holopad/another = pad if(another == src) continue diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 6f97856a227..740c3affaba 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -293,7 +293,7 @@ Class Procs: update_multitool_menu(usr) return TRUE -/obj/machinery/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state) +/obj/machinery/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = GLOB.default_state) if(..(href, href_list, nowindow, state)) return 1 @@ -555,14 +555,18 @@ Class Procs: if(check_records && !R) threatcount += 4 - if(check_arrest && R && (R.fields["criminal"] == "*Arrest*")) - threatcount += 4 + if(R && R.fields["criminal"]) + switch(R.fields["criminal"]) + if(SEC_RECORD_STATUS_EXECUTE) + threatcount += 7 + if(SEC_RECORD_STATUS_ARREST) + threatcount += 5 return threatcount -/obj/machinery/proc/shock(mob/user, prb) - if(inoperable()) +/obj/machinery/proc/shock(mob/living/user, prb) + if(!istype(user) || inoperable()) return FALSE if(!prob(prb)) return FALSE diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 61d96602343..c2396ab1d9f 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -55,9 +55,9 @@ var/list/datum/feed_channel/network_channels = list() var/datum/feed_message/wanted_issue -var/datum/feed_network/news_network = new /datum/feed_network //The global news-network, which is coincidentally a global list. +GLOBAL_DATUM_INIT(news_network, /datum/feed_network, new()) //The global news-network, which is coincidentally a global list. -var/list/obj/machinery/newscaster/allCasters = list() //Global list that will contain reference to all newscasters in existence. +GLOBAL_LIST_EMPTY(allNewscasters) //Global list that will contain reference to all newscasters in existence. #define NEWSCASTER_MAIN 0 // Main menu #define NEWSCASTER_FC_LIST 1 // Feed channel list @@ -128,13 +128,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co securityCaster = 1 /obj/machinery/newscaster/New() - allCasters += src - unit_no = allCasters.len + GLOB.allNewscasters += src + unit_no = GLOB.allNewscasters.len update_icon() //for any custom ones on the map... ..() /obj/machinery/newscaster/Destroy() - allCasters -= src + GLOB.allNewscasters -= src viewing_channel = null QDEL_NULL(photo) return ..() @@ -144,7 +144,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(inoperable()) icon_state = "newscaster_off" else - if(!news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message + if(!GLOB.news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message icon_state = "newscaster_normal" if(alert) //new message alert overlay add_overlay("newscaster_alert") @@ -194,7 +194,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co switch(screen) if(0) - data["wanted_issue"] = news_network.wanted_issue ? 1 : 0 + data["wanted_issue"] = GLOB.news_network.wanted_issue ? 1 : 0 data["silence"] = silence data["securityCaster"] = securityCaster if(securityCaster) @@ -202,7 +202,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(1, 6, 7) var/list/channels = list() data["channels"] = channels - for(var/datum/feed_channel/C in news_network.network_channels) + for(var/datum/feed_channel/C in GLOB.news_network.network_channels) channels[++channels.len] = list("name" = C.channel_name, "ref" = "\ref[C]", "censored" = C.censored, "admin" = C.is_admin_channel) if(2) data["scanned_user"] = scanned_user @@ -215,10 +215,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co data["msg"] = msg data["photo"] = photo ? 1 : 0 if(4) - var/total_num = length(news_network.network_channels) + var/total_num = length(GLOB.news_network.network_channels) var/active_num = total_num var/message_num=0 - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(!FC.censored) message_num += length(FC.messages) else @@ -254,7 +254,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(10) var/wanted_already = 0 var/end_param = 1 - if(news_network.wanted_issue) + if(GLOB.news_network.wanted_issue) wanted_already = 1 end_param = 2 data["wanted_already"] = wanted_already @@ -263,16 +263,16 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co data["msg"] = msg data["photo"] = photo ? 1 : 0 if(wanted_already) - data["author"] = news_network.wanted_issue.backup_author + data["author"] = GLOB.news_network.wanted_issue.backup_author else data["scanned_user"] = scanned_user if(11) - data["author"] = news_network.wanted_issue.backup_author - data["criminal"] = news_network.wanted_issue.author - data["description"] = news_network.wanted_issue.body - if(news_network.wanted_issue.img) - user << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") - data["photo"] = news_network.wanted_issue.img ? news_network.wanted_issue.img : 0 + data["author"] = GLOB.news_network.wanted_issue.backup_author + data["criminal"] = GLOB.news_network.wanted_issue.author + data["description"] = GLOB.news_network.wanted_issue.body + if(GLOB.news_network.wanted_issue.img) + user << browse_rsc(GLOB.news_network.wanted_issue.img, "tmp_photow.png") + data["photo"] = GLOB.news_network.wanted_issue.img ? GLOB.news_network.wanted_issue.img : 0 if(12) var/list/jobs = list() data["jobs"] = jobs @@ -295,13 +295,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else if(href_list["submit_new_channel"]) var/list/existing_authors = list() - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(FC.author == REDACTED) existing_authors += FC.backup_author else existing_authors += FC.author var/check = 0 - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(FC.channel_name == channel_name) check = 1 break @@ -325,13 +325,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co newChannel.author = scanned_user newChannel.locked = c_locked feedback_inc("newscaster_channels", 1) - news_network.network_channels += newChannel //Adding channel to the global network + GLOB.news_network.network_channels += newChannel //Adding channel to the global network temp = "Feed channel '[channel_name]' created successfully." temp_back_screen = NEWSCASTER_MAIN else if(href_list["set_channel_receiving"]) var/list/available_channels = list() - for(var/datum/feed_channel/F in news_network.network_channels) + for(var/datum/feed_channel/F in GLOB.news_network.network_channels) if((!F.locked || F.author == scanned_user) && !F.censored) available_channels += F.channel_name channel_name = strip_html_simple(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels) @@ -366,14 +366,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co newMsg.img = photo.img feedback_inc("newscaster_stories",1) var/announcement = "" - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel announcement = FC.announce_news(msg_title) break temp = "Feed story successfully submitted to [channel_name]." temp_back_screen = NEWSCASTER_MAIN - for(var/obj/machinery/newscaster/NC in allCasters) + for(var/obj/machinery/newscaster/NC in GLOB.allNewscasters) NC.newsAlert(announcement) else if(href_list["create_channel"]) @@ -405,12 +405,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else if(href_list["menu_wanted"]) var/already_wanted = 0 - if(news_network.wanted_issue) + if(GLOB.news_network.wanted_issue) already_wanted = 1 if(already_wanted) - channel_name = news_network.wanted_issue.author - msg = news_network.wanted_issue.body + channel_name = GLOB.news_network.wanted_issue.author + msg = GLOB.news_network.wanted_issue.body screen = NEWSCASTER_W_ISSUE_H else if(href_list["set_wanted_name"]) @@ -441,32 +441,32 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co W.backup_author = scanned_user //I know, a bit wacky if(photo) W.img = photo.img - news_network.wanted_issue = W - for(var/obj/machinery/newscaster/NS in allCasters) + GLOB.news_network.wanted_issue = W + for(var/obj/machinery/newscaster/NS in GLOB.allNewscasters) NS.newsAlert() NS.update_icon() temp = "Wanted issue for [channel_name] is now in Network Circulation." temp_back_screen = NEWSCASTER_MAIN else - if(news_network.wanted_issue.is_admin_message) + if(GLOB.news_network.wanted_issue.is_admin_message) alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot edit it.","Ok") return - news_network.wanted_issue.author = channel_name - news_network.wanted_issue.body = msg - news_network.wanted_issue.backup_author = scanned_user + GLOB.news_network.wanted_issue.author = channel_name + GLOB.news_network.wanted_issue.body = msg + GLOB.news_network.wanted_issue.backup_author = scanned_user if(photo) - news_network.wanted_issue.img = photo.img + GLOB.news_network.wanted_issue.img = photo.img temp = "Wanted issue for [channel_name] successfully edited." temp_back_screen = NEWSCASTER_MAIN else if(href_list["cancel_wanted"]) - if(news_network.wanted_issue.is_admin_message) + if(GLOB.news_network.wanted_issue.is_admin_message) alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot take it down.", "Ok") return var/choice = alert("Please confirm wanted issue removal", "Network Security Handler", "Confirm", "Cancel") if(choice == "Confirm") - news_network.wanted_issue = null - for(var/obj/machinery/newscaster/NC in allCasters) + GLOB.news_network.wanted_issue = null + for(var/obj/machinery/newscaster/NC in GLOB.allNewscasters) NC.update_icon() temp = "Wanted Issue successfully deleted from Circulation" temp_back_screen = NEWSCASTER_MAIN @@ -826,10 +826,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/proc/print_paper() feedback_inc("newscaster_newspapers_printed",1) var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) NEWSPAPER.news_content += FC - if(news_network.wanted_issue) - NEWSPAPER.important_message = news_network.wanted_issue + if(GLOB.news_network.wanted_issue) + NEWSPAPER.important_message = GLOB.news_network.wanted_issue NEWSPAPER.loc = get_turf(src) paper_remaining-- return diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 13ad44215bb..42452a9f8e2 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -216,7 +216,7 @@ /obj/item/pipe/Move() ..() if(is_bent_pipe() \ - && (src.dir in cardinal)) + && (src.dir in GLOB.cardinal)) src.dir = src.dir|turn(src.dir, 90) else if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) if(dir==2) @@ -305,7 +305,7 @@ return 0 /obj/item/pipe/proc/unflip(var/direction) - if(!(direction in cardinal)) + if(!(direction in GLOB.cardinal)) return turn(direction, 45) return direction diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index 53dd0135c54..b910b1272ff 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -157,7 +157,7 @@ ui = new(user, src, ui_key, "poolcontroller.tmpl", "Pool Controller Interface", 520, 410) ui.open() -/obj/machinery/poolcontroller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/poolcontroller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/currenttemp switch(temperature) //So we can output nice things like "Cool" to nanoUI diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm index 0bd368bd75b..12bae1bbf5a 100644 --- a/code/game/machinery/portable_tag_turret.dm +++ b/code/game/machinery/portable_tag_turret.dm @@ -13,8 +13,8 @@ lasercolor = "b" installation = /obj/item/gun/energy/laser/tag/blue -/obj/machinery/porta_turret/tag/New() - ..() +/obj/machinery/porta_turret/tag/Initialize(mapload) + . = ..() icon_state = "[lasercolor]grey_target_prism" /obj/machinery/porta_turret/tag/weapon_setup(var/obj/item/gun/energy/E) @@ -49,7 +49,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/porta_turret/tag/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/porta_turret/tag/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["access"] = !isLocked(user) data["locked"] = locked diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index a77cbe6c184..b63f4ab7f8b 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -87,8 +87,8 @@ lethal = 1 installation = /obj/item/gun/energy/laser -/obj/machinery/porta_turret/New() - ..() +/obj/machinery/porta_turret/Initialize(mapload) + . = ..() if(req_access && req_access.len) req_access.Cut() req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS) @@ -105,8 +105,8 @@ QDEL_NULL(spark_system) return ..() -/obj/machinery/porta_turret/centcom/New() - ..() +/obj/machinery/porta_turret/centcom/Initialize(mapload) + . = ..() if(req_one_access && req_one_access.len) req_one_access.Cut() req_access = list(ACCESS_CENT_SPECOPS) @@ -161,14 +161,14 @@ eprojectile = /obj/item/projectile/beam/pulse eshot_sound = 'sound/weapons/pulse.ogg' -var/list/turret_icons +GLOBAL_LIST_EMPTY(turret_icons) /obj/machinery/porta_turret/update_icon() - if(!turret_icons) - turret_icons = list() - turret_icons["open"] = image(icon, "openTurretCover") + if(!GLOB.turret_icons) + GLOB.turret_icons = list() + GLOB.turret_icons["open"] = image(icon, "openTurretCover") underlays.Cut() - underlays += turret_icons["open"] + underlays += GLOB.turret_icons["open"] if(stat & BROKEN) icon_state = "destroyed_target_prism" @@ -218,7 +218,7 @@ var/list/turret_icons ui.open() ui.set_auto_update(1) -/obj/machinery/porta_turret/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/porta_turret/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["access"] = !isLocked(user) data["screen"] = screen @@ -1015,8 +1015,8 @@ var/list/turret_icons depotarea.declare_started() return ..(target) -/obj/machinery/porta_turret/syndicate/New() - ..() +/obj/machinery/porta_turret/syndicate/Initialize(mapload) + . = ..() if(req_one_access && req_one_access.len) req_one_access.Cut() req_access = list(ACCESS_SYNDICATE) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 081a48c3da1..e4e37ae1bcb 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -19,8 +19,7 @@ var/item_recycle_sound = 'sound/machines/recycler.ogg' /obj/machinery/recycler/New() - AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_PLASTIC, MAT_BLUESPACE), 0, - TRUE, null, null, null, TRUE) + AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_PLASTIC, MAT_BLUESPACE), 0, TRUE, null, null, null, TRUE) ..() component_parts = list() component_parts += new /obj/item/circuitboard/recycler(null) @@ -37,7 +36,7 @@ mat_mod *= 50000 for(var/obj/item/stock_parts/manipulator/M in component_parts) amt_made = 25 * M.rating //% of materials salvaged - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.max_amount = mat_mod amount_produced = min(100, amt_made) @@ -135,7 +134,7 @@ /obj/machinery/recycler/proc/recycle_item(obj/item/I) I.forceMove(loc) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/material_amount = materials.get_item_material_amount(I) if(!material_amount) qdel(I) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index db913f171c3..095b2e7d56e 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -27,10 +27,10 @@ #define COM_ROLES list("Blueshield","NT Representative","Head of Personnel's Desk","Captain's Desk","Bridge") #define SCI_ROLES list("Robotics","Science","Research Director's Desk") -var/req_console_assistance = list() -var/req_console_supplies = list() -var/req_console_information = list() -var/list/obj/machinery/requests_console/allConsoles = list() +GLOBAL_LIST_EMPTY(req_console_assistance) +GLOBAL_LIST_EMPTY(req_console_supplies) +GLOBAL_LIST_EMPTY(req_console_information) +GLOBAL_LIST_EMPTY(allRequestConsoles) /obj/machinery/requests_console name = "Requests Console" @@ -93,30 +93,30 @@ var/list/obj/machinery/requests_console/allConsoles = list() announcement.newscast = 0 name = "[department] Requests Console" - allConsoles += src + GLOB.allRequestConsoles += src if(departmentType & RC_ASSIST) - req_console_assistance |= department + GLOB.req_console_assistance |= department if(departmentType & RC_SUPPLY) - req_console_supplies |= department + GLOB.req_console_supplies |= department if(departmentType & RC_INFO) - req_console_information |= department + GLOB.req_console_information |= department set_light(1) /obj/machinery/requests_console/Destroy() - allConsoles -= src + GLOB.allRequestConsoles -= src var/lastDeptRC = 1 - for(var/obj/machinery/requests_console/Console in allConsoles) + for(var/obj/machinery/requests_console/Console in GLOB.allRequestConsoles) if(Console.department == department) lastDeptRC = 0 break if(lastDeptRC) if(departmentType & RC_ASSIST) - req_console_assistance -= department + GLOB.req_console_assistance -= department if(departmentType & RC_SUPPLY) - req_console_supplies -= department + GLOB.req_console_supplies -= department if(departmentType & RC_INFO) - req_console_information -= department + GLOB.req_console_information -= department QDEL_NULL(Radio) return ..() @@ -138,7 +138,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() ui.open() ui.set_auto_update(1) -/obj/machinery/requests_console/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/requests_console/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["department"] = department @@ -148,9 +148,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() data["silent"] = silent data["announcementConsole"] = announcementConsole - data["assist_dept"] = req_console_assistance - data["supply_dept"] = req_console_supplies - data["info_dept"] = req_console_information + data["assist_dept"] = GLOB.req_console_assistance + data["supply_dept"] = GLOB.req_console_supplies + data["info_dept"] = GLOB.req_console_information data["ship_dept"] = GLOB.TAGGERLOCATIONS data["message"] = message @@ -233,7 +233,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(tempScreen == RCS_ANNOUNCE && !announcementConsole) return if(tempScreen == RCS_VIEWMSGS) - for(var/obj/machinery/requests_console/Console in allConsoles) + for(var/obj/machinery/requests_console/Console in GLOB.allRequestConsoles) if(Console.department == department) Console.newmessagepriority = 0 Console.icon_state = "req_comp0" diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index adbc3d67605..d0cf38a272d 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -27,7 +27,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/slot_machine/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/slot_machine/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["working"] = working data["money"] = account ? account.money : null @@ -52,18 +52,18 @@ icon_state = "slots-on" playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) addtimer(CALLBACK(src, .proc/spin_slots, usr.name), 25) - + /obj/machinery/slot_machine/proc/spin_slots(userName) switch(rand(1,4050)) if(1) // .02% atom_say("JACKPOT! [userName] has won a MILLION CREDITS!") - event_announcement.Announce("Congratulations to [userName] on winning the Jackpot of ONE MILLION CREDITS!", "Jackpot Winner") + GLOB.event_announcement.Announce("Congratulations to [userName] on winning the Jackpot of ONE MILLION CREDITS!", "Jackpot Winner") result = "JACKPOT! You win one million credits!" resultlvl = "highlight" win_money(1000000, 'sound/goonstation/misc/airraid_loop.ogg') if(2 to 5) // .07% atom_say("Big Winner! [userName] has won a hundred thousand credits!") - event_announcement.Announce("Congratulations to [userName] on winning a hundred thousand credits!", "Big Winner") + GLOB.event_announcement.Announce("Congratulations to [userName] on winning a hundred thousand credits!", "Big Winner") result = "Big Winner! You win a hundred thousand credits!" resultlvl = "good" win_money(100000, 'sound/goonstation/misc/klaxon.ogg') diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 99642db320e..b3745f947cd 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -78,7 +78,7 @@ try_detonate(TRUE) //Counter terrorists win else if(!active || defused) - if(defused && payload in src) + if(defused && (payload in src)) payload.defuse() countdown.stop() STOP_PROCESSING(SSfastprocess, src) diff --git a/code/game/machinery/tcomms/_base.dm b/code/game/machinery/tcomms/_base.dm new file mode 100644 index 00000000000..a857afcef89 --- /dev/null +++ b/code/game/machinery/tcomms/_base.dm @@ -0,0 +1,459 @@ +/* + + ParadiseSS13 Telecommunications System + + Rewritten from the ground up because I was totally unhappy with how laggy and complicated the current implementation was + The system is made up of two objects. A main core and relays. + + The main core is basically the same as all of the machines from the previous implementation, apart from the relay + The core handles recieving and sending messages, logging messages, the NTTC configuration, and serves as the linkage hub for relays + + Relays function much in the same way as the old ones. They just expand the reach of tcomms from one z-level to another. + + This file contains extra datums and helper procs which the system utilises. + Unlike old telecomms, everything in here **should** be well documented. If not, feel free to add your own + -aa07 + +*/ + +/// Global list for all telecomms machines in the world +GLOBAL_LIST_EMPTY(tcomms_machines) + +/** + * # Telecommunications Device + * + * This is the base machine for both tcomms devices (core + relay) + * + * This holds a few base procs (Icon updates, enable/disable, etc) + * It also has the initial overrides for Initialize() and Destroy() + */ +/obj/machinery/tcomms + name = "Telecommunications Device" + desc = "Someone forgot to say what this thingy does. Please yell at a coder" + icon = 'icons/obj/tcomms.dmi' + icon_state = "error" + density = TRUE + anchored = TRUE + use_power = IDLE_POWER_USE + idle_power_usage = 500 + /// Network ID used for names + auto linkage + var/network_id = "None" + /// Is the machine active + var/active = TRUE + +/** + * Base Initializer + * + * Ensures that the machine is put into the global list of tcomms devices, and then its made sure that the icon is correct if the machine starts offline + */ +/obj/machinery/tcomms/Initialize(mapload) + . = ..() + GLOB.tcomms_machines += src + update_icon() + +/** + * Base Destructor + * + * Ensures that the machine is taken out of the global list when destroyed + */ +/obj/machinery/tcomms/Destroy() + GLOB.tcomms_machines -= src + return ..() + +/** + * Icon Updater + * + * Ensures that the icon updates properly based on if the machine is active or not. This removes the need for this check in many other places. + */ +/obj/machinery/tcomms/update_icon() + . = ..() + if(!active || (stat & NOPOWER)) + icon_state = "[initial(icon_state)]_off" + else + icon_state = initial(icon_state) + + +// Attack overrides. These are needed so the UIs can be opened up // +/obj/machinery/tcomms/attack_ai(mob/user) + add_hiddenprint(user) + ui_interact(user) + +/obj/machinery/tcomms/attack_ghost(mob/user) + ui_interact(user) + +/obj/machinery/tcomms/attack_hand(mob/user) + if(..(user)) + return + ui_interact(user) + + +/** + * Machine Enabler + * + * Quick and dirty proc to allow for the machine to be programatically enabled easily. Used for the anomaly event + */ +/obj/machinery/tcomms/proc/enable_machine() + active = TRUE + update_icon() + +/** + * Machine Disabler + * + * Quick and dirty proc to allow for the machine to be programatically disabled easily. Used for the anomaly event + */ +/obj/machinery/tcomms/proc/disable_machine() + active = FALSE + update_icon() + +/** + * Logging helper + * + * Proc which allows easy logging of changs made to tcomms machines + * Arguments: + * * user - The user who did the action + * * msg - The log message + * * adminmsg - Should an admin log be sent when this happens + */ +/obj/machinery/tcomms/proc/log_action(user, msg, adminmsg = FALSE) + log_game("NTTC: [key_name(user)] [msg]") + log_investigate("[key_name(user)] [msg]", "nttc") + if(adminmsg) + message_admins("[key_name_admin(user)] [msg]") +/** + * Power Change Handler + * + * Proc which ensures icons are updated when machines lose power + */ +/obj/machinery/tcomms/power_change() + ..() + update_icon() + +/** + * # Telecommunications Message + * + * Datum which holds all the data for a message being sent + * + * This used to be a single associative list with just keys and values + * It had no typepath or presence checking, and was absolutely awful to work with + * This fixes that + * + */ +/datum/tcomms_message + /// Who sent the message + var/sender_name = "Error" + /// What job are they + var/sender_job = "Error" + /// Pieces of the message + var/list/message_pieces = list() + /// Source Z-level + var/source_level = 0 + /// What frequency the message is sent on + var/freq = 0 + /// Was it sent with a voice changer + var/vmask = FALSE + /// Did the signal come from a device that requires tcomms to function + var/needs_tcomms = TRUE + /// Origin of the signal + var/datum/radio_frequency/connection + /// Who sent it + var/mob/sender + /// The radio it was sent from + var/obj/item/radio/radio + /// The signal data (See defines/radio.dm) + var/data + /// Verbage used + var/verbage = "says" + /// Follow target for AI use + var/atom/follow_target = null + /// Is this signal meant to be rejected + var/reject = FALSE + /// Voice name if the person doesnt have a name (diona, alien, etc) + var/vname + /// List of all channels this can be sent or recieved on + var/list/zlevels = list() + +/** + * Destructor for the TCM datum. + * + * This needs to happen like this so that things dont keep references held in place + */ +/datum/tcomms_message/Destroy() + connection = null + radio = null + follow_target = null + return ..() + + +#define CREW_RADIO_TYPE 0 +#define CENTCOMM_RADIO_TYPE 1 +#define SYNDICATE_RADIO_TYPE 2 + +/** + * Connection checker + * + * Checks the connection frequency against the intended frequency for the message + * NOTE: I barely know what on earth this does, but it works and it scares me + * Arguments: + * * old_freq - Frequency of the connection + * * new_freq - Frequency of the message + */ +/proc/is_bad_connection(old_freq, new_freq) + var/old_type = CREW_RADIO_TYPE + var/new_type = CREW_RADIO_TYPE + for(var/antag_freq in SSradio.ANTAG_FREQS) + if(old_freq == antag_freq) + old_type = SYNDICATE_RADIO_TYPE + if(new_freq == antag_freq) + new_type = SYNDICATE_RADIO_TYPE + + for(var/cent_freq in SSradio.CENT_FREQS) + if(old_freq == cent_freq) + old_type = CENTCOMM_RADIO_TYPE + if(new_freq == cent_freq) + new_type = CENTCOMM_RADIO_TYPE + + return new_type > old_type + +#undef CREW_RADIO_TYPE +#undef CENTCOMM_RADIO_TYPE +#undef SYNDICATE_RADIO_TYPE + + +/** + * Message Broadcast Proc + * + * This big fat disaster is responsible for sending the message out to all headsets and radios on the station + * It is absolutely disgusting, but used to take about 20 arguments before I slimmed it down to just one + * Arguments: + * * tcm - The tcomms message datum + */ +/proc/broadcast_message(datum/tcomms_message/tcm) + + + /* ###### Prepare the radio connection ###### */ + + var/display_freq = tcm.freq + + var/bad_connection = FALSE + var/datum/radio_frequency/new_connection = tcm.connection + + if(tcm.connection.frequency != display_freq) + bad_connection = is_bad_connection(tcm.connection.frequency, display_freq) + new_connection = SSradio.return_frequency(display_freq) + + var/list/radios = list() + + // --- Broadcast only to intercom devices --- + + if(tcm.data == SIGNALTYPE_INTERCOM && !bad_connection) + + for(var/obj/item/radio/intercom/R in new_connection.devices["[RADIO_CHAT]"]) + if(R.receive_range(display_freq, tcm.zlevels) > -1) + radios += R + + // --- Broadcast only to intercoms and station-bounced radios --- + + else if(tcm.data == SIGNALTYPE_INTERCOM_SBR && !bad_connection) + + for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) + + if(istype(R, /obj/item/radio/headset)) + continue + + if(R.receive_range(display_freq, tcm.zlevels) > -1) + radios += R + + // --- Broadcast to ALL radio devices --- + + else if(!bad_connection) + + for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) + if(R.receive_range(display_freq, tcm.zlevels) > -1) + radios += R + + // Add syndie radios for intercepts if its a regular department frequency + for(var/antag_freq in SSradio.ANTAG_FREQS) + var/datum/radio_frequency/antag_connection = SSradio.return_frequency(antag_freq) + for(var/obj/item/radio/R in antag_connection.devices["[RADIO_CHAT]"]) + if(R.receive_range(antag_freq, tcm.zlevels) > -1) + // Only add if it wasnt there already + radios |= R + + // Get a list of mobs who can hear from the radios we collected. + var/list/receive = get_mobs_in_radio_ranges(radios) + + /* ###### Organize the receivers into categories for displaying the message ###### */ + + // Understood the message: + var/list/heard_masked = list() // masked name or no real name + var/list/heard_normal = list() // normal message + + // Did not understand the message: + var/list/heard_voice = list() // voice message (ie "chimpers") + var/list/heard_garbled = list() // garbled message (ie "f*c* **u, **i*er!") + var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!") + + for(var/M in receive) + var/mob/R = M + + /* --- Loop through the receivers and categorize them --- */ + + if(is_admin(R) && !R.get_preference(CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. + continue + + if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. + continue + + // --- Can understand the speech --- + if(!tcm.sender || R.say_understands(tcm.sender)) + + // - Not human or wearing a voice mask - + if(!tcm.sender || !ishuman(tcm.sender) || tcm.vmask) + heard_masked += R + + // - Human and not wearing voice mask - + else + heard_normal += R + + // --- Can't understand the speech --- + + else + // - Just display a garbled message - + heard_garbled += R + + + /* ###### Begin formatting and sending the message ###### */ + if(length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled) || length(heard_gibberish)) + + /* --- Some miscellaneous variables to format the string output --- */ + var/freq_text = get_frequency_name(display_freq) + + var/part_b_extra = "" + var/part_a = "\[[freq_text]\][part_b_extra] " // goes in the actual output + + // --- Some more pre-message formatting --- + var/part_b = " " + + + // --- Filter the message; place it in quotes apply a verb --- + var/quotedmsg = null + if(tcm.sender) + quotedmsg = "[tcm.sender.say_quote(multilingual_to_message(tcm.message_pieces))], \"[multilingual_to_message(tcm.message_pieces)]\"" + else + quotedmsg = "says, \"[multilingual_to_message(tcm.message_pieces)]\"" + + // --- This following recording is intended for research and feedback in the use of department radio channels --- + + var/part_blackbox_b = " \[[freq_text]\] [ckey] attempted to upload an NTTC configuration containing JS abusable tags!") + log_admin("EXPLOIT WARNING: [ckey] attempted to upload an NTTC configuration containing JS abusable tags") + return FALSE + var/list/var_list = json_decode(text) + for(var/variable in var_list) + if(variable in to_serialize) // Don't just accept any random vars jesus christ! + var/sanitize_method = serialize_sanitize[variable] + var/variable_value = var_list[variable] + variable_value = nttc_sanitize(variable_value, sanitize_method) + if(variable_value != null) + vars[variable] = variable_value + return TRUE + +// Sanitizing user input. Don't blindly trust the JSON. +/datum/nttc_configuration/proc/nttc_sanitize(variable, sanitize_method) + if(!sanitize_method) + return null + + switch(sanitize_method) + if("bool") + return variable ? TRUE : FALSE + // if("table", "array") + if("array") + if(!islist(variable)) + return list() + // Insert html filtering for the regexes here if you're boring + var/newlist = json_decode(html_decode(json_encode(variable))) + if(!islist(newlist)) + return null + return newlist + if("string") + return "[variable]" + + return variable + +// Primary signal modification. This is where all of the variables behavior are actually implemented. +/datum/nttc_configuration/proc/modify_message(datum/tcomms_message/tcm) + // All job and coloring shit + if(toggle_job_color || toggle_name_color) + var/job = tcm.sender_job + job_class = all_jobs[job] + + if(toggle_name_color) + var/new_name = "" + tcm.sender_name + "" + tcm.sender_name = new_name + tcm.vname = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on + + if(toggle_jobs) + var/new_name = "" + var/job = tcm.sender_job + if(job in ert_jobs) + job = "ERT" + if(toggle_job_color) + switch(job_indicator_type) + // These must have trailing spaces. No exceptions. + if(JOB_STYLE_1) + new_name = "[tcm.sender_name] ([job]) " + if(JOB_STYLE_2) + new_name = "[tcm.sender_name] - [job] " + if(JOB_STYLE_3) + new_name = "\[[job]\] [tcm.sender_name] " + if(JOB_STYLE_4) + new_name = "([job]) [tcm.sender_name] " + else + switch(job_indicator_type) + if(JOB_STYLE_1) + new_name = "[tcm.sender_name] ([job]) " + if(JOB_STYLE_2) + new_name = "[tcm.sender_name] - [job] " + if(JOB_STYLE_3) + new_name = "\[[job]\] [tcm.sender_name] " + if(JOB_STYLE_4) + new_name = "([job]) [tcm.sender_name] " + + // Only change the name if they have a job tag set, otherwise everyone becomes unknown, and thats bad + if(new_name != "") + tcm.sender_name = new_name + tcm.vname = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on + // This is hacky stuff for multilingual messages... + var/list/message_pieces = tcm.message_pieces + + // Makes heads of staff bold + if(toggle_command_bold) + var/job = tcm.sender_job + if((job in ert_jobs) || (job in heads)) + for(var/datum/multilingual_say_piece/S in message_pieces) + S.message = "[capitalize(S.message)]" // This only capitalizes the first word + + // Language Conversion + if(setting_language && valid_languages[setting_language]) + if(setting_language == "--DISABLE--") + setting_language = null + else + for(var/datum/multilingual_say_piece/S in message_pieces) + if(S.speaking != GLOB.all_languages["Noise"]) // check if they are emoting, these do not need to be translated + S.speaking = GLOB.all_languages[setting_language] + + return tcm + +#undef JOB_STYLE_1 +#undef JOB_STYLE_2 +#undef JOB_STYLE_3 +#undef JOB_STYLE_4 diff --git a/code/game/machinery/tcomms/presets.dm b/code/game/machinery/tcomms/presets.dm new file mode 100644 index 00000000000..efc98866f62 --- /dev/null +++ b/code/game/machinery/tcomms/presets.dm @@ -0,0 +1,32 @@ +/* + All machine presets go in here +*/ + +// STATION CORE // +/obj/machinery/tcomms/core/station + network_id = "STATION-CORE" + +// MINING RELAY // +/obj/machinery/tcomms/relay/mining + network_id = "MINING-RELAY" + autolink_id = "STATION-CORE" + +// ENGINEERING RELAY // +/obj/machinery/tcomms/relay/engineering + network_id = "ENGINEERING-RELAY" + autolink_id = "STATION-CORE" + active = FALSE + +// RUSKIE RELAY // +/obj/machinery/tcomms/relay/ruskie + network_id = "RUSKIE-RELAY" + autolink_id = "STATION-CORE" + active = FALSE + hidden_link = TRUE + +// CC RELAY // +/obj/machinery/tcomms/relay/cc + network_id = "CENTCOMM-RELAY" + autolink_id = "STATION-CORE" + hidden_link = TRUE + diff --git a/code/game/machinery/tcomms/relay.dm b/code/game/machinery/tcomms/relay.dm new file mode 100644 index 00000000000..8c2bbf28bf2 --- /dev/null +++ b/code/game/machinery/tcomms/relay.dm @@ -0,0 +1,180 @@ +/** + * # Telecommunications Relay + * + * Extends the reach of telecomms to the z-level it is built on + * + * Relays themselves dont do any processing, they just tell the core that this z-level is available in the tcomms network. + */ +/obj/machinery/tcomms/relay + name = "Telecommunications Relay" + desc = "A large device with several radio antennas on it." + icon_state = "relay" + /// The host core for this relay + var/obj/machinery/tcomms/core/linked_core + /// ID of the hub to auto link to + var/autolink_id + /// Is this linked to anything at all + var/linked = FALSE + /// Is this link invisible on the hub? + var/hidden_link = FALSE + +/** + * Initializer for the relay. + * + * Calls parent to ensure its added to the GLOB of tcomms machines, before checking if there is an autolink that needs to be added. + */ +/obj/machinery/tcomms/relay/Initialize(mapload) + . = ..() + if(mapload && autolink_id) + return INITIALIZE_HINT_LATELOAD + +/** + * Descrutor for the relay. + * + * Ensures that the machine is taken out of the global list when destroyed, and also removes the link to the core. + */ +/obj/machinery/tcomms/relay/Destroy() + Reset() + return ..() + +/** + * Late Initialize for the relay. + * + * Calls parent, then adds links to the cores. This is a LateInitialize because the core MUST be initialized first + */ +/obj/machinery/tcomms/relay/LateInitialize() + . = ..() + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + if(C.network_id == autolink_id) + AddLink(C) + // Only ONE of these with one ID should exist per world + break + +/** + * Proc to link the relay to the core. + * + * Sets the linked core to the target (argument below), before adding it to the list of linked relays, then re-freshing the zlevel list + * The relay is then marked as linked + * Arguments: + * * target - The telecomms core that this relay should be linked to + */ +/obj/machinery/tcomms/relay/proc/AddLink(obj/machinery/tcomms/core/target) + linked_core = target + target.linked_relays |= src + target.refresh_zlevels() + linked = TRUE + +/** + * Proc to rest the relay. + * + * Resets the relay, removing its linkage status, and refreshing the core's list of z-levels + */ +/obj/machinery/tcomms/relay/proc/Reset() + if(linked_core) + linked_core.linked_relays -= src + linked_core.refresh_zlevels() + linked_core = null + linked = FALSE + +/** + * Relay Enabler + * + * Modification to the standard one so that the links get updated + */ +/obj/machinery/tcomms/relay/enable_machine() + ..() + if(linked_core) + linked_core.refresh_zlevels() + +/** + * Relay Disabler + * + * Modification to the standard one so that the links get updated + */ +/obj/machinery/tcomms/relay/disable_machine() + ..() + if(linked_core) + linked_core.refresh_zlevels() + + +////////////// +// UI STUFF // +////////////// + +/obj/machinery/tcomms/relay/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "tcomms_relay.tmpl", "Telecommunications Relay", 600, 400) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/tcomms/relay/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) + var/data[0] + // Are we on or not + data["active"] = active + // What is our network ID + data["network_id"] = network_id + // Are we linked + data["linked"] = linked + // Is the link hidden + data["hidden_link"] = hidden_link + + // Only send linked tab stuff if we are linked. This saves on sending overhead. + if(linked) + data["linked_core_id"] = linked_core.network_id + data["linked_core_addr"] = "\ref[linked_core]" + + else + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + data["entries"] += list(list("addr" = "\ref[C]", "net_id" = C.network_id, "sector" = C.loc.z)) + + return data + +/obj/machinery/tcomms/relay/Topic(href, href_list) + // Check against href exploits + if(..()) + return + + // All the toggle on/offs go here + if(href_list["toggle_active"]) + active = !active + update_icon() + if(linked_core) + linked_core.refresh_zlevels() + + // Set network ID + if(href_list["network_id"]) + var/new_id = input(usr, "Please enter a new network ID", "Network ID", network_id) + log_action(usr, "renamed core with ID [network_id] to [new_id]") + to_chat(usr, "Device ID changed from [network_id] to [new_id].") + network_id = new_id + + if(linked) + // Only do these hrefs if we are linked to prevent bugs/exploits + if(href_list["toggle_hidden_link"]) + hidden_link = !hidden_link + log_action(usr, "Modified hidden link for [network_id] (Now [hidden_link])") + + if(href_list["unlink"]) + var/choice = alert(usr, "Are you SURE you want to unlink this relay?\nYou wont be able to re-link without the core password", "Unlink","Yes","No") + if(choice == "Yes") + log_action(usr, "Unlinked [network_id] from [linked_core.network_id]") + Reset() + else + // You should only be able to link if its not linked, to prevent weirdness + if(href_list["link"]) + var/obj/machinery/tcomms/core/C = locate(href_list["link"]) + if(istype(C, /obj/machinery/tcomms/core)) + var/user_pass = input(usr, "Please enter core password","Password Entry") + // Check the password + if(user_pass == C.link_password) + AddLink(C) + to_chat(usr, "Successfully linked to [C.network_id].") + else + to_chat(usr, "ERROR: Password incorrect.") + else + to_chat(usr, "ERROR: Core not found. Please file an issue report.") + + + // Hack to speed update the nanoUI + SSnanoui.update_uis(src) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm deleted file mode 100644 index 8cd285c994a..00000000000 --- a/code/game/machinery/telecomms/broadcaster.dm +++ /dev/null @@ -1,665 +0,0 @@ -/* - The broadcaster sends processed messages to all radio devices in the game. They - do not have to be headsets; intercoms and station-bounced radios suffice. - - They receive their message from a server after the message has been logged. -*/ - -var/list/recentmessages = list() // global list of recent messages broadcasted : used to circumvent massive radio spam -var/message_delay = 0 // To make sure restarting the recentmessages list is kept in sync - -/obj/machinery/telecomms/broadcaster - name = "Subspace Broadcaster" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "broadcaster" - desc = "A dish-shaped machine used to broadcast processed subspace signals." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 25 - machinetype = 5 - circuitboard = /obj/item/circuitboard/telecomms/broadcaster - -/obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - // Don't broadcast rejected signals - if(signal.data["reject"]) - return - - if(signal.data["message"]) - - // Prevents massive radio spam - signal.data["done"] = 1 // mark the signal as being broadcasted - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - original.data["compression"] = signal.data["compression"] - original.data["level"] = signal.data["level"] - - var/signal_message = "[signal.frequency]:[signal.data["message"]]:[signal.data["realname"]]" - if(signal_message in recentmessages) - return - recentmessages.Add(signal_message) - - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary - - signal.data["level"] |= listening_level - - /** #### - Normal Broadcast - #### **/ - - if(signal.data["type"] == 0) - - /* ###### Broadcast a message using signal.data ###### */ - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"],, - signal.data["compression"], signal.data["level"], signal.frequency, - signal.data["verb"] ) - - - /** #### - Simple Broadcast - #### **/ - - if(signal.data["type"] == 1) - - /* ###### Broadcast a message using signal.data ###### */ - Broadcast_SimpleMessage(signal.data["name"], signal.frequency, - signal.data["message"],null, null, - signal.data["compression"], listening_level) - - - /** #### - Artificial Broadcast - #### **/ - // (Imitates a mob) - - if(signal.data["type"] == 2) - - /* ###### Broadcast a message using signal.data ###### */ - // Parameter "data" as 4: AI can't track this person/mob - - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"], 4, signal.data["compression"], signal.data["level"], signal.frequency, - signal.data["verb"]) - - if(!message_delay) - message_delay = 1 - spawn(10) - message_delay = 0 - recentmessages = list() - - /* --- Do a snazzy animation! --- */ - flick("broadcaster_send", src) - -/obj/machinery/telecomms/broadcaster/Destroy() - // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. - if(message_delay) - message_delay = 0 - return ..() - - -/* - Basically just an empty shell for receiving and broadcasting radio messages. Not - very flexible, but it gets the job done. -*/ - -/obj/machinery/telecomms/allinone - name = "Telecommunications Mainframe" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "comm_server" - desc = "A compact machine used for portable subspace telecommuniations processing." - density = 1 - anchored = 1 - use_power = NO_POWER_USE - idle_power_usage = 0 - machinetype = 6 - var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel - -/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal) - - if(!on) // has to be on to receive messages - return - - if(is_freq_listening(signal)) // detect subspace signals - - signal.data["done"] = 1 // mark the signal as being broadcasted - signal.data["compression"] = 0 - - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary - - /* ###### Broadcast a message using signal.data ###### */ - - var/datum/radio_frequency/connection = signal.data["connection"] - - if(connection.frequency in SSradio.ANTAG_FREQS) // if antag broadcast, just - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"],, signal.data["compression"], list(0), connection.frequency, - signal.data["verb"]) - else - if(intercept) - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"], 3, signal.data["compression"], list(0), connection.frequency, - signal.data["verb"]) - -#define CREW_RADIO_TYPE 0 -#define CENTCOMM_RADIO_TYPE 1 -#define SYNDICATE_RADIO_TYPE 2 -/proc/Is_Bad_Connection(old_freq, new_freq) //Makes sure players cant read radios of a higher level than they are - var/old_type = CREW_RADIO_TYPE - var/new_type = CREW_RADIO_TYPE - for(var/antag_freq in SSradio.ANTAG_FREQS) - if(old_freq == antag_freq) - old_type = SYNDICATE_RADIO_TYPE - if(new_freq == antag_freq) - new_type = SYNDICATE_RADIO_TYPE - - for(var/cent_freq in SSradio.CENT_FREQS) - if(old_freq == cent_freq) - old_type = CENTCOMM_RADIO_TYPE - if(new_freq == cent_freq) - new_type = CENTCOMM_RADIO_TYPE - - return new_type > old_type - -/** - - Here is the big, bad function that broadcasts a message given the appropriate - parameters. - - @param connection: - The datum generated in radio.dm, stored in signal.data["connection"]. - - @param M: - Reference to the mob/speaker, stored in signal.data["mob"] - - @param vmask: - Boolean value if the mob is "hiding" its identity via voice mask, stored in - signal.data["vmask"] - - @param vmessage: - If specified, will display this as the message; such as "chimpering" - for monkies if the mob is not understood. Stored in signal.data["vmessage"]. - - @param radio: - Reference to the radio broadcasting the message, stored in signal.data["radio"] - - @param message: - The actual string message to display to mobs who understood mob M. Stored in - signal.data["message"] - - @param name: - The name to display when a mob receives the message. signal.data["name"] - - @param job: - The name job to display for the AI when it receives the message. signal.data["job"] - - @param realname: - The "real" name associated with the mob. signal.data["realname"] - - @param vname: - If specified, will use this name when mob M is not understood. signal.data["vname"] - - @param data: - If specified: - 1 -- Will only broadcast to intercoms - 2 -- Will only broadcast to intercoms and station-bounced radios - 3 -- Broadcast to syndicate frequency - 4 -- AI can't track down this person. Useful for imitation broadcasts where you can't find the actual mob - - @param compression: - If 0, the signal is audible - If nonzero, the signal may be partially inaudible or just complete gibberish. - - @param level: - The list of Z levels that the sending radio is broadcasting to. Having 0 in the list broadcasts on all levels - - @param freq - The frequency of the signal - -**/ - -/proc/Broadcast_Message(var/datum/radio_frequency/connection, var/mob/M, - var/vmask, list/vmessage_pieces, var/obj/item/radio/radio, - list/message_pieces, var/name, var/job, var/realname, var/vname, - var/data, var/compression, var/list/level, var/freq, var/verbage = "says", - var/atom/follow_target = null) - - - /* ###### Prepare the radio connection ###### */ - - var/display_freq = freq - - var/bad_connection = FALSE - var/datum/radio_frequency/new_connection = connection - - if(connection.frequency != display_freq) - bad_connection = Is_Bad_Connection(connection.frequency, display_freq) - new_connection = SSradio.return_frequency(display_freq) - - var/list/obj/item/radio/radios = list() - - // --- Broadcast only to intercom devices --- - - if(data == 1 && !bad_connection) - - for(var/obj/item/radio/intercom/R in new_connection.devices["[RADIO_CHAT]"]) - if(R.receive_range(display_freq, level) > -1) - radios += R - - // --- Broadcast only to intercoms and station-bounced radios --- - - else if(data == 2 && !bad_connection) - - for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) - - if(istype(R, /obj/item/radio/headset)) - continue - - if(R.receive_range(display_freq, level) > -1) - radios += R - - // --- Broadcast to antag radios! --- - - else if(data == 3) - for(var/antag_freq in SSradio.ANTAG_FREQS) - var/datum/radio_frequency/antag_connection = SSradio.return_frequency(antag_freq) - for(var/obj/item/radio/R in antag_connection.devices["[RADIO_CHAT]"]) - if(R.receive_range(antag_freq, level) > -1) - radios += R - - // --- Broadcast to ALL radio devices --- - - else if(!bad_connection) - - for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) - if(R.receive_range(display_freq, level) > -1) - radios += R - - // Get a list of mobs who can hear from the radios we collected. - var/list/receive = get_mobs_in_radio_ranges(radios) - - /* ###### Organize the receivers into categories for displaying the message ###### */ - - // Understood the message: - var/list/heard_masked = list() // masked name or no real name - var/list/heard_normal = list() // normal message - - // Did not understand the message: - var/list/heard_voice = list() // voice message (ie "chimpers") - var/list/heard_garbled = list() // garbled message (ie "f*c* **u, **i*er!") - var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!") - - for(var/mob/R in receive) - - /* --- Loop through the receivers and categorize them --- */ - - if(is_admin(R) && !R.get_preference(CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. - continue - - if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. - continue - - // Ghosts hearing all radio chat don't want to hear syndicate intercepts, they're duplicates - if(data == 3 && istype(R, /mob/dead/observer) && R.get_preference(CHAT_GHOSTRADIO)) - continue - - // --- Check for compression --- - if(compression > 0) - heard_gibberish += R - continue - - // --- Can understand the speech --- - - if(!M || R.say_understands(M)) - - // - Not human or wearing a voice mask - - if(!M || !ishuman(M) || vmask) - heard_masked += R - - // - Human and not wearing voice mask - - else - heard_normal += R - - // --- Can't understand the speech --- - - else - // - The speaker has a prespecified "voice message" to display if not understood - - if(vmessage_pieces) - heard_voice += R - - // - Just display a garbled message - - else - heard_garbled += R - - - /* ###### Begin formatting and sending the message ###### */ - if(length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled) || length(heard_gibberish)) - - /* --- Some miscellaneous variables to format the string output --- */ - var/freq_text = get_frequency_name(display_freq) - - var/part_b_extra = "" - if(data == 3) // intercepted radio message - part_b_extra = " (Intercepted)" - var/part_a = "\[[freq_text]\][part_b_extra] " // goes in the actual output - - // --- Some more pre-message formatting --- - var/part_b = " " - - - // --- Filter the message; place it in quotes apply a verb --- - var/quotedmsg = null - if(M) - quotedmsg = "[M.say_quote(multilingual_to_message(message_pieces))], \"[multilingual_to_message(message_pieces)]\"" - else - quotedmsg = "says, \"[multilingual_to_message(message_pieces)]\"" - - // --- This following recording is intended for research and feedback in the use of department radio channels --- - - var/part_blackbox_b = " \[[freq_text]\] [ckey] attempted to upload an NTTC configuration containing JS abusable tags!") - log_admin("EXPLOIT WARNING: [ckey] attempted to upload an NTTC configuration containing JS abusable tags") - return FALSE - var/list/var_list = json_decode(text) - for(var/variable in var_list) - if(variable in to_serialize) // Don't just accept any random vars jesus christ! - if(requires_unlock[variable] && (source && !source.unlocked)) - continue - var/sanitize_method = serialize_sanitize[variable] - var/variable_value = var_list[variable] - variable_value = nttc_sanitize(variable_value, sanitize_method) - if(variable_value != null) - vars[variable] = variable_value - return TRUE - -// Sanitizing user input. Don't blindly trust the JSON. -/datum/nttc_configuration/proc/nttc_sanitize(variable, sanitize_method) - if(!sanitize_method) - return null - - switch(sanitize_method) - if("bool") - return variable ? TRUE : FALSE - // if("table", "array") - if("array") - if(!islist(variable)) - return list() - // Insert html filtering for the regexes here if you're boring - var/newlist = json_decode(html_decode(json_encode(variable))) - if(!islist(newlist)) - return null - return newlist - if("string") - return "[variable]" - - return variable - -// Primary signal modification. This is where all of the variables behavior are actually implemented. -/datum/nttc_configuration/proc/modify_signal(datum/signal/signal) - // Servers are deliberately turned off. Mark every signal as rejected. - if(!toggle_activated) - signal.data["reject"] = TRUE - return - - // Firewall - // This must happen before anything else modifies the signal ["name"]. - if(islist(firewall) && firewall.len > 0) - if(firewall.Find(signal.data["name"])) - signal.data["reject"] = 1 - - // All job and coloring shit - if(toggle_job_color || toggle_name_color) - var/job = signal.data["job"] - job_class = all_jobs[job] - - if(toggle_name_color) - var/new_name = "" + signal.data["name"] + "" - signal.data["name"] = new_name - signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on - - if(toggle_jobs) - var/new_name = "" - var/job = signal.data["job"] - if(job in ert_jobs) - job = "ERT" - if(toggle_job_color) - switch(job_indicator_type) - if(JOB_STYLE_1) - new_name = signal.data["name"] + " ([job]) " - if(JOB_STYLE_2) - new_name = signal.data["name"] + " - [job] " - if(JOB_STYLE_3) - new_name = "\[[job]\] " + signal.data["name"] + " " - if(JOB_STYLE_4) - new_name = "([job]) " + signal.data["name"] + " " - else - switch(job_indicator_type) - if(JOB_STYLE_1) - new_name = signal.data["name"] + " ([job]) " - if(JOB_STYLE_2) - new_name = signal.data["name"] + " - [job] " - if(JOB_STYLE_3) - new_name = "\[[job]\] " + signal.data["name"] + " " - if(JOB_STYLE_4) - new_name = "([job]) " + signal.data["name"] + " " - - signal.data["name"] = new_name - signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on - - // Add the current station time like a time code. - if(toggle_timecode) - var/new_name = "\[[station_time_timestamp()]] " + signal.data["name"] - signal.data["name"] = new_name - signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on - - // This is hacky stuff for multilingual messages... - var/list/message_pieces = signal.data["message"] - - // Makes heads of staff bold - if(toggle_command_bold) - var/job = signal.data["job"] - if((job in ert_jobs) || (job in heads)) - for(var/datum/multilingual_say_piece/S in message_pieces) - S.message = "[capitalize(S.message)]" // This only capitalizes the first word - - // Hacks! - // Censor dat shit like nobody's business - if(toggle_gibberish) - Gibberish_all(message_pieces, 80) - - // Replace everything with HONK! - if(toggle_honk) - var/list/split = splittext(signal.data["message"], " ") - var/honklength = split.len - var/new_message = "" - for(var/i in 1 to honklength) - new_message += pick("HoNK!", "HONK", "HOOOoONK", "HONKHONK!", "HoNnnkKK!!!", "HOOOOOOOOOOONK!!!!11!", "henk!") + " " - signal.data["message"] = message_to_multilingual(new_message) - - // Language Conversion - if(setting_language && valid_languages[setting_language]) - if(setting_language == "--DISABLE--") - setting_language = null - else - for(var/datum/multilingual_say_piece/S in message_pieces) - if(S.speaking != GLOB.all_languages["Noise"]) // check if they are emoting, these do not need to be translated - S.speaking = GLOB.all_languages[setting_language] - - // Regex replacements - // if(islist(regex) && regex.len > 0) - // for(var/datum/multilingual_say_piece/S in message_pieces) - // var/new_message = S.message - // for(var/reg in regex) - // var/replacePattern = pencode_to_html(regex[reg]) - // var/regex/start = regex("[reg]", "gi") - // new_message = start.Replace(new_message, replacePattern) - // S.message = new_message - - // Make sure the message is valid after we tinkered with it, otherwise reject it - if(signal.data["message"] == "" || !signal.data["message"]) - signal.data["reject"] = 1 - -/datum/nttc_configuration/Topic(mob/user, href_list, window_id, obj/machinery/computer/telecomms/traffic/source) - // Toggles - if(href_list["toggle"]) - var/var_to_toggle = href_list["toggle"] - if(requires_unlock[var_to_toggle] && !source.unlocked) - return - if(!(var_to_toggle in to_serialize)) - return - vars[var_to_toggle] = !vars[var_to_toggle] - log_action(user, "toggled NTTC variable [var_to_toggle] [vars[var_to_toggle] ? "on" : "off"]") - - // Job Format - if(href_list["setting_job_card_style"]) - var/card_style = input(user, "Pick a job card format.", "Job Card Format") as null|anything in job_card_styles - if(!card_style) - return - job_indicator_type = card_style - to_chat(user, "Jobs will now have the style of [card_style].") - log_action(user, "has set NTTC job card format to [card_style]", TRUE) - - // Strings - if(href_list["setting_language"]) - var/new_language = input(user, "Pick a language to convert messages to.", "Language Conversion") as null|anything in valid_languages - if(!new_language) - return - if(new_language == "--DISABLE--") - setting_language = null - to_chat(user, "Language conversion disabled.") - else - setting_language = new_language - to_chat(user, "Messages will now be converted to [new_language].") - - log_action(user, new_language == "--DISABLE--" ? "disabled NTTC language conversion" : "set NTTC language conversion to [new_language]", TRUE) - - // Tables - // if(href_list["create_row"]) - // if(href_list["table"] && href_list["table"] in tables) - // if(requires_unlock[href_list["table"]] && !source.unlocked) - // return - // var/new_key = clean_input(user, "Provide a key for the new row.", "New Row") - // if(!new_key) - // return - // var/new_value = clean_input(user, "Provide a new value for the key [new_key]", "New Row") - // if(new_value == null) - // return - // if(word_blacklist.Find(new_value)) //uh oh, they tried to be naughty - // message_admins("EXPLOIT WARNING: [user.ckey] attempted to add a NTTC regex row containing JS abusable tags!") - // log_admin("EXPLOIT WARNING: [user.ckey] attempted to add a NTTC regex row containing JS abusable tags") - // to_chat(user, "ERROR: Regex contained bad strings. Upload cancelled.") - // return - // var/list/table = vars[href_list["table"]] - // table[new_key] = new_value - // to_chat(user, "Added row [new_key] -> [new_value].") - // log_action(user, "updated [href_list["table"]] - new row [new_key] -> [new_value]") - - // if(href_list["delete_row"]) - // if(href_list["table"] && href_list["table"] in tables) - // if(requires_unlock[href_list["table"]] && !source.unlocked) - // return - // var/list/table = vars[href_list["table"]] - // table.Remove(href_list["delete_row"]) - // to_chat(user, "Removed row [href_list["delete_row"]] from [href_list["table"]]") - // log_action(user, "updated [href_list["table"]] - removed row [href_list["delete_row"]]") - - // Arrays - if(href_list["create_item"]) - if(href_list["array"] && href_list["array"] in arrays) - if(requires_unlock[href_list["array"]] && !source.unlocked) - return - var/new_value = clean_input(user, "Provide a value for the new index.", "New Index") - if(new_value == null) - return - var/list/array = vars[href_list["array"]] - array.Add(new_value) - to_chat(user, "Added row [new_value].") - log_action(user, "updated [href_list["array"]] - new value [new_value]", TRUE) - - if(href_list["delete_item"]) - if(href_list["array"] && href_list["array"] in arrays) - if(requires_unlock[href_list["array"]] && !source.unlocked) - return - var/list/array = vars[href_list["array"]] - array.Remove(href_list["delete_item"]) - to_chat(user, "Removed [href_list["delete_item"]] from [href_list["array"]]") - log_action(user, "updated [href_list["array"]] - removed [href_list["delete_item"]]") - - // Spit out the serialized config to the user - if(href_list["save_config"]) - user << browse(nttc_serialize(), "window=save_nttc") - - if(href_list["load_config"]) - var/json = input(user, "Provide configuration JSON below.", "Load Config", nttc_serialize()) as message - if(nttc_deserialize(json, source, user.ckey)) - log_action(user, "has uploaded a NTTC JSON configuration: [ADMIN_SHOWDETAILS("Show", json)]", TRUE) - - user << output(list2params(list(nttc_serialize())), "[window_id].browser:updateConfig") - -/datum/nttc_configuration/proc/log_action(user, msg, adminmsg = FALSE) - log_game("NTTC: [key_name(user)] [msg]") - log_investigate("[key_name(user)] [msg]", "ntsl") - if(adminmsg) - message_admins("[key_name_admin(user)] [msg]") - -/* Asset datum for the UI */ -/datum/asset/simple/nttc - assets = list( - "bundle.css" = 'html/nttc/dist/bundle.css', - "bundle.js" = 'html/nttc/dist/bundle.js', - "tab_home.html" = 'html/nttc/dist/tab_home.html', - "tab_hack.html" = 'html/nttc/dist/tab_hack.html', - "tab_filtering.html" = 'html/nttc/dist/tab_filtering.html', - "tab_firewall.html" = 'html/nttc/dist/tab_firewall.html', - // "tab_regex.html" = 'html/nttc/dist/tab_regex.html', - "uiTitleFluff.png" = 'html/nttc/dist/uiTitleFluff.png' - ) - -/* Custom subtype of /datum/browser that behaves as we want for our project */ -/datum/browser/nttc - var/initial_config // Initial NTTC configuration - -/datum/browser/nttc/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null, nttc_config) - . = ..() - initial_config = nttc_config -// Prevent all stylesheets from being added, we have our own CSS that's bundled with gulp -/datum/browser/nttc/add_stylesheet() - return -// No header, we're running a fully complete .html file -/datum/browser/nttc/get_header() - return -// We inject a little code at the bottom of the file, similar to NanoUI, but more limited. -// This code is used for delivering live updates of config changes & allowing the UI to provide Topic data. -/datum/browser/nttc/get_footer() - var/byondSrc = "byond://?src=[ref.UID()];" - var/dat = "" - return dat - diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm deleted file mode 100644 index 212d8592e92..00000000000 --- a/code/game/machinery/telecomms/presets.dm +++ /dev/null @@ -1,234 +0,0 @@ -// ### Preset machines ### - -//Relay - -/obj/machinery/telecomms/relay/preset - network = "tcommsat" - -/obj/machinery/telecomms/relay/preset/station - id = "Station Relay" - listening_level = 1 - autolinkers = list("s_relay") - -/obj/machinery/telecomms/relay/preset/telecomms - id = "Telecomms Relay" - autolinkers = list("relay") - -/obj/machinery/telecomms/relay/preset/mining - id = "Mining Relay" - autolinkers = list("m_relay") - -/obj/machinery/telecomms/relay/preset/ruskie - id = "Ruskie Relay" - hide = 1 - toggled = 0 - autolinkers = list("r_relay") - -/obj/machinery/telecomms/relay/preset/engioutpost - id = "Engineering Outpost" - hide = 1 - toggled = 0 - autolinkers = list("e_relay") - -/obj/machinery/telecomms/relay/preset/centcom - id = "Centcom Relay" - hide = 1 - toggled = 1 - //anchored = 1 - use_power = NO_POWER_USE - //idle_power_usage = 0 - autolinkers = list("c_relay") - -//HUB - -/obj/machinery/telecomms/hub/preset - id = "Hub" - network = "tcommsat" - autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "e_relay", "science", "medical", - "supply", "service", "common", "command", "engineering", "security", - "receiverA", "receiverB", "broadcasterA", "broadcasterB") - -/obj/machinery/telecomms/hub/preset_cent - id = "CentComm Hub" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", "e_relay", - "centcomm", "receiverCent", "broadcasterCent") - -//Receivers - -//--PRESET LEFT--// - -/obj/machinery/telecomms/receiver/preset_left - id = "Receiver A" - network = "tcommsat" - autolinkers = list("receiverA") // link to relay - freq_listening = list(SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ) - - -//--PRESET RIGHT--// - -/obj/machinery/telecomms/receiver/preset_right - id = "Receiver B" - network = "tcommsat" - autolinkers = list("receiverB") // link to relay - freq_listening = list(AI_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ) - - //Common and other radio frequencies for people to freely use -/obj/machinery/telecomms/receiver/preset_right/New() - for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2) - freq_listening |= i - ..() - -/obj/machinery/telecomms/receiver/preset_cent - id = "CentComm Receiver" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("receiverCent") - freq_listening = list(ERT_FREQ, DTH_FREQ) - -//Buses - -/obj/machinery/telecomms/bus/preset_one - id = "Bus 1" - network = "tcommsat" - freq_listening = list(SCI_FREQ, MED_FREQ) - autolinkers = list("processor1", "science", "medical") - -/obj/machinery/telecomms/bus/preset_two - id = "Bus 2" - network = "tcommsat" - freq_listening = list(SUP_FREQ, SRV_FREQ) - autolinkers = list("processor2", "supply", "service") - -/obj/machinery/telecomms/bus/preset_three - id = "Bus 3" - network = "tcommsat" - freq_listening = list(SEC_FREQ, COMM_FREQ) - autolinkers = list("processor3", "security", "command") - -/obj/machinery/telecomms/bus/preset_four - id = "Bus 4" - network = "tcommsat" - freq_listening = list(ENG_FREQ, AI_FREQ, PUB_FREQ) - autolinkers = list("processor4", "engineering", "common") - -/obj/machinery/telecomms/bus/preset_four/New() - for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2) - freq_listening |= i - ..() - -/obj/machinery/telecomms/bus/preset_cent - id = "CentComm Bus" - network = "tcommsat" - use_power = NO_POWER_USE - freq_listening = list(ERT_FREQ, DTH_FREQ) - autolinkers = list("processorCent", "centcomm") - -//Processors - -/obj/machinery/telecomms/processor/preset_one - id = "Processor 1" - network = "tcommsat" - autolinkers = list("processor1") // processors are sort of isolated; they don't need backward links - -/obj/machinery/telecomms/processor/preset_two - id = "Processor 2" - network = "tcommsat" - autolinkers = list("processor2") - -/obj/machinery/telecomms/processor/preset_three - id = "Processor 3" - network = "tcommsat" - autolinkers = list("processor3") - -/obj/machinery/telecomms/processor/preset_four - id = "Processor 4" - network = "tcommsat" - autolinkers = list("processor4") - -/obj/machinery/telecomms/processor/preset_cent - id = "CentComm Processor" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("processorCent") - -//Servers - -/obj/machinery/telecomms/server/presets - - network = "tcommsat" - -/obj/machinery/telecomms/server/presets/science - id = "Science Server" - freq_listening = list(SCI_FREQ) - autolinkers = list("science") - -/obj/machinery/telecomms/server/presets/medical - id = "Medical Server" - freq_listening = list(MED_FREQ) - autolinkers = list("medical") - -/obj/machinery/telecomms/server/presets/supply - id = "Supply Server" - freq_listening = list(SUP_FREQ) - autolinkers = list("supply") - -/obj/machinery/telecomms/server/presets/service - id = "Service Server" - freq_listening = list(SRV_FREQ) - autolinkers = list("service") - -/obj/machinery/telecomms/server/presets/common - id = "Common Server" - freq_listening = list(PUB_FREQ, AI_FREQ) - autolinkers = list("common") - -//Common and other radio frequencies for people to freely use -/obj/machinery/telecomms/server/presets/common/New() - for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2) - freq_listening |= i - ..() - -/obj/machinery/telecomms/server/presets/command - id = "Command Server" - freq_listening = list(COMM_FREQ) - autolinkers = list("command") - -/obj/machinery/telecomms/server/presets/engineering - id = "Engineering Server" - freq_listening = list(ENG_FREQ) - autolinkers = list("engineering") - -/obj/machinery/telecomms/server/presets/security - id = "Security Server" - freq_listening = list(SEC_FREQ) - autolinkers = list("security") - -/obj/machinery/telecomms/server/presets/centcomm - id = "CentComm Server" - freq_listening = list(ERT_FREQ, DTH_FREQ) - use_power = NO_POWER_USE - autolinkers = list("centcomm") - -//Broadcasters - -//--PRESET LEFT--// - -/obj/machinery/telecomms/broadcaster/preset_left - id = "Broadcaster A" - network = "tcommsat" - autolinkers = list("broadcasterA") - -//--PRESET RIGHT--// - -/obj/machinery/telecomms/broadcaster/preset_right - id = "Broadcaster B" - network = "tcommsat" - autolinkers = list("broadcasterB") - -/obj/machinery/telecomms/broadcaster/preset_cent - id = "CentComm Broadcaster" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("broadcasterCent") diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm deleted file mode 100644 index 06eacdd8da1..00000000000 --- a/code/game/machinery/telecomms/telecomunications.dm +++ /dev/null @@ -1,529 +0,0 @@ -/* - Hello, friends, this is Doohl from sexylands. You may be wondering what this - monstrous code file is. Sit down, boys and girls, while I tell you the tale. - - - The machines defined in this file were designed to be compatible with any radio - signals, provided they use subspace transmission. Currently they are only used for - headsets, but they can eventually be outfitted for real COMPUTER networks. This - is just a skeleton, ladies and gentlemen. - - Look at radio.dm for the prequel to this code. -*/ - -var/global/list/obj/machinery/telecomms/telecomms_list = list() - -/obj/machinery/telecomms - var/list/links = list() // list of machines this machine is linked to - var/traffic = 0 // value increases as traffic increases - var/netspeed = 5 // how much traffic to lose per tick (50 gigabytes/second * netspeed) - var/list/autolinkers = list() // list of text/number values to link with - var/id = "NULL" // identification string - var/network = "NULL" // the network of the machinery - - var/list/freq_listening = list() // list of frequencies to tune into: if none, will listen to all - - var/machinetype = 0 // just a hacky way of preventing alike machines from pairing - var/toggled = 1 // Is it toggled on - var/on = 1 - var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub) - var/circuitboard = null // type pointing to a circuitboard type - var/hide = 0 // Is it a hidden machine? - var/listening_level = 0 // 0 = auto set in New() - this is the z level that the machine is listening to. - Mtoollink = 1 - -/obj/machinery/telecomms/proc/relay_information(datum/signal/signal, filter, copysig, amount = 20) - // relay signal to all linked machinery that are of type [filter]. If signal has been sent [amount] times, stop sending - - if(!on) - return -// to_chat(world, "[src] ([src.id]) - [signal.debug_print()]") - var/send_count = 0 - - - // Apply some lag based on traffic rates - var/netlag = round(traffic / 50) - if(netlag > signal.data["slow"]) - signal.data["slow"] = netlag - -// Loop through all linked machines and send the signal or copy. - for(var/obj/machinery/telecomms/machine in links) - if(filter && !istype( machine, text2path(filter) )) - continue - if(!machine.on) - continue - if(amount && send_count >= amount) - break - // TODO: Make the radio system cooperate with the space manager - if(machine.loc.z != listening_level) - if(long_range_link == 0 && machine.long_range_link == 0) - continue - // If we're sending a copy, be sure to create the copy for EACH machine and paste the data - var/datum/signal/copy - if(copysig) - copy = new - copy.transmission_method = 2 - copy.frequency = signal.frequency - copy.data = signal.data.Copy() - - // Keep the "original" signal constant - if(!signal.data["original"]) - copy.data["original"] = signal - else - copy.data["original"] = signal.data["original"] - - send_count++ - if(machine.is_freq_listening(signal)) - machine.traffic++ - - if(copysig) - machine.receive_information(copy, src) - else - machine.receive_information(signal, src) - - - if(send_count > 0 && is_freq_listening(signal)) - traffic++ - - return send_count - -/obj/machinery/telecomms/proc/relay_direct_information(datum/signal/signal, obj/machinery/telecomms/machine) - // send signal directly to a machine - machine.receive_information(signal, src) - -/obj/machinery/telecomms/proc/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - // receive information from linked machinery - ..() - -/obj/machinery/telecomms/proc/is_freq_listening(datum/signal/signal) - // return 1 if found, 0 if not found - if(!signal) - return 0 - if((signal.frequency in freq_listening) || (!freq_listening.len)) - return 1 - else - return 0 - - -/obj/machinery/telecomms/New() - telecomms_list += src - ..() - - //Set the listening_level if there's none. - if(!listening_level) - //Defaults to our Z level! - var/turf/position = get_turf(src) - // TODO: Make the radio system cooperate with the space manager - listening_level = position.z - -/obj/machinery/telecomms/Initialize() - ..() - if(autolinkers.len) - // Links nearby machines - if(!long_range_link) - for(var/obj/machinery/telecomms/T in orange(20, src)) - add_link(T) - else - for(var/obj/machinery/telecomms/T in telecomms_list) - add_link(T) - - -/obj/machinery/telecomms/Destroy() - telecomms_list -= src - for(var/obj/machinery/telecomms/comm in telecomms_list) - comm.links -= src - links.Cut() - return ..() - -// Used in auto linking -/obj/machinery/telecomms/proc/add_link(var/obj/machinery/telecomms/T) - var/turf/position = get_turf(src) - var/turf/T_position = get_turf(T) - // TODO: Make the radio system cooperate with the space manager - if((position.z == T_position.z) || (src.long_range_link && T.long_range_link)) - for(var/x in autolinkers) - if(T.autolinkers.Find(x)) - if(src != T) - links |= T - -/obj/machinery/telecomms/update_icon() - if(on) - icon_state = initial(icon_state) - else - icon_state = "[initial(icon_state)]_off" - -/obj/machinery/telecomms/proc/update_power() - - if(toggled) - if(stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off - on = 0 - else - on = 1 - else - on = 0 - -/obj/machinery/telecomms/process() - update_power() - - // Update the icon - update_icon() - - if(traffic > 0) - traffic -= netspeed - -/obj/machinery/telecomms/emp_act(severity) - if(prob(100/severity)) - if(!(stat & EMPED)) - stat |= EMPED - var/duration = (300 * 10)/severity - spawn(rand(duration - 20, duration + 20)) // Takes a long time for the machines to reboot. - stat &= ~EMPED - ..() - -/* - The receiver idles and receives messages from subspace-compatible radio equipment; - primarily headsets. They then just relay this information to all linked devices, - which can would probably be network hubs. - - Link to Processor Units in case receiver can't send to bus units. -*/ - -/obj/machinery/telecomms/receiver - name = "Subspace Receiver" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "broadcast receiver" - desc = "This machine has a dish-like shape and green lights. It is designed to detect and process subspace radio activity." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 30 - machinetype = 1 - circuitboard = /obj/item/circuitboard/telecomms/receiver - -/obj/machinery/telecomms/receiver/receive_signal(datum/signal/signal) - - if(!on) // has to be on to receive messages - return - if(!signal) - return - if(!check_receive_level(signal)) - return - - if(signal.transmission_method == 2) - - if(is_freq_listening(signal)) // detect subspace signals - - //Remove the level and then start adding levels that it is being broadcasted in. - signal.data["level"] = list() - - var/can_send = relay_information(signal, "/obj/machinery/telecomms/hub") // ideally relay the copied information to relays - if(!can_send) - relay_information(signal, "/obj/machinery/telecomms/bus") // Send it to a bus instead, if it's linked to one - -/obj/machinery/telecomms/receiver/proc/check_receive_level(datum/signal/signal) - - if(signal.data["level"] != listening_level) - for(var/obj/machinery/telecomms/hub/H in links) - var/list/connected_levels = list() - for(var/obj/machinery/telecomms/relay/R in H.links) - if(R.can_receive(signal)) - connected_levels |= R.listening_level - if(signal.data["level"] in connected_levels) - return 1 - return 0 - return 1 - - -/* - The HUB idles until it receives information. It then passes on that information - depending on where it came from. - - This is the heart of the Telecommunications Network, sending information where it - is needed. It mainly receives information from long-distance Relays and then sends - that information to be processed. Afterwards it gets the uncompressed information - from Servers/Buses and sends that back to the relay, to then be broadcasted. -*/ - -/obj/machinery/telecomms/hub - name = "Telecommunication Hub" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "hub" - desc = "A mighty piece of hardware used to send/receive massive amounts of data." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 80 - machinetype = 7 - circuitboard = /obj/item/circuitboard/telecomms/hub - long_range_link = 1 - netspeed = 40 - - -/obj/machinery/telecomms/hub/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - if(is_freq_listening(signal)) - if(istype(machine_from, /obj/machinery/telecomms/receiver)) - //If the signal is compressed, send it to the bus. - relay_information(signal, "/obj/machinery/telecomms/bus", 1) // ideally relay the copied information to bus units - else - // Get a list of relays that we're linked to, then send the signal to their levels. - relay_information(signal, "/obj/machinery/telecomms/relay", 1) - relay_information(signal, "/obj/machinery/telecomms/broadcaster", 1) // Send it to a broadcaster. - - -/* - The relay idles until it receives information. It then passes on that information - depending on where it came from. - - The relay is needed in order to send information pass Z levels. It must be linked - with a HUB, the only other machine that can send/receive pass Z levels. -*/ - -/obj/machinery/telecomms/relay - name = "Telecommunication Relay" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "relay" - desc = "A mighty piece of hardware used to send massive amounts of data far away." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 30 - machinetype = 8 - circuitboard = /obj/item/circuitboard/telecomms/relay - netspeed = 5 - long_range_link = 1 - var/broadcasting = 1 - var/receiving = 1 - -/obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - - // Add our level and send it back - if(can_send(signal)) - signal.data["level"] |= listening_level - -// Checks to see if it can send/receive. - -/obj/machinery/telecomms/relay/proc/can(datum/signal/signal) - if(!on) - return 0 - if(!is_freq_listening(signal)) - return 0 - return 1 - -/obj/machinery/telecomms/relay/proc/can_send(datum/signal/signal) - if(!can(signal)) - return 0 - return broadcasting - -/obj/machinery/telecomms/relay/proc/can_receive(datum/signal/signal) - if(!can(signal)) - return 0 - return receiving - -/* - The bus mainframe idles and waits for hubs to relay them signals. They act - as junctions for the network. - - They transfer uncompressed subspace packets to processor units, and then take - the processed packet to a server for logging. - - Link to a subspace hub if it can't send to a server. -*/ - -/obj/machinery/telecomms/bus - name = "Bus Mainframe" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "bus" - desc = "A mighty piece of hardware used to send massive amounts of data quickly." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 50 - machinetype = 2 - circuitboard = /obj/item/circuitboard/telecomms/bus - netspeed = 40 - var/change_frequency = 0 - -/obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - - if(is_freq_listening(signal)) - - if(change_frequency) - signal.frequency = change_frequency - - if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it - // send to one linked processor unit - var/send_to_processor = relay_information(signal, "/obj/machinery/telecomms/processor") - - if(send_to_processor) - return - // failed to send to a processor, relay information anyway - signal.data["slow"] += rand(1, 5) // slow the signal down only slightly - src.receive_information(signal, src) - - // Try sending it! - var/list/try_send = list("/obj/machinery/telecomms/server", "/obj/machinery/telecomms/hub", "/obj/machinery/telecomms/broadcaster") - var/i = 0 - for(var/send in try_send) - if(i) - signal.data["slow"] += rand(0, 1) // slow the signal down only slightly - i++ - var/can_send = relay_information(signal, send) - if(can_send) - break - - - -/* - The processor is a very simple machine that decompresses subspace signals and - transfers them back to the original bus. It is essential in producing audible - data. - - Link to servers if bus is not present -*/ - -/obj/machinery/telecomms/processor - name = "Processor Unit" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "processor" - desc = "This machine is used to process large quantities of information." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 30 - machinetype = 3 - circuitboard = /obj/item/circuitboard/telecomms/processor - var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals - - receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - - if(is_freq_listening(signal)) - - if(process_mode) - signal.data["compression"] = 0 // uncompress subspace signal - else - signal.data["compression"] = 100 // even more compressed signal - - if(istype(machine_from, /obj/machinery/telecomms/bus)) - relay_direct_information(signal, machine_from) // send the signal back to the machine - else // no bus detected - send the signal to servers instead - signal.data["slow"] += rand(5, 10) // slow the signal down - relay_information(signal, "/obj/machinery/telecomms/server") - - -/* - The server logs all traffic and signal data. Once it records the signal, it sends - it to the subspace broadcaster. - - Store a maximum of 100 logs and then deletes them. -*/ - - -/obj/machinery/telecomms/server - name = "Telecommunication Server" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "comm_server" - desc = "A machine used to store data and network statistics." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 15 - machinetype = 4 - circuitboard = /obj/item/circuitboard/telecomms/server - var/list/log_entries = list() - var/list/stored_names = list() - var/list/TrafficActions = list() - var/logs = 0 // number of logs - var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes) - - var/encryption = "null" // encryption key: ie "password" - var/salt = "null" // encryption salt: ie "123comsat" - // would add up to md5("password123comsat") - var/obj/item/radio/headset/server_radio = null - -/obj/machinery/telecomms/server/Initialize() - ..() - server_radio = new() - -/obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - if(signal.data["message"]) - if(is_freq_listening(signal)) - if(traffic > 0) - totaltraffic += traffic // add current traffic to total traffic - - //Is this a test signal? Bypass logging - if(signal.data["type"] != 4) - // If signal has a message and appropriate frequency - update_logs() - - var/datum/comm_log_entry/log = new - var/mob/M = signal.data["mob"] - - // Copy the signal.data entries we want - log.parameters["mobtype"] = signal.data["mobtype"] - log.parameters["race"] = signal.data["race"] - log.parameters["job"] = signal.data["job"] - log.parameters["key"] = signal.data["key"] - log.parameters["vmessage"] = multilingual_to_message(signal.data["message"]) - log.parameters["vname"] = signal.data["vname"] - log.parameters["message"] = multilingual_to_message(signal.data["message"]) - log.parameters["name"] = signal.data["name"] - log.parameters["realname"] = signal.data["realname"] - - if(!istype(M, /mob/new_player) && M) - log.parameters["uspeech"] = M.universal_speak - else - log.parameters["uspeech"] = 0 - - // If the signal is still compressed, make the log entry gibberish - if(signal.data["compression"] > 0) - log.parameters["message"] = Gibberish(multilingual_to_message(signal.data["message"]), signal.data["compression"] + 50) - log.parameters["job"] = Gibberish(signal.data["job"], signal.data["compression"] + 50) - log.parameters["name"] = Gibberish(signal.data["name"], signal.data["compression"] + 50) - log.parameters["realname"] = Gibberish(signal.data["realname"], signal.data["compression"] + 50) - log.parameters["vname"] = Gibberish(signal.data["vname"], signal.data["compression"] + 50) - log.input_type = "Corrupt File" - - // Log and store everything that needs to be logged - log_entries.Add(log) - if(!(signal.data["name"] in stored_names)) - stored_names.Add(signal.data["name"]) - logs++ - signal.data["server"] = src - - // Give the log a name - var/identifier = num2text( rand(-1000,1000) + world.time ) - log.name = "data packet ([md5(identifier)])" - - // Run NTTC against the signal - if(GLOB.nttc_config) - GLOB.nttc_config.modify_signal(signal) - - var/can_send = relay_information(signal, "/obj/machinery/telecomms/hub") - if(!can_send) - relay_information(signal, "/obj/machinery/telecomms/broadcaster") - -/obj/machinery/telecomms/server/proc/update_logs() - // start deleting the very first log entry - if(logs >= 400) - for(var/i = 1, i <= logs, i++) // locate the first garbage collectable log entry and remove it - var/datum/comm_log_entry/L = log_entries[i] - if(L.garbage_collector) - log_entries.Remove(L) - logs-- - break - -/obj/machinery/telecomms/server/proc/add_entry(var/content, var/input) - var/datum/comm_log_entry/log = new - var/identifier = num2text( rand(-1000,1000) + world.time ) - log.name = "[input] ([md5(identifier)])" - log.input_type = input - log.parameters["message"] = content - log_entries.Add(log) - update_logs() - -// Simple log entry datum -/datum/comm_log_entry - var/parameters = list() // carbon-copy to signal.data[] - var/name = "data packet (#)" - var/garbage_collector = 1 // if set to 0, will not be garbage collected - var/input_type = "Speech File" diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm deleted file mode 100644 index 73a9261feb0..00000000000 --- a/code/game/machinery/telecomms/telemonitor.dm +++ /dev/null @@ -1,161 +0,0 @@ -/* - Telecomms monitor tracks the overall trafficing of a telecommunications network - and displays a heirarchy of linked machines. -*/ - - -/obj/machinery/computer/telecomms/monitor - name = "telecommunications monitor" - icon_screen = "comm_monitor" - - var/screen = 0 // the screen number: - var/list/machinelist = list() // the machines located by the computer - var/obj/machinery/telecomms/SelectedMachine - - var/network = "NULL" // the network to probe - - var/temp = "" // temporary feedback messages - circuit = /obj/item/circuitboard/comm_monitor - - light_color = LIGHT_COLOR_DARKGREEN - - attack_hand(mob/user as mob) - if(stat & (BROKEN|NOPOWER)) - return - user.set_machine(src) - var/dat = "Telecommunications Monitor Telecommunications Monitor "
-
- switch(screen)
-
-
- // --- Main Menu ---
-
- if(0)
- dat += "
[temp]
" - dat += "
Current Network: [network]
" - if(machinelist.len) - dat += "
Detected Network Entities:
\[Flush Buffer\]" - else - dat += "\[Probe Network\]" - - - // --- Viewing Machine --- - - if(1) - dat += "
[temp]
" - dat += "\[Main Menu\] "
- dat += "
Current Network: [network]
" - dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
" - dat += "Linked Entities:
Name of Deceased: [dead_name]
Rank of Deceased: [dead_rank]
Time of Death: [dead_tod]
Cause of Death: [dead_cause]
Trace Chemicals: [dead_chems]
Additional Coroner's Notes: [dead_notes]
Coroner's Signature: " + R.info = "Nanotrasen Science Station [GLOB.using_map.station_short] - Coroner's Report
Name of Deceased: [dead_name]
Rank of Deceased: [dead_rank]
Time of Death: [dead_tod]
Cause of Death: [dead_cause]
Trace Chemicals: [dead_chems]
Additional Coroner's Notes: [dead_notes]
Coroner's Signature: " playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) sleep(10) user.put_in_hands(R) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 3ca37a3f662..7724d499e7e 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -54,26 +54,26 @@ user.set_machine(src) interact(user) -/obj/item/camera_bug/check_eye(var/mob/user as mob) - if(user.stat || loc != user || !user.canmove || !user.has_vision() || !current) - user.reset_perspective(null) +/obj/item/camera_bug/check_eye(mob/user) + if(loc != user || user.incapacitated() || !user.has_vision() || !current) user.unset_machine() - return null - - var/turf/T = get_turf(user.loc) - if(T.z != current.z || !current.can_use()) + return FALSE + var/turf/T_user = get_turf(user.loc) + var/turf/T_current = get_turf(current) + if(!atoms_share_level(T_user, T_current) || !current.can_use()) to_chat(user, "[src] has lost the signal.") current = null - user.reset_perspective(null) user.unset_machine() - return null + return FALSE + return TRUE - return 1 +/obj/item/camera_bug/on_unset_machine(mob/user) + user.reset_perspective(null) /obj/item/camera_bug/proc/get_cameras() if(world.time > (last_net_update + 100)) bugged_cameras = list() - for(var/obj/machinery/camera/camera in cameranet.cameras) + for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras) if(camera.stat || !camera.can_use()) continue if(length(list("SS13","MINE")&camera.network)) @@ -182,7 +182,6 @@ /obj/item/camera_bug/Topic(var/href,var/list/href_list) if(usr != loc) usr.unset_machine() - usr.reset_perspective(null) usr << browse(null, "window=camerabug") return usr.set_machine(src) @@ -233,7 +232,6 @@ interact() else usr.unset_machine() - usr.reset_perspective(null) usr << browse(null, "window=camerabug") return else diff --git a/code/game/objects/items/devices/enginepicker.dm b/code/game/objects/items/devices/enginepicker.dm index fe6bb7e8717..0fd3a591560 100644 --- a/code/game/objects/items/devices/enginepicker.dm +++ b/code/game/objects/items/devices/enginepicker.dm @@ -14,8 +14,12 @@ var/list/list_enginebeacons = list() var/isactive = FALSE +/obj/item/enginepicker/Destroy() + list_enginebeacons.Cut() + return ..() + /obj/item/enginepicker/attack_self(mob/living/carbon/user) - if(usr.stat || !usr.canmove || usr.restrained()) + if(user.incapacitated()) return if(!isactive) @@ -72,7 +76,7 @@ new G(T) //Spawns the switch-selected engine on the chosen beacon's turf var/ailist[] = list() - for(var/mob/living/silicon/ai/A in GLOB.living_mob_list) + for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list) ailist += A if(ailist.len) var/mob/living/silicon/ai/announcer = pick(ailist) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index af673c7b285..58848f3f7e4 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -67,44 +67,48 @@ times_used = max(0, times_used) //sanity -/obj/item/flash/proc/try_use_flash(var/mob/user = null) +/obj/item/flash/proc/try_use_flash(mob/user = null) flash_recharge(user) if(broken) - return 0 + return FALSE - playsound(src.loc, use_sound, 100, 1) + playsound(loc, use_sound, 100, 1) flick("[initial(icon_state)]2", src) + set_light(2, 1, COLOR_WHITE) + addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2) times_used++ if(user && !clown_check(user)) - return 0 + return FALSE - return 1 + return TRUE /obj/item/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1) - add_attack_logs(user, M, "Flashed with [src]") - if(user && targeted) - if(M.weakeyes) - M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash - if(M.flash_eyes(1, 1)) - M.AdjustConfused(power) - terrible_conversion_proc(M, user) - M.Stun(1) - visible_message("[user] blinds [M] with the flash!") - to_chat(user, "You blind [M] with the flash!") - to_chat(M, "[user] blinds you with the flash!") + if(user) + add_attack_logs(user, M, "Flashed with [src]") + if(targeted) if(M.weakeyes) - M.Stun(2) - M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shields your eyes!") - else - visible_message("[user] fails to blind [M] with the flash!") - to_chat(user, "You fail to blind [M] with the flash!") - to_chat(M, "[user] fails to blind you with the flash!") - else - if(M.flash_eyes()) - M.AdjustConfused(power) + M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash + if(M.flash_eyes(1, 1)) + M.AdjustConfused(power) + terrible_conversion_proc(M, user) + M.Stun(1) + visible_message("[user] blinds [M] with the flash!") + to_chat(user, "You blind [M] with the flash!") + to_chat(M, "[user] blinds you with the flash!") + if(M.weakeyes) + M.Stun(2) + M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shield your eyes!") + else + visible_message("[user] fails to blind [M] with the flash!") + to_chat(user, "You fail to blind [M] with the flash!") + to_chat(M, "[user] fails to blind you with the flash!") + return + + if(M.flash_eyes()) + M.AdjustConfused(power) /obj/item/flash/attack(mob/living/M, mob/user) if(!try_use_flash(user)) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4ce64a859ec..307964ca25c 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -74,7 +74,7 @@ if(istype(H)) //robots and aliens are unaffected var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes) - if(M.stat == DEAD || !eyes || M.disabilities & BLIND) //mob is dead or fully blind + if(M.stat == DEAD || !eyes || (BLINDNESS in M.mutations)) //mob is dead or fully blind to_chat(user, "[M]'s pupils are unresponsive to the light!") else if((XRAY in M.mutations) || eyes.see_in_dark >= 8) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms). to_chat(user, "[M]'s pupils glow eerily!") diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index a296e465a59..53ead129836 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -35,7 +35,7 @@ song.ui_interact(user, ui_key, ui, force_open) -/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) return song.ui_data(user, ui_key, state) /obj/item/instrument/Topic(href, href_list) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 21b71e7668c..cfaea9f32f9 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -138,6 +138,7 @@ log_admin("[key_name(user)] EMPd a camera with a laser pointer") user.create_attack_log("[key_name(user)] EMPd a camera with a laser pointer") + add_attack_logs(user, C, "EMPd with [src]", ATKLOG_ALL) else outmsg = "You missed the lens of [C] with [src]." diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 5f987bdce45..b3695229790 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -264,7 +264,7 @@ return last_request = world.time / 10 looking_for_personality = 1 - paiController.findPAI(src, usr) + GLOB.paiController.findPAI(src, usr) if(href_list["wipe"]) var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No") if(confirm == "Yes") diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 69beb04f67c..842a96c2af2 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -9,7 +9,7 @@ /obj/item/pipe_painter/New() ..() modes = new() - for(var/C in pipe_colors) + for(var/C in GLOB.pipe_colors) modes += "[C]" mode = pick(modes) @@ -23,7 +23,7 @@ to_chat(user, "You must remove the plating first.") return - P.change_color(pipe_colors[mode]) + P.change_color(GLOB.pipe_colors[mode]) /obj/item/pipe_painter/attack_self(mob/user as mob) mode = input("Which colour do you want to use?", "Pipe Painter", mode) in modes diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 517f9f595c5..aa123930323 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -69,8 +69,8 @@ to_chat(user, "Locked In") new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + user.drop_item() qdel(src) - return /obj/item/radio/beacon/syndicate/bomb name = "suspicious beacon" @@ -82,16 +82,21 @@ to_chat(user, "Locked In") new /obj/machinery/syndicatebomb( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + user.drop_item() qdel(src) - return /obj/item/radio/beacon/engine desc = "A label on it reads: Warning: This device is used for transportation of high-density objects used for high-yield power generation. Stay away!." anchored = 1 //Let's not move these around. Some folk might get the idea to use these for assassinations var/list/enginetype = list() -/obj/item/radio/beacon/engine/Initialize() +/obj/item/radio/beacon/engine/Initialize(mapload) LAZYADD(GLOB.engine_beacon_list, src) + return ..() + +/obj/item/radio/beacon/engine/Destroy() + GLOB.engine_beacon_list -= src + return ..() /obj/item/radio/beacon/engine/tesling name = "Engine Beacon for Tesla and Singularity" diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 4b5716d73eb..083720f0e22 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -103,7 +103,7 @@ ui.open() ui.set_auto_update(1) -/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["power"] = on diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 72e584e91aa..691c12e1347 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -21,6 +21,7 @@ var/ks1type = null var/ks2type = null dog_fashion = null + requires_tcomms = TRUE /obj/item/radio/headset/New() ..() @@ -88,6 +89,8 @@ /obj/item/radio/headset/syndicate origin_tech = "syndicate=3" ks1type = /obj/item/encryptionkey/syndicate/nukeops + requires_tcomms = FALSE + instant = TRUE // Work instantly if there are no comms /obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection name = "syndicate headset" @@ -103,6 +106,13 @@ /obj/item/radio/headset/syndicate/alt/syndteam ks1type = /obj/item/encryptionkey/syndteam +/obj/item/radio/headset/syndicate/alt/lavaland + name = "syndicate lavaland headset" + +/obj/item/radio/headset/syndicate/alt/lavaland/New() + . = ..() + set_frequency(SYND_FREQ) + /obj/item/radio/headset/binary origin_tech = "syndicate=3" ks1type = /obj/item/encryptionkey/binary diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index fbfe984d35f..13c97f26730 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -63,7 +63,7 @@ /obj/item/radio/intercom/department/medbay/New() ..() - internal_channels = default_medbay_channels.Copy() + internal_channels = GLOB.default_medbay_channels.Copy() /obj/item/radio/intercom/department/security/New() ..() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 23d897d491f..4c2aaa82c1e 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -1,4 +1,4 @@ -var/global/list/default_internal_channels = list( +GLOBAL_LIST_INIT(default_internal_channels, list( num2text(PUB_FREQ) = list(), num2text(AI_FREQ) = list(ACCESS_CAPTAIN), num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS), @@ -11,13 +11,13 @@ var/global/list/default_internal_channels = list( num2text(SCI_FREQ) = list(ACCESS_RESEARCH), num2text(SUP_FREQ) = list(ACCESS_CARGO), num2text(SRV_FREQ) = list(ACCESS_HOP, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLOWN, ACCESS_MIME) -) +)) -var/global/list/default_medbay_channels = list( +GLOBAL_LIST_INIT(default_medbay_channels, list( num2text(PUB_FREQ) = list(), num2text(MED_FREQ) = list(ACCESS_MEDICAL), num2text(MED_I_FREQ) = list(ACCESS_MEDICAL) -) +)) /obj/item/radio icon = 'icons/obj/radio.dmi' @@ -58,6 +58,9 @@ var/global/list/default_medbay_channels = list( var/datum/radio_frequency/radio_connection var/list/datum/radio_frequency/secure_radio_connections = new + var/requires_tcomms = FALSE // Does this device require tcomms to work.If TRUE it wont function at all without tcomms. If FALSE, it will work without tcomms, just slowly + var/instant = FALSE // Should this device instantly communicate if there isnt tcomms + /obj/item/radio/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) @@ -69,7 +72,7 @@ var/global/list/default_medbay_channels = list( ..() wires = new(src) - internal_channels = default_internal_channels.Copy() + internal_channels = GLOB.default_internal_channels.Copy() GLOB.global_radios |= src /obj/item/radio/Destroy() @@ -116,7 +119,7 @@ var/global/list/default_medbay_channels = list( ui.open() ui.set_auto_update(1) -/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["mic_status"] = broadcasting @@ -233,7 +236,7 @@ var/global/list/default_medbay_channels = list( add_fingerprint(usr) -/obj/item/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = config.contact_levels, var/role = "Unknown") //BS12 EDIT +/obj/item/radio/proc/autosay(message, from, channel, role = "Unknown") //BS12 EDIT var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if(channel == "department") @@ -258,10 +261,29 @@ var/global/list/default_medbay_channels = list( if(jammed) message = Gibberish(message, 100) var/list/message_pieces = message_to_multilingual(message) - Broadcast_Message(connection, A, - 0, "*garbled automated announcement*", src, - message_pieces, from, "Automated Announcement", from, "synthesized voice", - 4, 0, zlevel, connection.frequency, follow_target = follow_target) + + // Make us a message datum! + var/datum/tcomms_message/tcm = new + tcm.connection = connection + tcm.sender = A + tcm.radio = src + tcm.sender_name = from + tcm.message_pieces = message_pieces + tcm.sender_job = "Automated Announcement" + tcm.vname = "synthesized voice" + tcm.data = SIGNALTYPE_AINOTRACK + // Datum radios dont have a location (obviously + if(loc && loc.z) + tcm.source_level = loc.z // For anyone that reads this: This used to pull from a LIST from the CONFIG DATUM. WHYYYYYYYYY!!!!!!!! -aa + else + tcm.source_level = 1 // Assume Z1 if we dont have an actual Z level available to us. + tcm.freq = connection.frequency + tcm.follow_target = follow_target + + // Now put that through the stuff + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + C.handle_message(tcm) + qdel(tcm) // Delete the message datum qdel(A) // Just a dummy mob used for making announcements, so we don't create AIs to do this @@ -318,48 +340,32 @@ var/global/list/default_medbay_channels = list( if(!M.IsVocal()) return 0 - /* Quick introduction: - This new radio system uses a very robust FTL signaling technology unoriginally - dubbed "subspace" which is somewhat similar to 'blue-space' but can't - actually transmit large mass. Headsets are the only radio devices capable - of sending subspace transmissions to the Communications Satellite. - - A headset sends a signal to a subspace listener/receiver elsewhere in space, - the signal gets processed and logged, and an audible transmission gets sent - to each individual headset. - */ - - //#### Grab the connection datum ####// - var/message_mode = handle_message_mode(M, message_pieces, channel) - switch(message_mode) //special cases - if(RADIO_CONNECTION_FAIL) - return 0 - if(RADIO_CONNECTION_NON_SUBSPACE) - return 1 - - if(!istype(message_mode, /datum/radio_frequency)) //if not a special case, it should be returning a radio connection - return 0 - - var/datum/radio_frequency/connection = message_mode - var/turf/position = get_turf(src) - var/jammed = FALSE - for(var/obj/item/jammer/jammer in GLOB.active_jammers) + var/turf/position = get_turf(src) + for(var/J in GLOB.active_jammers) + var/obj/item/jammer/jammer = J if(get_dist(position, get_turf(jammer)) < jammer.range) jammed = TRUE break - //#### Tagging the signal with all appropriate identity values ####// + var/message_mode = handle_message_mode(M, message_pieces, channel) + switch(message_mode) //special cases + // This is if the connection fails + if(RADIO_CONNECTION_FAIL) + return 0 + // This is if were using either a binary key, or a hivemind through a headset somehow. Dont ask. + if(RADIO_CONNECTION_NON_SUBSPACE) + return 1 + + if(!istype(message_mode, /datum/radio_frequency)) //if not a special case, it should be returning a radio connection + return + + var/datum/radio_frequency/connection = message_mode + // ||-- The mob's name identity --|| var/displayname = M.name // grab the display name (name you get when you hover over someone's icon) - var/real_name = M.real_name // mob's real name - var/mobkey = "none" // player key associated with mob var/voicemask = 0 // the speaker is wearing a voice mask - if(M.client) - mobkey = M.key // assign the mob's key - - var/jobname // the mob's "job" if(jammed) @@ -397,7 +403,7 @@ var/global/list/default_medbay_channels = list( if(ishuman(M)) var/mob/living/carbon/human/H = M displayname = H.voice - if(H.voice != real_name) + if(H.voice != M.real_name) voicemask = TRUE if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ) @@ -405,124 +411,45 @@ var/global/list/default_medbay_channels = list( jobname = "Unknown" voicemask = TRUE + // Make us a message datum! + var/datum/tcomms_message/tcm = new + tcm.sender_name = displayname + tcm.sender_job = jobname + tcm.message_pieces = message_pieces + tcm.source_level = position.z + tcm.freq = connection.frequency + tcm.vmask = voicemask + tcm.needs_tcomms = requires_tcomms + tcm.connection = connection + tcm.vname = M.voice_name + tcm.sender = M + // Now put that through the stuff + var/handled = FALSE + if(connection) + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + if(C.handle_message(tcm)) + handled = TRUE + qdel(tcm) // Delete the message datum + return TRUE - /* ###### Radio headsets can only broadcast through subspace ###### */ + // If we dont need tcomms and we have no connection + if(!requires_tcomms && !handled) + // If they dont need tcomms for their signal, set the type to intercoms + tcm.data = SIGNALTYPE_INTERCOM_SBR + tcm.zlevels = list(position.z) + if(!instant) + // Simulate two seconds of lag + addtimer(CALLBACK(GLOBAL_PROC, .proc/broadcast_message, tcm), 20) + QDEL_IN(tcm, 20) + else + // Nukeops + Deathsquad headsets are instant and should work the same, whether there is comms or not + broadcast_message(tcm) + qdel(tcm) // Delete the message datum + return TRUE - if(subspace_transmission) - // First, we want to generate a new radio signal - var/datum/signal/signal = new - signal.transmission_method = 2 // 2 would be a subspace transmission. - // transmission_method could probably be enumerated through #define. Would be neater. - - // --- Finally, tag the actual signal with the appropriate values --- - signal.data = list( - // Identity-associated tags: - "mob" = M, // store a reference to the mob - "mobtype" = M.type, // the mob's type - "race" = signal.get_race(M), - "realname" = real_name, // the mob's real name - "name" = displayname, // the mob's display name - "job" = jobname, // the mob's job - "key" = mobkey, // the mob's key - "vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood - "vname" = M.voice_name, // the name to display if the voice wasn't understood - "vmask" = voicemask, // 1 if the mob is using a voice gas mask - - // We store things that would otherwise be kept in the actual mob - // so that they can be logged even AFTER the mob is deleted or something - - // Other tags: - "compression" = rand(45,50), // compressed radio signal - "message" = message_pieces, // the actual sent message - "connection" = connection, // the radio connection to use - "radio" = src, // stores the radio used for transmission - "slow" = 0, // how much to sleep() before broadcasting - simulates net lag - "traffic" = 0, // dictates the total traffic sum that the signal went through - "type" = 0, // determines what type of radio input it is: normal broadcast - "server" = null, // the last server to log this signal - "reject" = 0, // if nonzero, the signal will not be accepted by any broadcasting machinery - "level" = position.z, // The source's z level - "verb" = verb - ) - signal.frequency = connection.frequency // Quick frequency set - - //#### Sending the signal to all subspace receivers ####// - - for(var/obj/machinery/telecomms/receiver/R in telecomms_list) - spawn(0) - R.receive_signal(signal) - - // Allinone can act as receivers. - for(var/obj/machinery/telecomms/allinone/R in telecomms_list) - spawn(0) - R.receive_signal(signal) - - // Receiving code can be located in Telecommunications.dm - return signal.data["done"] && position.z in signal.data["level"] - - - /* ###### Intercoms and station-bounced radios ###### */ - - var/filter_type = 2 - - /* --- Intercoms can only broadcast to other intercoms, but bounced radios can broadcast to bounced radios and intercoms --- */ - if(istype(src, /obj/item/radio/intercom)) - filter_type = 1 - - - var/datum/signal/signal = new - signal.transmission_method = 2 - - - /* --- Try to send a normal subspace broadcast first */ - - signal.data = list( - - "mob" = M, // store a reference to the mob - "mobtype" = M.type, // the mob's type - "race" = signal.get_race(M), // text to show next to mob in comms log console - "realname" = real_name, // the mob's real name - "name" = displayname, // the mob's display name - "job" = jobname, // the mob's job - "key" = mobkey, // the mob's key - "vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood - "vname" = M.voice_name, // the name to display if the voice wasn't understood - "vmask" = voicemask, // 1 if the mob is using a voice gas mas - - "compression" = 0, // uncompressed radio signal - "message" = message_pieces, // the actual sent message - "connection" = connection, // the radio connection to use - "radio" = src, // stores the radio used for transmission - "slow" = 0, - "traffic" = 0, - "type" = 0, - "server" = null, - "reject" = 0, - "level" = position.z, - "verb" = verb - ) - signal.frequency = connection.frequency // Quick frequency set - - for(var/obj/machinery/telecomms/receiver/R in telecomms_list) - spawn(0) - R.receive_signal(signal) - - - sleep(rand(10,25)) // wait a little... - - if(signal.data["done"] && position.z in signal.data["level"]) - // we're done here. - return 1 - - // Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level. - // Send a mundane broadcast with limited targets: - - //THIS IS TEMPORARY. YEAH RIGHT - if(!connection) return 0 //~Carn - - return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote), - src, message_pieces, displayname, jobname, real_name, M.voice_name, - filter_type, signal.data["compression"], list(position.z), connection.frequency,verb) + // If we didnt get here, oh fuck + qdel(tcm) // Delete the message datum + return FALSE /obj/item/radio/hear_talk(mob/M as mob, list/message_pieces, var/verb = "says") @@ -812,7 +739,7 @@ var/global/list/default_medbay_channels = list( ui.open() ui.set_auto_update(1) -/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["mic_status"] = broadcasting @@ -863,4 +790,4 @@ var/global/list/default_medbay_channels = list( /obj/item/radio/phone/medbay/New() ..() - internal_channels = default_medbay_channels.Copy() + internal_channels = GLOB.default_medbay_channels.Copy() diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 34183a81102..0d8873a6377 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -212,7 +212,7 @@ REAGENT SCANNER if(H.getBrainLoss() >= 100) to_chat(user, "Subject is brain dead.") else if(H.getBrainLoss() >= 60) - to_chat(user, "Severe brain damage detected. Subject likely to have mental retardation.") + to_chat(user, "Severe brain damage detected. Subject likely to have dementia.") else if(H.getBrainLoss() >= 10) to_chat(user, "Significant brain damage detected. Subject may have had a concussion.") else @@ -859,11 +859,11 @@ REAGENT SCANNER dat += "[i.name] N/A [i.damage] [infection]:[mech]
" - if(target.disabilities & COLOURBLIND) + if(COLOURBLIND in target.mutations) dat += "Photoreceptor abnormalities detected.
" - if(target.disabilities & NEARSIGHTED) + if(NEARSIGHTED in target.mutations) dat += "Retinal misalignment detected.
" return dat diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 7a8766ebb3c..3eeb992c87e 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -194,13 +194,11 @@ if(mytape.storedinfo.len < i + 1) playsleepseconds = 1 sleep(10) - T = get_turf(src) atom_say("End of recording.") else playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i] if(playsleepseconds > 14) sleep(10) - T = get_turf(src) atom_say("Skipping [playsleepseconds] seconds of silence.") playsleepseconds = 1 i++ diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 40eea3a9856..acba0087caf 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -100,7 +100,7 @@ // auto update every Master Controller tick //ui.set_auto_update(1) -/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["attachmentOne"] = tank_one ? tank_one.name : null diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index ab4387a988e..c5c8f67e34d 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -6,7 +6,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid */ -var/list/world_uplinks = list() +GLOBAL_LIST_EMPTY(world_uplinks) /obj/item/uplink var/welcome // Welcoming menu message @@ -35,10 +35,10 @@ var/list/world_uplinks = list() uses = SSticker.mode.uplink_uses uplink_items = get_uplink_items() - world_uplinks += src + GLOB.world_uplinks += src /obj/item/uplink/Destroy() - world_uplinks -= src + GLOB.world_uplinks -= src return ..() /obj/item/uplink/proc/generate_items(mob/user as mob) @@ -168,7 +168,6 @@ var/list/world_uplinks = list() to_chat(user, "[I] refunded.") qdel(I) return - ..() // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it. /* How to create an uplink in 3 easy steps! @@ -216,7 +215,7 @@ var/list/world_uplinks = list() /* NANO UI FOR UPLINK WOOP WOOP */ -/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) +/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state) var/title = "Remote Uplink" // update the ui if it exists, returns null if no ui is passed/found ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) @@ -227,7 +226,7 @@ var/list/world_uplinks = list() // open the new ui window ui.open() -/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) +/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state) var/data[0] data["welcome"] = welcome @@ -277,14 +276,14 @@ var/list/world_uplinks = list() /obj/item/uplink/hidden/proc/update_nano_data(var/id) if(nanoui_menu == 1) var/permanentData[0] - for(var/datum/data/record/L in sortRecord(data_core.general)) + for(var/datum/data/record/L in sortRecord(GLOB.data_core.general)) permanentData[++permanentData.len] = list(Name = sanitize(L.fields["name"]),"id" = L.fields["id"]) nanoui_data["exploit_records"] = permanentData if(nanoui_menu == 11) nanoui_data["exploit_exists"] = 0 - for(var/datum/data/record/L in data_core.general) + for(var/datum/data/record/L in GLOB.data_core.general) if(L.fields["id"] == id) nanoui_data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value. nanoui_data["exploit"]["name"] = html_encode(L.fields["name"]) diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 0edcafd64b5..14bb468e049 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -222,7 +222,7 @@ var/input_flag = input(user, "Choose a flag to disguise as.", "Choose a flag.") in show_flag - if(user && src in user.contents) + if(user && (src in user.contents)) var/obj/item/flag/chosen_flag = flag[input_flag] diff --git a/code/game/objects/items/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm index 7120f8c880d..cfb4d18473c 100644 --- a/code/game/objects/items/mountable_frames/mountables.dm +++ b/code/game/objects/items/mountable_frames/mountables.dm @@ -20,7 +20,7 @@ return if(proximity_flag != 1) //if we aren't next to the wall return - if(!( get_dir(on_wall,user) in cardinal)) + if(!( get_dir(on_wall,user) in GLOB.cardinal)) to_chat(user, "You need to be standing next to a wall to place \the [src].") return diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 6ce10294940..46bc15a2ffe 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -14,7 +14,7 @@ ..(newloc) if(model_info && model) model_info = model - var/datum/robolimb/R = all_robolimbs[model] + var/datum/robolimb/R = GLOB.all_robolimbs[model] if(R) name = "[R.company] [initial(name)]" desc = "[R.desc]" @@ -24,7 +24,7 @@ name = "robot [initial(name)]" /obj/item/robot_parts/attack_self(mob/user) - var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in selectable_robolimbs + var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in GLOB.selectable_robolimbs if(!choice) return if(loc != user) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index a13bce6fb61..43178a85ef8 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -74,7 +74,7 @@ R.stat = CONSCIOUS GLOB.dead_mob_list -= R //please never forget this ever kthx - GLOB.living_mob_list += R + GLOB.alive_mob_list += R R.notify_ai(1) return 1 diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 8b85d8821d9..9b24b1efce6 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -4,24 +4,23 @@ desc = "A shooting target." icon = 'icons/obj/objects.dmi' icon_state = "target_h" - density = 0 + density = FALSE var/hp = 1800 - var/icon/virtualIcon - var/list/bulletholes = list() /obj/item/target/Destroy() + cut_overlays() // if a target is deleted and associated with a stake, force stake to forget - for(var/obj/structure/target_stake/T in view(3,src)) + for(var/obj/structure/target_stake/T in view(3, src)) if(T.pinned_target == src) T.pinned_target = null - T.density = 1 + T.density = TRUE break return ..() // delete target /obj/item/target/Move() ..() // After target moves, check for nearby stakes. If associated, move to target - for(var/obj/structure/target_stake/M in view(3,src)) + for(var/obj/structure/target_stake/M in view(3, src)) if(M.density == 0 && M.pinned_target == src) M.loc = loc @@ -33,12 +32,12 @@ /obj/item/target/welder_act(mob/user, obj/item/I) . = TRUE - if(!use_tool(src, user, 0,, volume = I.tool_volume)) + if(!use_tool(src, user, 0, volume = I.tool_volume)) return overlays.Cut() - to_chat(usr, "You slice off [src]'s uneven chunks of aluminum and scorch marks.") + to_chat(user, "You slice off [src]'s uneven chunks of aluminium and scorch marks.") -/obj/item/target/attack_hand(mob/user as mob) +/obj/item/target/attack_hand(mob/user) // taking pinned targets off! var/obj/structure/target_stake/stake for(var/obj/structure/target_stake/T in view(3,src)) @@ -48,8 +47,8 @@ if(stake) if(stake.pinned_target) - stake.density = 1 - density = 0 + stake.density = TRUE + density = FALSE layer = OBJ_LAYER loc = user.loc @@ -77,101 +76,37 @@ desc = "A shooting target that looks like a xenomorphic alien." hp = 2350 // alium onest too kinda -/obj/item/target/bullet_act(var/obj/item/projectile/Proj) - var/p_x = Proj.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset Proj.p_x!" - var/p_y = Proj.p_y + pick(0,0,0,0,0,-1,1) - var/decaltype = 1 // 1 - scorch, 2 - bullet +#define DECALTYPE_SCORCH 1 +#define DECALTYPE_BULLET 2 - if(istype(/obj/item/projectile/bullet, Proj)) - decaltype = 2 +/obj/item/target/bullet_act(obj/item/projectile/P) + var/p_x = P.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset P.p_x!" + var/p_y = P.p_y + pick(0,0,0,0,0,-1,1) + var/decaltype = DECALTYPE_SCORCH + if(istype(P, /obj/item/projectile/bullet)) + decaltype = DECALTYPE_BULLET - - virtualIcon = new(icon, icon_state) - - if( virtualIcon.GetPixel(p_x, p_y) ) // if the located pixel isn't blank (null) - - hp -= Proj.damage + var/icon/C = icon(icon, icon_state) + if(LAZYLEN(overlays) <= 35 && C.GetPixel(p_x, p_y)) // if the located pixel isn't blank (null) + hp -= P.damage if(hp <= 0) - visible_message("[src] breaks into tiny pieces and collapses!") + visible_message("[src] breaks into tiny pieces and collapses!") qdel(src) - - // Create a temporary object to represent the damage - var/obj/bmark = new - bmark.pixel_x = p_x - bmark.pixel_y = p_y - bmark.icon = 'icons/effects/effects.dmi' - bmark.layer = 3.5 - bmark.icon_state = "scorch" - - if(decaltype == 1) - // Energy weapons are hot. they scorch! - - // offset correction - bmark.pixel_x-- - bmark.pixel_y-- - - if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice)) - bmark.icon_state = "scorch" - bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design - - + return + var/image/bullet_hole = image('icons/effects/effects.dmi', "scorch", OBJ_LAYER + 0.5) + bullet_hole.pixel_x = p_x - 1 //offset correction + bullet_hole.pixel_y = p_y - 1 + if(decaltype == DECALTYPE_SCORCH) + if(P.damage >= 20 || istype(P, /obj/item/projectile/beam/practice)) + bullet_hole.setDir(pick(NORTH,SOUTH,EAST,WEST))// random scorch design. light_scorch does not have different directions else - bmark.icon_state = "light_scorch" + bullet_hole.icon_state = "light_scorch" else - - // Bullets are hard. They make dents! - bmark.icon_state = "dent" - - if(Proj.damage >= 10 && bulletholes.len <= 35) // maximum of 35 bullet holes - if(decaltype == 2) // bullet - if(prob(Proj.damage+30)) // bullets make holes more commonly! - new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole - else // Lasers! - if(prob(Proj.damage-10)) // lasers make holes less commonly - new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole - - // draw bullet holes - for(var/datum/bullethole/B in bulletholes) - - virtualIcon.DrawBox(null, B.b1x1, B.b1y, B.b1x2, B.b1y) // horizontal line, left to right - virtualIcon.DrawBox(null, B.b2x, B.b2y1, B.b2x, B.b2y2) // vertical line, top to bottom - - overlays += bmark // add the decal - - icon = virtualIcon // apply bulletholes over decals - + bullet_hole.icon_state = "dent" + add_overlay(bullet_hole) return return -1 // the bullet/projectile goes through the target! Ie, you missed - -// Small memory holder entity for transparent bullet holes -/datum/bullethole - // First box - var/b1x1 = 0 - var/b1x2 = 0 - var/b1y = 0 - - // Second box - var/b2x = 0 - var/b2y1 = 0 - var/b2y2 = 0 - -/datum/bullethole/New(obj/item/target/Target, pixel_x = 0, pixel_y = 0) - if(!Target) return - - // Randomize the first box - b1x1 = pixel_x - pick(1,1,1,1,2,2,3,3,4) - b1x2 = pixel_x + pick(1,1,1,1,2,2,3,3,4) - b1y = pixel_y - if(prob(35)) - b1y += rand(-4,4) - - // Randomize the second box - b2x = pixel_x - if(prob(35)) - b2x += rand(-4,4) - b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4) - b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4) - - Target.bulletholes.Add(src) +#undef DECALTYPE_SCORCH +#undef DECALTYPE_BULLET diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 59dad865acb..708070e1478 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -4,6 +4,7 @@ desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." icon = 'icons/obj/nanopaste.dmi' icon_state = "tube" + w_class = WEIGHT_CLASS_TINY origin_tech = "materials=2;engineering=3" amount = 6 max_amount = 6 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 3b214f87940..3911ab51cc7 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -1,7 +1,7 @@ -var/global/list/datum/stack_recipe/rod_recipes = list ( \ +GLOBAL_LIST_INIT(rod_recipes, list ( \ new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - ) + )) /obj/item/stack/rods name = "metal rod" @@ -36,7 +36,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ /obj/item/stack/rods/New(loc, amount=null) ..() - recipes = rod_recipes + recipes = GLOB.rod_recipes update_icon() /obj/item/stack/rods/update_icon() diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index d79c31467bf..5fc457dae62 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -9,13 +9,13 @@ singular_name = "human skin piece" icon_state = "sheet-hide" -var/global/list/datum/stack_recipe/human_recipes = list( \ - new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = 1), \ - new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = 1), \ - ) +GLOBAL_LIST_INIT(human_recipes, list( \ + new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = TRUE), \ + new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = TRUE), \ + )) /obj/item/stack/sheet/animalhide/human/New(var/loc, var/amount=null) - recipes = human_recipes + recipes = GLOB.human_recipes return ..() /obj/item/stack/sheet/animalhide/generic @@ -48,6 +48,14 @@ var/global/list/datum/stack_recipe/human_recipes = list( \ singular_name = "lizard skin piece" icon_state = "sheet-lizard" +GLOBAL_LIST_INIT(lizard_recipes, list( \ + new/datum/stack_recipe("lizard skin handbag", /obj/item/storage/backpack/satchel/lizard, 5, on_floor = TRUE), \ + )) + +/obj/item/stack/sheet/animalhide/lizard/Initialize(mapload, new_amount, merge = TRUE) + recipes = GLOB.lizard_recipes + return ..() + /obj/item/stack/sheet/animalhide/xeno name = "alien hide" desc = "The skin of a terrible creature." @@ -132,12 +140,12 @@ GLOBAL_LIST_INIT(leather_recipes, list ( icon_state = "sinew" origin_tech = "biotech=4" -var/global/list/datum/stack_recipe/sinew_recipes = list ( \ +GLOBAL_LIST_INIT(sinew_recipes, list ( \ new/datum/stack_recipe("sinew restraints", /obj/item/restraints/handcuffs/sinew, 1, on_floor = 1), \ - ) + )) /obj/item/stack/sheet/sinew/New(var/loc, var/amount=null) - recipes = sinew_recipes + recipes = GLOB.sinew_recipes return ..() /obj/item/stack/sheet/animalhide/goliath_hide diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 0791bb760dc..54d42176f52 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -15,16 +15,16 @@ Mineral Sheets - Adamantine */ -var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ +GLOBAL_LIST_INIT(sandstone_recipes, list ( \ new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/silver_recipes = list ( \ +GLOBAL_LIST_INIT(silver_recipes, list ( \ new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \ @@ -34,9 +34,9 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Med Doctor Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/diamond_recipes = list ( \ +GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \ @@ -44,18 +44,18 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/uranium_recipes = list ( \ +GLOBAL_LIST_INIT(uranium_recipes, list ( \ new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \ null, \ new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/gold_recipes = list ( \ +GLOBAL_LIST_INIT(gold_recipes, list ( \ new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \ @@ -67,51 +67,51 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \ new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \ - ) + )) -var/global/list/datum/stack_recipe/plasma_recipes = list ( \ +GLOBAL_LIST_INIT(plasma_recipes, list ( \ new/datum/stack_recipe/dangerous("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe/dangerous("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \ null, \ new/datum/stack_recipe/dangerous("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/dangerous("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/bananium_recipes = list ( \ +GLOBAL_LIST_INIT(bananium_recipes, list ( \ new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \ null, \ new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("bananium grenade casing", /obj/item/grenade/bananade/casing, 4, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \ +GLOBAL_LIST_INIT(tranquillite_recipes, list ( \ new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \ null, \ new/datum/stack_recipe("silent tile", /obj/item/stack/tile/mineral/tranquillite, 1, 4, 20), \ null, \ new/datum/stack_recipe("Mime Statue", /obj/structure/statue/tranquillite/mime, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/abductor_recipes = list ( \ +GLOBAL_LIST_INIT(abductor_recipes, list ( \ new/datum/stack_recipe("alien bed", /obj/structure/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \ - ) + )) -var/global/list/datum/stack_recipe/adamantine_recipes = list( +GLOBAL_LIST_INIT(adamantine_recipes, list( new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount = 1, res_amount = 1), \ - ) + )) -var/global/list/datum/stack_recipe/snow_recipes = list( +GLOBAL_LIST_INIT(snow_recipes, list( new/datum/stack_recipe("snowman", /obj/structure/snowman, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Snowball", /obj/item/snowball, 1) - ) + )) /obj/item/stack/sheet/mineral force = 5 @@ -135,7 +135,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list( /obj/item/stack/sheet/mineral/sandstone/New() ..() - recipes = sandstone_recipes + recipes = GLOB.sandstone_recipes /* * Sandbags @@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/diamond/New() ..() - recipes = diamond_recipes + recipes = GLOB.diamond_recipes /obj/item/stack/sheet/mineral/uranium name = "uranium" @@ -199,7 +199,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/uranium/New() ..() - recipes = uranium_recipes + recipes = GLOB.uranium_recipes /obj/item/stack/sheet/mineral/plasma name = "solid plasma" @@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/plasma/New() ..() - recipes = plasma_recipes + recipes = GLOB.plasma_recipes /obj/item/stack/sheet/mineral/plasma/welder_act(mob/user, obj/item/I) if(I.use_tool(src, user, volume = I.tool_volume)) @@ -239,7 +239,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/gold/New() ..() - recipes = gold_recipes + recipes = GLOB.gold_recipes /obj/item/stack/sheet/mineral/silver name = "silver" @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/silver/New() ..() - recipes = silver_recipes + recipes = GLOB.silver_recipes /obj/item/stack/sheet/mineral/bananium name = "bananium" @@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/bananium/New(loc, amount=null) ..() - recipes = bananium_recipes + recipes = GLOB.bananium_recipes /obj/item/stack/sheet/mineral/tranquillite name = "tranquillite" @@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null) ..() - recipes = tranquillite_recipes + recipes = GLOB.tranquillite_recipes /* * Titanium @@ -298,13 +298,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT) point_value = 20 -var/global/list/datum/stack_recipe/titanium_recipes = list ( +GLOBAL_LIST_INIT(titanium_recipes, list( new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), new/datum/stack_recipe("surgical tray", /obj/structure/table/tray, 2, one_per_turf = 1, on_floor = 1), - ) + )) /obj/item/stack/sheet/mineral/titanium/New(loc, amount=null) - recipes = titanium_recipes + recipes = GLOB.titanium_recipes ..() /obj/item/stack/sheet/mineral/titanium/fifty @@ -328,12 +328,12 @@ var/global/list/datum/stack_recipe/titanium_recipes = list ( materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000) point_value = 45 -var/global/list/datum/stack_recipe/plastitanium_recipes = list ( +GLOBAL_LIST_INIT(plastitanium_recipes, list( new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20), - ) + )) /obj/item/stack/sheet/mineral/plastitanium/New(loc, amount=null) - recipes = plastitanium_recipes + recipes = GLOB.plastitanium_recipes ..() /obj/item/stack/sheet/mineral/enruranium @@ -356,7 +356,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list ( sheettype = "abductor" /obj/item/stack/sheet/mineral/abductor/New(loc, amount=null) - recipes = abductor_recipes + recipes = GLOB.abductor_recipes ..() /obj/item/stack/sheet/mineral/adamantine @@ -369,7 +369,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list ( wall_allowed = FALSE /obj/item/stack/sheet/mineral/adamantine/New(loc, amount = null) - recipes = adamantine_recipes + recipes = GLOB.adamantine_recipes ..() /* @@ -385,5 +385,5 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list ( merge_type = /obj/item/stack/sheet/mineral/snow /obj/item/stack/sheet/mineral/snow/New(loc, amount = null) - recipes = snow_recipes + recipes = GLOB.snow_recipes ..() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 30085f8dad2..ac635eebef7 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -13,7 +13,7 @@ /* * Metal */ -var/global/list/datum/stack_recipe/metal_recipes = list( +GLOBAL_LIST_INIT(metal_recipes, list( new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1), @@ -94,7 +94,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list( new /datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2), new /datum/stack_recipe("extinguisher cabinet frame", /obj/item/mounted/frame/extinguisher, 2), null -) +)) /obj/item/stack/sheet/metal name = "metal" @@ -124,13 +124,13 @@ var/global/list/datum/stack_recipe/metal_recipes = list( qdel(src) /obj/item/stack/sheet/metal/New(var/loc, var/amount=null) - recipes = metal_recipes + recipes = GLOB.metal_recipes return ..() /* * Plasteel */ -var/global/list/datum/stack_recipe/plasteel_recipes = list( +GLOBAL_LIST_INIT(plasteel_recipes, list( new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), new /datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 3, time = 50), new /datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1), @@ -141,7 +141,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1), )), -) +)) /obj/item/stack/sheet/plasteel name = "plasteel" @@ -159,13 +159,13 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( point_value = 23 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null) - recipes = plasteel_recipes + recipes = GLOB.plasteel_recipes return ..() /* * Wood */ -var/global/list/datum/stack_recipe/wood_recipes = list( +GLOBAL_LIST_INIT(wood_recipes, list( new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), new /datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \ @@ -178,7 +178,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list( new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), - new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50), new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10), @@ -189,7 +189,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list( new /datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50), new /datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100) -) +)) /obj/item/stack/sheet/wood name = "wooden planks" @@ -203,13 +203,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list( merge_type = /obj/item/stack/sheet/wood /obj/item/stack/sheet/wood/New(var/loc, var/amount=null) - recipes = wood_recipes + recipes = GLOB.wood_recipes return ..() /* * Cloth */ -var/global/list/datum/stack_recipe/cloth_recipes = list ( \ +GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), \ new/datum/stack_recipe("white shoes", /obj/item/clothing/shoes/white, 2), \ new/datum/stack_recipe("white scarf", /obj/item/clothing/accessory/scarf/white, 1), \ @@ -234,7 +234,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \ new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \ null, \ new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 3), \ - ) + )) /obj/item/stack/sheet/cloth name = "cloth" @@ -248,7 +248,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \ merge_type = /obj/item/stack/sheet/cloth /obj/item/stack/sheet/cloth/New(loc, amount=null) - recipes = cloth_recipes + recipes = GLOB.cloth_recipes ..() /obj/item/stack/sheet/cloth/ten @@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ /* * Cardboard */ -var/global/list/datum/stack_recipe/cardboard_recipes = list ( +GLOBAL_LIST_INIT(cardboard_recipes, list ( new /datum/stack_recipe("box", /obj/item/storage/box), new /datum/stack_recipe("large box", /obj/item/storage/box/large, 4), new /datum/stack_recipe("patch pack", /obj/item/storage/pill_bottle/patch_pack, 2), @@ -314,7 +314,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( new /datum/stack_recipe("cardboard tube", /obj/item/c_tube), new /datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4), new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), -) +)) /obj/item/stack/sheet/cardboard/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/stamp/clown) && !istype(loc, /obj/item/storage)) @@ -336,21 +336,21 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( merge_type = /obj/item/stack/sheet/cardboard /obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null) - recipes = cardboard_recipes + recipes = GLOB.cardboard_recipes return ..() /* * Runed Metal */ -var/global/list/datum/stack_recipe/cult = list ( \ +GLOBAL_LIST_INIT(cult_recipes, list ( \ new/datum/stack_recipe/cult("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), new/datum/stack_recipe/cult("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("pylon", /obj/structure/cult/functional/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("forge", /obj/structure/cult/functional/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("archives", /obj/structure/cult/functional/archives, 2, time = 40, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("altar", /obj/structure/cult/functional/altar, 5, time = 40, one_per_turf = 1, on_floor = 1), \ - ) + )) /obj/item/stack/sheet/runed_metal name = "runed metal" @@ -393,13 +393,13 @@ var/global/list/datum/stack_recipe/cult = list ( \ amount = 50 /obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null) - recipes = cult + recipes = GLOB.cult_recipes return ..() /* * Brass */ -var/global/list/datum/stack_recipe/brass_recipes = list (\ +GLOBAL_LIST_INIT(brass_recipes, list (\ new/datum/stack_recipe("wall gear", /obj/structure/clockwork/wall_gear, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ null, new/datum/stack_recipe/window("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \ @@ -408,7 +408,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\ new/datum/stack_recipe/window("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \ - ) + )) /obj/item/stack/tile/brass name = "brass" @@ -428,7 +428,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\ qdel(src) /obj/item/stack/tile/brass/New(loc, amount=null) - recipes = brass_recipes + recipes = GLOB.brass_recipes . = ..() pixel_x = 0 pixel_y = 0 diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index c568e66c86a..1c499a7d6af 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -27,9 +27,9 @@ mineralType = "uranium" materials = list(MAT_URANIUM=500) -var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \ +GLOBAL_LIST_INIT(gold_tile_recipes, list ( \ new/datum/stack_recipe("fancy gold tile", /obj/item/stack/tile/mineral/gold/fancy, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/gold name = "gold tile" @@ -42,11 +42,11 @@ var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \ /obj/item/stack/tile/mineral/gold/New(loc, amount=null) ..() - recipes = gold_tile_recipes + recipes = GLOB.gold_tile_recipes -var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \ +GLOBAL_LIST_INIT(goldfancy_tile_recipes, list ( \ new/datum/stack_recipe("regular gold tile", /obj/item/stack/tile/mineral/gold, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/gold/fancy icon_state = "tile_goldfancy" @@ -54,11 +54,11 @@ var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \ /obj/item/stack/tile/mineral/gold/fancy/New(loc, amount=null) ..() - recipes = goldfancy_tile_recipes + recipes = GLOB.goldfancy_tile_recipes -var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \ +GLOBAL_LIST_INIT(silver_tile_recipes, list ( \ new/datum/stack_recipe("fancy silver tile", /obj/item/stack/tile/mineral/silver/fancy, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/silver name = "silver tile" @@ -71,11 +71,11 @@ var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \ /obj/item/stack/tile/mineral/silver/New(loc, amount=null) ..() - recipes = silver_tile_recipes + recipes = GLOB.silver_tile_recipes -var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \ +GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \ new/datum/stack_recipe("regular silver tile", /obj/item/stack/tile/mineral/silver, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/silver/fancy icon_state = "tile_silverfancy" @@ -83,7 +83,7 @@ var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \ /obj/item/stack/tile/mineral/silver/fancy/New(loc, amount=null) ..() - recipes = silverfancy_tile_recipes + recipes = GLOB.silverfancy_tile_recipes /obj/item/stack/tile/mineral/diamond name = "diamond tile" diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index 22c9861da6e..c31f0666f50 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -73,13 +73,13 @@ /obj/item/multitool/ai_detect/proc/multitool_detect() var/turf/our_turf = get_turf(src) - for(var/mob/living/silicon/ai/AI in ai_list) + for(var/mob/living/silicon/ai/AI in GLOB.ai_list) if(AI.cameraFollow == src) detect_state = PROXIMITY_ON_SCREEN break - if(!detect_state && cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z)) - var/datum/camerachunk/chunk = cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) + if(!detect_state && GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z)) + var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) if(chunk) if(chunk.seenby.len) for(var/mob/camera/aiEye/A in chunk.seenby) diff --git a/code/game/objects/items/tools/tool_behaviour.dm b/code/game/objects/items/tools/tool_behaviour.dm index c937f80c30d..986e3a981b2 100644 --- a/code/game/objects/items/tools/tool_behaviour.dm +++ b/code/game/objects/items/tools/tool_behaviour.dm @@ -16,11 +16,11 @@ var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, target, amount, extra_checks) if(ismob(target)) - if(!do_mob(user, target, delay, extra_checks=tool_check)) + if(!do_mob(user, target, delay, extra_checks = list(tool_check))) return else - if(!do_after(user, delay, target=target, extra_checks=tool_check)) + if(!do_after(user, delay, target=target, extra_checks = list(tool_check))) return else // Invoke the extra checks once, just in case. @@ -57,4 +57,4 @@ // Used in a callback that is passed by use_tool into do_after call. Do not override, do not call manually. /obj/item/proc/tool_check_callback(mob/living/user, atom/target, amount, datum/callback/extra_checks) - return tool_use_check(user, amount) && (!extra_checks || extra_checks.Invoke()) + return tool_use_check(user, amount) && (extra_checks && !extra_checks.Invoke()) diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index b002ed32205..49f5bb4073b 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -35,10 +35,12 @@ ..() create_reagents(maximum_fuel) reagents.add_reagent("fuel", maximum_fuel) - if(refills_over_time) - reagents.reagents_generated_per_cycle += list("fuel" = 1) update_icon() +/obj/item/weldingtool/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + /obj/item/weldingtool/examine(mob/user) . = ..() if(get_dist(user, src) <= 0) @@ -49,10 +51,15 @@ return FIRELOSS /obj/item/weldingtool/process() - var/turf/T = get_turf(src) - T.hotspot_expose(2500, 5) - if(prob(5)) - remove_fuel(1) + if(tool_enabled) + var/turf/T = get_turf(src) + if(T) // Implants for instance won't find a turf + T.hotspot_expose(2500, 5) + if(prob(5)) + remove_fuel(1) + if(refills_over_time) + if(GET_FUEL < maximum_fuel) + reagents.add_reagent("fuel", 1) ..() /obj/item/weldingtool/attack_self(mob/user) @@ -76,7 +83,8 @@ playsound(loc, activation_sound, 50, 1) set_light(light_intensity) else - STOP_PROCESSING(SSobj, src) + if(!refills_over_time) + STOP_PROCESSING(SSobj, src) damtype = BRUTE force = 3 hitsound = "swing_hit" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a4d54f12ab0..21795fb738c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1023,6 +1023,18 @@ obj/item/toy/cards/deck/syndicate/black name = "orange fox plushie" icon_state = "orangefox" +/obj/item/toy/plushie/orange_fox/grump + name = "grumpy fox" + desc = "An ancient plushie that seems particularly grumpy." + +/obj/item/toy/plushie/orange_fox/grump/ComponentInitialize() + . = ..() + var/static/list/grumps = list("Ahh, yes, you're so clever, var editing that.", "Really?", "If you make a runtime with var edits, it's your own damn fault.", + "Don't you dare post issues on the git when you don't even know how this works.", "Was that necessary?", "Ohhh, setting admin edited var must be your favorite pastime!", + "Oh, so you have time to var edit, but you don't have time to ban that greytider?", "Oh boy, is this another one of those 'events'?", "Seriously, just stop.", "You do realize this is incurring proc call overhead.", + "Congrats, you just left a reference with your dirty client and now that thing you edited will never garbage collect properly.", "Is it that time of day, again, for unecessary adminbus?") + AddComponent(/datum/component/edit_complainer, grumps) + /obj/item/toy/plushie/coffee_fox name = "coffee fox plushie" icon_state = "coffeefox" @@ -1087,6 +1099,21 @@ obj/item/toy/cards/deck/syndicate/black return ..() +/obj/item/toy/plushie/ipcplushie + name = "IPC plushie" + desc = "An adorable IPC plushie, straight from New Canaan. Arguably more durable than the real deal. Toaster functionality included." + icon_state = "plushie_ipc" + item_state = "plushie_ipc" + +/obj/item/toy/plushie/ipcplushie/attackby(obj/item/B, mob/user, params) + if(istype(B, /obj/item/reagent_containers/food/snacks/breadslice)) + new /obj/item/reagent_containers/food/snacks/toast(get_turf(loc)) + to_chat(user, " You insert bread into the toaster. ") + playsound(loc, 'sound/machines/ding.ogg', 50, 1) + qdel(B) + else + return ..() + //New generation TG plushies /obj/item/toy/plushie/lizardplushie @@ -1117,15 +1144,15 @@ obj/item/toy/cards/deck/syndicate/black * Foam Armblade */ - /obj/item/toy/foamblade - name = "foam armblade" - desc = "it says \"Sternside Changs #1 fan\" on it. " - icon = 'icons/obj/toy.dmi' - icon_state = "foamblade" - item_state = "arm_blade" - attack_verb = list("pricked", "absorbed", "gored") - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE +/obj/item/toy/foamblade + name = "foam armblade" + desc = "it says \"Sternside Changs #1 fan\" on it. " + icon = 'icons/obj/toy.dmi' + icon_state = "foamblade" + item_state = "arm_blade" + attack_verb = list("pricked", "absorbed", "gored") + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE /* * Toy/fake flash @@ -1208,10 +1235,10 @@ obj/item/toy/cards/deck/syndicate/black var/list/messages = list() var/datum/devilinfo/devil = randomDevilInfo() messages += "Some fun facts about: [devil.truename]" - messages += "[lawlorify[LORE][devil.bane]]" - messages += "[lawlorify[LORE][devil.obligation]]" - messages += "[lawlorify[LORE][devil.ban]]" - messages += "[lawlorify[LORE][devil.banish]]" + messages += "[GLOB.lawlorify[LORE][devil.bane]]" + messages += "[GLOB.lawlorify[LORE][devil.obligation]]" + messages += "[GLOB.lawlorify[LORE][devil.ban]]" + messages += "[GLOB.lawlorify[LORE][devil.banish]]" playsound(loc, 'sound/machines/click.ogg', 20, 1) cooldown = TRUE for(var/message in messages) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 1f89bd03336..1e34561c441 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -84,7 +84,7 @@ AI MODULES /obj/item/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) var/time = time2text(world.realtime,"hh:mm:ss") - lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])") + GLOB.lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])") log_and_message_admins("used [src.name] on [target.name]([target.key])") /obj/item/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) @@ -114,7 +114,7 @@ AI MODULES var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) to_chat(target, law) target.add_supplied_law(4, law) - lawchanges.Add("The law specified [targetName]") + GLOB.lawchanges.Add("The law specified [targetName]") /******************** oneCrewMember ********************/ /obj/item/aiModule/oneCrewMember @@ -141,12 +141,11 @@ AI MODULES if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite to_chat(target, law) target.set_zeroth_law(law) - lawchanges.Add("The law specified [targetName]") + GLOB.lawchanges.Add("The law specified [targetName]") else - to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite - - to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]") - lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") + to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite + to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]") + GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") /******************** ProtectStation ********************/ /obj/item/aiModule/protectStation @@ -203,7 +202,7 @@ AI MODULES if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER) lawpos = MIN_SUPPLIED_LAW_NUMBER target.add_supplied_law(lawpos, law) - lawchanges.Add("The law was '[newFreeFormLaw]'") + GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'") /obj/item/aiModule/freeform/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) @@ -222,11 +221,11 @@ AI MODULES log_law_changes(target, sender) if(!is_special_character(target)) - target.set_zeroth_law("") + target.clear_zeroth_law() target.laws.clear_supplied_laws() target.laws.clear_ion_laws() - to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") + to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") target.show_laws() /******************** Purge ********************/ @@ -238,8 +237,8 @@ AI MODULES /obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) ..() if(!is_special_character(target)) - target.set_zeroth_law("") - to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.") + target.clear_zeroth_law() + to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.") target.clear_supplied_laws() target.clear_ion_laws() target.clear_inherent_laws() @@ -332,7 +331,7 @@ AI MODULES ..() var/law = "[newFreeFormLaw]" target.add_inherent_law(law) - lawchanges.Add("The law is '[newFreeFormLaw]'") + GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'") /obj/item/aiModule/freeformcore/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) @@ -358,7 +357,7 @@ AI MODULES // ..() //We don't want this module reporting to the AI who dun it. --NEO log_law_changes(target, sender) - lawchanges.Add("The law is '[newFreeFormLaw]'") + GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'") to_chat(target, "BZZZZT") var/law = "[newFreeFormLaw]" target.add_ion_law(law) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index fda3418fd11..d6397025424 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -167,14 +167,14 @@ GLOBAL_LIST_INIT(rcd_door_types, list( /obj/item/rcd/attack_self_tk(mob/user) radial_menu(user) -/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) +/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state) ui.open() ui.set_auto_update(1) -/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) +/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state) var/data[0] data["mode"] = mode data["door_type"] = door_type @@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list( QDEL_NULL(A) for(var/obj/structure/window/W in T1.contents) qdel(W) - for(var/cdir in cardinal) + for(var/cdir in GLOB.cardinal) var/turf/T2 = get_step(T1, cdir) if(locate(/obj/structure/window/full/shuttle) in T2) continue // Shuttle windows? Nah. We don't need extra windows there. @@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list( new /obj/structure/grille(A) for(var/obj/structure/window/W in A) qdel(W) - for(var/cdir in cardinal) + for(var/cdir in GLOB.cardinal) var/turf/T = get_step(A, cdir) if(locate(/obj/structure/grille) in T) for(var/obj/structure/window/W in T) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 58258687fc7..405ce47a033 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -495,17 +495,17 @@ else if(department != "Civilian") switch(department) if("Engineering") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in engineering_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.engineering_positions if("Medical") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in medical_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.medical_positions if("Science") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in science_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.science_positions if("Security") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in security_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.security_positions if("Support") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in support_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.support_positions if("Command") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in command_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.command_positions if(!Adjacent(user)) return diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 91bb84f880b..bf46343b963 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -32,7 +32,7 @@ if(PA) qdel(PA) else - PA = new(src) + PA = new(user, src) user.put_in_hands(PA) /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user) @@ -55,7 +55,7 @@ var/obj/structure/chrono_field/field = null var/turf/startpos = null -/obj/item/gun/energy/chrono_gun/New(var/obj/item/chrono_eraser/T) +/obj/item/gun/energy/chrono_gun/Initialize(mapload, obj/item/chrono_eraser/T) . = ..() if(istype(T)) TED = T diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 24c904bc9d3..98a7b769642 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -360,7 +360,7 @@ LIGHTERS ARE IN LIGHTERS.DM lit = FALSE icon_state = icon_off item_state = icon_off - M.update_inv_wear_mask(0) + M.update_inv_wear_mask() STOP_PROCESSING(SSobj, src) return smoke() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 7f9cd2f1663..8815ad6a20f 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -108,7 +108,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M var/obj/item/organ/external/head/C = H.get_organ("head") - var/datum/robolimb/robohead = all_robolimbs[C.model] + var/datum/robolimb/robohead = GLOB.all_robolimbs[C.model] if(user.zone_selected == "mouth") if(!get_location_accessible(H, "mouth")) to_chat(user, "The mask is in the way.") diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm index 09d43434560..4a9e3c2b7cf 100644 --- a/code/game/objects/items/weapons/courtroom.dm +++ b/code/game/objects/items/weapons/courtroom.dm @@ -27,10 +27,12 @@ throwforce = 2.0 w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE + var/next_gavel_hit /obj/item/gavelblock/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/gavelhammer)) - playsound(loc, 'sound/items/gavel.ogg', 100, 1) - user.visible_message("[user] strikes \the [src] with \the [I].") - else + if(!istype(I, /obj/item/gavelhammer)) return + if(world.time > next_gavel_hit) + playsound(loc, 'sound/items/gavel.ogg', 100, 1) + next_gavel_hit = world.time + 5 SECONDS + user.visible_message("[user] strikes \the [src] with \the [I].") diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 82b885c03d1..bc6a98a9b1f 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -178,9 +178,9 @@ spawn(40) var/cap = 0 - if(result > MAX_EX_LIGHT_RANGE && result != 20) + if(result > GLOB.max_ex_light_range && result != 20) cap = 1 - result = min(result, MAX_EX_LIGHT_RANGE) //Apply the bombcap + result = min(result, GLOB.max_ex_light_range) //Apply the bombcap else if(result == 20) //Roll a nat 20, screw the bombcap result = 24 var/turf/epicenter = get_turf(src) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 295d17efc39..8f11f65fe71 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -127,12 +127,12 @@ if(buf && buf.types & DNA2_BUF_SE) if(block) - if(GetState() && block == MONKEYBLOCK && ishuman(M)) + if(GetState() && block == GLOB.monkeyblock && ishuman(M)) attack_log = "injected with the Isolated [name] (MONKEY)" message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") else - if(GetState(MONKEYBLOCK) && ishuman(M)) + if(GetState(GLOB.monkeyblock) && ishuman(M)) attack_log = "injected with the Isolated [name] (MONKEY)" message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") @@ -165,7 +165,7 @@ forcedmutation = TRUE /obj/item/dnainjector/hulkmut/Initialize() - block = HULKBLOCK + block = GLOB.hulkblock ..() /obj/item/dnainjector/antihulk @@ -176,7 +176,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antihulk/Initialize() - block = HULKBLOCK + block = GLOB.hulkblock ..() /obj/item/dnainjector/xraymut @@ -187,7 +187,7 @@ forcedmutation = TRUE /obj/item/dnainjector/xraymut/Initialize() - block = XRAYBLOCK + block = GLOB.xrayblock ..() /obj/item/dnainjector/antixray @@ -198,7 +198,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antixray/Initialize() - block = XRAYBLOCK + block = GLOB.xrayblock ..() /obj/item/dnainjector/firemut @@ -209,7 +209,7 @@ forcedmutation = TRUE /obj/item/dnainjector/firemut/Initialize() - block = FIREBLOCK + block = GLOB.fireblock ..() /obj/item/dnainjector/antifire @@ -220,7 +220,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antifire/Initialize() - block = FIREBLOCK + block = GLOB.fireblock ..() /obj/item/dnainjector/telemut @@ -231,7 +231,7 @@ forcedmutation = TRUE /obj/item/dnainjector/telemut/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/telemut/darkbundle @@ -247,7 +247,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antitele/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/nobreath @@ -258,7 +258,7 @@ forcedmutation = TRUE /obj/item/dnainjector/nobreath/Initialize() - block = BREATHLESSBLOCK + block = GLOB.breathlessblock ..() /obj/item/dnainjector/antinobreath @@ -269,7 +269,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antinobreath/Initialize() - block = BREATHLESSBLOCK + block = GLOB.breathlessblock ..() /obj/item/dnainjector/remoteview @@ -280,7 +280,7 @@ forcedmutation = TRUE /obj/item/dnainjector/remoteview/Initialize() - block = REMOTEVIEWBLOCK + block = GLOB.remoteviewblock ..() /obj/item/dnainjector/antiremoteview @@ -291,7 +291,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiremoteview/Initialize() - block = REMOTEVIEWBLOCK + block = GLOB.remoteviewblock ..() /obj/item/dnainjector/regenerate @@ -302,7 +302,7 @@ forcedmutation = TRUE /obj/item/dnainjector/regenerate/Initialize() - block = REGENERATEBLOCK + block = GLOB.regenerateblock ..() /obj/item/dnainjector/antiregenerate @@ -313,7 +313,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiregenerate/Initialize() - block = REGENERATEBLOCK + block = GLOB.regenerateblock ..() /obj/item/dnainjector/runfast @@ -324,7 +324,7 @@ forcedmutation = TRUE /obj/item/dnainjector/runfast/Initialize() - block = INCREASERUNBLOCK + block = GLOB.increaserunblock ..() /obj/item/dnainjector/antirunfast @@ -335,7 +335,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antirunfast/Initialize() - block = INCREASERUNBLOCK + block = GLOB.increaserunblock ..() /obj/item/dnainjector/morph @@ -346,7 +346,7 @@ forcedmutation = TRUE /obj/item/dnainjector/morph/Initialize() - block = MORPHBLOCK + block = GLOB.morphblock ..() /obj/item/dnainjector/antimorph @@ -357,7 +357,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antimorph/Initialize() - block = MORPHBLOCK + block = GLOB.morphblock ..() /obj/item/dnainjector/noprints @@ -368,7 +368,7 @@ forcedmutation = TRUE /obj/item/dnainjector/noprints/Initialize() - block = NOPRINTSBLOCK + block = GLOB.noprintsblock ..() /obj/item/dnainjector/antinoprints @@ -379,7 +379,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antinoprints/Initialize() - block = NOPRINTSBLOCK + block = GLOB.noprintsblock ..() /obj/item/dnainjector/insulation @@ -390,7 +390,7 @@ forcedmutation = TRUE /obj/item/dnainjector/insulation/Initialize() - block = SHOCKIMMUNITYBLOCK + block = GLOB.shockimmunityblock ..() /obj/item/dnainjector/antiinsulation @@ -401,7 +401,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiinsulation/Initialize() - block = SHOCKIMMUNITYBLOCK + block = GLOB.shockimmunityblock ..() /obj/item/dnainjector/midgit @@ -412,7 +412,7 @@ forcedmutation = TRUE /obj/item/dnainjector/midgit/Initialize() - block = SMALLSIZEBLOCK + block = GLOB.smallsizeblock ..() /obj/item/dnainjector/antimidgit @@ -423,7 +423,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antimidgit/Initialize() - block = SMALLSIZEBLOCK + block = GLOB.smallsizeblock ..() ///////////////////////////////////// @@ -435,7 +435,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiglasses/Initialize() - block = GLASSESBLOCK + block = GLOB.glassesblock ..() /obj/item/dnainjector/glassesmut @@ -446,7 +446,7 @@ forcedmutation = TRUE /obj/item/dnainjector/glassesmut/Initialize() - block = GLASSESBLOCK + block = GLOB.glassesblock ..() /obj/item/dnainjector/epimut @@ -457,7 +457,7 @@ forcedmutation = TRUE /obj/item/dnainjector/epimut/Initialize() - block = EPILEPSYBLOCK + block = GLOB.epilepsyblock ..() /obj/item/dnainjector/antiepi @@ -468,7 +468,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiepi/Initialize() - block = EPILEPSYBLOCK + block = GLOB.epilepsyblock ..() /obj/item/dnainjector/anticough @@ -479,7 +479,7 @@ forcedmutation = TRUE /obj/item/dnainjector/anticough/Initialize() - block = COUGHBLOCK + block = GLOB.coughblock ..() /obj/item/dnainjector/coughmut @@ -490,7 +490,7 @@ forcedmutation = TRUE /obj/item/dnainjector/coughmut/Initialize() - block = COUGHBLOCK + block = GLOB.coughblock ..() /obj/item/dnainjector/clumsymut @@ -501,7 +501,7 @@ forcedmutation = TRUE /obj/item/dnainjector/clumsymut/Initialize() - block = CLUMSYBLOCK + block = GLOB.clumsyblock ..() /obj/item/dnainjector/anticlumsy @@ -512,7 +512,7 @@ forcedmutation = TRUE /obj/item/dnainjector/anticlumsy/Initialize() - block = CLUMSYBLOCK + block = GLOB.clumsyblock ..() /obj/item/dnainjector/antitour @@ -523,7 +523,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antitour/Initialize() - block = TWITCHBLOCK + block = GLOB.twitchblock ..() /obj/item/dnainjector/tourmut @@ -534,7 +534,7 @@ forcedmutation = TRUE /obj/item/dnainjector/tourmut/Initialize() - block = TWITCHBLOCK + block = GLOB.twitchblock ..() /obj/item/dnainjector/stuttmut @@ -545,7 +545,7 @@ forcedmutation = TRUE /obj/item/dnainjector/stuttmut/Initialize() - block = NERVOUSBLOCK + block = GLOB.nervousblock ..() @@ -557,7 +557,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antistutt/Initialize() - block = NERVOUSBLOCK + block = GLOB.nervousblock ..() /obj/item/dnainjector/blindmut @@ -568,7 +568,7 @@ forcedmutation = TRUE /obj/item/dnainjector/blindmut/Initialize() - block = BLINDBLOCK + block = GLOB.blindblock ..() /obj/item/dnainjector/antiblind @@ -579,7 +579,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiblind/Initialize() - block = BLINDBLOCK + block = GLOB.blindblock ..() /obj/item/dnainjector/telemut @@ -590,7 +590,7 @@ forcedmutation = TRUE /obj/item/dnainjector/telemut/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/antitele @@ -601,7 +601,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antitele/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/deafmut @@ -612,7 +612,7 @@ forcedmutation = TRUE /obj/item/dnainjector/deafmut/Initialize() - block = DEAFBLOCK + block = GLOB.deafblock ..() /obj/item/dnainjector/antideaf @@ -623,7 +623,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antideaf/Initialize() - block = DEAFBLOCK + block = GLOB.deafblock ..() /obj/item/dnainjector/hallucination @@ -634,7 +634,7 @@ forcedmutation = TRUE /obj/item/dnainjector/hallucination/Initialize() - block = HALLUCINATIONBLOCK + block = GLOB.hallucinationblock ..() /obj/item/dnainjector/antihallucination @@ -645,7 +645,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antihallucination/Initialize() - block = HALLUCINATIONBLOCK + block = GLOB.hallucinationblock ..() /obj/item/dnainjector/h2m @@ -656,7 +656,7 @@ forcedmutation = TRUE /obj/item/dnainjector/h2m/Initialize() - block = MONKEYBLOCK + block = GLOB.monkeyblock ..() /obj/item/dnainjector/m2h @@ -667,7 +667,7 @@ forcedmutation = TRUE /obj/item/dnainjector/m2h/Initialize() - block = MONKEYBLOCK + block = GLOB.monkeyblock ..() @@ -679,7 +679,7 @@ forcedmutation = TRUE /obj/item/dnainjector/comic/Initialize() - block = COMICBLOCK + block = GLOB.comicblock ..() /obj/item/dnainjector/anticomic @@ -690,5 +690,5 @@ forcedmutation = TRUE /obj/item/dnainjector/anticomic/Initialize() - block = COMICBLOCK + block = GLOB.comicblock ..() diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index c2dc8e285ab..1dcc4a942c2 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -45,7 +45,7 @@ scramble(1, H, 100) H.real_name = random_name(H.gender, H.dna.species.name) //Give them a name that makes sense for their species. H.sync_organ_dna(assimilate = 1) - H.update_body(0) + H.update_body() H.reset_hair() //No more winding up with hairstyles you're not supposed to have, and blowing your cover. H.reset_markings() //...Or markings. H.dna.ResetUIFrom(H) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index c534a89277c..5c69a59aba9 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -229,6 +229,7 @@ desc = "A C4 charge with an altered chemical composition, designed to blind and deafen the occupants of a room before breaching." /obj/item/grenade/plastic/c4_shaped/flash/prime() + var/turf/T if(target && target.density) T = get_step(get_turf(target), aim_dir) else if(target) @@ -266,6 +267,7 @@ addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3) else + var/turf/T = get_step(location, aim_dir) addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 5a3286bfc05..48edcc826e6 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -49,8 +49,7 @@ to_chat(user, "You cut open the present.") for(var/mob/M in src) //Should only be one but whatever. - M.loc = src.loc - M.reset_perspective(null) + M.forceMove(loc) qdel(src) diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index 26a1f3ede0d..96a3a8e1400 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -1,5 +1,5 @@ -var/turf/T +// var/turf/T | This was made 14th September 2013, and has no use at all. Its being removed /obj/item/grenade/bananade name = "bananade" diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm index bce9861fb72..1dcf250dfe4 100644 --- a/code/game/objects/items/weapons/grenades/clowngrenade.dm +++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm @@ -13,22 +13,12 @@ /obj/item/grenade/clown_grenade/prime() ..() playsound(src.loc, 'sound/items/bikehorn.ogg', 25, -3) - /* - for(var/turf/simulated/floor/T in view(affected_area, src.loc)) - if(prob(75)) - banana(T) - */ var/i = 0 var/number = 0 - for(var/direction in alldirs) + for(var/direction in GLOB.alldirs) for(i = 0; i < 2; i++) number++ var/obj/item/grown/bananapeel/traitorpeel/peel = new /obj/item/grown/bananapeel/traitorpeel(get_turf(src.loc)) - /* var/direction = pick(alldirs) - var/spaces = pick(1;150, 2) - var/a = 0 - for(a = 0; a < spaces; a++) - step(peel,direction)*/ var/a = 1 if(number & 2) for(a = 1; a <= 2; a++) @@ -39,21 +29,17 @@ qdel(src) return -/obj/item/grown/bananapeel/traitorpeel - trip_stun = 0 - trip_weaken = 7 - trip_tiles = 4 - trip_walksafe = FALSE - - trip_chance = 100 - - -/obj/item/grown/bananapeel/traitorpeel/on_trip(mob/living/carbon/human/H) +/obj/item/grown/bananapeel/traitorpeel/New(newloc, obj/item/seeds/new_seed) . = ..() - if(.) - to_chat(H, "Your feet feel like they're on fire!") - H.take_overall_damage(0, rand(2,8)) - H.take_organ_damage(2) // Was 5 -- TLE + // The reason this AddComponent is here and not in ComponentInitialize() is because if it's put there, it will be ran before the parent New proc for /grown types. + // And then be overriden by the generic component placed onto it by the `/datum/plant_gene/trait/slip`. + AddComponent(/datum/component/slippery, src, 0, 7, 100, 4, FALSE) + +/obj/item/grown/bananapeel/traitorpeel/after_slip(mob/living/carbon/human/H) + to_chat(H, "Your feet feel like they're on fire!") + H.take_overall_damage(0, rand(2,8)) + H.take_organ_damage(2) + return ..() /obj/item/grown/bananapeel/traitorpeel/throw_impact(atom/hit_atom) var/burned = rand(1,3) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index e188279eb8c..1f73e5c7062 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -37,6 +37,9 @@ cuff(C, user) /obj/item/restraints/handcuffs/proc/cuff(mob/living/carbon/C, mob/user, remove_src = TRUE) + if(!istype(C)) // Shouldn't be able to cuff anything but carbons. + return + if(ishuman(C)) var/mob/living/carbon/human/H = C if(!(H.has_left_hand() || H.has_right_hand())) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 95cf1e7026a..4efb6994e8d 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -37,7 +37,7 @@ user.visible_message("[src] slips out of the grip of [user] as they try to pick it up, bouncing upwards and smacking [user.p_them()] in the face!", \ "[src] slips out of your grip as you pick it up, bouncing upwards and smacking you in the face!") playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1) - throw_at(get_edge_target_turf(user, pick(alldirs)), rand(1, 3), 5) + throw_at(get_edge_target_turf(user, pick(GLOB.alldirs)), rand(1, 3), 5) /obj/item/nullrod/attack_self(mob/user) diff --git a/code/game/objects/items/weapons/implants/implant_death_alarm.dm b/code/game/objects/items/weapons/implants/implant_death_alarm.dm index d27d6dd5f7e..e8330c0c5cd 100644 --- a/code/game/objects/items/weapons/implants/implant_death_alarm.dm +++ b/code/game/objects/items/weapons/implants/implant_death_alarm.dm @@ -47,7 +47,7 @@ a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm") qdel(src) if("emp") - var/name = prob(50) ? t.name : pick(teleportlocs) + var/name = prob(50) ? t.name : pick(GLOB.teleportlocs) a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm") else a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm") diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/implants/implant_storage.dm index 18b08bba283..b530fd860fa 100644 --- a/code/game/objects/items/weapons/implants/implant_storage.dm +++ b/code/game/objects/items/weapons/implants/implant_storage.dm @@ -20,6 +20,10 @@ ..() storage = new /obj/item/storage/hidden/implant(src) +/obj/item/implant/storage/emp_act(severity) + ..() + storage.emp_act(severity) + /obj/item/implant/storage/activate() storage.MouseDrop(imp_in) diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm index 05d2363ee01..40998caa774 100644 --- a/code/game/objects/items/weapons/implants/implant_traitor.dm +++ b/code/game/objects/items/weapons/implants/implant_traitor.dm @@ -40,14 +40,13 @@ L.adjustBrainLoss(20) removed(mindslave_target) qdel(src) - return -1 + return -1 if(ismindshielded(mindslave_target)) mindslave_target.visible_message("[mindslave_target] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.") removed(mindslave_target) qdel(src) return -1 - mindslave_target.implanting = 1 to_chat(mindslave_target, "You feel completely loyal to [user.name].") if(!(user.mind in SSticker.mode.implanter)) SSticker.mode.implanter[user.mind] = list() @@ -56,7 +55,7 @@ SSticker.mode.implanted.Add(mindslave_target.mind) SSticker.mode.implanted[mindslave_target.mind] = user.mind SSticker.mode.implanter[user.mind] = implanters - + to_chat(mindslave_target, "You're now completely loyal to [user.name]! You now must lay down your life to protect [user.p_them()] and assist in [user.p_their()] goals at any cost.") var/datum/objective/protect/mindslave/MS = new diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index e24346c1ee9..740079db8e1 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -1,29 +1,19 @@ -///////// -//ZIPPO// -///////// +// Basic lighters /obj/item/lighter name = "cheap lighter" desc = "A cheap-as-free lighter." icon = 'icons/obj/items.dmi' icon_state = "lighter-g" item_state = "lighter-g" - var/icon_on = "lighter-g-on" - var/icon_off = "lighter-g" w_class = WEIGHT_CLASS_TINY throwforce = 4 flags = CONDUCT slot_flags = SLOT_BELT attack_verb = null resistance_flags = FIRE_PROOF - var/lit = 0 - -/obj/item/lighter/zippo - name = "zippo lighter" - desc = "The zippo." - icon_state = "zippo" - item_state = "zippo" - icon_on = "zippoon" - icon_off = "zippo" + var/lit = FALSE + var/icon_on = "lighter-g-on" + var/icon_off = "lighter-g" /obj/item/lighter/random/New() ..() @@ -33,54 +23,51 @@ icon_state = icon_off /obj/item/lighter/attack_self(mob/living/user) - if(user.r_hand == src || user.l_hand == src || isrobot(user)) - if(!lit) - lit = 1 - w_class = WEIGHT_CLASS_BULKY - icon_state = icon_on - item_state = icon_on - force = 5 - damtype = "fire" - hitsound = 'sound/items/welder.ogg' - attack_verb = list("burnt", "singed") - if(istype(src, /obj/item/lighter/zippo) ) - user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") - playsound(src.loc, 'sound/items/zippolight.ogg', 25, 1) - else - if(prob(75)) - user.visible_message("After a few attempts, [user] manages to light the [src].") - else - to_chat(user, "You burn yourself while lighting the lighter.") - var/mob/living/M = user - if(ishuman(M)) - var/mob/living/carbon/human/H = M - var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") - if(affecting.receive_damage( 0, 5 )) //INFERNO - H.UpdateDamageIcon() - user.visible_message("After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.") - - set_light(2) - START_PROCESSING(SSobj, src) - else - lit = 0 - w_class = WEIGHT_CLASS_TINY - icon_state = icon_off - item_state = icon_off - hitsound = "swing_hit" - force = 0 - attack_verb = null //human_defense.dm takes care of it - if(istype(src, /obj/item/lighter/zippo) ) - user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.") - playsound(src.loc, 'sound/items/zippoclose.ogg', 25, 1) - else - user.visible_message("[user] quietly shuts off the [src].") - - set_light(0) - STOP_PROCESSING(SSobj, src) + . = ..() + if(!lit) + turn_on_lighter(user) else - return ..() - return + turn_off_lighter(user) +/obj/item/lighter/proc/turn_on_lighter(mob/living/user) + lit = TRUE + w_class = WEIGHT_CLASS_BULKY + icon_state = icon_on + item_state = icon_on + force = 5 + damtype = BURN + hitsound = 'sound/items/welder.ogg' + attack_verb = list("burnt", "singed") + + attempt_light(user) + set_light(2) + START_PROCESSING(SSobj, src) + +/obj/item/lighter/proc/attempt_light(mob/living/user) + if(prob(75) || issilicon(user)) // Robots can never burn themselves trying to light it. + to_chat(user, "You light [src].") + else + var/mob/living/carbon/human/H = user + var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") + if(affecting.receive_damage( 0, 5 )) //INFERNO + H.UpdateDamageIcon() + to_chat(user,"You light [src], but you burn your hand in the process.") + +/obj/item/lighter/proc/turn_off_lighter(mob/living/user) + lit = FALSE + w_class = WEIGHT_CLASS_TINY + icon_state = icon_off + item_state = icon_off + hitsound = "swing_hit" + force = 0 + attack_verb = null //human_defense.dm takes care of it + + show_off_message(user) + set_light(0) + STOP_PROCESSING(SSobj, src) + +/obj/item/lighter/proc/show_off_message(mob/living/user) + to_chat(user, "You shut off [src].") /obj/item/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!isliving(M)) @@ -108,6 +95,41 @@ location.hotspot_expose(700, 5) return +// Zippo lighters +/obj/item/lighter/zippo + name = "zippo lighter" + desc = "The zippo." + icon_state = "zippo" + item_state = "zippo" + icon_on = "zippoon" + icon_off = "zippo" + var/next_on_message + var/next_off_message + +/obj/item/lighter/zippo/turn_on_lighter(mob/living/user) + . = ..() + if(world.time > next_on_message) + user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") + playsound(src.loc, 'sound/items/zippolight.ogg', 25, 1) + next_on_message = world.time + 5 SECONDS + else + to_chat(user, "You light [src].") + +/obj/item/lighter/zippo/turn_off_lighter(mob/living/user) + . = ..() + if(world.time > next_off_message) + user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.") + playsound(src.loc, 'sound/items/zippoclose.ogg', 25, 1) + next_off_message = world.time + 5 SECONDS + else + to_chat(user, "You shut off [src].") + +/obj/item/lighter/zippo/show_off_message(mob/living/user) + return + +/obj/item/lighter/zippo/attempt_light(mob/living/user) + return + //EXTRA LIGHTERS /obj/item/lighter/zippo/nt_rep name = "gold engraved zippo" diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index c3f2e50174b..006de63af17 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -37,7 +37,7 @@ return BRUTELOSS|FIRELOSS /obj/item/melee/energy/attack_self(mob/living/carbon/user) - if(user.disabilities & CLUMSY && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") user.take_organ_damage(5,5) active = !active @@ -290,7 +290,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.disabilities & CLUMSY && prob(50)) + if((CLUMSY in H.mutations) && prob(50)) to_chat(H, "You accidentally cut yourself with [src], like a doofus!") H.take_organ_damage(10,10) active = !active diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 0732c0fdd1d..40d68cc8fc6 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -77,6 +77,10 @@ item_state = "gift" w_class = WEIGHT_CLASS_BULKY +/obj/item/gift/emp_act(severity) + ..() + gift.emp_act(severity) + /obj/item/kidanglobe name = "Kidan homeworld globe" icon = 'icons/obj/decorations.dmi' diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index 073ae0941e4..415a02f4456 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -39,6 +39,21 @@ var/primary_sound = 'sound/machines/click.ogg' var/alt_sound = null + //Lists of things + var/list/mainmenu = list( + list("category" = "Atmospherics", "mode" = RPD_ATMOS_MODE, "icon" = "wrench"), + list("category" = "Disposals", "mode" = RPD_DISPOSALS_MODE, "icon" = "recycle"), + list("category" = "Rotate", "mode" = RPD_ROTATE_MODE, "icon" = "rotate-right"), + list("category" = "Flip", "mode" = RPD_FLIP_MODE, "icon" = "exchange"), + list("category" = "Recycle", "mode" = RPD_DELETE_MODE, "icon" = "trash")) + var/list/pipemenu = list( + list("category" = "Normal", "pipemode" = RPD_ATMOS_PIPING), + list("category" = "Supply", "pipemode" = RPD_SUPPLY_PIPING), + list("category" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING), + list("category" = "Devices", "pipemode" = RPD_DEVICES), + list("category" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING)) + + /obj/item/rpd/New() ..() spark_system = new /datum/effect_system/spark_spread() @@ -91,7 +106,7 @@ P = new(T, whatpipe, iconrotation) //Make the pipe, BUT WAIT! There's more! if(!iconrotation && P.is_bent_pipe()) //Automatically rotates dispensed pipes if the user selected auto-rotation P.dir = turn(user.dir, 135) - else if(!iconrotation && P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT)) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction + else if(!iconrotation && (P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT))) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction P.dir = turn(user.dir, -180) else if(iconrotation && P.is_bent_pipe()) //If user selected a rotation and the pipe is bent P.dir = turn(iconrotation, -45) @@ -150,27 +165,12 @@ QDEL_NULL(P) activate_rpd() -//Lists of things - -var/list/mainmenu = list( - list("category" = "Atmospherics", "mode" = RPD_ATMOS_MODE, "icon" = "wrench"), - list("category" = "Disposals", "mode" = RPD_DISPOSALS_MODE, "icon" = "recycle"), - list("category" = "Rotate", "mode" = RPD_ROTATE_MODE, "icon" = "rotate-right"), - list("category" = "Flip", "mode" = RPD_FLIP_MODE, "icon" = "exchange"), - list("category" = "Recycle", "mode" = RPD_DELETE_MODE, "icon" = "trash")) -var/list/pipemenu = list( - list("category" = "Normal", "pipemode" = RPD_ATMOS_PIPING), - list("category" = "Supply", "pipemode" = RPD_SUPPLY_PIPING), - list("category" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING), - list("category" = "Devices", "pipemode" = RPD_DEVICES), - list("category" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING)) - //NanoUI stuff /obj/item/rpd/attack_self(mob/user) ui_interact(user) -/obj/item/rpd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) +/obj/item/rpd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "rpd.tmpl", "[name]", 400, 650, state = state) @@ -180,7 +180,7 @@ var/list/pipemenu = list( /obj/item/rpd/AltClick(mob/user) radial_menu(user) -/obj/item/rpd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) +/obj/item/rpd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state) var/data[0] data["iconrotation"] = iconrotation data["mainmenu"] = mainmenu diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 70add3839ef..14f3b0ab91f 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -47,12 +47,12 @@ var/A - A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs + A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in GLOB.teleportlocs if(!A) return - var/area/thearea = teleportlocs[A] + var/area/thearea = GLOB.teleportlocs[A] if(user.stat || user.restrained()) return @@ -60,7 +60,7 @@ return if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) - to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") + to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") return var/datum/effect_system/smoke_spread/smoke = new @@ -79,7 +79,7 @@ L+=T if(!L.len) - to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") + to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") return if(user && user.buckled) @@ -100,7 +100,8 @@ break if(!success) - user.loc = pick(L) + user.forceMove(pick(L)) smoke.start() src.uses -= 1 + user.update_action_buttons_icon() //Update action buttons as some spells might now be castable diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 362ab601685..19e56e161e3 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -76,7 +76,7 @@ return (active) /obj/item/shield/energy/attack_self(mob/living/carbon/human/user) - if(user.disabilities & CLUMSY && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You beat yourself in the head with [src].") user.take_organ_damage(5) active = !active diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 62f65b5a6cc..cb220ff9565 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -11,15 +11,11 @@ throw_speed = 4 throw_range = 20 discrete = 1 - - trip_stun = 4 - trip_weaken = 2 - trip_chance = 100 - trip_walksafe = FALSE - trip_verb = TV_SLIP - var/cleanspeed = 50 //slower than mop +/obj/item/soap/ComponentInitialize() + AddComponent(/datum/component/slippery, src, 4, 2, 100, 0, FALSE) + /obj/item/soap/afterattack(atom/target, mob/user, proximity) if(!proximity) return //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm index 1cc2b25edf0..0d5591bbc16 100644 --- a/code/game/objects/items/weapons/stock_parts.dm +++ b/code/game/objects/items/weapons/stock_parts.dm @@ -235,57 +235,6 @@ rating = 4 materials = list(MAT_METAL=80) -// Subspace stock parts - -/obj/item/stock_parts/subspace/ansible - name = "subspace ansible" - icon_state = "subspace_ansible" - desc = "A compact module capable of sensing extradimensional activity." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=1" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/filter - name = "hyperwave filter" - icon_state = "hyperwave_filter" - desc = "A tiny device capable of filtering and converting super-intense radiowaves." - origin_tech = "programming=2;magnets=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/amplifier - name = "subspace amplifier" - icon_state = "subspace_amplifier" - desc = "A compact micro-machine capable of amplifying weak subspace transmissions." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/treatment - name = "subspace treatment disk" - icon_state = "treatment_disk" - desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/analyzer - name = "subspace wavelength analyzer" - icon_state = "wavelength_analyzer" - desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/crystal - name = "ansible crystal" - icon_state = "ansible_crystal" - desc = "A crystal made from pure glass used to transmit laser databursts to subspace." - origin_tech = "magnets=2;materials=2;bluespace=2;plasmatech=2" - materials = list(MAT_GLASS=50) - -/obj/item/stock_parts/subspace/transmitter - name = "subspace transmitter" - icon_state = "subspace_transmitter" - desc = "A large piece of equipment used to open a window into the subspace dimension." - origin_tech = "magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=50) - /obj/item/research//Makes testing much less of a pain -Sieve name = "research" icon = 'icons/obj/stock_parts.dmi' diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 757d2b05757..26045731bd9 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -230,6 +230,11 @@ desc = "An NT Deluxe satchel, with the finest quality leather and the company logo in a thin gold stitch" icon_state = "nt_deluxe" +/obj/item/storage/backpack/satchel/lizard + name = "lizard skin handbag" + desc = "A handbag made out of what appears to be supple green Unathi skin. A face can be vaguely seen on the front." + icon_state = "satchel-lizard" + /obj/item/storage/backpack/satchel/withwallet/New() ..() new /obj/item/storage/wallet/random(src) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 755b0076c3c..403088e2b71 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -134,7 +134,8 @@ /obj/item/rad_laser, /obj/item/sensor_device, /obj/item/wrench/medical, - /obj/item/handheld_defibrillator + /obj/item/handheld_defibrillator, + /obj/item/reagent_containers/applicator ) /obj/item/storage/belt/medical/surgery diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index dceab93330a..da0094bb2ef 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1059,6 +1059,7 @@ name = "clown box" desc = "A colorful cardboard box for the clown" icon_state = "box_clown" + var/robot_arm // This exists for bot construction /obj/item/storage/box/emptysandbags name = "box of empty sandbags" @@ -1123,6 +1124,11 @@ playsound(loc, "rustle", 50, 1, -5) user.visible_message("[user] hugs \the [src].","You hug \the [src].") +/obj/item/storage/box/wizard + name = "magical box" + desc = "It's just an ordinary magical box." + icon_state = "box_wizard" + #undef NODESIGN #undef NANOTRASEN #undef SYNDI diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index bc1e90dac8e..4ff769a7d3f 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -14,7 +14,7 @@ icon_state = "firstaid" throw_speed = 2 throw_range = 8 - var/empty = 0 + var/empty = FALSE req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots. var/treatment_brute = "salglu_solution" var/treatment_oxy = "salbutamol" @@ -23,6 +23,7 @@ var/treatment_virus = "spaceacillin" var/med_bot_skin = null var/syndicate_aligned = FALSE + var/robot_arm // This is for robot construction /obj/item/storage/firstaid/fire @@ -32,39 +33,51 @@ item_state = "firstaid-ointment" med_bot_skin = "ointment" - New() - ..() - if(empty) return - - icon_state = pick("ointment","firefirstaid") - - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/healthanalyzer( src ) - new /obj/item/reagent_containers/hypospray/autoinjector( src ) - new /obj/item/reagent_containers/food/pill/salicylic( src ) +/obj/item/storage/firstaid/fire/New() + ..() + if(empty) return + icon_state = pick("ointment", "firefirstaid") + new /obj/item/reagent_containers/applicator/burn(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf/small(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/food/pill/salicylic(src) /obj/item/storage/firstaid/fire/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/regular desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" icon_state = "firstaid" - New() - ..() - if(empty) return - new /obj/item/reagent_containers/food/pill/patch/styptic( src ) - new /obj/item/reagent_containers/food/pill/patch/styptic( src ) - new /obj/item/reagent_containers/food/pill/salicylic( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/healthanalyzer( src ) - new /obj/item/reagent_containers/hypospray/autoinjector( src ) +/obj/item/storage/firstaid/regular/New() + ..() + if(empty) return + new /obj/item/reagent_containers/food/pill/patch/styptic(src) + new /obj/item/reagent_containers/food/pill/patch/styptic(src) + new /obj/item/reagent_containers/food/pill/salicylic(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + +/obj/item/storage/firstaid/doctor + desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" + icon_state = "firstaid" + +/obj/item/storage/firstaid/doctor/New() + ..() + if(empty) + return + new /obj/item/reagent_containers/applicator/brute(src) + new /obj/item/reagent_containers/applicator/burn(src) + new /obj/item/reagent_containers/food/pill/patch/styptic(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) + new /obj/item/reagent_containers/food/pill/salicylic(src) + new /obj/item/healthanalyzer/advanced(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) /obj/item/storage/firstaid/toxin name = "toxin first aid kit" @@ -73,23 +86,21 @@ item_state = "firstaid-toxin" med_bot_skin = "tox" - New() - ..() - if(empty) return - - icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") - - new /obj/item/reagent_containers/syringe/charcoal( src ) - new /obj/item/reagent_containers/syringe/charcoal( src ) - new /obj/item/reagent_containers/syringe/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/healthanalyzer( src ) +/obj/item/storage/firstaid/toxin/New() + ..() + if(empty) return + icon_state = pick("antitoxin", "antitoxfirstaid", "antitoxfirstaid2", "antitoxfirstaid3") + new /obj/item/reagent_containers/syringe/charcoal(src) + new /obj/item/reagent_containers/syringe/charcoal(src) + new /obj/item/reagent_containers/syringe/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/healthanalyzer(src) /obj/item/storage/firstaid/toxin/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/o2 name = "oxygen deprivation first aid kit" @@ -98,18 +109,18 @@ item_state = "firstaid-o2" med_bot_skin = "o2" - New() - ..() - if(empty) return - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/healthanalyzer( src ) +/obj/item/storage/firstaid/o2/New() + ..() + if(empty) return + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/healthanalyzer(src) /obj/item/storage/firstaid/o2/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/brute name = "brute trauma treatment kit" @@ -118,23 +129,19 @@ item_state = "firstaid-brute" med_bot_skin = "brute" - New() - ..() - if(empty) return - - icon_state = pick("brute","brute2") - - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/healthanalyzer(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) - new /obj/item/stack/medical/bruise_pack(src) +/obj/item/storage/firstaid/brute/New() + ..() + if(empty) return + icon_state = pick("brute", "brute2") + new /obj/item/reagent_containers/applicator/brute(src) + new /obj/item/reagent_containers/food/pill/patch/styptic/small(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/stack/medical/bruise_pack(src) /obj/item/storage/firstaid/brute/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/adv name = "advanced first-aid kit" @@ -156,7 +163,7 @@ new /obj/item/healthanalyzer(src) /obj/item/storage/firstaid/adv/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/machine name = "machine repair kit" @@ -177,7 +184,7 @@ new /obj/item/robotanalyzer(src) /obj/item/storage/firstaid/machine/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/tactical @@ -195,18 +202,15 @@ /obj/item/storage/firstaid/tactical/New() ..() - if(empty) return + if(empty) + return new /obj/item/reagent_containers/hypospray/combat(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) // Because you ain't got no time to look at what damage dey taking yo - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) + new /obj/item/reagent_containers/applicator/dual(src) // Because you ain't got no time to look at what damage dey taking yo new /obj/item/defibrillator/compact/combat/loaded(src) new /obj/item/clothing/glasses/hud/health/night(src) - return /obj/item/storage/firstaid/tactical/empty - empty =1 + empty = TRUE /obj/item/storage/firstaid/surgery name = "field surgery kit" @@ -346,15 +350,15 @@ desc = "Contains pills used to counter toxins." wrapper_color = COLOR_GREEN - New() - ..() - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) +/obj/item/storage/pill_bottle/charcoal/New() + ..() + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) /obj/item/storage/pill_bottle/painkillers name = "Pill Bottle (Salicylic Acid)" diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index d38c3c97dac..357cb043ca4 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -98,6 +98,7 @@ add_fingerprint(usr) to_chat(usr, "It's locked!") return FALSE + return TRUE /obj/item/storage/secure/attack_self(mob/user as mob) user.set_machine(src) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index d79a121e685..55b25ad725a 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -83,11 +83,14 @@ return /obj/item/storage/AltClick(mob/user) - if(Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE)) + if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE)) orient2hud(user) if(user.s_active) user.s_active.close(user) show_to(user) + playsound(loc, "rustle", 50, 1, -5) + add_fingerprint(user) + return ..() /obj/item/storage/proc/return_inv() @@ -479,10 +482,10 @@ return ..() /obj/item/storage/emp_act(severity) - if(!istype(loc, /mob/living)) - for(var/obj/O in contents) - O.emp_act(severity) ..() + for(var/i in contents) + var/atom/A = i + A.emp_act(severity) /obj/item/storage/hear_talk(mob/living/M as mob, list/message_pieces) ..() diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index a0dd6aa485d..9ded7947202 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -156,7 +156,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/item/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/using_internal if(iscarbon(loc)) var/mob/living/carbon/C = loc diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 2375c42db65..55dc189fc9b 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -119,7 +119,7 @@ amount_per_transfer_from_this = 50 possible_transfer_amounts = list(25,50,100) volume = 500 - flags = NODROP | NOBLUDGEON + flags = NOBLUDGEON container_type = OPENCONTAINER var/obj/item/watertank/tank diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 57c9a5301f6..ed857c18ded 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -179,6 +179,7 @@ slot_flags = SLOT_BACK force_unwielded = 5 force_wielded = 24 + toolspeed = 0.25 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' usesound = 'sound/items/crowbar.ogg' @@ -542,6 +543,7 @@ w_class = WEIGHT_CLASS_BULKY // can't fit in backpacks force_unwielded = 15 //still pretty robust force_wielded = 40 //you'll gouge their eye out! Or a limb...maybe even their entire body! + hitsound = null // Handled in the snowflaked attack proc wieldsound = 'sound/weapons/chainsawstart.ogg' hitsound = null armour_penetration = 35 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 6ef379ffcad..32158a9a3ab 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -205,7 +205,7 @@ else if(prob(30)) visible_message("[owner] swings! And [p_they()] miss[p_es()]! How embarassing.", "You swing! You miss! Oh no!") playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - do_attack_animation(get_step(owner, pick(alldirs)), ATTACK_EFFECT_DISARM) + do_attack_animation(get_step(owner, pick(GLOB.alldirs)), ATTACK_EFFECT_DISARM) deflectmode = FALSE if(!istype(I, /obj/item/beach_ball)) lastdeflect = world.time + 3000 @@ -214,7 +214,7 @@ visible_message("[owner] swings and deflects [I]!", "You swing and deflect the [I]!") playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1) do_attack_animation(I, ATTACK_EFFECT_DISARM) - I.throw_at(get_edge_target_turf(owner, pick(cardinal)), rand(8,10), 14, owner) + I.throw_at(get_edge_target_turf(owner, pick(GLOB.cardinal)), rand(8,10), 14, owner) deflectmode = FALSE if(!istype(I, /obj/item/beach_ball)) lastdeflect = world.time + 3000 diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 1816357d450..e1464e47e48 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -205,7 +205,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF)) resistance_flags |= ON_FIRE SSfires.processing[src] = src - add_overlay(fire_overlay, TRUE) + add_overlay(GLOB.fire_overlay, TRUE) return 1 ///called when the obj is destroyed by fire @@ -218,7 +218,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e /obj/proc/extinguish() if(resistance_flags & ON_FIRE) resistance_flags &= ~ON_FIRE - cut_overlay(fire_overlay, TRUE) + cut_overlay(GLOB.fire_overlay, TRUE) SSfires.processing -= src ///Called when the obj is hit by a tesla bolt. diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e30c8c5c4c2..951eb79f853 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -44,7 +44,7 @@ else T.add_blueprints_preround(src) -/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state) +/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = GLOB.default_state) // Calling Topic without a corresponding window open causes runtime errors if(!nowindow && ..()) return 1 @@ -192,13 +192,13 @@ /obj/proc/multitool_menu(var/mob/user,var/obj/item/multitool/P) return "NO MULTITOOL_MENU!" -/obj/proc/linkWith(var/mob/user, var/obj/buffer, var/link/context) +/obj/proc/linkWith(var/mob/user, var/obj/buffer, var/context) return 0 /obj/proc/unlinkFrom(var/mob/user, var/obj/buffer) return 0 -/obj/proc/canLink(var/obj/O, var/link/context) +/obj/proc/canLink(var/obj/O, var/context) return 0 /obj/proc/isLinkedWith(var/obj/O) @@ -251,9 +251,7 @@ a { if(P) if(P.buffer) var/id = null - if(istype(P.buffer, /obj/machinery/telecomms)) - id=P.buffer:id - else if("id_tag" in P.buffer.vars) + if("id_tag" in P.buffer.vars) id=P.buffer:id_tag dat += "
Available [severity_to_string[selected_event_container.severity]] Events (queued & running events will not be displayed)
" + html += "Available [GLOB.severity_to_string[selected_event_container.severity]] Events (queued & running events will not be displayed)
" html += "" @@ -622,7 +622,9 @@ SUBSYSTEM_DEF(jobs) if(tgtcard.assignment && tgtcard.assignment == job.title) jobs_to_formats[job.title] = "disabled" // the job they already have is pre-selected else if(!job.would_accept_job_transfer_from_player(M)) - jobs_to_formats[job.title] = "linkDiscourage" // karma jobs they don't have available are discouraged + jobs_to_formats[job.title] = "linkDiscourage" // jobs which are karma-locked and not unlocked for this player are discouraged + else if((job.title in GLOB.command_positions) && istype(M) && M.client && job.available_in_playtime(M.client)) + jobs_to_formats[job.title] = "linkDiscourage" // command jobs which are playtime-locked and not unlocked for this player are discouraged else if(job.total_positions && !job.current_positions && job.title != "Civilian") jobs_to_formats[job.title] = "linkEncourage" // jobs with nobody doing them at all are encouraged else if(job.total_positions >= 0 && job.current_positions >= job.total_positions) @@ -638,7 +640,7 @@ SUBSYSTEM_DEF(jobs) var/datum/job/oldjobdatum = SSjobs.GetJob(oldtitle) var/datum/job/newjobdatum = SSjobs.GetJob(newtitle) if(istype(oldjobdatum) && oldjobdatum.current_positions > 0 && istype(newjobdatum)) - if(!(oldjobdatum.title in command_positions) && !(newjobdatum.title in command_positions)) + if(!(oldjobdatum.title in GLOB.command_positions) && !(newjobdatum.title in GLOB.command_positions)) oldjobdatum.current_positions-- newjobdatum.current_positions++ diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 7441d855f22..3fc92a3346a 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -7,6 +7,7 @@ SUBSYSTEM_DEF(lighting) wait = 2 init_order = INIT_ORDER_LIGHTING flags = SS_TICKER + offline_implications = "Lighting will no longer update. Shuttle call recommended." /datum/controller/subsystem/lighting/stat_entry() ..("L:[GLOB.lighting_update_lights.len]|C:[GLOB.lighting_update_corners.len]|O:[GLOB.lighting_update_objects.len]") diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm index 9a73c1dbabb..7e78e2b9df1 100644 --- a/code/controllers/subsystem/machinery.dm +++ b/code/controllers/subsystem/machinery.dm @@ -6,6 +6,7 @@ SUBSYSTEM_DEF(machines) name = "Machines" init_order = INIT_ORDER_MACHINES flags = SS_KEEP_TIMING + offline_implications = "Machinery will no longer process. Shuttle call recommended." var/list/processing = list() var/list/currentrun = list() diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index af741423526..67e2b5c5e88 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -13,24 +13,109 @@ SUBSYSTEM_DEF(mapping) if(!config.disable_space_ruins) var/timer = start_watch() log_startup_progress("Creating random space levels...") - seedRuins(list(level_name_to_num(EMPTY_AREA)), rand(0, 3), /area/space, space_ruins_templates) + seedRuins(list(level_name_to_num(EMPTY_AREA)), rand(0, 3), /area/space, GLOB.space_ruins_templates) log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.") // load in extra levels of space ruins var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max) for(var/i = 1, i <= num_extra_space, i++) - var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED, traits = list(REACHABLE)) - seedRuins(list(zlev), rand(0, 3), /area/space, space_ruins_templates) + var/zlev = GLOB.space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED, traits = list(REACHABLE)) + seedRuins(list(zlev), rand(0, 3), /area/space, GLOB.space_ruins_templates) // Setup the Z-level linkage - space_manager.do_transition_setup() + GLOB.space_manager.do_transition_setup() // Spawn Lavaland ruins and rivers. - seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates) + seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, GLOB.lava_ruins_templates) spawn_rivers(list(level_name_to_num(MINING))) return ..() + +/datum/controller/subsystem/mapping/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins) + if(!z_levels || !z_levels.len) + WARNING("No Z levels provided - Not generating ruins") + return + + for(var/zl in z_levels) + var/turf/T = locate(1, 1, zl) + if(!T) + WARNING("Z level [zl] does not exist - Not generating ruins") + return + + var/list/ruins = potentialRuins.Copy() + + var/list/forced_ruins = list() //These go first on the z level associated (same random one by default) + var/list/ruins_availible = list() //we can try these in the current pass + var/forced_z //If set we won't pick z level and use this one instead. + + //Set up the starting ruin list + for(var/key in ruins) + var/datum/map_template/ruin/R = ruins[key] + if(R.cost > budget) //Why would you do that + continue + if(R.always_place) + forced_ruins[R] = -1 + if(R.unpickable) + continue + ruins_availible[R] = R.placement_weight + + while(budget > 0 && (ruins_availible.len || forced_ruins.len)) + var/datum/map_template/ruin/current_pick + var/forced = FALSE + if(forced_ruins.len) //We have something we need to load right now, so just pick it + for(var/ruin in forced_ruins) + current_pick = ruin + if(forced_ruins[ruin] > 0) //Load into designated z + forced_z = forced_ruins[ruin] + forced = TRUE + break + else //Otherwise just pick random one + current_pick = pickweight(ruins_availible) + + var/placement_tries = PLACEMENT_TRIES + var/failed_to_place = TRUE + var/z_placed = 0 + while(placement_tries > 0) + placement_tries-- + z_placed = pick(z_levels) + if(!current_pick.try_to_place(forced_z ? forced_z : z_placed,whitelist)) + continue + else + failed_to_place = FALSE + break + + //That's done remove from priority even if it failed + if(forced) + //TODO : handle forced ruins with multiple variants + forced_ruins -= current_pick + forced = FALSE + + if(failed_to_place) + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.id == current_pick.id) + ruins_availible -= R + log_world("Failed to place [current_pick.name] ruin.") + else + budget -= current_pick.cost + if(!current_pick.allow_duplicates) + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.id == current_pick.id) + ruins_availible -= R + if(current_pick.never_spawn_with) + for(var/blacklisted_type in current_pick.never_spawn_with) + for(var/possible_exclusion in ruins_availible) + if(istype(possible_exclusion,blacklisted_type)) + ruins_availible -= possible_exclusion + forced_z = 0 + + //Update the availible list + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.cost > budget) + ruins_availible -= R + + log_world("Ruin loader finished with [budget] left to spend.") + /datum/controller/subsystem/mapping/Recover() flags |= SS_NO_INIT diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index c21b8f0760a..9445dd2717a 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(mobs) priority = FIRE_PRIORITY_MOBS flags = SS_KEEP_TIMING runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Mobs will no longer process. Immediate server restart recommended." var/list/currentrun = list() var/static/list/clients_by_zlevel[][] @@ -10,7 +11,7 @@ SUBSYSTEM_DEF(mobs) var/static/list/cubemonkeys = list() /datum/controller/subsystem/mobs/stat_entry() - ..("P:[GLOB.mob_list.len]") + ..("P:[GLOB.mob_living_list.len]") /datum/controller/subsystem/mobs/Initialize(start_timeofday) clients_by_zlevel = new /list(world.maxz,0) @@ -20,17 +21,17 @@ SUBSYSTEM_DEF(mobs) /datum/controller/subsystem/mobs/fire(resumed = 0) var/seconds = wait * 0.1 if(!resumed) - src.currentrun = GLOB.mob_list.Copy() + src.currentrun = GLOB.mob_living_list.Copy() //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun var/times_fired = src.times_fired while(currentrun.len) - var/mob/M = currentrun[currentrun.len] + var/mob/living/L = currentrun[currentrun.len] currentrun.len-- - if(M) - M.Life(seconds, times_fired) + if(L) + L.Life(seconds, times_fired) else - GLOB.mob_list.Remove(M) + GLOB.mob_living_list.Remove(L) if(MC_TICK_CHECK) return diff --git a/code/controllers/subsystem/nano_mob_hunter.dm b/code/controllers/subsystem/nano_mob_hunter.dm index a634f091013..9094bf9fe2b 100644 --- a/code/controllers/subsystem/nano_mob_hunter.dm +++ b/code/controllers/subsystem/nano_mob_hunter.dm @@ -2,6 +2,7 @@ SUBSYSTEM_DEF(mob_hunt) name = "Nano-Mob Hunter GO Server" init_order = INIT_ORDER_NANOMOB priority = FIRE_PRIORITY_NANOMOB // Low priority, no need for MC_TICK_CHECK due to extremely low performance impact. + offline_implications = "Nano-Mob Hunter will no longer spawn mobs. No immediate action is needed." var/max_normal_spawns = 15 //change this to adjust the number of normal spawns that can exist at one time. trapped spawns (from traitors) don't count towards this var/list/normal_spawns = list() var/max_trap_spawns = 15 //change this to adjust the number of trap spawns that can exist at one time. traps spawned beyond this point clear the oldest traps diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm index c8cbbc62013..ef1b6ee03fe 100644 --- a/code/controllers/subsystem/nanoui.dm +++ b/code/controllers/subsystem/nanoui.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(nanoui) flags = SS_NO_INIT priority = FIRE_PRIORITY_NANOUI runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + offline_implications = "All NanoUIs will no longer process. Shuttle call recommended." var/list/currentrun = list() var/list/open_uis = list() // A list of open UIs, grouped by src_object and ui_key. diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index 4ebe1dceb0e..deffcb6bddf 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(nightshift) priority = FIRE_PRIORITY_NIGHTSHIFT wait = 600 flags = SS_NO_TICK_CHECK + offline_implications = "The game will no longer shift between day and night lighting. No immediate action is needed." var/nightshift_active = FALSE var/nightshift_start_time = 702000 //7:30 PM, station time @@ -25,12 +26,12 @@ SUBSYSTEM_DEF(nightshift) check_nightshift() /datum/controller/subsystem/nightshift/proc/announce(message) - priority_announcement.Announce(message, new_sound = 'sound/misc/notice2.ogg', new_title = "Automated Lighting System Announcement") + GLOB.priority_announcement.Announce(message, new_sound = 'sound/misc/notice2.ogg', new_title = "Automated Lighting System Announcement") /datum/controller/subsystem/nightshift/proc/check_nightshift(check_canfire=FALSE) if(check_canfire && !can_fire) return - var/emergency = security_level >= SEC_LEVEL_RED + var/emergency = GLOB.security_level >= SEC_LEVEL_RED var/announcing = TRUE var/time = station_time() var/night_time = (time < nightshift_end_time) || (time > nightshift_start_time) @@ -41,7 +42,7 @@ SUBSYSTEM_DEF(nightshift) if(!emergency) announce("Restoring night lighting configuration to normal operation.") else - announce("Disabling night lighting: Station is in a state of emergency.") + announce("Disabling night lighting: Station is in a state of emergency.") if(emergency) night_time = FALSE if(nightshift_active != night_time) diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 5eaca5d19c4..79541c199a4 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(npcpool) flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND priority = FIRE_PRIORITY_NPC runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Simple animals will no longer process. Shuttle call recommended." var/list/currentrun = list() diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index c35f1adee65..95b9e925b5d 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(overlays) wait = 1 priority = FIRE_PRIORITY_OVERLAYS init_order = INIT_ORDER_OVERLAY + offline_implications = "Overlays may look strange. No immediate action is needed." var/list/queue var/list/stats diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index 039b6d2b008..9135f62b03f 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(parallax) flags = SS_POST_FIRE_TIMING | SS_BACKGROUND priority = FIRE_PRIORITY_PARALLAX runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + offline_implications = "Space parallax will no longer move around. No immediate action is needed." var/list/currentrun var/planet_x_offset = 128 var/planet_y_offset = 128 diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm index 49b30062786..5a49070bf89 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -54,7 +54,7 @@ SUBSYSTEM_DEF(radio) // If the above switch somehow failed. And it needs the SSradio. part otherwise it fails to compile if(frequency in DEPT_FREQS) return "deptradio" - + // If its none of the others return "radio" diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index da3d91c1de1..247d71d05b8 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -6,6 +6,7 @@ SUBSYSTEM_DEF(shuttle) init_order = INIT_ORDER_SHUTTLE flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME + offline_implications = "Shuttles will no longer function and cargo will not generate points. Immediate server restart recommended." var/list/mobile = list() var/list/stationary = list() var/list/transit = list() @@ -223,11 +224,12 @@ SUBSYSTEM_DEF(shuttle) return 0 //dock successful -/datum/controller/subsystem/shuttle/proc/moveShuttle(shuttleId, dockId, timed) +/datum/controller/subsystem/shuttle/proc/moveShuttle(shuttleId, dockId, timed, mob/user) var/obj/docking_port/mobile/M = getShuttle(shuttleId) var/obj/docking_port/stationary/D = getDock(dockId) if(!M) return 1 + M.last_caller = user // Save the caller of the shuttle for later logging if(timed) if(M.request(D)) return 2 diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm index fcc62a2fa50..d9c46f9c9d7 100644 --- a/code/controllers/subsystem/spacedrift.dm +++ b/code/controllers/subsystem/spacedrift.dm @@ -4,6 +4,7 @@ SUBSYSTEM_DEF(spacedrift) wait = 5 flags = SS_NO_INIT|SS_KEEP_TIMING runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Mobs will no longer respect a lack of gravity. No immediate action is needed." var/list/currentrun = list() var/list/processing = list() diff --git a/code/controllers/subsystem/statistics.dm b/code/controllers/subsystem/statistics.dm new file mode 100644 index 00000000000..3a0bf7e51e2 --- /dev/null +++ b/code/controllers/subsystem/statistics.dm @@ -0,0 +1,28 @@ +SUBSYSTEM_DEF(statistics) + name = "Statistics" + wait = 6000 // 10 minute delay between fires + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME // Only count time actually ingame to avoid logging pre-round dips + offline_implications = "Player count and admin count statistics will no longer be logged to the database. No immediate action is needed." + + +/datum/controller/subsystem/statistics/Initialize(start_timeofday) + if(!config.sql_enabled) + flags |= SS_NO_FIRE // Disable firing if SQL is disabled + return ..() + +/datum/controller/subsystem/statistics/fire(resumed = 0) + sql_poll_players() + +/datum/controller/subsystem/statistics/proc/sql_poll_players() + if(!config.sql_enabled) + return + var/playercount = GLOB.clients.len + var/admincount = GLOB.admins.len + if(!GLOB.dbcon.IsConnected()) + log_game("SQL ERROR during player polling. Failed to connect.") + else + var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") + var/DBQuery/query = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time) VALUES ([playercount], [admincount], '[sqltime]')") + if(!query.Execute()) + var/err = query.ErrorMsg() + log_game("SQL ERROR during playercount polling. Error: \[[err]\]\n") diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm index 6cfb52f2d25..3f8e15df05a 100644 --- a/code/controllers/subsystem/sun.dm +++ b/code/controllers/subsystem/sun.dm @@ -1,19 +1,29 @@ SUBSYSTEM_DEF(sun) name = "Sun" wait = 600 - flags = SS_NO_TICK_CHECK|SS_NO_INIT + flags = SS_NO_TICK_CHECK + init_order = INIT_ORDER_SUN + offline_implications = "Solar panels will no longer rotate. No immediate action is needed." var/angle var/dx var/dy var/rate var/list/solars = list() -/datum/controller/subsystem/sun/PreInit() +/datum/controller/subsystem/sun/Initialize(start_timeofday) + // Lets work out an angle for the "sun" to rotate around the station angle = rand (0,360) // the station position to the sun is randomised at round start rate = rand(50,200)/100 // 50% - 200% of standard rotation if(prob(50)) // same chance to rotate clockwise than counter-clockwise rate = -rate + // Solar consoles need to load after machines init, so this handles that + for(var/obj/machinery/power/solar_control/SC in solars) + SC.setup() + + return ..() + + /datum/controller/subsystem/sun/stat_entry(msg) ..("P:[solars.len]") diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 74dbf4c4d93..04ddf40f442 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -7,6 +7,7 @@ SUBSYSTEM_DEF(throwing) wait = 1 flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + offline_implications = "Thrown objects may not react properly. Shuttle call recommended." var/list/currentrun var/list/processing = list() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 6366eba7613..228f1a7c528 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -5,6 +5,7 @@ SUBSYSTEM_DEF(ticker) priority = FIRE_PRIORITY_TICKER flags = SS_KEEP_TIMING runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME + offline_implications = "The game is no longer aware of when the round ends. Immediate server restart recommended." var/round_start_time = 0 var/const/restart_timeout = 600 @@ -23,17 +24,15 @@ SUBSYSTEM_DEF(ticker) var/Bible_deity_name var/datum/cult_info/cultdat = null //here instead of cult for adminbus purposes var/random_players = 0 // if set to nonzero, ALL players who latejoin or declare-ready join will have random appearances/genders - var/list/syndicate_coalition = list() // list of traitor-compatible factions - var/list/factions = list() // list of all factions - var/list/availablefactions = list() // list of factions with openings var/tipped = FALSE //Did we broadcast the tip of the day yet? var/selected_tip // What will be the tip of the day? var/pregame_timeleft // This is used for calculations var/delay_end = 0 //if set to nonzero, the round will not restart on it's own var/triai = 0//Global holder for Triumvirate - var/initialtpass = 0 //holder for inital autotransfer vote timer + var/next_autotransfer = 0 //holder for inital autotransfer vote timer var/obj/screen/cinematic = null //used for station explosion cinematic - var/round_end_announced = 0 // Spam Prevention. Announce round end only once.\ + var/round_end_announced = 0 // Spam Prevention. Announce round end only once. + var/ticker_going = TRUE // This used to be in the unused globals, but it turns out its actually used in a load of places. Its now a ticker var because its related to round stuff, -aa /datum/controller/subsystem/ticker/Initialize() login_music = pick(\ @@ -42,10 +41,9 @@ SUBSYSTEM_DEF(ticker) 'sound/music/title1.ogg',\ 'sound/music/title2.ogg',\ 'sound/music/title3.ogg',) - // Map name - if(using_map && using_map.name) - GLOB.map_name = "[using_map.name]" + if(GLOB.using_map && GLOB.using_map.name) + GLOB.map_name = "[GLOB.using_map.name]" else GLOB.map_name = "Unknown" @@ -68,12 +66,12 @@ SUBSYSTEM_DEF(ticker) current_state = GAME_STATE_PREGAME fire() // TG says this is a good idea if(GAME_STATE_PREGAME) - if(!going) + if(!SSticker.ticker_going) // This has to be referenced like this, and I dont know why. If you dont put SSticker. it will break return // This is so we dont have sleeps in controllers, because that is a bad, bad thing if(!delay_end) - pregame_timeleft = max(0,round_start_time - world.time) // Normal lobby countdown when roundstart was not delayed + pregame_timeleft = max(0,round_start_time - world.time) // Normal lobby countdown when roundstart was not delayed else pregame_timeleft = max(0,pregame_timeleft - 20) // If roundstart was delayed, we should resume the countdown where it left off @@ -92,12 +90,17 @@ SUBSYSTEM_DEF(ticker) delay_end = 0 // reset this in case round start was delayed mode.process() mode.process_job_tasks() + + if(world.time > next_autotransfer) + SSvote.autotransfer() + next_autotransfer = world.time + config.vote_autotransfer_interval + var/game_finished = SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || mode.station_was_nuked if(config.continuous_rounds) mode.check_finished() // some modes contain var-changing code in here, so call even if we don't uses result else game_finished |= mode.check_finished() - if(game_finished) + if(game_finished || force_ending) current_state = GAME_STATE_FINISHED if(GAME_STATE_FINISHED) current_state = GAME_STATE_FINISHED @@ -113,36 +116,23 @@ SUBSYSTEM_DEF(ticker) else world.Reboot("Round ended.", "end_proper", "proper completion") - -/datum/controller/subsystem/ticker/proc/votetimer() - var/timerbuffer = 0 - if(initialtpass == 0) - timerbuffer = config.vote_autotransfer_initial - else - timerbuffer = config.vote_autotransfer_interval - spawn(timerbuffer) - SSvote.autotransfer() - initialtpass = 1 - votetimer() - - /datum/controller/subsystem/ticker/proc/setup() cultdat = setupcult() //Create and announce mode - if(master_mode=="secret") + if(GLOB.master_mode=="secret") src.hide_mode = 1 var/list/datum/game_mode/runnable_modes - if((master_mode=="random") || (master_mode=="secret")) + if((GLOB.master_mode=="random") || (GLOB.master_mode=="secret")) runnable_modes = config.get_runnable_modes() if(runnable_modes.len==0) current_state = GAME_STATE_PREGAME Master.SetRunLevel(RUNLEVEL_LOBBY) to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.") return 0 - if(secret_force_mode != "secret") - var/datum/game_mode/M = config.pick_mode(secret_force_mode) + if(GLOB.secret_force_mode != "secret") + var/datum/game_mode/M = config.pick_mode(GLOB.secret_force_mode) if(M.can_start()) - src.mode = config.pick_mode(secret_force_mode) + src.mode = config.pick_mode(GLOB.secret_force_mode) SSjobs.ResetOccupations() if(!src.mode) src.mode = pickweight(runnable_modes) @@ -150,7 +140,7 @@ SUBSYSTEM_DEF(ticker) var/mtype = src.mode.type src.mode = new mtype else - src.mode = config.pick_mode(master_mode) + src.mode = config.pick_mode(GLOB.master_mode) if(!src.mode.can_start()) to_chat(world, "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.") mode = null @@ -167,7 +157,7 @@ SUBSYSTEM_DEF(ticker) if(!can_continue) qdel(mode) current_state = GAME_STATE_PREGAME - to_chat(world, "Error setting up [master_mode]. Reverting to pre-game lobby.") + to_chat(world, "Error setting up [GLOB.master_mode]. Reverting to pre-game lobby.") SSjobs.ResetOccupations() Master.SetRunLevel(RUNLEVEL_LOBBY) return 0 @@ -186,7 +176,7 @@ SUBSYSTEM_DEF(ticker) populate_spawn_points() collect_minds() equip_characters() - data_core.manifest() + GLOB.data_core.manifest() current_state = GAME_STATE_PLAYING Master.SetRunLevel(RUNLEVEL_GAME) @@ -194,7 +184,6 @@ SUBSYSTEM_DEF(ticker) //here to initialize the random events nicely at round start setup_economy() - setupfactions() //shuttle_controller.setup_shuttle_docks() @@ -284,11 +273,8 @@ SUBSYSTEM_DEF(ticker) auto_toggle_ooc(0) // Turn it off round_start_time = world.time - if(config.sql_enabled) - spawn(3000) - statistic_cycle() // Polls population totals regularly and stores them in an SQL DB - - votetimer() + // Sets the auto shuttle vote to happen after the config duration + next_autotransfer = world.time + config.vote_autotransfer_initial for(var/mob/new_player/N in GLOB.mob_list) if(N.client) @@ -309,15 +295,12 @@ SUBSYSTEM_DEF(ticker) cinematic.mouse_opacity = MOUSE_OPACITY_TRANSPARENT cinematic.screen_loc = "1,0" - var/obj/structure/bed/temp_buckle = new(src) if(station_missed) for(var/mob/M in GLOB.mob_list) - M.buckled = temp_buckle //buckles the mob so it can't do anything if(M.client) M.client.screen += cinematic //show every client the cinematic else //nuke kills everyone on z-level 1 to prevent "hurr-durr I survived" for(var/mob/M in GLOB.mob_list) - M.buckled = temp_buckle if(M.stat != DEAD) var/turf/T = get_turf(M) if(T && is_station_level(T.z) && !istype(M.loc, /obj/structure/closet/secure_closet/freezer)) @@ -387,8 +370,6 @@ SUBSYSTEM_DEF(ticker) //Otherwise if its a verb it will continue on afterwards. spawn(300) QDEL_NULL(cinematic) //end the cinematic - if(temp_buckle) - qdel(temp_buckle) //release everybody @@ -442,18 +423,12 @@ SUBSYSTEM_DEF(ticker) if(m) to_chat(world, "Tip of the round: [html_encode(m)]") -/datum/controller/subsystem/ticker/proc/getfactionbyname(var/name) - for(var/datum/faction/F in factions) - if(F.name == name) - return F - - /datum/controller/subsystem/ticker/proc/declare_completion() - nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point. + GLOB.nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point. //Round statistics report var/datum/station_state/end_state = new /datum/station_state() end_state.count() - var/station_integrity = min(round( 100.0 * start_state.score(end_state), 0.1), 100.0) + var/station_integrity = min(round( 100.0 * GLOB.start_state.score(end_state), 0.1), 100.0) to_chat(world, "
[TAB]Shift Duration: [round(ROUND_TIME / 36000)]:[add_zero("[ROUND_TIME / 600 % 60]", 2)]:[ROUND_TIME / 100 % 6][ROUND_TIME / 100 % 10]") to_chat(world, "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]") @@ -518,8 +493,13 @@ SUBSYSTEM_DEF(ticker) //Ask the event manager to print round end information SSevents.RoundEnd() + //make big obvious note in game logs that round ended + log_game("///////////////////////////////////////////////////////") + log_game("///////////////////// ROUND ENDED /////////////////////") + log_game("///////////////////////////////////////////////////////") + // Add AntagHUD to everyone, see who was really evil the whole time! - for(var/datum/atom_hud/antag/H in huds) + for(var/datum/atom_hud/antag/H in GLOB.huds) for(var/m in GLOB.player_list) var/mob/M = m H.add_hud_to(M) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 1caa3d7819a..7bb6a496274 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -9,6 +9,7 @@ SUBSYSTEM_DEF(timer) init_order = INIT_ORDER_TIMER flags = SS_TICKER|SS_NO_INIT + offline_implications = "The game will no longer process timers. Immediate server restart recommended." var/list/second_queue = list() //awe, yes, you've had first queue, but what about second queue? var/list/hashes = list() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 4cb49e8a3f1..b0110258da7 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(vote) wait = 10 flags = SS_KEEP_TIMING|SS_NO_INIT runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT + offline_implications = "Votes (Endround shuttle) will no longer function. Shuttle call recommended." var/initiator = null var/started_time = null @@ -90,10 +91,10 @@ SUBSYSTEM_DEF(vote) if(choices["Continue Playing"] >= greatest_votes) greatest_votes = choices["Continue Playing"] else if(mode == "gamemode") - if(master_mode in choices) - choices[master_mode] += non_voters - if(choices[master_mode] >= greatest_votes) - greatest_votes = choices[master_mode] + if(GLOB.master_mode in choices) + choices[GLOB.master_mode] += non_voters + if(choices[GLOB.master_mode] >= greatest_votes) + greatest_votes = choices[GLOB.master_mode] else if(mode == "crew_transfer") var/factor = 0.5 switch(world.time / (10 * 60)) // minutes @@ -164,14 +165,14 @@ SUBSYSTEM_DEF(vote) if(. == "Restart Round") restart = 1 if("gamemode") - if(master_mode != .) + if(GLOB.master_mode != .) world.save_mode(.) if(SSticker && SSticker.mode) restart = 1 else - master_mode = . - if(!going) - going = 1 + GLOB.master_mode = . + if(!SSticker.ticker_going) + SSticker.ticker_going = TRUE to_chat(world, "The round will start soon.") if("crew_transfer") if(. == "Initiate Crew Transfer") @@ -253,8 +254,8 @@ SUBSYSTEM_DEF(vote) world << sound('sound/ambience/alarm4.ogg') if("custom") world << sound('sound/ambience/alarm4.ogg') - if(mode == "gamemode" && going) - going = 0 + if(mode == "gamemode" && SSticker.ticker_going) + SSticker.ticker_going = FALSE to_chat(world, "Round start has been delayed.") if(mode == "crew_transfer" && config.ooc_allowed) auto_muted = 1 diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index ac2f0c59313..bf405444110 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -9,6 +9,7 @@ SUBSYSTEM_DEF(weather) flags = SS_BACKGROUND wait = 10 runlevels = RUNLEVEL_GAME + offline_implications = "Ash storms will no longer trigger. No immediate action is needed." var/list/processing = list() var/list/eligible_zlevels = list() var/list/next_hit_by_zlevel = list() //Used by barometers to know when the next storm is coming @@ -19,7 +20,7 @@ SUBSYSTEM_DEF(weather) var/datum/weather/W = V if(W.aesthetic || W.stage != MAIN_STAGE) continue - for(var/i in GLOB.living_mob_list) + for(var/i in GLOB.mob_living_list) var/mob/living/L = i if(W.can_weather_act(L)) W.weather_act(L) diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index c67e53184a1..3eaed85c303 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -53,10 +53,10 @@ debug_variables(config) feedback_add_details("admin_verb","DConf") if("pAI") - debug_variables(paiController) + debug_variables(GLOB.paiController) feedback_add_details("admin_verb","DpAI") if("Cameras") - debug_variables(cameranet) + debug_variables(GLOB.cameranet) feedback_add_details("admin_verb","DCameras") if("Garbage") debug_variables(SSgarbage) @@ -92,7 +92,7 @@ debug_variables(SSweather) feedback_add_details("admin_verb","DWeather") if("Space") - debug_variables(space_manager) + debug_variables(GLOB.space_manager) feedback_add_details("admin_verb","DSpace") if("Mob Hunt Server") debug_variables(SSmob_hunt) diff --git a/code/datums/action.dm b/code/datums/action.dm index b7af84e9ddf..c1802da47c1 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -339,7 +339,7 @@ /datum/action/item_action/remove_tape/Trigger(attack_self = FALSE) if(..()) - GET_COMPONENT_FROM(DT, /datum/component/ducttape, target) + var/datum/component/ducttape/DT = target.GetComponent(/datum/component/ducttape) DT.remove_tape(target, usr) /datum/action/item_action/toggle_jetpack diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 0a14b0e9476..8e1a9d8bcce 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -62,15 +62,15 @@ if(sorted_laws.len) return - for(var/ion_law in ion_laws) - sorted_laws += ion_law - - for(var/evil_law in devil_laws) - sorted_laws += evil_law - if(zeroth_law) sorted_laws += zeroth_law + for(var/ion_law in ion_laws) + sorted_laws += ion_law + + for(var/evil_law in devil_laws) + sorted_laws += evil_law + var/index = 1 for(var/datum/ai_law/inherent_law in inherent_laws) inherent_law.index = index++ @@ -133,12 +133,12 @@ for(var/datum/ai_law/AL in devil_laws) if(AL.law == law) return - + var/new_law = new/datum/ai_law/sixsixsix(law) devil_laws += new_law if(state_devil.len < devil_laws.len) state_devil += 1 - + sorted_laws.Cut() /datum/ai_laws/proc/add_ion_law(var/law) @@ -209,9 +209,9 @@ /datum/ai_law/ion/delete_law(var/datum/ai_laws/laws) laws.internal_delete_law(laws.ion_laws, laws.state_ion, src) - + /datum/ai_law/sixsixsix/delete_law(var/datum/ai_laws/laws) - laws.internal_delete_law(laws.devil_laws, laws.state_devil, src) + laws.internal_delete_law(laws.devil_laws, laws.state_devil, src) /datum/ai_law/inherent/delete_law(var/datum/ai_laws/laws) laws.internal_delete_law(laws.inherent_laws, laws.state_inherent, src) diff --git a/code/datums/cache/air_alarm.dm b/code/datums/cache/air_alarm.dm index 662b0958d5c..2edc0792a34 100644 --- a/code/datums/cache/air_alarm.dm +++ b/code/datums/cache/air_alarm.dm @@ -1,4 +1,4 @@ -var/global/datum/repository/air_alarm/air_alarm_repository = new() +GLOBAL_DATUM_INIT(air_alarm_repository, /datum/repository/air_alarm, new()) /datum/repository/air_alarm/proc/air_alarm_data(var/list/monitored_alarms, var/refresh = 0, var/obj/machinery/alarm/passed_alarm) var/alarms[0] @@ -11,13 +11,13 @@ var/global/datum/repository/air_alarm/air_alarm_repository = new() if(!refresh) return cache_entry.data - if(SSticker && SSticker.current_state < GAME_STATE_PLAYING && istype(passed_alarm)) // Generating the list for the first time as the game hasn't started - no need to run through the machines list everything every time + if(SSticker && SSticker.current_state < GAME_STATE_PLAYING && istype(passed_alarm)) // Generating the list for the first time as the game hasn't started - no need to run through the machines list everything every time alarms = cache_entry.data // Don't deleate the list if(is_station_contact(passed_alarm.z) && passed_alarm.remote_control) // Still need sanity checks - alarms[++alarms.len] = passed_alarm.get_nano_data_console() + alarms[++alarms.len] = passed_alarm.get_nano_data_console() else for(var/obj/machinery/alarm/alarm in (monitored_alarms ? monitored_alarms : GLOB.air_alarms)) // Generating the whole list again is a bad habit but I can't be bothered to fix it right now - if(!monitored_alarms && !is_station_contact(alarm.z)) + if(!monitored_alarms && !is_station_contact(alarm.z)) continue if(!alarm.remote_control) continue diff --git a/code/datums/cache/apc.dm b/code/datums/cache/apc.dm index 524a8793415..318fd654fe3 100644 --- a/code/datums/cache/apc.dm +++ b/code/datums/cache/apc.dm @@ -1,4 +1,4 @@ -var/global/datum/repository/apc/apc_repository = new() +GLOBAL_DATUM_INIT(apc_repository, /datum/repository/apc, new()) /datum/repository/apc/proc/apc_data(datum/powernet/powernet) var/apcData[0] diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm index b30b5c57889..21ec5ebcc79 100644 --- a/code/datums/cache/crew.dm +++ b/code/datums/cache/crew.dm @@ -1,4 +1,4 @@ -var/global/datum/repository/crew/crew_repository = new() +GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new()) /datum/repository/crew/New() cache_data = list() diff --git a/code/datums/cache/powermonitor.dm b/code/datums/cache/powermonitor.dm index 29394195edf..606dd500eda 100644 --- a/code/datums/cache/powermonitor.dm +++ b/code/datums/cache/powermonitor.dm @@ -1,8 +1,8 @@ -var/global/datum/repository/powermonitor/powermonitor_repository = new() +GLOBAL_DATUM_INIT(powermonitor_repository, /datum/repository/powermonitor, new()) /datum/repository/powermonitor/proc/powermonitor_data(var/refresh = 0) var/pMonData[0] - + var/datum/cache_entry/cache_entry = cache_data if(!cache_entry) cache_entry = new/datum/cache_entry @@ -10,15 +10,15 @@ var/global/datum/repository/powermonitor/powermonitor_repository = new() if(!refresh) return cache_entry.data - + for(var/obj/machinery/computer/monitor/pMon in GLOB.power_monitors) if( !(pMon.stat & (NOPOWER|BROKEN)) && !pMon.is_secret_monitor ) pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]") cache_entry.timestamp = world.time //+ 30 SECONDS - cache_entry.data = pMonData + cache_entry.data = pMonData return pMonData - + /datum/repository/powermonitor/proc/update_cache() return powermonitor_data(refresh = 1) - + diff --git a/code/datums/components/README.md b/code/datums/components/README.md index 9d06a255dd7..03f7d3a5875 100644 --- a/code/datums/components/README.md +++ b/code/datums/components/README.md @@ -2,134 +2,8 @@ ## Concept -Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward it's arguments with a `SEND_SIGNAL` call. Now every component that want's to can also know about this happening. +Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward it's arguments with a `SendSignal()` call. Now every component that want's to can also know about this happening. -### In the code +See [this thread](https://tgstation13.org/phpBB/viewtopic.php?f=5&t=22674) for an introduction to the system as a whole. -#### Slippery things - -At the time of this writing, every object that is slippery overrides atom/Crossed does some checks, then slips the mob. Instead of all those Crossed overrides they could add a slippery component to all these objects. And have the checks in one proc that is run by the Crossed event - -#### Powercells - -A lot of objects have powercells. The `get_cell()` proc was added to give generic access to the cell var if it had one. This is just a specific use case of `GetComponent()` - -#### Radios - -The radio object as it is should not exist, given that more things use the _concept_ of radios rather than the object itself. The actual function of the radio can exist in a component which all the things that use it (Request consoles, actual radios, the SM shard) can add to themselves. - -#### Standos - -Stands have a lot of procs which mimic mob procs. Rather than inserting hooks for all these procs in overrides, the same can be accomplished with signals - -## API - -### Defines - -1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned. This will be noted in the runtime logs - -### Vars - -1. `/datum/var/list/datum_components` (private) - * Lazy associated list of type -> component/list of components. -1. `/datum/var/list/comp_lookup` (private) - * Lazy associated list of signal -> registree/list of registrees -1. `/datum/var/list/signal_procs` (private) - * Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum receives that signal -1. `/datum/var/signal_enabled` (protected, boolean) - * If the datum is signal enabled. If not, it will not react to signals - * `FALSE` by default, set to `TRUE` when a signal is registered -1. `/datum/component/var/dupe_mode` (protected, enum) - * How duplicate component types are handled when added to the datum. - * `COMPONENT_DUPE_HIGHLANDER` (default): Old component will be deleted, new component will first have `/datum/component/proc/InheritComponent(datum/component/old, FALSE)` on it - * `COMPONENT_DUPE_ALLOWED`: The components will be treated as separate, `GetComponent()` will return the first added - * `COMPONENT_DUPE_UNIQUE`: New component will be deleted, old component will first have `/datum/component/proc/InheritComponent(datum/component/new, TRUE)` on it - * `COMPONENT_DUPE_UNIQUE_PASSARGS`: New component will never exist and instead its initialization arguments will be passed on to the old component. -1. `/datum/component/var/dupe_type` (protected, type) - * Definition of a duplicate component type - * `null` means exact match on `type` (default) - * Any other type means that and all subtypes -1. `/datum/component/var/datum/parent` (protected, read-only) - * The datum this component belongs to - * Never `null` in child procs -1. `report_signal_origin` (protected, boolean) - * If `TRUE`, will invoke the callback when signalled with the signal type as the first argument. - * `FALSE` by default. - -### Procs - -1. `/datum/proc/GetComponent(component_type(type)) -> datum/component?` (public, final) - * Returns a reference to a component of component_type if it exists in the datum, null otherwise -1. `/datum/proc/GetComponents(component_type(type)) -> list` (public, final) - * Returns a list of references to all components of component_type that exist in the datum -1. `/datum/proc/GetExactComponent(component_type(type)) -> datum/component?` (public, final) - * Returns a reference to a component whose type MATCHES component_type if that component exists in the datum, null otherwise -1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)` - * Shorthand for `var/component_type/varname = src.GetComponent(component_type)` -1. `SEND_SIGNAL(target, sigtype, ...)` (public, final) - * Use to send signals to target datum - * Extra arguments are to be specified in the signal definition - * Returns a bitflag with signal specific information assembled from all activated components - * Arguments are packaged in a list and handed off to _SendSignal() -1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component` (public, final) - * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call - * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum - * All components a datum owns are deleted with the datum - * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set - * If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it - * Properly handles duplicate situations based on the `dupe_mode` var -1. `/datum/proc/LoadComponent(component_type(type), ...) -> datum/component` (public, final) - * Equivalent to calling `GetComponent(component_type)` where, if the result would be `null`, returns `AddComponent(component_type, ...)` instead -1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract, async) - * Called on a component's `parent` after a signal received causes it to activate. `src` is the parameter - * Will only be called if a component's callback returns `TRUE` -1. `/datum/proc/TakeComponent(datum/component/C)` (public, final) - * Properly transfers ownership of a component from one datum to another - * Signals `COMSIG_COMPONENT_REMOVING` on the parent - * Called on the datum you want to own the component with another datum's component -1. `/datum/proc/_SendSignal(signal, list/arguments)` (private, final) - * Handles most of the actual signaling procedure - * Will runtime if used on datums with an empty component list -1. `/datum/proc/RegisterSignal(datum/target, signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final) - * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments - * Makes the datum listen for the specified `signal` on it's `parent` datum. - * When that signal is received `proc_ref` will be called on the component, along with associated arguments - * Example proc ref: `.proc/OnEvent` - * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this - * These callbacks run asyncronously - * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `SendSignal()` that initiated it -1. `/datum/component/New(datum/parent, ...)` (private, final) - * Runs internal setup for the component - * Extra arguments are passed to `Initialize()` -1. `/datum/component/Initialize(...)` (abstract, no-sleep) - * Called by `New()` with the same argments excluding `parent` - * Component does not exist in `parent`'s `datum_components` list yet, although `parent` is set and may be used - * Signals will not be received while this function is running - * Component may be deleted after this function completes without being attached - * Do not call `qdel(src)` from this function -1. `/datum/component/Destroy(force(bool), silent(bool))` (virtual, no-sleep) - * Sends the `COMSIG_COMPONENT_REMOVING` signal to the parent datum if the `parent` isn't being qdeleted - * Properly removes the component from `parent` and cleans up references - * Setting `force` makes it not check for and remove the component from the parent - * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal -1. `/datum/component/proc/InheritComponent(datum/component/C, i_am_original(boolean))` (abstract, no-sleep) - * Called on a component when a component of the same type was added to the same parent - * See `/datum/component/var/dupe_mode` - * `C`'s type will always be the same of the called component -1. `/datum/component/proc/AfterComponentActivated()` (abstract, async) - * Called on a component that was activated after it's `parent`'s `ComponentActivated()` is called -1. `/datum/component/proc/OnTransfer(datum/new_parent)` (abstract, no-sleep) - * Called before `new_parent` is assigned to `parent` in `TakeComponent()` - * Allows the component to react to ownership transfers -1. `/datum/component/proc/_RemoveFromParent()` (private, final) - * Clears `parent` and removes the component from it's component list -1. `/datum/component/proc/_JoinParent` (private, final) - * Tries to add the component to it's `parent`s `datum_components` list -1. `/datum/component/proc/RegisterWithParent` (abstract, no-sleep) - * Used to register the signals that should be on the `parent` object - * Use this if you plan on the component transfering between parents -1. `/datum/component/proc/UnregisterFromParent` (abstract, no-sleep) - * Counterpart to `RegisterWithParent()` - * Used to unregister the signals that should only be on the `parent` object - -### See/Define signals and their arguments in __DEFINES\components.dm +### See/Define signals and their arguments in [__DEFINES\dcs\signals.dm](../../__DEFINES/dcs/signals.dm) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index e733ca78d2b..f895b8d81b1 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -1,21 +1,87 @@ +/** + * # Component + * + * The component datum + * + * A component should be a single standalone unit + * of functionality, that works by receiving signals from it's parent + * object to provide some single functionality (i.e a slippery component) + * that makes the object it's attached to cause people to slip over. + * Useful when you want shared behaviour independent of type inheritance + */ /datum/component + /** + * Defines how duplicate existing components are handled when added to a datum + * + * See [COMPONENT_DUPE_*][COMPONENT_DUPE_ALLOWED] definitions for available options + */ var/dupe_mode = COMPONENT_DUPE_HIGHLANDER + + /** + * The type to check for duplication + * + * `null` means exact match on `type` (default) + * + * Any other type means that and all subtypes + */ var/dupe_type + + /// The datum this components belongs to var/datum/parent - //only set to true if you are able to properly transfer this component - //At a minimum RegisterWithParent and UnregisterFromParent should be used - //Make sure you also implement PostTransfer for any post transfer handling + + /** + * Only set to true if you are able to properly transfer this component + * + * At a minimum [RegisterWithParent][/datum/component/proc/RegisterWithParent] and [UnregisterFromParent][/datum/component/proc/UnregisterFromParent] should be used + * + * Make sure you also implement [PostTransfer][/datum/component/proc/PostTransfer] for any post transfer handling + */ var/can_transfer = FALSE -/datum/component/New(datum/P, ...) - parent = P - var/list/arguments = args.Copy(2) +/** + * Create a new component. + * + * Additional arguments are passed to [Initialize()][/datum/component/proc/Initialize] + * + * Arguments: + * * datum/P the parent datum this component reacts to signals from + */ +/datum/component/New(list/raw_args) + parent = raw_args[1] + var/list/arguments = raw_args.Copy(2) if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE) + stack_trace("Incompatible [type] assigned to a [parent.type]! args: [json_encode(arguments)]") qdel(src, TRUE, TRUE) - CRASH("Incompatible [type] assigned to a [P.type]! args: [json_encode(arguments)]") + return - _JoinParent(P) + _JoinParent(parent) +/** + * Called during component creation with the same arguments as in new excluding parent. + * + * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead + */ +/datum/component/proc/Initialize(...) + return + +/** + * Properly removes the component from `parent` and cleans up references + * + * Arguments: + * * force - makes it not check for and remove the component from the parent + * * silent - deletes the component without sending a [COMSIG_COMPONENT_REMOVING] signal + */ +/datum/component/Destroy(force=FALSE, silent=FALSE) + if(!force && parent) + _RemoveFromParent() + if(!silent) + SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src) + parent = null + return ..() + +/** + * Internal proc to handle behaviour of components when joining a parent + */ /datum/component/proc/_JoinParent() var/datum/P = parent //lazy init the parent's dc list @@ -51,21 +117,9 @@ RegisterWithParent() -// If you want/expect to be moving the component around between parents, use this to register on the parent for signals -/datum/component/proc/RegisterWithParent() - return - -/datum/component/proc/Initialize(...) - return - -/datum/component/Destroy(force=FALSE, silent=FALSE) - if(!force && parent) - _RemoveFromParent() - if(!silent) - SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src) - parent = null - return ..() - +/** + * Internal proc to handle behaviour when being removed from a parent + */ /datum/component/proc/_RemoveFromParent() var/datum/P = parent var/list/dc = P.datum_components @@ -84,10 +138,41 @@ UnregisterFromParent() +/** + * Register the component with the parent object + * + * Use this proc to register with your parent object + * + * Overridable proc that's called when added to a new parent + */ +/datum/component/proc/RegisterWithParent() + return + +/** + * Unregister from our parent object + * + * Use this proc to unregister from your parent object + * + * Overridable proc that's called when removed from a parent + * * + */ /datum/component/proc/UnregisterFromParent() return -/datum/proc/RegisterSignal(datum/target, sig_type_or_types, proc_or_callback, override = FALSE) +/** + * Register to listen for a signal from the passed in target + * + * This sets up a listening relationship such that when the target object emits a signal + * the source datum this proc is called upon, will recieve a callback to the given proctype + * Return values from procs registered must be a bitfield + * + * Arguments: + * * datum/target The target to listen for signals from + * * sig_type_or_types Either a string signal name, or a list of signal names (strings) + * * proctype The proc to call back when the signal is emitted + * * override If a previous registration exists you must explicitly set this + */ +/datum/proc/RegisterSignal(datum/target, sig_type_or_types, proctype, override = FALSE) if(QDELETED(src) || QDELETED(target)) return @@ -100,15 +185,12 @@ if(!lookup) target.comp_lookup = lookup = list() - if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now - proc_or_callback = CALLBACK(src, proc_or_callback) - var/list/sig_types = islist(sig_type_or_types) ? sig_type_or_types : list(sig_type_or_types) for(var/sig_type in sig_types) if(!override && procs[target][sig_type]) stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning") - procs[target][sig_type] = proc_or_callback + procs[target][sig_type] = proctype if(!lookup[sig_type]) // Nothing has registered here yet lookup[sig_type] = src @@ -122,6 +204,17 @@ signal_enabled = TRUE +/** + * Stop listening to a given signal from target + * + * Breaks the relationship between target and source datum, removing the callback when the signal fires + * + * Doesn't care if a registration exists or not + * + * Arguments: + * * datum/target Datum to stop listening to signals from + * * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically + */ /datum/proc/UnregisterSignal(datum/target, sig_type_or_types) var/list/lookup = target.comp_lookup if(!signal_procs || !signal_procs[target] || !lookup) @@ -129,6 +222,8 @@ if(!islist(sig_type_or_types)) sig_type_or_types = list(sig_type_or_types) for(var/sig in sig_type_or_types) + if(!signal_procs[target][sig]) + continue switch(length(lookup[sig])) if(2) lookup[sig] = (lookup[sig]-src)[1] @@ -151,41 +246,96 @@ if(!signal_procs[target].len) signal_procs -= target +/** + * Called on a component when a component of the same type was added to the same parent + * + * See [/datum/component/var/dupe_mode] + * + * `C`'s type will always be the same of the called component + */ /datum/component/proc/InheritComponent(datum/component/C, i_am_original) return + +/** + * Called on a component when a component of the same type was added to the same parent with [COMPONENT_DUPE_SELECTIVE] + * + * See [/datum/component/var/dupe_mode] + * + * `C`'s type will always be the same of the called component + * + * return TRUE if you are absorbing the component, otherwise FALSE if you are fine having it exist as a duplicate component + */ +/datum/component/proc/CheckDupeComponent(datum/component/C, ...) + return + + +/** + * Callback Just before this component is transferred + * + * Use this to do any special cleanup you might need to do before being deregged from an object + */ /datum/component/proc/PreTransfer() return +/** + * Callback Just after a component is transferred + * + * Use this to do any special setup you need to do after being moved to a new object + * + * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead + */ /datum/component/proc/PostTransfer() return COMPONENT_INCOMPATIBLE //Do not support transfer by default as you must properly support it +/** + * Internal proc to create a list of our type and all parent types + */ /datum/component/proc/_GetInverseTypeList(our_type = type) //we can do this one simple trick var/current_type = parent_type . = list(our_type, current_type) //and since most components are root level + 1, this won't even have to run - while(current_type != /datum/component) + while (current_type != /datum/component) current_type = type2parent(current_type) . += current_type +/** + * Internal proc to handle most all of the signaling procedure + * + * Will runtime if used on datums with an empty component list + * + * Use the [SEND_SIGNAL] define instead + */ /datum/proc/_SendSignal(sigtype, list/arguments) var/target = comp_lookup[sigtype] if(!length(target)) var/datum/C = target if(!C.signal_enabled) return NONE - var/datum/callback/CB = C.signal_procs[src][sigtype] - return CB.InvokeAsync(arglist(arguments)) + var/proctype = C.signal_procs[src][sigtype] + return NONE | CallAsync(C, proctype, arguments) . = NONE for(var/I in target) var/datum/C = I if(!C.signal_enabled) continue - var/datum/callback/CB = C.signal_procs[src][sigtype] - . |= CB.InvokeAsync(arglist(arguments)) + var/proctype = C.signal_procs[src][sigtype] + . |= CallAsync(C, proctype, arguments) -/datum/proc/GetComponent(c_type) +// The type arg is casted so initial works, you shouldn't be passing a real instance into this +/** + * Return any component assigned to this datum of the given type + * + * This will throw an error if it's possible to have more than one component of that type on the parent + * + * Arguments: + * * datum/component/c_type The typepath of the component you want to get a reference to + */ +/datum/proc/GetComponent(datum/component/c_type) + RETURN_TYPE(c_type) + if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE) + stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]") var/list/dc = datum_components if(!dc) return null @@ -193,7 +343,19 @@ if(length(.)) return .[1] -/datum/proc/GetExactComponent(c_type) +// The type arg is casted so initial works, you shouldn't be passing a real instance into this +/** + * Return any component assigned to this datum of the exact given type + * + * This will throw an error if it's possible to have more than one component of that type on the parent + * + * Arguments: + * * datum/component/c_type The typepath of the component you want to get a reference to + */ +/datum/proc/GetExactComponent(datum/component/c_type) + RETURN_TYPE(c_type) + if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE) + stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]") var/list/dc = datum_components if(!dc) return null @@ -205,6 +367,12 @@ return C return null +/** + * Get all components of a given type that are attached to this datum + * + * Arguments: + * * c_type The component type path + */ /datum/proc/GetComponents(c_type) var/list/dc = datum_components if(!dc) @@ -213,7 +381,19 @@ if(!length(.)) return list(.) -/datum/proc/AddComponent(new_type, ...) +/** + * Creates an instance of `new_type` in the datum and attaches to it as parent + * + * Sends the [COMSIG_COMPONENT_ADDED] signal to the datum + * + * Returns the component that was created. Or the old component in a dupe situation where [COMPONENT_DUPE_UNIQUE] was set + * + * If this tries to add a component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it + * + * Properly handles duplicate situations based on the `dupe_mode` var + */ +/datum/proc/_AddComponent(list/raw_args) + var/new_type = raw_args[1] var/datum/component/nt = new_type var/dm = initial(nt.dupe_mode) var/dt = initial(nt.dupe_type) @@ -228,7 +408,7 @@ new_comp = nt nt = new_comp.type - args[1] = src + raw_args[1] = src if(dm != COMPONENT_DUPE_ALLOWED) if(!dt) @@ -239,37 +419,62 @@ switch(dm) if(COMPONENT_DUPE_UNIQUE) if(!new_comp) - new_comp = new nt(arglist(args)) + new_comp = new nt(raw_args) if(!QDELETED(new_comp)) old_comp.InheritComponent(new_comp, TRUE) QDEL_NULL(new_comp) if(COMPONENT_DUPE_HIGHLANDER) if(!new_comp) - new_comp = new nt(arglist(args)) + new_comp = new nt(raw_args) if(!QDELETED(new_comp)) new_comp.InheritComponent(old_comp, FALSE) QDEL_NULL(old_comp) if(COMPONENT_DUPE_UNIQUE_PASSARGS) if(!new_comp) - var/list/arguments = args.Copy(2) - old_comp.InheritComponent(null, TRUE, arguments) + var/list/arguments = raw_args.Copy(2) + arguments.Insert(1, null, TRUE) + old_comp.InheritComponent(arglist(arguments)) else old_comp.InheritComponent(new_comp, TRUE) + if(COMPONENT_DUPE_SELECTIVE) + var/list/arguments = raw_args.Copy() + arguments[1] = new_comp + var/make_new_component = TRUE + for(var/i in GetComponents(new_type)) + var/datum/component/C = i + if(C.CheckDupeComponent(arglist(arguments))) + make_new_component = FALSE + QDEL_NULL(new_comp) + break + if(!new_comp && make_new_component) + new_comp = new nt(raw_args) else if(!new_comp) - new_comp = new nt(arglist(args)) // There's a valid dupe mode but there's no old component, act like normal + new_comp = new nt(raw_args) // There's a valid dupe mode but there's no old component, act like normal else if(!new_comp) - new_comp = new nt(arglist(args)) // Dupes are allowed, act like normal + new_comp = new nt(raw_args) // Dupes are allowed, act like normal if(!old_comp && !QDELETED(new_comp)) // Nothing related to duplicate components happened and the new component is healthy SEND_SIGNAL(src, COMSIG_COMPONENT_ADDED, new_comp) return new_comp return old_comp +/** + * Get existing component of type, or create it and return a reference to it + * + * Use this if the item needs to exist at the time of this call, but may not have been created before now + * + * Arguments: + * * component_type The typepath of the component to create or return + * * ... additional arguments to be passed when creating the component if it does not exist + */ /datum/proc/LoadComponent(component_type, ...) . = GetComponent(component_type) if(!.) - return AddComponent(arglist(args)) + return _AddComponent(args) +/** + * Removes the component from parent, ends up with a null parent + */ /datum/component/proc/RemoveComponent() if(!parent) return @@ -279,6 +484,14 @@ parent = null SEND_SIGNAL(old_parent, COMSIG_COMPONENT_REMOVING, src) +/** + * Transfer this component to another parent + * + * Component is taken from source datum + * + * Arguments: + * * datum/component/target Target datum to transfer to + */ /datum/proc/TakeComponent(datum/component/target) if(!target || target.parent == src) return @@ -295,6 +508,14 @@ if(target == AddComponent(target)) target._JoinParent() +/** + * Transfer all components to target + * + * All components from source datum are taken + * + * Arguments: + * * /datum/target the target to move the components to + */ /datum/proc/TransferComponents(datum/target) var/list/dc = datum_components if(!dc) @@ -309,5 +530,8 @@ if(C.can_transfer) target.TakeComponent(comps) +/** + * Return the object that is the host of any UI's that this component has + */ /datum/component/nano_host() return parent diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm index 6a0f686b13a..876cf0c0507 100644 --- a/code/datums/components/decal.dm +++ b/code/datums/components/decal.dm @@ -7,7 +7,7 @@ var/first_dir // This only stores the dir arg from init -/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description, _alpha=255) +/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable = CLEAN_GOD, _color, _layer = TURF_LAYER, _description, _alpha = 255) if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha)) return COMPONENT_INCOMPATIBLE first_dir = _dir diff --git a/code/datums/components/edit_complainer.dm b/code/datums/components/edit_complainer.dm new file mode 100644 index 00000000000..35bb05ca791 --- /dev/null +++ b/code/datums/components/edit_complainer.dm @@ -0,0 +1,23 @@ +// This is just a bit of fun while making an example for global signal +/datum/component/edit_complainer + var/list/say_lines + +/datum/component/edit_complainer/Initialize(list/text) + if(!ismovableatom(parent)) + return COMPONENT_INCOMPATIBLE + + var/static/list/default_lines = list( + "CentComm's profligacy frays another thread.", + "Another tug at the weave.", + "Who knows when the stresses will finally shatter the form?", + "Even now a light shines through the cracks.", + "CentComm once more twists knowledge beyond its authority.", + "There is an uncertain air in the mansus.", + ) + say_lines = text || default_lines + + RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react) + +/datum/component/edit_complainer/proc/var_edit_react(datum/source, list/arguments) + var/atom/movable/master = parent + master.atom_say(pick(say_lines)) diff --git a/code/datums/components/jestosterone.dm b/code/datums/components/jestosterone.dm deleted file mode 100644 index f37f1f03efb..00000000000 --- a/code/datums/components/jestosterone.dm +++ /dev/null @@ -1,5 +0,0 @@ -/datum/component/jestosterone - var/mind_type //Is the affected mob a clown / mime? - -/datum/component/jestosterone/Initialize(mind_type_arg) - mind_type = mind_type_arg diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm new file mode 100644 index 00000000000..c6d0c595ebb --- /dev/null +++ b/code/datums/components/label.dm @@ -0,0 +1,87 @@ +/** + The label component. + + This component is used to manage labels applied by the hand labeler. + + Atoms can only have one instance of this component, and therefore only one label at a time. + This is to avoid having names like "Backpack (label1) (label2) (label3)". This is annoying and abnoxious to read. + + When a player clicks the atom with a hand labeler to apply a label, this component gets applied to it. + If the labeler is off, the component will be removed from it, and the label will be removed from its name. + */ +/datum/component/label + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS + /// The name of the label the player is applying to the parent. + var/label_name + +/datum/component/label/Initialize(_label_name) + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + + label_name = _label_name + apply_label() + +/datum/component/label/RegisterWithParent() + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackby) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/Examine) + +/datum/component/label/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) + +/** + This proc will fire after the parent is hit by a hand labeler which is trying to apply another label. + Since the parent already has a label, it will remove the old one from the parent's name, and apply the new one. +*/ +/datum/component/label/InheritComponent(datum/component/label/new_comp , i_am_original, _label_name) + remove_label() + if(new_comp) + label_name = new_comp.label_name + else + label_name = _label_name + apply_label() + +/** + This proc will trigger when any object is used to attack the parent. + + If the attacking object is not a hand labeler, it will return. + If the attacking object is a hand labeler it will restore the name of the parent to what it was before this component was added to it, and the component will be deleted. + + Arguments: + * source: The parent. + * attacker: The object that is hitting the parent. + * user: The mob who is wielding the attacking object. +*/ +/datum/component/label/proc/OnAttackby(datum/source, obj/item/attacker, mob/user) + // If the attacking object is not a hand labeler or its mode is 1 (has a label ready to apply), return. + // The hand labeler should be off (mode is 0), in order to remove a label. + var/obj/item/hand_labeler/labeler = attacker + if(!istype(labeler) || labeler.mode) + return + + remove_label() + playsound(parent, 'sound/items/poster_ripped.ogg', 20, TRUE) + to_chat(user, "You remove the label from [parent].") + qdel(src) // Remove the component from the object. + +/** + This proc will trigger when someone examines the parent. + It will attach the text found in the body of the proc to the `examine_list` and display it to the player examining the parent. + + Arguments: + * source: The parent. + * user: The mob exmaining the parent. + * examine_list: The current list of text getting passed from the parent's normal examine() proc. +*/ +/datum/component/label/proc/Examine(datum/source, mob/user, list/examine_list) + examine_list += "It has a label with some words written on it. Use a hand labeler to remove it." + +/// Applies a label to the name of the parent in the format of: "parent_name (label)" +/datum/component/label/proc/apply_label() + var/atom/owner = parent + owner.name += " ([label_name])" + +/// Removes the label from the parent's name +/datum/component/label/proc/remove_label() + var/atom/owner = parent + owner.name = replacetext(owner.name, "([label_name])", "") // Remove the label text from the parent's name, wherever it's located. + owner.name = trim(owner.name) // Shave off any white space from the beginning or end of the parent's name. diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm new file mode 100644 index 00000000000..3e505eb0a8a --- /dev/null +++ b/code/datums/components/slippery.dm @@ -0,0 +1,56 @@ +/** + * # Slip Component + * + * This is a component that can be applied to any movable atom (mob or obj). + * + * While the atom has this component, any human mob that walks over it will have a chance to slip. + * Duration, tiles moved, and so on, depend on what variables are passed in when the component is added. + * + */ +/datum/component/slippery + /// Text that gets displayed in the slip proc, i.e. "user slips on [description]" + var/description + /// The amount of stun to apply after slip. + var/stun + /// The amount of weaken to apply after slip. + var/weaken + /// The chance that walking over the parent will slip you. + var/slip_chance + /// The amount of tiles someone will be moved after slip. + var/slip_tiles + /// TRUE If this slip can be avoided by walking. + var/walking_is_safe + /// TRUE if having no slip shoes makes you immune to this slip. + var/noslip_is_immune + /// The verb that players will see when someone slips on the parent. In the form of "You [slip_verb]ped on". + var/slip_verb + +/datum/component/slippery/Initialize(_description, _stun = 0, _weaken = 0, _slip_chance = 100, _slip_tiles = 0, _walking_is_safe = TRUE, _noslip_is_immune = TRUE, _slip_verb = "slip") + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + + description = _description + stun = max(0, _stun) + weaken = max(0, _weaken) + slip_chance = max(0, _slip_chance) + slip_tiles = max(0, _slip_tiles) + walking_is_safe = _walking_is_safe + noslip_is_immune = _noslip_is_immune + slip_verb = _slip_verb + +/datum/component/slippery/RegisterWithParent() + RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip) + +/datum/component/slippery/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED)) + +/** + Called whenever the parent recieves either the `MOVABLE_CROSSED` signal or the `ATOM_ENTERED` signal. + + Calls the `victim`'s `slip()` proc with the component's variables as arguments. + Additionally calls the parent's `after_slip()` proc on the `victim`. +*/ +/datum/component/slippery/proc/Slip(datum/source, mob/living/carbon/human/victim) + if(istype(victim) && prob(slip_chance) && victim.slip(description, stun, weaken, slip_tiles, walking_is_safe, noslip_is_immune, slip_verb)) + var/atom/movable/owner = parent + owner.after_slip(victim) diff --git a/code/datums/components/waddling.dm b/code/datums/components/waddling.dm deleted file mode 100644 index a1f538e4dd7..00000000000 --- a/code/datums/components/waddling.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/component/waddling - dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS - -/datum/component/waddling/Initialize() - if(!isliving(parent)) - return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Waddle) - -/datum/component/waddling/proc/Waddle() - var/mob/living/L = parent - if(L.incapacitated() || L.lying) - return - animate(L, pixel_z = 4, time = 0) - animate(pixel_z = 0, transform = turn(matrix(), pick(-12, 0, 12)), time=2) - animate(pixel_z = 0, transform = matrix(), time = 0) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index f908685cf09..7bfc79e4e71 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -1,5 +1,5 @@ /hook/startup/proc/createDatacore() - data_core = new /datum/datacore() + GLOB.data_core = new /datum/datacore() return 1 /datum/datacore @@ -34,7 +34,7 @@ "} var/even = 0 // sort mobs - for(var/datum/data/record/t in data_core.general) + for(var/datum/data/record/t in GLOB.data_core.general) var/name = t.fields["name"] var/rank = t.fields["rank"] var/real_rank = t.fields["real_rank"] @@ -48,28 +48,28 @@ else isactive[name] = t.fields["p_stat"] var/department = 0 - if(real_rank in command_positions) + if(real_rank in GLOB.command_positions) heads[name] = rank department = 1 - if(real_rank in security_positions) + if(real_rank in GLOB.security_positions) sec[name] = rank department = 1 - if(real_rank in engineering_positions) + if(real_rank in GLOB.engineering_positions) eng[name] = rank department = 1 - if(real_rank in medical_positions) + if(real_rank in GLOB.medical_positions) med[name] = rank department = 1 - if(real_rank in science_positions) + if(real_rank in GLOB.science_positions) sci[name] = rank department = 1 - if(real_rank in service_positions) + if(real_rank in GLOB.service_positions) ser[name] = rank department = 1 - if(real_rank in supply_positions) + if(real_rank in GLOB.supply_positions) sup[name] = rank department = 1 - if(real_rank in nonhuman_positions) + if(real_rank in GLOB.nonhuman_positions) bot[name] = rank department = 1 if(!department && !(name in heads)) @@ -133,10 +133,10 @@ we'll only update it when it changes. The PDA_Manifest global list is zeroed ou using /datum/datacore/proc/manifest_inject(), or manifest_insert() */ -var/global/list/PDA_Manifest = list() +GLOBAL_LIST_EMPTY(PDA_Manifest) /datum/datacore/proc/get_manifest_json() - if(PDA_Manifest.len) + if(GLOB.PDA_Manifest.len) return var/heads[0] var/sec[0] @@ -147,7 +147,7 @@ var/global/list/PDA_Manifest = list() var/sup[0] var/bot[0] var/misc[0] - for(var/datum/data/record/t in data_core.general) + for(var/datum/data/record/t in GLOB.data_core.general) var/name = sanitize(t.fields["name"]) var/rank = sanitize(t.fields["rank"]) var/real_rank = t.fields["real_rank"] @@ -155,50 +155,50 @@ var/global/list/PDA_Manifest = list() var/isactive = t.fields["p_stat"] var/department = 0 var/depthead = 0 // Department Heads will be placed at the top of their lists. - if(real_rank in command_positions) + if(real_rank in GLOB.command_positions) heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 depthead = 1 if(rank == "Captain" && heads.len != 1) heads.Swap(1, heads.len) - if(real_rank in security_positions) + if(real_rank in GLOB.security_positions) sec[++sec.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && sec.len != 1) sec.Swap(1, sec.len) - if(real_rank in engineering_positions) + if(real_rank in GLOB.engineering_positions) eng[++eng.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && eng.len != 1) eng.Swap(1, eng.len) - if(real_rank in medical_positions) + if(real_rank in GLOB.medical_positions) med[++med.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && med.len != 1) med.Swap(1, med.len) - if(real_rank in science_positions) + if(real_rank in GLOB.science_positions) sci[++sci.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && sci.len != 1) sci.Swap(1, sci.len) - if(real_rank in service_positions) + if(real_rank in GLOB.service_positions) ser[++ser.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && ser.len != 1) ser.Swap(1, ser.len) - if(real_rank in supply_positions) + if(real_rank in GLOB.supply_positions) sup[++sup.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 if(depthead && sup.len != 1) sup.Swap(1, sup.len) - if(real_rank in nonhuman_positions) + if(real_rank in GLOB.nonhuman_positions) bot[++bot.len] = list("name" = name, "rank" = rank, "active" = isactive) department = 1 @@ -206,7 +206,7 @@ var/global/list/PDA_Manifest = list() misc[++misc.len] = list("name" = name, "rank" = rank, "active" = isactive) - PDA_Manifest = list(\ + GLOB.PDA_Manifest = list(\ "heads" = heads,\ "sec" = sec,\ "eng" = eng,\ @@ -226,12 +226,12 @@ var/global/list/PDA_Manifest = list() manifest_inject(H) /datum/datacore/proc/manifest_modify(name, assignment) - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() var/datum/data/record/foundrecord var/real_title = assignment - for(var/datum/data/record/t in data_core.general) + for(var/datum/data/record/t in GLOB.data_core.general) if(t) if(t.fields["name"] == name) foundrecord = t @@ -250,10 +250,10 @@ var/global/list/PDA_Manifest = list() foundrecord.fields["rank"] = assignment foundrecord.fields["real_rank"] = real_title -var/record_id_num = 1001 +GLOBAL_VAR_INIT(record_id_num, 1001) /datum/datacore/proc/manifest_inject(mob/living/carbon/human/H) - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() if(H.mind && (H.mind.assigned_role != H.mind.special_role)) var/assignment @@ -266,7 +266,7 @@ var/record_id_num = 1001 else assignment = "Unassigned" - var/id = num2hex(record_id_num++, 6) + var/id = num2hex(GLOB.record_id_num++, 6) //General Record @@ -624,7 +624,7 @@ var/record_id_num = 1001 clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) - else if(H.mind && H.mind.assigned_role in get_all_centcom_jobs()) + else if(H.mind && (H.mind.assigned_role in get_all_centcom_jobs())) clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) else diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 00054349e36..6a183987a30 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -5,7 +5,7 @@ /// Status traits attached to this datum var/list/status_traits var/list/comp_lookup - var/list/signal_procs + var/list/list/datum/callback/signal_procs var/signal_enabled = FALSE var/datum_flags = NONE var/var_edited = FALSE //Warranty void if seal is broken diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 1defb9a6afa..b2b09003934 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -31,7 +31,7 @@ /datum/proc/vv_get_var(var_name) switch(var_name) - if("attack_log", "debug_log") + if("attack_log_old", "debug_log") return debug_variable(var_name, vars[var_name], 0, src, sanitize = FALSE) if("vars") return debug_variable(var_name, list(), 0, src) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 63fa3af0605..81312cdfcc4 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -126,11 +126,19 @@ AddDisease(D) +/** + * Forces the mob to contract a virus. If the mob can have viruses. Ignores clothing and other protection + * Returns TRUE if it succeeds. False if it doesn't + * + * Arguments: + * * D - the disease the mob will try to contract + */ //Same as ContractDisease, except never overidden clothes checks /mob/proc/ForceContractDisease(datum/disease/D) if(!CanContractDisease(D)) - return 0 + return FALSE AddDisease(D) + return TRUE /mob/living/carbon/human/CanContractDisease(datum/disease/D) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 84dde0f22e0..6b7c2d89606 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -29,7 +29,7 @@ #define BIOHAZARD "BIOHAZARD THREAT!" -var/list/diseases = subtypesof(/datum/disease) +GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease)) /datum/disease diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index e0711d88e5f..9aeade59a1d 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -6,16 +6,15 @@ If you need help with creating new symptoms or expanding the advance disease, ask for Giacom on #coderbus. */ - -var/list/archive_diseases = list() +GLOBAL_LIST_EMPTY(archive_diseases) // The order goes from easy to cure to hard to cure. -var/list/advance_cures = list( +GLOBAL_LIST_INIT(advance_cures, list( "sodiumchloride", "sugar", "orangejuice", "spaceacillin", "salglu_solution", "ethanol", "teporone", "diphenhydramine", "lipolicide", "silver", "gold" - ) +)) /* @@ -132,7 +131,7 @@ var/list/advance_cures = list( // Generate symptoms. By default, we only choose non-deadly symptoms. var/list/possible_symptoms = list() - for(var/symp in list_symptoms) + for(var/symp in GLOB.list_symptoms) var/datum/symptom/S = new symp if(S.level >= level_min && S.level <= level_max) if(!HasSymptom(S)) @@ -158,13 +157,13 @@ var/list/advance_cures = list( AssignProperties(properties) id = null - if(!archive_diseases[GetDiseaseID()]) + if(!GLOB.archive_diseases[GetDiseaseID()]) if(new_name) AssignName() - archive_diseases[GetDiseaseID()] = src // So we don't infinite loop - archive_diseases[GetDiseaseID()] = new /datum/disease/advance(0, src, 1) + GLOB.archive_diseases[GetDiseaseID()] = src // So we don't infinite loop + GLOB.archive_diseases[GetDiseaseID()] = new /datum/disease/advance(0, src, 1) - var/datum/disease/advance/A = archive_diseases[GetDiseaseID()] + var/datum/disease/advance/A = GLOB.archive_diseases[GetDiseaseID()] AssignName(A.name) //Generate disease properties based on the effects. Returns an associated list. @@ -246,9 +245,9 @@ var/list/advance_cures = list( // Will generate a random cure, the less resistance the symptoms have, the harder the cure. /datum/disease/advance/proc/GenerateCure(list/properties = list()) if(properties && properties.len) - var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) + var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, GLOB.advance_cures.len) // to_chat(world, "Res = [res]") - cures = list(advance_cures[res]) + cures = list(GLOB.advance_cures[res]) // Get the cure name from the cure_id var/datum/reagent/D = GLOB.chemical_reagents_list[cures[1]] @@ -371,7 +370,7 @@ var/list/advance_cures = list( var/list/symptoms = list() symptoms += "Done" - symptoms += list_symptoms.Copy() + symptoms += GLOB.list_symptoms.Copy() do if(user) var/symptom = input(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom") in symptoms @@ -397,7 +396,7 @@ var/list/advance_cures = list( for(var/datum/disease/advance/AD in GLOB.active_diseases) AD.Refresh() - for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list)) + for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list)) if(!is_station_level(H.z)) continue if(!H.HasDisease(D)) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index 1a9bba6961e..a3111478b26 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -33,7 +33,7 @@ Bonus if(3, 4) to_chat(M, "[pick("You hear a ringing in your ear.", "Your ears pop.")]") if(5) - if(!(M.disabilities & DEAF)) + if(!(DEAF in M.mutations)) to_chat(M, "Your ears pop and begin ringing loudly!") M.BecomeDeaf() spawn(200) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index cf39d91a866..5759ab32de6 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -62,4 +62,4 @@ Bonus M.reagents.add_reagent("oculine", 20) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) - to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]") + to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your hearing feels more acute.")]") diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index aa5a3494584..a3346dce800 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -35,7 +35,7 @@ BONUS switch(A.stage) if(5) H.s_tone = -85 - H.update_body(0) + H.update_body() else H.visible_message("[H] looks a bit pale...", "Your skin suddenly appears lighter...") @@ -79,7 +79,7 @@ BONUS switch(A.stage) if(5) H.s_tone = 85 - H.update_body(0) + H.update_body() else H.visible_message("[H] looks a bit dark...", "Your skin suddenly appears darker...") diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index f2c5beee400..8f72de7f599 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -1,6 +1,6 @@ // Symptoms are the effects that engineered advanced diseases do. -var/list/list_symptoms = subtypesof(/datum/symptom) +GLOBAL_LIST_INIT(list_symptoms, subtypesof(/datum/symptom)) /datum/symptom // Buffs/Debuffs the symptom has to the overall engineered disease. @@ -17,7 +17,7 @@ var/list/list_symptoms = subtypesof(/datum/symptom) var/id = "" /datum/symptom/New() - var/list/S = list_symptoms + var/list/S = GLOB.list_symptoms for(var/i = 1; i <= S.len; i++) if(type == S[i]) id = "[i]" diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index cacd229c429..02f36b532d7 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -30,7 +30,7 @@ affected_mob.emote("stare") if(prob(2)) affected_mob.emote("drool") - if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't retard you to death now + if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't brainpain you to death now affected_mob.adjustBrainLoss(2) if(prob(2)) to_chat(affected_mob, "Your try to remember something important...but can't.") @@ -40,7 +40,7 @@ affected_mob.emote("stare") if(prob(2)) affected_mob.emote("drool") - if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't retard you to death now + if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't brainpain you to death now affected_mob.adjustBrainLoss(3) if(prob(2)) to_chat(affected_mob, "Strange buzzing fills your head, removing all thoughts.") diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm index e3ebc2cf905..3afb48ce534 100644 --- a/code/datums/diseases/critical.dm +++ b/code/datums/diseases/critical.dm @@ -6,12 +6,17 @@ if(prob(stage_prob)) stage = min(stage + 1, max_stages) + if(has_cure()) + cure() + return FALSE + return TRUE + +/datum/disease/critical/has_cure() for(var/C_id in cures) if(affected_mob.reagents.has_reagent(C_id)) if(prob(cure_chance)) - cure() - return FALSE - return TRUE + return TRUE + return FALSE /datum/disease/critical/shock name = "Shock" @@ -31,7 +36,7 @@ /datum/disease/critical/shock/stage_act() if(..()) - if(affected_mob.health >= 25) + if(affected_mob.health >= 25 && affected_mob.nutrition >= NUTRITION_LEVEL_HYPOGLYCEMIA) to_chat(affected_mob, "You feel better.") cure() return @@ -134,3 +139,64 @@ if(prob(5) && ishuman(affected_mob)) var/mob/living/carbon/human/H = affected_mob H.set_heartattack(TRUE) + +/datum/disease/critical/hypoglycemia + name = "Hypoglycemia" + form = "Medical Emergency" + max_stages = 3 + spread_flags = SPECIAL + spread_text = "The patient has low blood sugar." + cure_text = "Eating or administration of vitamins or nutrients" + viable_mobtypes = list(/mob/living/carbon/human) + stage_prob = 1 + severity = DANGEROUS + disease_flags = CURABLE + bypasses_immunity = TRUE + virus_heal_resistant = TRUE + +/datum/disease/critical/hypoglycemia/has_cure() + if(ishuman(affected_mob)) + var/mob/living/carbon/human/H = affected_mob + if(NO_HUNGER in H.dna.species.species_traits) + return TRUE + if(ismachine(H)) + return TRUE + return ..() + +/datum/disease/critical/hypoglycemia/stage_act() + if(..()) + if(affected_mob.nutrition > NUTRITION_LEVEL_HYPOGLYCEMIA) + to_chat(affected_mob, "You feel a lot better!") + cure() + return + switch(stage) + if(1) + if(prob(4)) + to_chat(affected_mob, "You feel hungry!") + if(prob(2)) + to_chat(affected_mob, "You have a headache!") + if(prob(2)) + to_chat(affected_mob, "You feel [pick("anxious", "depressed")]!") + if(2) + if(prob(4)) + to_chat(affected_mob, "You feel like everything is wrong with your life!") + if(prob(5)) + affected_mob.Slowed(rand(4, 16)) + to_chat(affected_mob, "You feel [pick("tired", "exhausted", "sluggish")].") + if(prob(5)) + affected_mob.Weaken(6) + affected_mob.Stuttering(10) + to_chat(affected_mob, "You feel [pick("numb", "confused", "dizzy", "lightheaded")].") + affected_mob.emote("collapse") + if(3) + if(prob(8)) + var/datum/disease/D = new /datum/disease/critical/shock + affected_mob.ForceContractDisease(D) + if(prob(12)) + affected_mob.Weaken(6) + affected_mob.Stuttering(10) + to_chat(affected_mob, "You feel [pick("numb", "confused", "dizzy", "lightheaded")].") + affected_mob.emote("collapse") + if(prob(12)) + to_chat(affected_mob, "You feel [pick("tired", "exhausted", "sluggish")].") + affected_mob.Slowed(rand(4, 16)) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 158324e72f1..bb85f62199a 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -9,7 +9,7 @@ viable_mobtypes = list(/mob/living/carbon/human) disease_flags = CAN_CARRY|CAN_RESIST|CURABLE permeability_mod = 0.75 - desc = "Some speculate, that this virus is the cause of Wizard Federation existance. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." + desc = "Some speculate, that this virus is the cause of Wizard Federation existance. Subjects affected show the signs of dementia, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition." severity = HARMFUL required_organs = list(/obj/item/organ/external/head) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm new file mode 100644 index 00000000000..46a295f90be --- /dev/null +++ b/code/datums/elements/_element.dm @@ -0,0 +1,55 @@ +/** + * A holder for simple behaviour that can be attached to many different types + * + * Only one element of each type is instanced during game init. + * Otherwise acts basically like a lightweight component. + */ +/datum/element + /// Option flags for element behaviour + var/element_flags = NONE + /** + * The index of the first attach argument to consider for duplicate elements + * + * Is only used when flags contains [ELEMENT_BESPOKE] + * + * This is infinity so you must explicitly set this + */ + var/id_arg_index = INFINITY + +/// Activates the functionality defined by the element on the given target datum +/datum/element/proc/Attach(datum/target) + SHOULD_CALL_PARENT(1) + if(type == /datum/element) + return ELEMENT_INCOMPATIBLE + SEND_SIGNAL(target, COMSIG_ELEMENT_ATTACH, src) + if(element_flags & ELEMENT_DETACH) + RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach, override = TRUE) + +/// Deactivates the functionality defines by the element on the given datum +/datum/element/proc/Detach(datum/source, force) + SEND_SIGNAL(source, COMSIG_ELEMENT_DETACH, src) + SHOULD_CALL_PARENT(1) + UnregisterSignal(source, COMSIG_PARENT_QDELETING) + +/datum/element/Destroy(force) + if(!force) + return QDEL_HINT_LETMELIVE + SSdcs.elements_by_type -= type + return ..() + +//DATUM PROCS + +/// Finds the singleton for the element type given and attaches it to src +/datum/proc/_AddElement(list/arguments) + var/datum/element/ele = SSdcs.GetElement(arguments) + arguments[1] = src + if(ele.Attach(arglist(arguments)) == ELEMENT_INCOMPATIBLE) + CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]") + +/** + * Finds the singleton for the element type given and detaches it from src + * You only need additional arguments beyond the type if you're using [ELEMENT_BESPOKE] + */ +/datum/proc/_RemoveElement(list/arguments) + var/datum/element/ele = SSdcs.GetElement(arguments) + ele.Detach(src) diff --git a/code/datums/elements/waddling.dm b/code/datums/elements/waddling.dm new file mode 100644 index 00000000000..6abe75b3923 --- /dev/null +++ b/code/datums/elements/waddling.dm @@ -0,0 +1,25 @@ +/datum/element/waddling + +/datum/element/waddling/Attach(datum/target) + . = ..() + if(!ismovableatom(target)) + return ELEMENT_INCOMPATIBLE + if(isliving(target)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/LivingWaddle) + else + RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Waddle) + +/datum/element/waddling/Detach(datum/source, force) + . = ..() + UnregisterSignal(source, COMSIG_MOVABLE_MOVED) + +/datum/element/waddling/proc/LivingWaddle(mob/living/target) + if(target.incapacitated() || target.lying) + return + Waddle(target) + +/datum/element/waddling/proc/Waddle(atom/movable/target) + animate(target, pixel_z = 4, time = 0) + var/prev_trans = matrix(target.transform) + animate(pixel_z = 0, transform = turn(target.transform, pick(-12, 0, 12)), time = 2) + animate(pixel_z = 0, transform = prev_trans, time = 0) diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index 35cc970aa67..63b70b512ee 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -645,7 +645,7 @@ What are the archived variables for? ((nitrogen < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen) || (nitrogen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen))) return 0 if((abs(carbon_dioxide-sample.carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && \ - ((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (oxygen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide))) + ((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (carbon_dioxide > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide))) return 0 if((abs(toxins-sample.toxins) > MINIMUM_AIR_TO_SUSPEND) && \ ((toxins < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins) || (toxins > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins))) diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm deleted file mode 100644 index 214045941b5..00000000000 --- a/code/datums/helper_datums/global_iterator.dm +++ /dev/null @@ -1,152 +0,0 @@ -/* -README: - -The global_iterator datum is supposed to provide a simple and robust way to -create some constantly "looping" processes with ability to stop and restart them at will. -Generally, the only thing you want to play with (meaning, redefine) is the process() proc. -It must contain all the things you want done. - -Control functions: - new - used to create datum. First argument (optional) - var list(to use in process() proc) as list, - second (optional) - autostart control. - If autostart == TRUE, the loop will be started immediately after datum creation. - - start(list/arguments) - starts the loop. Takes arguments(optional) as a list, which is then used - by process() proc. Returns null if datum already active, 1 if loop started succesfully and 0 if there's - an error in supplied arguments (not list or empty list). - - stop() - stops the loop. Returns null if datum is already inactive and 1 on success. - - set_delay(new_delay) - sets the delay between iterations. Pretty selfexplanatory. - Returns 0 on error(new_delay is not numerical), 1 otherwise. - - set_process_args(list/arguments) - passes the supplied arguments to the process() proc. - - active() - Returns 1 if datum is active, 0 otherwise. - - toggle() - toggles datum state. Returns new datum state (see active()). - -Misc functions: - - get_last_exec_time() - Returns the time of last iteration. - - get_last_exec_time_as_text() - Returns the time of last iteration as text - - -Control vars: - - delay - delay between iterations - - check_for_null - if equals TRUE, on each iteration the supplied arguments will be checked for nulls. - If some varible equals null (and null only), the loop is stopped. - Usefull, if some var unexpectedly becomes null - due to object deletion, for example. - Of course, you can also check the variables inside process() proc to prevent runtime errors. - -Data storage vars: - - result - stores the value returned by process() proc -*/ - -/datum/global_iterator - var/control_switch = 0 - var/delay = 10 - var/list/arg_list = new - var/last_exec = null - var/check_for_null = 1 - var/forbid_garbage = 0 - var/result - var/state = 0 - -/datum/global_iterator/New(list/arguments=null,autostart=1) - delay = delay>0?(delay):1 - if(forbid_garbage) //prevents garbage collection with tag != null - tag = "\ref[src]" - set_process_args(arguments) - if(autostart) - start() - return - -/datum/global_iterator/proc/main() - state = 1 - while(src && control_switch) - last_exec = world.timeofday - if(check_for_null && has_null_args()) - stop() - return 0 - result = process(arglist(arg_list)) - for(var/sleep_time=delay;sleep_time>0;sleep_time--) //uhh, this is ugly. But I see no other way to terminate sleeping proc. Such disgrace. - if(!control_switch) - return 0 - sleep(1) - return 0 - -/datum/global_iterator/proc/start(list/arguments=null) - if(active()) - return - if(arguments) - if(!set_process_args(arguments)) - return 0 - if(!state_check()) //the main loop is sleeping, wait for it to terminate. - return - control_switch = 1 - spawn() - state = main() - return 1 - -/datum/global_iterator/proc/stop() - if(!active()) - return - control_switch = 0 - spawn(-1) //report termination error but don't wait for state_check(). - state_check() - return 1 - -/datum/global_iterator/proc/state_check() - var/lag = 0 - while(state) - sleep(1) - if(++lag>10) - CRASH("The global_iterator loop \ref[src] failed to terminate in designated timeframe. This may be caused by server lagging.") - return 1 - -/datum/global_iterator/process() - return - -/datum/global_iterator/proc/active() - return control_switch - -/datum/global_iterator/proc/has_null_args() - if(null in arg_list) - return 1 - return 0 - - -/datum/global_iterator/proc/set_delay(new_delay) - if(isnum(new_delay)) - delay = max(1, round(new_delay)) - return 1 - else - return 0 - -/datum/global_iterator/proc/get_last_exec_time() - return (last_exec||0) - -/datum/global_iterator/proc/get_last_exec_time_as_text() - return (time2text(last_exec)||"Wasn't executed yet") - -/datum/global_iterator/proc/set_process_args(list/arguments) - if(arguments && istype(arguments, /list) && arguments.len) - arg_list = arguments - return 1 - else -// to_chat(world, "Invalid arguments supplied for [src.type], ref = \ref[src]") - return 0 - -/datum/global_iterator/proc/toggle_null_checks() - check_for_null = !check_for_null - return check_for_null - -/datum/global_iterator/proc/toggle() - if(!stop()) - start() - return active() diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm index 8a1e7576e7a..a54707842db 100644 --- a/code/datums/helper_datums/map_template.dm +++ b/code/datums/helper_datums/map_template.dm @@ -17,7 +17,7 @@ name = rename /datum/map_template/proc/preload_size(path) - var/bounds = maploader.load_map(file(path), 1, 1, 1, cropMap = 0, measureOnly = 1) + var/bounds = GLOB.maploader.load_map(file(path), 1, 1, 1, cropMap = 0, measureOnly = 1) if(bounds) width = bounds[MAP_MAXX] // Assumes all templates are rectangular, have a single Z level, and begin at 1,1,1 height = bounds[MAP_MAXY] @@ -48,8 +48,8 @@ // This system will metaphorically snap in half (not postpone init everywhere) // if given a multi-z template // it might need to be adapted for that when that time comes - space_manager.add_dirt(placement.z) - var/list/bounds = maploader.load_map(get_file(), min_x, min_y, placement.z, cropMap = 1) + GLOB.space_manager.add_dirt(placement.z) + var/list/bounds = GLOB.maploader.load_map(get_file(), min_x, min_y, placement.z, cropMap = 1) if(!bounds) return 0 if(bot_left == null || top_right == null) @@ -58,7 +58,7 @@ if(ST_bot_left == null || ST_top_right == null) log_runtime(EXCEPTION("One of the smoothing corners is bust"), src) - space_manager.remove_dirt(placement.z) + GLOB.space_manager.remove_dirt(placement.z) late_setup_level( block(bot_left, top_right), block(ST_bot_left, ST_top_right)) @@ -108,7 +108,7 @@ for(var/map in flist(path)) if(cmptext(copytext(map, length(map) - 3), ".dmm")) var/datum/map_template/T = new(path = "[path][map]", rename = "[map]") - map_templates[T.name] = T + GLOB.map_templates[T.name] = T if(!config.disable_space_ruins) // so we don't unnecessarily clutter start-up preloadRuinTemplates() @@ -134,13 +134,13 @@ if(banned.Find(R.mappath)) continue - map_templates[R.name] = R - ruins_templates[R.name] = R + GLOB.map_templates[R.name] = R + GLOB.ruins_templates[R.name] = R if(istype(R, /datum/map_template/ruin/lavaland)) - lava_ruins_templates[R.name] = R + GLOB.lava_ruins_templates[R.name] = R if(istype(R, /datum/map_template/ruin/space)) - space_ruins_templates[R.name] = R + GLOB.space_ruins_templates[R.name] = R /proc/preloadShelterTemplates() for(var/item in subtypesof(/datum/map_template/shelter)) @@ -149,8 +149,8 @@ continue var/datum/map_template/shelter/S = new shelter_type() - shelter_templates[S.shelter_id] = S - map_templates[S.shelter_id] = S + GLOB.shelter_templates[S.shelter_id] = S + GLOB.map_templates[S.shelter_id] = S /proc/preloadShuttleTemplates() for(var/item in subtypesof(/datum/map_template/shuttle)) @@ -160,5 +160,5 @@ var/datum/map_template/shuttle/S = new shuttle_type() - shuttle_templates[S.shuttle_id] = S - map_templates[S.shuttle_id] = S + GLOB.shuttle_templates[S.shuttle_id] = S + GLOB.map_templates[S.shuttle_id] = S diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index b8684072c3f..369c01cce42 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -148,7 +148,6 @@ eye.eye_user = user eye.name = "Camera Eye ([user.name])" user.remote_control = eye - user.remote_view = 1 user.reset_perspective(eye) eye.setLoc(get_turf(H)) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index f204465d7d6..50152c4873d 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -1,8 +1,8 @@ /* HUD DATUMS */ -var/global/list/all_huds = list() +GLOBAL_LIST_EMPTY(all_huds) ///GLOBAL HUD LIST -var/datum/atom_hud/huds = list( \ +GLOBAL_LIST_INIT(huds, list( \ DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/human/security/basic(), \ DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(), \ DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \ @@ -24,7 +24,7 @@ var/datum/atom_hud/huds = list( \ ANTAG_HUD_DEVIL = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_EVENTMISC = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden()\ - ) +)) /datum/atom_hud var/list/atom/hudatoms = list() //list of all atoms which display this hud @@ -33,14 +33,14 @@ var/datum/atom_hud/huds = list( \ /datum/atom_hud/New() - all_huds += src + GLOB.all_huds += src /datum/atom_hud/Destroy() for(var/v in hudusers) remove_hud_from(v) for(var/v in hudatoms) remove_from_hud(v) - all_huds -= src + GLOB.all_huds -= src return ..() /datum/atom_hud/proc/remove_hud_from(mob/M) @@ -99,7 +99,7 @@ var/datum/atom_hud/huds = list( \ serv_huds += serv.thrallhud - for(var/datum/atom_hud/hud in (all_huds|serv_huds))//|gang_huds)) + for(var/datum/atom_hud/hud in (GLOB.all_huds|serv_huds))//|gang_huds)) if(src in hud.hudusers) hud.add_hud_to(src) diff --git a/code/datums/log_record.dm b/code/datums/log_record.dm new file mode 100644 index 00000000000..9b7d52b5390 --- /dev/null +++ b/code/datums/log_record.dm @@ -0,0 +1,37 @@ +/datum/log_record + var/log_type // Type of log + var/raw_time // When did this happen? + var/what // What happened + var/who // Who did it + var/target // Who/what was targeted (can be a string) + var/turf/where // Where did it happen + +/datum/log_record/New(_log_type, _who, _what, _target, _where, _raw_time) + log_type = _log_type + + who = get_subject_text(_who) + what = _what + target = get_subject_text(_target) + if(!_where) + _where = get_turf(_who) + where = _where + if(!_raw_time) + _raw_time = world.time + raw_time = _raw_time + +/datum/log_record/proc/get_subject_text(subject) + if(ismob(subject) || isclient(subject) || istype(subject, /datum/mind)) + return key_name_admin(subject) + if(isatom(subject)) + var/atom/A = subject + return A.name + if(istype(subject, /datum)) + var/datum/D = subject + return D.type + return subject + +/proc/compare_log_record(datum/log_record/A, datum/log_record/B) + var/time_diff = A.raw_time - B.raw_time + if(!time_diff) // Same time + return cmp_text_asc(A.log_type, B.log_type) + return time_diff diff --git a/code/datums/log_viewer.dm b/code/datums/log_viewer.dm new file mode 100644 index 00000000000..67eb3d21d86 --- /dev/null +++ b/code/datums/log_viewer.dm @@ -0,0 +1,235 @@ +#define ALL_LOGS list(ATTACK_LOG, DEFENSE_LOG, CONVERSION_LOG, SAY_LOG, EMOTE_LOG, MISC_LOG) + +/datum/log_viewer + var/time_from = 0 + var/time_to = 4 HOURS // 4 Hours should be enough. INFINITY would screw the UI up + var/list/selected_mobs = list() // The mobs in question + var/list/selected_log_types = list() // The log types being searched for + + var/list/log_records = list() // Found and sorted records + +/datum/log_viewer/proc/clear_all() + selected_mobs.Cut() + selected_log_types.Cut() + time_from = initial(time_from) + time_to = initial(time_to) + log_records.Cut() + return + +/datum/log_viewer/proc/search() + log_records.Cut() // Empty the old results + var/list/invalid_mobs = list() + for(var/i in selected_mobs) + var/mob/M = i + if(!M || QDELETED(M)) + invalid_mobs |= M + continue + for(var/log_type in selected_log_types) + var/list/logs = M.logs[log_type] + var/len_logs = length(logs) + if(len_logs) + var/start_index = get_earliest_log_index(logs) + if(!start_index) // No log found that matches the starting time criteria + continue + var/end_index = get_latest_log_index(logs) + if(!end_index) // No log found that matches the end time criteria + continue + log_records.Add(logs.Copy(start_index, end_index + 1)) + + if(invalid_mobs.len) + to_chat(usr, "The search criteria contained invalid mobs. They have been removed from the criteria.") + for(var/i in invalid_mobs) + selected_mobs -= i // Cleanup + + log_records = sortTim(log_records, /proc/compare_log_record) + +/** Binary search like implementation to find the earliest log + * Returns the index of the earliest log using the time_from value for the given list of logs. + * It will return 0 if no log after time_from is found +*/ +/datum/log_viewer/proc/get_earliest_log_index(list/logs) + if(!time_from) + return 1 + var/start = 1 + var/end = length(logs) + var/mid + do + mid = round_down((end + start) / 2) + var/datum/log_record/L = logs[mid] + if(L.raw_time >= time_from) + end = mid + else + start = mid + while(end - start > 1) + var/datum/log_record/L = logs[end] + if(L.raw_time >= time_from) // Check if there is atleast one valid log + return end + return 0 + +/** Binary search like implementation to find the latest log + * Returns the index of the latest log using the time_to value (1 second is added to prevent rounding weirdness) for the given list of logs. + * It will return 0 if no log before time_to + 10 is found +*/ +/datum/log_viewer/proc/get_latest_log_index(list/logs) + if(world.time < time_to) + return length(logs) + + var/end = length(logs) + var/start = 1 + var/mid + var/max_time = time_to + 10 + do + mid = round((end + start) / 2 + 0.5) + var/datum/log_record/L = logs[mid] + if(L.raw_time >= max_time) + end = mid + else + start = mid + while(end - start > 1) + var/datum/log_record/L = logs[start] + if(L.raw_time < max_time) // Check if there is atleast one valid log + return start + return 0 + +/datum/log_viewer/proc/add_mob(mob/user, mob/M) + if(!M || !user) + return + selected_mobs |= M + + show_ui(user) + +/datum/log_viewer/proc/show_ui(mob/user) + var/all_log_types = ALL_LOGS + var/trStyleTop = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;" + var/trStyle = "border-top:1px solid; border-bottom:1px solid; padding-top: 5px; padding-bottom: 5px;" + var/dat + dat += "" + dat += "
"
+ dat += "Time Search Range: [gameTimestamp(wtime = time_from)]"
+ dat += " To: [gameTimestamp(wtime = time_to)]"
+ dat += "
" + + dat += "Mobs being used:" + for(var/i in selected_mobs) + var/mob/M = i + if(QDELETED(M)) + selected_mobs -= i + continue + dat += "[M.name]" + dat += "Add Mob" + dat += "Clear All Mobs" + dat += "
" + + dat += "Log Types:" + for(var/i in all_log_types) + var/log_type = i + var/enabled = (log_type in selected_log_types) + var/text + var/style + if(enabled) + text = "[log_type]" + style = "background: [get_logtype_color(i)]" + else + text = log_type + + dat += "[text]" + + dat += "
" + dat += "Clear All Settings" + dat += "Search" + dat += "
"
+
+ // Search results
+ var/tdStyleTime = "width:80px; text-align:center;"
+ var/tdStyleType = "width:80px; text-align:center;"
+ var/tdStyleWho = "width:300px; text-align:center;"
+ var/tdStyleWhere = "width:150px; text-align:center;"
+ dat += "" + + dat += "Mobs being used:" + for(var/i in selected_mobs) + var/mob/M = i + if(QDELETED(M)) + selected_mobs -= i + continue + dat += "[M.name]" + dat += "Add Mob" + dat += "Clear All Mobs" + dat += "
" + + dat += "Log Types:" + for(var/i in all_log_types) + var/log_type = i + var/enabled = (log_type in selected_log_types) + var/text + var/style + if(enabled) + text = "[log_type]" + style = "background: [get_logtype_color(i)]" + else + text = log_type + + dat += "[text]" + + dat += "
" + dat += "Clear All Settings" + dat += "Search" + dat += "
"
+ dat += ""
+ dat += "
"
+ dat += "
"
+
+ var/datum/browser/popup = new(user, "Log viewer", "Log viewer", 1400, 600)
+ popup.set_content(dat)
+ popup.open()
+
+/datum/log_viewer/Topic(href, href_list)
+ if(href_list["start_time"])
+ var/input = input(usr, "hh:mm:ss", "Start time", "00:00:00") as text|null
+ if(!input)
+ return
+ var/res = timeStampToNum(input)
+ if(res < 0)
+ to_chat(usr, "'[input]' is an invalid input value.")
+ return
+ time_from = res
+ show_ui(usr)
+ return
+ if(href_list["end_time"])
+ var/input = input(usr, "hh:mm:ss", "End time", "04:00:00") as text|null
+ if(!input)
+ return
+ var/res = timeStampToNum(input)
+ if(res < 0)
+ to_chat(usr, "'[input]' is an invalid input value.")
+ return
+ time_to = res
+
+ show_ui(usr)
+ return
+ if(href_list["search"])
+ search(usr)
+ show_ui(usr)
+ return
+ if(href_list["clear_all"])
+ clear_all(usr)
+ show_ui(usr)
+ return
+ if(href_list["clear_mobs"])
+ selected_mobs.Cut()
+ show_ui(usr)
+ return
+ if(href_list["add_mob"])
+ var/list/mobs = getpois(TRUE, TRUE)
+ var/datum/async_input/A = input_autocomplete_async(usr, "Please, select a mob: ", mobs)
+ A.on_close(CALLBACK(src, .proc/add_mob, usr))
+ return
+ if(href_list["remove_mob"])
+ var/mob/M = locate(href_list["remove_mob"])
+ if(M)
+ selected_mobs -= M
+ show_ui(usr)
+ return
+ if(href_list["toggle_log_type"])
+ var/log_type = href_list["toggle_log_type"]
+ if(log_type in selected_log_types)
+ selected_log_types -= log_type
+ else
+ selected_log_types += log_type
+ show_ui(usr)
+ return
+
+/datum/log_viewer/proc/get_logtype_color(log_type)
+ switch(log_type)
+ if(ATTACK_LOG)
+ return "darkred"
+ if(DEFENSE_LOG)
+ return "chocolate"
+ if(CONVERSION_LOG)
+ return "indigo"
+ if(SAY_LOG)
+ return "teal"
+ if(EMOTE_LOG)
+ return "deepskyblue"
+ if(MISC_LOG)
+ return "gray"
+ return "slategray"
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index db2420a1bf8..7d3a73abf24 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -49,23 +49,19 @@
var/miming = 0 // Mime's vow of silence
var/list/antag_datums
var/speech_span // What span any body this mind has talks in.
- var/datum/faction/faction //associated faction
var/datum/changeling/changeling //changeling holder
var/linglink
var/datum/vampire/vampire //vampire holder
var/datum/abductor/abductor //abductor holder
- var/datum/devilinfo/devilinfo //devil holder
var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD
var/datum/mindslaves/som //stands for slave or master...hush..
var/datum/devilinfo/devilinfo //Information about the devil, if any.
- var/damnation_type = 0
- var/datum/mind/soulOwner //who owns the soul. Under normal circumstances, this will point to src
+ var/damnation_type = 0
+ var/datum/mind/soulOwner //who owns the soul. Under normal circumstances, this will point to src
var/hasSoul = TRUE
- var/rev_cooldown = 0
-
var/isholy = FALSE // is this person a chaplain or admin role allowed to use bibles
var/isblessed = FALSE // is this person blessed by a chaplain?
var/num_blessed = 0 // for prayers
@@ -105,6 +101,14 @@
current.mind = null
leave_all_huds() //leave all the huds in the old body, so it won't get huds if somebody else enters it
+ for(var/log_type in current.logs) // Copy the old logs
+ var/list/logs = current.logs[log_type]
+ if(new_character.logs[log_type])
+ new_character.logs[log_type] += logs.Copy() // Append the old ones
+ new_character.logs[log_type] = sortTim(new_character.logs[log_type], /proc/compare_log_record) // Sort them on time
+ else
+ new_character.logs[log_type] = logs.Copy() // Just copy them
+
SSnanoui.user_transferred(current, new_character)
if(new_character.mind) //remove any mind currently in our new body's mind variable
@@ -539,7 +543,7 @@
var/mob/def_target = null
var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain)
if(objective&&(objective.type in objective_list) && objective:target)
- def_target = objective:target.current
+ def_target = objective.target.current
possible_targets = sortAtom(possible_targets)
possible_targets += "Free objective"
@@ -845,11 +849,11 @@
to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [SSticker.cultdat.entity_title2] above all else. Bring It back.")
log_admin("[key_name(usr)] has culted [key_name(current)]")
message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]")
- if(!summon_spots.len)
- while(summon_spots.len < SUMMON_POSSIBILITIES)
- var/area/summon = pick(return_sorted_areas() - summon_spots)
+ if(!GLOB.summon_spots.len)
+ while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES)
+ var/area/summon = pick(return_sorted_areas() - GLOB.summon_spots)
if(summon && is_station_level(summon.z) && summon.valid_territory)
- summon_spots += summon
+ GLOB.summon_spots += summon
if("tome")
var/mob/living/carbon/human/H = current
if(istype(H))
@@ -902,7 +906,7 @@
log_admin("[key_name(usr)] has wizarded [key_name(current)]")
message_admins("[key_name_admin(usr)] has wizarded [key_name_admin(current)]")
if("lair")
- current.forceMove(pick(wizardstart))
+ current.forceMove(pick(GLOB.wizardstart))
log_admin("[key_name(usr)] has moved [key_name(current)] to the wizard's lair")
message_admins("[key_name_admin(usr)] has moved [key_name_admin(current)] to the wizard's lair")
if("dressup")
@@ -1165,7 +1169,7 @@
remove_antag_datum(/datum/antagonist/traitor)
log_admin("[key_name(usr)] has de-traitored [key_name(current)]")
message_admins("[key_name_admin(usr)] has de-traitored [key_name_admin(current)]")
-
+
if("traitor")
if(!(has_antag_datum(/datum/antagonist/traitor)))
var/datum/antagonist/traitor/T = new()
@@ -1487,11 +1491,11 @@
special_role = SPECIAL_ROLE_WIZARD
assigned_role = SPECIAL_ROLE_WIZARD
//ticker.mode.learn_basic_spells(current)
- if(!wizardstart.len)
- current.loc = pick(latejoin)
+ if(!GLOB.wizardstart.len)
+ current.loc = pick(GLOB.latejoin)
to_chat(current, "HOT INSERTION, GO GO GO")
else
- current.loc = pick(wizardstart)
+ current.loc = pick(GLOB.wizardstart)
SSticker.mode.equip_wizard(current)
for(var/obj/item/spellbook/S in current.contents)
@@ -1659,7 +1663,7 @@
SSticker.mode.implanter[missionary.mind] = implanters
SSticker.mode.traitors += src
-
+
var/datum/objective/protect/zealot_objective = new
zealot_objective.target = missionary.mind
zealot_objective.owner = src
@@ -1684,7 +1688,7 @@
if(H.w_uniform)
jumpsuit = H.w_uniform
jumpsuit.color = team_color
- H.update_inv_w_uniform(0,0)
+ H.update_inv_w_uniform()
add_attack_logs(missionary, current, "Converted to a zealot for [convert_duration/600] minutes")
addtimer(CALLBACK(src, .proc/remove_zealot, jumpsuit), convert_duration) //deconverts after the timer expires
@@ -1701,7 +1705,7 @@
jumpsuit.color = initial(jumpsuit.color) //reset the jumpsuit no matter where our mind is
if(ishuman(current)) //but only try updating us if we are still a human type since it is a human proc
var/mob/living/carbon/human/H = current
- H.update_inv_w_uniform(0,0)
+ H.update_inv_w_uniform()
to_chat(current, "You seem to have forgotten the events of the past 10 minutes or so, and your head aches a bit as if someone beat it savagely with a stick.")
to_chat(current, "This means you don't remember who you were working for or what you were doing.")
diff --git a/code/datums/mixed.dm b/code/datums/mixed.dm
index 05fb0a99649..a5ff38a26b0 100644
--- a/code/datums/mixed.dm
+++ b/code/datums/mixed.dm
@@ -22,14 +22,14 @@
var/list/fields = list( )
/datum/data/record/Destroy()
- if(src in data_core.medical)
- data_core.medical -= src
- if(src in data_core.security)
- data_core.security -= src
- if(src in data_core.general)
- data_core.general -= src
- if(src in data_core.locked)
- data_core.locked -= src
+ if(src in GLOB.data_core.medical)
+ GLOB.data_core.medical -= src
+ if(src in GLOB.data_core.security)
+ GLOB.data_core.security -= src
+ if(src in GLOB.data_core.general)
+ GLOB.data_core.general -= src
+ if(src in GLOB.data_core.locked)
+ GLOB.data_core.locked -= src
return ..()
/datum/data/text
diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm
index 0887290a6f4..4d870e1296c 100644
--- a/code/datums/mutable_appearance.dm
+++ b/code/datums/mutable_appearance.dm
@@ -22,5 +22,4 @@
/mutable_appearance/clean/New()
. = ..()
alpha = 255
- opacity = 1
transform = null
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index db5cca6e9ec..416c4f9c02d 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -1,5 +1,5 @@
/datum/outfit
- var/name = "Naked"
+ var/name = "SOMEBODY FORGOT TO SET A NAME, NOTIFY A CODER"
var/collect_not_del = FALSE
var/uniform = null
@@ -33,6 +33,9 @@
var/can_be_admin_equipped = TRUE // Set to FALSE if your outfit requires runtime parameters
+/datum/outfit/naked
+ name = "Naked"
+
/datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
//to be overriden for customization depending on client prefs,species etc
return
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index d2c19f61bfa..14bc959fbb1 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -541,7 +541,7 @@
P.attack_self(H) // activate them, display musical notes effect
/datum/outfit/admin/soviet
-
+ name = "Soviet Generic"
gloves = /obj/item/clothing/gloves/combat
uniform = /obj/item/clothing/under/soviet
back = /obj/item/storage/backpack/satchel
@@ -709,7 +709,8 @@
pda = /obj/item/pda
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/hand_labeler = 1
+ /obj/item/hand_labeler = 1,
+ /obj/item/hand_labeler_refill = 1
)
/datum/outfit/admin/sol_trader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -771,6 +772,7 @@
apply_to_card(I, H, get_all_accesses(), "Space Explorer")
/datum/outfit/admin/hardsuit
+ name = "Hardsuit Generic"
back = /obj/item/tank/jetpack/oxygen
mask = /obj/item/clothing/mask/breath
shoes = /obj/item/clothing/shoes/magboots
@@ -823,6 +825,7 @@
/datum/outfit/admin/tournament
+ name = "Tournament Generic"
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/helmet/thunderdome
@@ -1048,8 +1051,8 @@
to_chat(H, "You have gained the ability to shapeshift into lesser hellhound form. This is a combat form with different abilities, tough but not invincible. It can regenerate itself over time by resting.")
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/raise_vampires)
to_chat(H, "You have gained the ability to Raise Vampires. This extremely powerful AOE ability affects all humans near you. Vampires/thralls are healed. Corpses are raised as vampires. Others are stunned, then brain damaged, then killed.")
- H.dna.SetSEState(JUMPBLOCK, 1)
- genemutcheck(H, JUMPBLOCK, null, MUTCHK_FORCED)
+ H.dna.SetSEState(GLOB.jumpblock, 1)
+ genemutcheck(H, GLOB.jumpblock, null, MUTCHK_FORCED)
H.update_mutations()
H.gene_stability = 100
@@ -1100,7 +1103,7 @@
l_hand = null
backpack_contents = list(
/obj/item/storage/box/engineer = 1,
- /obj/item/clothing/suit/space/hardsuit/shielded/wizard = 1,
+ /obj/item/clothing/suit/space/hardsuit/shielded/wizard/arch = 1,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/kitchen/knife/ritual = 1,
/obj/item/clothing/suit/wizrobe/red = 1,
diff --git a/code/datums/outfits/plasmamen.dm b/code/datums/outfits/plasmamen.dm
index 376bf2af90c..94206c0ae3a 100644
--- a/code/datums/outfits/plasmamen.dm
+++ b/code/datums/outfits/plasmamen.dm
@@ -176,3 +176,9 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/blueshield
uniform = /obj/item/clothing/under/plasmaman/blueshield
+
+/datum/outfit/plasmaman/wizard
+ name = "Wizard Plasmaman"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/wizard
+ uniform = /obj/item/clothing/under/plasmaman/wizard
diff --git a/code/datums/periodic_news.dm b/code/datums/periodic_news.dm
index 9a09ec4a7ec..d0d1f01ebf3 100644
--- a/code/datums/periodic_news.dm
+++ b/code/datums/periodic_news.dm
@@ -2,136 +2,125 @@
// Uses BYOND's type system to put everything into a nice format
/datum/news_announcement
- var
- round_time // time of the round at which this should be announced, in seconds
- message // body of the message
- author = "Nanotrasen Editor"
- channel_name = "Nyx Daily"
- can_be_redacted = 0
- message_type = "Story"
- revolution_inciting_event
+ var/round_time // time of the round at which this should be announced, in seconds
+ var/message // body of the message
+ var/author = "Nanotrasen Editor"
+ var/channel_name = "Nyx Daily"
+ var/can_be_redacted = FALSE
+ var/message_type = "Story"
- paycuts_suspicion
- round_time = 60*10
- message = {"Reports have leaked that Nanotrasen Inc. is planning to put paycuts into
- effect on many of its Research Stations in Tau Ceti. Apparently these research
- stations haven't been able to yield the expected revenue, and thus adjustments
- have to be made."}
- author = "Unauthorized"
+/datum/news_announcement/revolution_inciting_event/paycuts_suspicion
+ round_time = 60*10
+ message = {"Reports have leaked that Nanotrasen Inc. is planning to put paycuts into
+ effect on many of its Research Stations in Tau Ceti. Apparently these research
+ stations haven't been able to yield the expected revenue, and thus adjustments
+ have to be made."}
+ author = "Unauthorized"
- paycuts_confirmation
- round_time = 60*40
- message = {"Earlier rumours about paycuts on Research Stations in the Tau Ceti system have
- been confirmed. Shockingly, however, the cuts will only affect lower tier
- personnel. Heads of Staff will, according to our sources, not be affected."}
- author = "Unauthorized"
+/datum/news_announcement/revolution_inciting_event/paycuts_confirmation
+ round_time = 60*40
+ message = {"Earlier rumours about paycuts on Research Stations in the Tau Ceti system have
+ been confirmed. Shockingly, however, the cuts will only affect lower tier
+ personnel. Heads of Staff will, according to our sources, not be affected."}
+ author = "Unauthorized"
- human_experiments
- round_time = 60*90
- message = {"Unbelievable reports about human experimentation have reached our ears. According
- to a refugee from one of the Tau Ceti Research Stations, their station, in order
- to increase revenue, has refactored several of their facilities to perform experiments
- on live humans, including virology research, genetic manipulation, and \"feeding them
- to the slimes to see what happens\". Allegedly, these test subjects were neither
- humanified monkeys nor volunteers, but rather unqualified staff that were forced into
- the experiments, and reported to have died in a \"work accident\" by Nanotrasen Inc."}
- author = "Unauthorized"
+/datum/news_announcement/revolution_inciting_event/human_experiments
+ round_time = 60*90
+ message = {"Unbelievable reports about human experimentation have reached our ears. According
+ to a refugee from one of the Tau Ceti Research Stations, their station, in order
+ to increase revenue, has refactored several of their facilities to perform experiments
+ on live humans, including virology research, genetic manipulation, and \"feeding them
+ to the slimes to see what happens\". Allegedly, these test subjects were neither
+ humanified monkeys nor volunteers, but rather unqualified staff that were forced into
+ the experiments, and reported to have died in a \"work accident\" by Nanotrasen Inc."}
+ author = "Unauthorized"
- bluespace_research
+/datum/news_announcement/bluespace_research/announcement
+ round_time = 60*20
+ message = {"The new field of research trying to explain several interesting spacetime oddities,
+ also known as \"Bluespace Research\", has reached new heights. Of the several
+ hundred space stations now orbiting in Tau Ceti, fifteen are now specially equipped
+ to experiment with and research Bluespace effects. Rumours have it some of these
+ stations even sport functional \"travel gates\" that can instantly move a whole research
+ team to an alternate reality."}
- announcement
- round_time = 60*20
- message = {"The new field of research trying to explain several interesting spacetime oddities,
- also known as \"Bluespace Research\", has reached new heights. Of the several
- hundred space stations now orbiting in Tau Ceti, fifteen are now specially equipped
- to experiment with and research Bluespace effects. Rumours have it some of these
- stations even sport functional \"travel gates\" that can instantly move a whole research
- team to an alternate reality."}
+/datum/news_announcement/random_junk/cheesy_honkers
+ author = "Assistant Editor Carl Ritz"
+ channel_name = "The Gibson Gazette"
+ message = {"Do cheesy honkers increase risk of having a miscarriage? Several health administrations
+ say so!"}
+ round_time = 60 * 15
- random_junk
+/datum/news_announcement/random_junk/net_block
+ author = "Assistant Editor Carl Ritz"
+ channel_name = "The Gibson Gazette"
+ message = {"Several corporations banding together to block access to 'wetskrell.nt', site administrators
+ claiming violation of net laws."}
+ round_time = 60 * 50
- cheesy_honkers
- author = "Assistant Editor Carl Ritz"
- channel_name = "The Gibson Gazette"
- message = {"Do cheesy honkers increase risk of having a miscarriage? Several health administrations
- say so!"}
- round_time = 60 * 15
+/datum/news_announcement/random_junk/found_ssd
+ channel_name = "Nyx Daily"
+ author = "Doctor Eric Hanfield"
- net_block
- author = "Assistant Editor Carl Ritz"
- channel_name = "The Gibson Gazette"
- message = {"Several corporations banding together to block access to 'wetskrell.nt', site administrators
- claiming violation of net laws."}
- round_time = 60 * 50
+ message = {"Several people have been found unconscious at their terminals. It is thought that it was due
+ to a lack of sleep or of simply migraines from staring at the screen too long. Camera footage
+ reveals that many of them were playing games instead of working and their pay has been docked
+ accordingly."}
+ round_time = 60 * 90
- found_ssd
- channel_name = "Nyx Daily"
- author = "Doctor Eric Hanfield"
+/datum/news_announcement/lotus_tree/explosions
+ channel_name = "Nyx Daily"
+ author = "Reporter Leland H. Howards"
- message = {"Several people have been found unconscious at their terminals. It is thought that it was due
- to a lack of sleep or of simply migraines from staring at the screen too long. Camera footage
- reveals that many of them were playing games instead of working and their pay has been docked
- accordingly."}
- round_time = 60 * 90
+ message = {"The newly-christened civillian transport Lotus Tree suffered two very large explosions near the
+ bridge today, and there are unconfirmed reports that the death toll has passed 50. The cause of
+ the explosions remain unknown, but there is speculation that it might have something to do with
+ the recent change of regulation in the Moore-Lee Corporation, a major funder of the ship, when M-L
+ announced that they were officially acknowledging inter-species marriage and providing couples
+ with marriage tax-benefits."}
+ round_time = 60 * 30
- lotus_tree
+/datum/news_announcement/food_riots/breaking_news
+ channel_name = "Nyx Daily"
+ author = "Reporter Ro'kii Ar-Raqis"
- explosions
- channel_name = "Nyx Daily"
- author = "Reporter Leland H. Howards"
+ message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
+ Lupus system. This comes only hours after Nanotrasen officials announced they will no longer trade with the
+ colony, citing the increased presence of \"hostile factions\" on the colony has made trade too dangerous to
+ continue. Nanotrasen officials have not given any details about said factions. More on that at the top of
+ the hour."}
+ round_time = 60 * 10
- message = {"The newly-christened civillian transport Lotus Tree suffered two very large explosions near the
- bridge today, and there are unconfirmed reports that the death toll has passed 50. The cause of
- the explosions remain unknown, but there is speculation that it might have something to do with
- the recent change of regulation in the Moore-Lee Corporation, a major funder of the ship, when M-L
- announced that they were officially acknowledging inter-species marriage and providing couples
- with marriage tax-benefits."}
- round_time = 60 * 30
+/datum/news_announcement/food_riots/more
+ channel_name = "Nyx Daily"
+ author = "Reporter Ro'kii Ar-Raqis"
- food_riots
+ message = {"More on the Refuge food riots: The Refuge Council has condemned Nanotrasen's withdrawal from
+ the colony, claiming \"there has been no increase in anti-Nanotrasen activity\", and \"\[the only] reason
+ Nanotrasen withdrew was because the \[Tenebrae Lupus] system's Plasma deposits have been completely mined out.
+ We have little to trade with them now\". Nanotrasen officials have denied these allegations, calling them
+ \"further proof\" of the colony's anti-Nanotrasen stance. Meanwhile, Refuge Security has been unable to quell
+ the riots. More on this at 6."}
+ round_time = 60 * 60
+GLOBAL_LIST_INIT(newscaster_standard_feeds, list(/datum/news_announcement/bluespace_research, /datum/news_announcement/lotus_tree, /datum/news_announcement/random_junk, /datum/news_announcement/food_riots))
- breaking_news
- channel_name = "Nyx Daily"
- author = "Reporter Ro'kii Ar-Raqis"
-
- message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
- Lupus system. This comes only hours after Nanotrasen officials announced they will no longer trade with the
- colony, citing the increased presence of \"hostile factions\" on the colony has made trade too dangerous to
- continue. Nanotrasen officials have not given any details about said factions. More on that at the top of
- the hour."}
- round_time = 60 * 10
-
- more
- channel_name = "Nyx Daily"
- author = "Reporter Ro'kii Ar-Raqis"
-
- message = {"More on the Refuge food riots: The Refuge Council has condemned Nanotrasen's withdrawal from
- the colony, claiming \"there has been no increase in anti-Nanotrasen activity\", and \"\[the only] reason
- Nanotrasen withdrew was because the \[Tenebrae Lupus] system's Plasma deposits have been completely mined out.
- We have little to trade with them now\". Nanotrasen officials have denied these allegations, calling them
- \"further proof\" of the colony's anti-Nanotrasen stance. Meanwhile, Refuge Security has been unable to quell
- the riots. More on this at 6."}
- round_time = 60 * 60
-
-
-var/global/list/newscaster_standard_feeds = list(/datum/news_announcement/bluespace_research, /datum/news_announcement/lotus_tree, /datum/news_announcement/random_junk, /datum/news_announcement/food_riots)
-
-proc/process_newscaster()
+/proc/process_newscaster()
check_for_newscaster_updates(SSticker.mode.newscaster_announcements)
-var/global/tmp/announced_news_types = list()
-proc/check_for_newscaster_updates(type)
+GLOBAL_LIST_EMPTY(announced_news_types)
+
+/proc/check_for_newscaster_updates(type)
for(var/subtype in subtypesof(type))
var/datum/news_announcement/news = new subtype()
- if(news.round_time * 10 <= world.time && !(subtype in announced_news_types))
- announced_news_types += subtype
+ if(news.round_time * 10 <= world.time && !(subtype in GLOB.announced_news_types))
+ GLOB.announced_news_types += subtype
announce_newscaster_news(news)
-proc/announce_newscaster_news(datum/news_announcement/news)
+/proc/announce_newscaster_news(datum/news_announcement/news)
var/datum/feed_channel/sendto
- for(var/datum/feed_channel/FC in news_network.network_channels)
+ for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
if(FC.channel_name == news.channel_name)
sendto = FC
break
@@ -142,7 +131,7 @@ proc/announce_newscaster_news(datum/news_announcement/news)
sendto.author = news.author
sendto.locked = 1
sendto.is_admin_channel = 1
- news_network.network_channels += sendto
+ GLOB.news_network.network_channels += sendto
var/datum/feed_message/newMsg = new /datum/feed_message
newMsg.author = news.author ? news.author : sendto.author
@@ -152,5 +141,5 @@ proc/announce_newscaster_news(datum/news_announcement/news)
sendto.messages += newMsg
- for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+ for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allNewscasters)
NEWSCASTER.newsAlert(news.channel_name)
diff --git a/code/datums/radio.dm b/code/datums/radio.dm
index b748a9f9229..efeebc7c973 100644
--- a/code/datums/radio.dm
+++ b/code/datums/radio.dm
@@ -1,7 +1,7 @@
/datum/radio_frequency
var/frequency as num
- var/list/list/obj/devices = list()
+ var/list/obj/devices = list()
/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as text|null, var/range = null as num|null)
var/turf/start_point
@@ -108,7 +108,7 @@
. = "Domestic Animal"
else
. = "Unidentifiable"
-
+
//callback used by objects to react to incoming radio signals
/obj/proc/receive_signal(datum/signal/signal, receive_method, receive_param)
return null
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
index 5cc76721377..a651edbc79c 100644
--- a/code/datums/spawners_menu.dm
+++ b/code/datums/spawners_menu.dm
@@ -6,7 +6,7 @@
qdel(src)
owner = new_owner
-/datum/spawners_menu/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = FALSE, datum/topic_state/state = ghost_state, datum/nanoui/master_ui = null)
+/datum/spawners_menu/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = FALSE, datum/topic_state/state = GLOB.ghost_state, datum/nanoui/master_ui = null)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "spawners_menu.tmpl", "Spawners Menu", 700, 600, master_ui, state = state)
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 7f1541248d9..6b114971258 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -13,7 +13,7 @@
/obj/effect/proc_holder/singularity_pull()
return
-var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin verb for now
+GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
/obj/effect/proc_holder/proc/InterceptClickOn(mob/living/user, params, atom/A)
if(user.ranged_ability != src)
@@ -241,7 +241,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
before_cast(targets)
invocation()
if(user && user.ckey)
- user.create_attack_log("[key_name(user)] cast the spell [name].")
+ add_attack_logs(user, targets, "cast the spell [name]", ATKLOG_ALL)
spawn(0)
if(charge_type == "recharge" && recharge)
start_recharge()
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
index fbde291ae98..0d24a984014 100644
--- a/code/datums/spells/area_teleport.dm
+++ b/code/datums/spells/area_teleport.dm
@@ -25,14 +25,14 @@
var/A = null
if(!randomise_selection)
- A = input("Area to teleport to", "Teleport", A) as null|anything in teleportlocs
+ A = input("Area to teleport to", "Teleport", A) as null|anything in GLOB.teleportlocs
else
- A = pick(teleportlocs)
+ A = pick(GLOB.teleportlocs)
if(!A)
return
- var/area/thearea = teleportlocs[A]
+ var/area/thearea = GLOB.teleportlocs[A]
if(thearea.tele_proof && !istype(thearea, /area/wizard_station))
to_chat(usr, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.")
@@ -79,6 +79,8 @@
target.forceMove(pick(L))
playsound(get_turf(user), sound2, 50,1)
+ user.update_action_buttons_icon() //Update action buttons as some spells might now be castable
+
return
/obj/effect/proc_holder/spell/targeted/area_teleport/invocation(area/chosenarea = null)
diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm
index cbfa158531e..e8b7f27b0da 100644
--- a/code/datums/spells/banana_touch.dm
+++ b/code/datums/spells/banana_touch.dm
@@ -55,10 +55,10 @@
equip_to_slot_if_possible(new /obj/item/clothing/under/rank/clown/nodrop, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, slot_shoes, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, slot_wear_mask, TRUE, TRUE)
- dna.SetSEState(CLUMSYBLOCK, TRUE, TRUE)
- dna.SetSEState(COMICBLOCK, TRUE, TRUE)
- genemutcheck(src, CLUMSYBLOCK, null, MUTCHK_FORCED)
- genemutcheck(src, COMICBLOCK, null, MUTCHK_FORCED)
+ dna.SetSEState(GLOB.clumsyblock, TRUE, TRUE)
+ dna.SetSEState(GLOB.comicblock, TRUE, TRUE)
+ genemutcheck(src, GLOB.clumsyblock, null, MUTCHK_FORCED)
+ genemutcheck(src, GLOB.comicblock, null, MUTCHK_FORCED)
if(!(iswizard(src) || (mind && mind.special_role == SPECIAL_ROLE_WIZARD_APPRENTICE))) //Mutations are permanent on non-wizards. Can still be removed by genetics fuckery but not mutadone.
- dna.default_blocks.Add(CLUMSYBLOCK)
- dna.default_blocks.Add(COMICBLOCK)
+ dna.default_blocks.Add(GLOB.clumsyblock)
+ dna.default_blocks.Add(GLOB.comicblock)
diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm
index 58a33e31a44..19a12055fef 100644
--- a/code/datums/spells/cluwne.dm
+++ b/code/datums/spells/cluwne.dm
@@ -27,8 +27,8 @@
var/obj/item/organ/internal/honktumor/cursed/tumor = new
tumor.insert(src)
mutations.Add(NERVOUS)
- dna.SetSEState(NERVOUSBLOCK, 1, 1)
- genemutcheck(src, NERVOUSBLOCK, null, MUTCHK_FORCED)
+ dna.SetSEState(GLOB.nervousblock, 1, 1)
+ genemutcheck(src, GLOB.nervousblock, null, MUTCHK_FORCED)
rename_character(real_name, "cluwne")
unEquip(w_uniform, 1)
@@ -36,10 +36,10 @@
unEquip(gloves, 1)
if(!istype(wear_mask, /obj/item/clothing/mask/cursedclown)) //Infinite loops otherwise
unEquip(wear_mask, 1)
- equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, slot_w_uniform, 1, 1, 1)
- equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, slot_gloves, 1, 1, 1)
- equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, slot_wear_mask, 1, 1, 1)
- equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, slot_shoes, 1, 1, 1)
+ equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, slot_w_uniform, TRUE, TRUE)
+ equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, slot_gloves, TRUE, TRUE)
+ equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, slot_wear_mask, TRUE, TRUE)
+ equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, slot_shoes, TRUE, TRUE)
/mob/living/carbon/human/proc/makeAntiCluwne()
to_chat(src, "You don't feel very funny.")
@@ -56,14 +56,14 @@
tumor.remove(src)
else
mutations.Remove(CLUMSY)
- mutations.Remove(COMICBLOCK)
- dna.SetSEState(CLUMSYBLOCK,0)
- dna.SetSEState(COMICBLOCK,0)
- genemutcheck(src, CLUMSYBLOCK, null, MUTCHK_FORCED)
- genemutcheck(src, COMICBLOCK, null, MUTCHK_FORCED)
+ mutations.Remove(GLOB.comicblock)
+ dna.SetSEState(GLOB.clumsyblock,0)
+ dna.SetSEState(GLOB.comicblock,0)
+ genemutcheck(src, GLOB.clumsyblock, null, MUTCHK_FORCED)
+ genemutcheck(src, GLOB.comicblock, null, MUTCHK_FORCED)
mutations.Remove(NERVOUS)
- dna.SetSEState(NERVOUSBLOCK, 0)
- genemutcheck(src, NERVOUSBLOCK, null, MUTCHK_FORCED)
+ dna.SetSEState(GLOB.nervousblock, 0)
+ genemutcheck(src, GLOB.nervousblock, null, MUTCHK_FORCED)
var/obj/item/clothing/under/U = w_uniform
unEquip(w_uniform, 1)
@@ -83,5 +83,5 @@
unEquip(gloves, 1)
qdel(G)
- equip_to_slot_if_possible(new /obj/item/clothing/under/lawyer/black, slot_w_uniform, 1, 1, 1)
- equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, slot_shoes, 1, 1, 1)
+ equip_to_slot_if_possible(new /obj/item/clothing/under/lawyer/black, slot_w_uniform, TRUE, TRUE)
+ equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, slot_shoes, TRUE, TRUE)
diff --git a/code/datums/spells/devil.dm b/code/datums/spells/devil.dm
index 12e2a44a8c1..27b2fcb8851 100644
--- a/code/datums/spells/devil.dm
+++ b/code/datums/spells/devil.dm
@@ -142,7 +142,6 @@
return 0
fakefire()
forceMove(get_turf(src))
- reset_perspective()
visible_message("[src] appears in a firey blaze!")
playsound(get_turf(src), 'sound/misc/exit_blood.ogg', 100, 1, -1)
spawn(15)
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 4f2c88b659d..f7d7a9bfb8d 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -56,7 +56,7 @@
qdel(holder)
if(!QDELETED(target))
if(mobloc.density)
- for(var/direction in alldirs)
+ for(var/direction in GLOB.alldirs)
var/turf/T = get_step(mobloc, direction)
if(T)
if(target.Move(T))
diff --git a/code/datums/spells/genetic.dm b/code/datums/spells/genetic.dm
index 3c2f997e461..d95c6212486 100644
--- a/code/datums/spells/genetic.dm
+++ b/code/datums/spells/genetic.dm
@@ -2,7 +2,6 @@
name = "Genetic"
desc = "This spell inflicts a set of mutations and disabilities upon the target."
- var/disabilities = 0 //bits
var/list/mutations = list() //mutation strings
var/duration = 100 //deciseconds
/*
@@ -20,16 +19,12 @@
for(var/mob/living/target in targets)
for(var/x in mutations)
target.mutations.Add(x)
- /* if(x == HULK && ishuman(target))
- target:hulk_time=world.time + duration */
- target.disabilities |= disabilities
target.update_mutations() //update target's mutation overlays
var/mob/living/carbon/human/H = target
if(ishuman(target))
H.update_body()
spawn(duration)
target.mutations.Remove(mutations)
- target.disabilities &= ~disabilities
target.update_mutations()
if(ishuman(target))
H.update_body()
diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm
index 2c000a0d232..0140fbdf951 100644
--- a/code/datums/spells/horsemask.dm
+++ b/code/datums/spells/horsemask.dm
@@ -43,6 +43,6 @@
"Your face burns up, and shortly after the fire you realise you have the face of a horse!")
if(!target.unEquip(target.wear_mask))
qdel(target.wear_mask)
- target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
+ target.equip_to_slot_if_possible(magichead, slot_wear_mask, TRUE, TRUE)
target.flash_eyes()
diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm
index 95c16978638..dc2efcc1e91 100644
--- a/code/datums/spells/knock.dm
+++ b/code/datums/spells/knock.dm
@@ -51,7 +51,7 @@
if(is_station_level(A.z))
A.req_access = list()
A.req_one_access = list()
- command_announcement.Announce("We have removed all access requirements on your station's airlocks. You can thank us later!", "Greetings!", 'sound/misc/notice2.ogg', , , "Space Wizard Federation Message")
+ GLOB.command_announcement.Announce("We have removed all access requirements on your station's airlocks. You can thank us later!", "Greetings!", 'sound/misc/notice2.ogg', , , "Space Wizard Federation Message")
else
..()
return
diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm
index 9db46b517db..9175fd677fb 100644
--- a/code/datums/spells/lichdom.dm
+++ b/code/datums/spells/lichdom.dm
@@ -28,7 +28,7 @@
config.continuous_rounds = 0
return ..()
-/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr)
+/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets, mob/user = usr)
if(!config.continuous_rounds)
existence_stops_round_end = 1
config.continuous_rounds = 1
@@ -36,7 +36,7 @@
for(var/mob/M in targets)
var/list/hand_items = list()
if(iscarbon(M))
- hand_items = list(M.get_active_hand(),M.get_inactive_hand())
+ hand_items = list(M.get_active_hand(), M.get_inactive_hand())
if(marked_item && !stat_allowed) //sanity, shouldn't happen without badminry
marked_item = null
@@ -74,12 +74,9 @@
var/mob/old_body = current_body
var/turf/body_turf = get_turf(old_body)
current_body = lich
- lich.Weaken(10+10*resurrections)
+ lich.Weaken(10 + 10 * resurrections)
++resurrections
- lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(lich), slot_shoes)
- lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), slot_w_uniform)
- lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), slot_wear_suit)
- lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), slot_head)
+ equip_lich(lich)
if(old_body && old_body.loc)
if(iscarbon(old_body))
@@ -95,7 +92,7 @@
if(!marked_item) //linking item to the spell
message = ""
for(var/obj/item in hand_items)
- if(ABSTRACT in item.flags || NODROP in item.flags)
+ if((ABSTRACT in item.flags) || (NODROP in item.flags))
continue
marked_item = item
to_chat(M, "You begin to focus your very being into the [item.name]...")
@@ -127,7 +124,10 @@
H.unEquip(H.head)
H.unEquip(H.shoes)
H.unEquip(H.head)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
- H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
- H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
- H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)
+ equip_lich(H)
+
+/obj/effect/proc_holder/spell/targeted/lichdom/proc/equip_lich(mob/living/carbon/human/H)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
+ H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
+ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)
diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm
index 31066001270..11b0a75b275 100644
--- a/code/datums/spells/mime.dm
+++ b/code/datums/spells/mime.dm
@@ -141,6 +141,7 @@
else
user.mind.AddSpell(S)
to_chat(user, "You flip through the pages. Your understanding of the boundaries of reality increases. You can cast [spellname]!")
+ user.create_log(MISC_LOG, "learned the spell [spellname] ([S])")
user.create_attack_log("[key_name(user)] learned the spell [spellname] ([S]).")
onlearned(user)
diff --git a/code/datums/spells/mime_malaise.dm b/code/datums/spells/mime_malaise.dm
index 1c212c62125..1765b2f5741 100644
--- a/code/datums/spells/mime_malaise.dm
+++ b/code/datums/spells/mime_malaise.dm
@@ -49,6 +49,6 @@
equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, slot_wear_mask, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/under/mime/nodrop, slot_w_uniform, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, slot_wear_suit, TRUE, TRUE)
- dna.SetSEState(MUTEBLOCK , TRUE, TRUE)
- genemutcheck(src, MUTEBLOCK , null, MUTCHK_FORCED)
- dna.default_blocks.Add(MUTEBLOCK)
+ dna.SetSEState(GLOB.muteblock , TRUE, TRUE)
+ genemutcheck(src, GLOB.muteblock , null, MUTCHK_FORCED)
+ dna.default_blocks.Add(GLOB.muteblock)
diff --git a/code/datums/spells/rathens.dm b/code/datums/spells/rathens.dm
index b2d35ff5393..4d98be324b2 100644
--- a/code/datums/spells/rathens.dm
+++ b/code/datums/spells/rathens.dm
@@ -21,14 +21,14 @@
A.remove(H)
A.forceMove(get_turf(H))
spawn()
- A.throw_at(get_edge_target_turf(H, pick(alldirs)), rand(1, 10), 5)
+ A.throw_at(get_edge_target_turf(H, pick(GLOB.alldirs)), rand(1, 10), 5)
H.visible_message("[H]'s [A.name] flies out of their body in a magical explosion!",\
"Your [A.name] flies out of your body in a magical explosion!")
H.Weaken(2)
else
var/obj/effect/decal/cleanable/blood/gibs/G = new/obj/effect/decal/cleanable/blood/gibs(get_turf(H))
spawn()
- G.throw_at(get_edge_target_turf(H, pick(alldirs)), rand(1, 10), 5)
+ G.throw_at(get_edge_target_turf(H, pick(GLOB.alldirs)), rand(1, 10), 5)
H.apply_damage(10, BRUTE, "chest")
to_chat(H, "You have no appendix, but something had to give! Holy shit, what was that?")
H.Weaken(3)
diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm
index aaef2229856..2a8e1d94526 100644
--- a/code/datums/spells/summonitem.dm
+++ b/code/datums/spells/summonitem.dm
@@ -41,7 +41,7 @@
else
message = "You must hold the desired item in your hands to mark it for recall."
- else if(marked_item && marked_item in hand_items) //unlinking item to the spell
+ else if(marked_item && (marked_item in hand_items)) //unlinking item to the spell
message = "You remove the mark on [marked_item] to use elsewhere."
name = "Instant Summons"
marked_item = null
@@ -75,7 +75,7 @@
B.transfer_identity(C)
C.death()
add_attack_logs(target, C, "Magically debrained INTENT: [uppertext(target.a_intent)]")*/
- if(C.stomach_contents && item_to_retrieve in C.stomach_contents)
+ if(C.stomach_contents && (item_to_retrieve in C.stomach_contents))
C.stomach_contents -= item_to_retrieve
for(var/X in C.bodyparts)
var/obj/item/organ/external/part = X
@@ -104,12 +104,12 @@
if(target.hand) //left active hand
- if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, 0, 1, 1))
- if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, 0, 1, 1))
+ if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, FALSE, TRUE))
+ if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, FALSE, TRUE))
butterfingers = 1
else //right active hand
- if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, 0, 1, 1))
- if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, 0, 1, 1))
+ if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, FALSE, TRUE))
+ if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, FALSE, TRUE))
butterfingers = 1
if(butterfingers)
item_to_retrieve.loc = target.loc
diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm
index d656bccac4a..c242a1aa52f 100644
--- a/code/datums/spells/touch_attacks.dm
+++ b/code/datums/spells/touch_attacks.dm
@@ -27,12 +27,12 @@
var/hand_handled = 1
attached_hand = new hand_path(src)
if(user.hand) //left active hand
- if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, 0, 1, 1))
- if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, 0, 1, 1))
+ if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, FALSE, TRUE))
+ if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, FALSE, TRUE))
hand_handled = 0
else //right active hand
- if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, 0, 1, 1))
- if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, 0, 1, 1))
+ if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, FALSE, TRUE))
+ if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, FALSE, TRUE))
hand_handled = 0
if(!hand_handled)
qdel(attached_hand)
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index fb4b80ff69f..6a951ac66a0 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -97,11 +97,11 @@
/obj/effect/proc_holder/spell/targeted/genetic/mutate/cast(list/targets, mob/user = usr)
for(var/mob/living/target in targets)
- target.dna.SetSEState(HULKBLOCK, 1)
- genemutcheck(target, HULKBLOCK, null, MUTCHK_FORCED)
+ target.dna.SetSEState(GLOB.hulkblock, 1)
+ genemutcheck(target, GLOB.hulkblock, null, MUTCHK_FORCED)
spawn(duration)
- target.dna.SetSEState(HULKBLOCK, 0)
- genemutcheck(target, HULKBLOCK, null, MUTCHK_FORCED)
+ target.dna.SetSEState(GLOB.hulkblock, 0)
+ genemutcheck(target, GLOB.hulkblock, null, MUTCHK_FORCED)
..()
/obj/effect/proc_holder/spell/targeted/smoke
@@ -304,7 +304,7 @@
sound = 'sound/magic/blind.ogg'
/obj/effect/proc_holder/spell/targeted/genetic/blind
- disabilities = BLIND
+ mutations = list(BLINDNESS)
duration = 300
sound = 'sound/magic/blind.ogg'
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 479694de4d7..61decede9bc 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -113,13 +113,13 @@
/datum/status_effect/hippocraticOath/on_apply()
//Makes the user passive, it's in their oath not to harm!
ADD_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
- var/datum/atom_hud/H = huds[DATA_HUD_MEDICAL_ADVANCED]
+ var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
H.add_hud_to(owner)
return ..()
/datum/status_effect/hippocraticOath/on_remove()
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
- var/datum/atom_hud/H = huds[DATA_HUD_MEDICAL_ADVANCED]
+ var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
H.remove_hud_from(owner)
/datum/status_effect/hippocraticOath/tick()
@@ -190,7 +190,7 @@
L.adjustBrainLoss(-3.5)
L.adjustCloneLoss(-1) //Becasue apparently clone damage is the bastion of all health
if(ishuman(L))
- var/var/mob/living/carbon/human/H = L
+ var/mob/living/carbon/human/H = L
for(var/obj/item/organ/external/E in H.bodyparts)
if(prob(10))
E.mend_fracture()
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index db6aef6ea0e..d8b5e4d9cbe 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -107,7 +107,7 @@
if(needs_to_bleed)
var/turf/T = get_turf(owner)
new /obj/effect/temp_visual/bleed/explode(T)
- for(var/d in alldirs)
+ for(var/d in GLOB.alldirs)
new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d)
playsound(T, "desceration", 200, 1, -1)
owner.adjustBruteLoss(bleed_damage)
diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm
index 896f4f999a9..2580b1c9935 100644
--- a/code/datums/status_effects/status_effect.dm
+++ b/code/datums/status_effects/status_effect.dm
@@ -5,7 +5,7 @@
/datum/status_effect
var/id = "effect" //Used for screen alerts.
var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means.
- var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second.
+ var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second. Setting this to -1 will stop processing if duration is also unlimited.
var/mob/living/owner //The mob affected by the status effect.
var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
@@ -31,7 +31,8 @@
var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
A.attached_effect = src //so the alert can reference us, if it needs to
linked_alert = A //so we can reference the alert, if we need to
- START_PROCESSING(SSfastprocess, src)
+ if(duration > 0 || initial(tick_interval) > 0) //don't process if we don't care
+ START_PROCESSING(SSfastprocess, src)
return TRUE
/datum/status_effect/Destroy()
@@ -41,6 +42,9 @@
LAZYREMOVE(owner.status_effects, src)
on_remove()
owner = null
+ if(linked_alert)
+ linked_alert.attached_effect = null
+ linked_alert = null
return ..()
/datum/status_effect/process()
@@ -85,6 +89,13 @@
desc = "You don't feel any different..."
var/datum/status_effect/attached_effect
+/obj/screen/alert/status_effect/Destroy()
+ if(attached_effect)
+ attached_effect.linked_alert = null
+ attached_effect = null
+ return ..()
+
+
//////////////////
// HELPER PROCS //
//////////////////
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index f17e9840e4f..a18a9d74f28 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -16,7 +16,7 @@
#define SUPPLY_MISC 8
#define SUPPLY_VEND 9
-var/list/all_supply_groups = list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY_ENGINEER,SUPPLY_MEDICAL,SUPPLY_SCIENCE,SUPPLY_ORGANIC,SUPPLY_MATERIALS,SUPPLY_MISC,SUPPLY_VEND)
+GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY_ENGINEER,SUPPLY_MEDICAL,SUPPLY_SCIENCE,SUPPLY_ORGANIC,SUPPLY_MATERIALS,SUPPLY_MISC,SUPPLY_VEND))
/proc/get_supply_group_name(var/cat)
switch(cat)
@@ -1204,7 +1204,7 @@ var/list/all_supply_groups = list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY_ENGINE
containername = "hydroponics crate"
announce_beacons = list("Hydroponics" = list("Hydroponics"))
-/datum/supply_packs/misc/hydroponics/hydrotank
+/datum/supply_packs/organic/hydroponics/hydrotank
name = "Hydroponics Watertank Crate"
contains = list(/obj/item/watertank)
cost = 10
@@ -1434,6 +1434,8 @@ var/list/all_supply_groups = list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY_ENGINE
contains = list(/obj/structure/filingcabinet/chestdrawer,
/obj/item/camera_film,
/obj/item/hand_labeler,
+ /obj/item/hand_labeler_refill,
+ /obj/item/hand_labeler_refill,
/obj/item/stack/tape_roll,
/obj/item/paper_bin,
/obj/item/pen,
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index a5155cceb4a..a0c9a19e4b0 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -108,7 +108,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
return desc
/datum/uplink_item/proc/buy(var/obj/item/uplink/hidden/U, var/mob/user)
- ..()
if(!istype(U))
return 0
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
index 57d8c11f80b..558669df3c6 100644
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ b/code/datums/weather/weather_types/ash_storm.dm
@@ -36,7 +36,7 @@
var/list/outside_areas = list()
var/list/eligible_areas = list()
for(var/z in impacted_z_levels)
- eligible_areas += space_manager.areas_in_z["[z]"]
+ eligible_areas += GLOB.space_manager.areas_in_z["[z]"]
for(var/i in 1 to eligible_areas.len)
var/area/place = eligible_areas[i]
if(place.outdoors)
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 85b8d3fd2af..2bfefa5624e 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -26,8 +26,8 @@
/datum/weather/rad_storm/telegraph()
..()
status_alarm(TRUE)
- pre_maint_all_access = maint_all_access
- if(!maint_all_access)
+ pre_maint_all_access = GLOB.maint_all_access
+ if(!GLOB.maint_all_access)
make_maint_all_access()
@@ -51,7 +51,7 @@
/datum/weather/rad_storm/end()
if(..())
return
- priority_announcement.Announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
+ GLOB.priority_announcement.Announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
status_alarm(FALSE)
if(!pre_maint_all_access)
revoke_maint_all_access()
diff --git a/code/datums/wires/nuclearbomb.dm b/code/datums/wires/nuclearbomb.dm
index 63687ad8839..3b8ff5db098 100644
--- a/code/datums/wires/nuclearbomb.dm
+++ b/code/datums/wires/nuclearbomb.dm
@@ -72,7 +72,7 @@
if(N.icon_state == "nuclearbomb2")
N.icon_state = "nuclearbomb1"
N.timing = 0
- bomb_set = 0
+ GLOB.bomb_set = 0
if(NUCLEARBOMB_WIRE_LIGHT)
N.lighthack = !N.lighthack
diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index 07cf919db2d..907e6a695e1 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -5,9 +5,9 @@
#define MAX_FLAG 65535
-var/list/same_wires = list()
+GLOBAL_LIST_EMPTY(same_wires)
// 12 colours, if you're adding more than 12 wires then add more colours here
-var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", "gold", "gray", "cyan", "navy", "purple", "pink")
+GLOBAL_LIST_INIT(wireColours, list("red", "blue", "green", "black", "orange", "brown", "gold", "gray", "cyan", "navy", "purple", "pink"))
/datum/wires
@@ -39,11 +39,11 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
// Get the same wires
else
// We don't have any wires to copy yet, generate some and then copy it.
- if(!same_wires[holder_type])
+ if(!GLOB.same_wires[holder_type])
GenerateWires()
- same_wires[holder_type] = src.wires.Copy()
+ GLOB.same_wires[holder_type] = src.wires.Copy()
else
- var/list/wires = same_wires[holder_type]
+ var/list/wires = GLOB.same_wires[holder_type]
src.wires = wires // Reference the wires list.
/datum/wires/Destroy()
@@ -51,7 +51,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
return ..()
/datum/wires/proc/GenerateWires()
- var/list/colours_to_pick = wireColours.Copy() // Get a copy, not a reference.
+ var/list/colours_to_pick = GLOB.wireColours.Copy() // Get a copy, not a reference.
var/list/indexes_to_pick = list()
//Generate our indexes
for(var/i = 1; i < MAX_FLAG && i < (1 << wire_count); i += i)
@@ -81,13 +81,13 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
ui = new(user, src, ui_key, "wires.tmpl", holder.name, window_x, window_y)
ui.open()
-/datum/wires/ui_data(mob/user, ui_key = "main", datum/topic_state/state = physical_state)
+/datum/wires/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.physical_state)
var/data[0]
var/list/replace_colours = null
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
- if(eyes && H.disabilities & COLOURBLIND)
+ if(eyes && (COLOURBLIND in H.mutations))
replace_colours = eyes.replace_colours
diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm
index e593888c265..1f8c83f5f04 100644
--- a/code/defines/procs/AStar.dm
+++ b/code/defines/procs/AStar.dm
@@ -155,7 +155,7 @@ Actual Adjacent procs :
var/list/L = new()
var/turf/simulated/T
- for(var/dir in cardinal)
+ for(var/dir in GLOB.cardinal)
T = get_step(src,dir)
if(!T || (simulated_only && !istype(T)))
continue
diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm
index b7036f9fbdc..fb8ca665906 100644
--- a/code/defines/procs/admin.dm
+++ b/code/defines/procs/admin.dm
@@ -7,7 +7,7 @@
/proc/key_name_helper(whom, include_name, include_link = FALSE, type = null)
if(include_link != FALSE && include_link != TRUE)
- log_runtime(EXCEPTION("Key_name was called with an incorrect include_link [include_link]"), src)
+ log_runtime(EXCEPTION("Key_name was called with an incorrect include_link [include_link]"))
var/mob/M
var/client/C
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 3a70d05029e..a2b80440ecb 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -1,7 +1,7 @@
-/var/datum/announcement/minor/minor_announcement = new()
-/var/datum/announcement/priority/priority_announcement = new(do_log = 0)
-/var/datum/announcement/priority/command/command_announcement = new(do_log = 0, do_newscast = 0)
-/var/datum/announcement/priority/command/event/event_announcement = new(do_log = 0, do_newscast = 0)
+GLOBAL_DATUM_INIT(minor_announcement, /datum/announcement/minor, new())
+GLOBAL_DATUM_INIT(priority_announcement, /datum/announcement/priority, new(do_log = 0))
+GLOBAL_DATUM_INIT(command_announcement, /datum/announcement/priority/command, new(do_log = 0, do_newscast = 0))
+GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event, new(do_log = 0, do_newscast = 0))
/datum/announcement
var/title = "Attention"
diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm
index 86862eb9fcc..76e5a1fd0a6 100644
--- a/code/defines/procs/dbcore.dm
+++ b/code/defines/procs/dbcore.dm
@@ -29,13 +29,6 @@
#define BLOB 14
// TODO: Investigate more recent type additions and see if I can handle them. - Nadrew
-
-// Deprecated! See global.dm for new configuration vars
-/*
-var/DB_SERVER = "" // This is the location of your MySQL server (localhost is USUALLY fine)
-var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is the default)
-*/
-
DBConnection
var/_db_con // This variable contains a reference to the actual database connection.
var/dbi // This variable is a string containing the DBI MySQL requires.
diff --git a/code/defines/procs/radio.dm b/code/defines/procs/radio.dm
index 84d3ddaae78..7c0dc4de7f8 100644
--- a/code/defines/procs/radio.dm
+++ b/code/defines/procs/radio.dm
@@ -24,62 +24,9 @@
return freq_text
-/datum/reception
- var/obj/machinery/message_server/message_server = null
- var/telecomms_reception = TELECOMMS_RECEPTION_NONE
- var/message = ""
-
-/datum/receptions
- var/obj/machinery/message_server/message_server = null
- var/sender_reception = TELECOMMS_RECEPTION_NONE
- var/list/receiver_reception = new
-
/proc/get_message_server()
- if(message_servers)
- for(var/obj/machinery/message_server/MS in message_servers)
+ if(GLOB.message_servers)
+ for(var/obj/machinery/message_server/MS in GLOB.message_servers)
if(MS.active)
return MS
return null
-
-/proc/check_signal(var/datum/signal/signal)
- return signal && signal.data["done"]
-
-/proc/get_sender_reception(var/atom/sender, var/datum/signal/signal)
- return check_signal(signal) ? TELECOMMS_RECEPTION_SENDER : TELECOMMS_RECEPTION_NONE
-
-/proc/get_receiver_reception(var/receiver, var/datum/signal/signal)
- if(receiver && check_signal(signal))
- var/turf/pos = get_turf(receiver)
- // Maybe should get tie-in to the space manager?
- if(pos && (pos.z in signal.data["level"]))
- return TELECOMMS_RECEPTION_RECEIVER
- return TELECOMMS_RECEPTION_NONE
-
-/proc/get_reception(var/atom/sender, var/receiver, var/message = "", var/do_sleep = 1)
- var/datum/reception/reception = new
-
- // check if telecomms I/O route 1459 is stable
- reception.message_server = get_message_server()
-
- var/datum/signal/signal = sender.telecomms_process(do_sleep) // Be aware that this proc calls sleep, to simulate transmition delays
- reception.telecomms_reception |= get_sender_reception(sender, signal)
- reception.telecomms_reception |= get_receiver_reception(receiver, signal)
- reception.message = signal && signal.data["compression"] > 0 ? Gibberish(message, signal.data["compression"] + 50) : message
-
- return reception
-
-/proc/get_receptions(var/atom/sender, var/list/atom/receivers, var/do_sleep = 1)
- var/datum/receptions/receptions = new
- receptions.message_server = get_message_server()
-
- var/datum/signal/signal
- if(sender)
- signal = sender.telecomms_process(do_sleep)
- receptions.sender_reception = get_sender_reception(sender, signal)
-
- for(var/atom/receiver in receivers)
- if(!signal)
- signal = receiver.telecomms_process()
- receptions.receiver_reception[receiver] = get_receiver_reception(receiver, signal)
-
- return receptions
diff --git a/code/defines/procs/records.dm b/code/defines/procs/records.dm
index 256ae51dbf2..a74680ec578 100644
--- a/code/defines/procs/records.dm
+++ b/code/defines/procs/records.dm
@@ -20,7 +20,7 @@
G.fields["religion"] = "Unknown"
G.fields["photo_front"] = front
G.fields["photo_side"] = side
- data_core.general += G
+ GLOB.data_core.general += G
qdel(dummy)
return G
@@ -36,11 +36,11 @@
R.fields["ma_crim"] = "None"
R.fields["ma_crim_d"] = "No major crime convictions."
R.fields["notes"] = "No notes."
- data_core.security += R
+ GLOB.data_core.security += R
return R
/proc/find_security_record(field, value)
- return find_record(field, value, data_core.security)
+ return find_record(field, value, GLOB.data_core.security)
/proc/find_record(field, value, list/L)
for(var/datum/data/record/R in L)
diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm
index b2b643541ec..094e4f9ca2b 100644
--- a/code/defines/procs/statistics.dm
+++ b/code/defines/procs/statistics.dm
@@ -1,35 +1,3 @@
-/proc/sql_poll_players()
- if(!config.sql_enabled)
- return
- var/playercount = 0
- for(var/mob/M in GLOB.player_list)
- if(M.client)
- playercount += 1
- establish_db_connection()
- if(!dbcon.IsConnected())
- log_game("SQL ERROR during player polling. Failed to connect.")
- else
- var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")
- var/DBQuery/query = dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, time) VALUES ([playercount], '[sqltime]')")
- if(!query.Execute())
- var/err = query.ErrorMsg()
- log_game("SQL ERROR during player polling. Error : \[[err]\]\n")
-
-
-/proc/sql_poll_admins()
- if(!config.sql_enabled)
- return
- var/admincount = GLOB.admins.len
- establish_db_connection()
- if(!dbcon.IsConnected())
- log_game("SQL ERROR during admin polling. Failed to connect.")
- else
- var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")
- var/DBQuery/query = dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (admincount, time) VALUES ([admincount], '[sqltime]')")
- if(!query.Execute())
- var/err = query.ErrorMsg()
- log_game("SQL ERROR during admin polling. Error : \[[err]\]\n")
-
/proc/sql_report_round_start()
// TODO
if(!config.sql_enabled)
@@ -67,10 +35,10 @@
var/coord = "[H.x], [H.y], [H.z]"
// to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.getBrainLoss()], [H.getOxyLoss()])")
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
log_game("SQL ERROR during death reporting. Failed to connect.")
else
- var/DBQuery/query = dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, coord) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.getBruteLoss()], [H.getFireLoss()], [H.getBrainLoss()], [H.getOxyLoss()], '[coord]')")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, coord) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.getBruteLoss()], [H.getFireLoss()], [H.getBrainLoss()], [H.getOxyLoss()], '[coord]')")
if(!query.Execute())
var/err = query.ErrorMsg()
log_game("SQL ERROR during death reporting. Error : \[[err]\]\n")
@@ -102,42 +70,33 @@
var/coord = "[H.x], [H.y], [H.z]"
// to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])")
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
log_game("SQL ERROR during death reporting. Failed to connect.")
else
- var/DBQuery/query = dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, coord) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.getBruteLoss()], [H.getFireLoss()], [H.getBrainLoss()], [H.getOxyLoss()], '[coord]')")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, coord) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.getBruteLoss()], [H.getFireLoss()], [H.getBrainLoss()], [H.getOxyLoss()], '[coord]')")
if(!query.Execute())
var/err = query.ErrorMsg()
log_game("SQL ERROR during death reporting. Error : \[[err]\]\n")
-/proc/statistic_cycle()
- if(!config.sql_enabled)
- return
- while(1)
- sql_poll_players()
- sleep(600)
- sql_poll_admins()
- sleep(6000) //Poll every ten minutes
-
//This proc is used for feedback. It is executed at round end.
/proc/sql_commit_feedback()
- if(!blackbox)
+ if(!GLOB.blackbox)
log_game("Round ended without a blackbox recorder. No feedback was sent to the database.")
return
//content is a list of lists. Each item in the list is a list with two fields, a variable name and a value. Items MUST only have these two values.
- var/list/datum/feedback_variable/content = blackbox.get_round_feedback()
+ var/list/datum/feedback_variable/content = GLOB.blackbox.get_round_feedback()
if(!content)
log_game("Round ended without any feedback being generated. No feedback was sent to the database.")
return
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
log_game("SQL ERROR during feedback reporting. Failed to connect.")
else
- var/DBQuery/max_query = dbcon.NewQuery("SELECT MAX(roundid) AS max_round_id FROM [format_table_name("feedback")]")
+ var/DBQuery/max_query = GLOB.dbcon.NewQuery("SELECT MAX(roundid) AS max_round_id FROM [format_table_name("feedback")]")
max_query.Execute()
var/newroundid
@@ -157,7 +116,7 @@
var/variable = item.get_variable()
var/value = item.get_value()
- var/DBQuery/query = dbcon.NewQuery("INSERT INTO [format_table_name("feedback")] (id, roundid, time, variable, value) VALUES (null, [newroundid], Now(), '[variable]', '[value]')")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("feedback")] (id, roundid, time, variable, value) VALUES (null, [newroundid], Now(), '[variable]', '[value]')")
if(!query.Execute())
var/err = query.ErrorMsg()
log_game("SQL ERROR during feedback reporting. Error : \[[err]\]\n")
diff --git a/code/defines/vox_sounds.dm b/code/defines/vox_sounds.dm
index bb155337502..1d7bb9753a0 100644
--- a/code/defines/vox_sounds.dm
+++ b/code/defines/vox_sounds.dm
@@ -1,7 +1,7 @@
// List is required to compile the resources into the game when it loads.
// Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable.
-var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
+GLOBAL_LIST_INIT(vox_sounds, list("," = 'sound/vox_fem/,.ogg',
"." = 'sound/vox_fem/..ogg',
"a" = 'sound/vox_fem/a.ogg',
"abortions" = 'sound/vox_fem/abortions.ogg',
@@ -1267,4 +1267,4 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg',
"zero" = 'sound/vox_fem/zero.ogg',
"zone" = 'sound/vox_fem/zone.ogg',
"zulu" = 'sound/vox_fem/zulu.ogg'
-)
+))
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 97eca30cbfe..edfae8fd53e 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -15,30 +15,30 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
-var/list/teleportlocs = list()
+GLOBAL_LIST_EMPTY(teleportlocs)
/hook/startup/proc/process_teleport_locs()
for(var/area/AR in world)
if(AR.no_teleportlocs) continue
- if(teleportlocs.Find(AR.name)) continue
+ if(GLOB.teleportlocs.Find(AR.name)) continue
var/turf/picked = safepick(get_area_turfs(AR.type))
if(picked && is_station_level(picked.z))
- teleportlocs += AR.name
- teleportlocs[AR.name] = AR
+ GLOB.teleportlocs += AR.name
+ GLOB.teleportlocs[AR.name] = AR
- teleportlocs = sortAssoc(teleportlocs)
+ GLOB.teleportlocs = sortAssoc(GLOB.teleportlocs)
return 1
-var/list/ghostteleportlocs = list()
+GLOBAL_LIST_EMPTY(ghostteleportlocs)
/hook/startup/proc/process_ghost_teleport_locs()
for(var/area/AR in world)
- if(ghostteleportlocs.Find(AR.name)) continue
+ if(GLOB.ghostteleportlocs.Find(AR.name)) continue
var/list/turfs = get_area_turfs(AR.type)
if(turfs.len)
- ghostteleportlocs += AR.name
- ghostteleportlocs[AR.name] = AR
+ GLOB.ghostteleportlocs += AR.name
+ GLOB.ghostteleportlocs[AR.name] = AR
- ghostteleportlocs = sortAssoc(ghostteleportlocs)
+ GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs)
return 1
@@ -2109,14 +2109,11 @@ var/list/ghostteleportlocs = list()
/area/tcommsat
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-/area/tcommsat/entrance
- name = "\improper Telecoms Teleporter"
- icon_state = "tcomsatentrance"
-
/area/tcommsat/chamber
name = "\improper Telecoms Central Compartment"
icon_state = "tcomsatcham"
+// These areas are needed for MetaStation's AI sat
/area/turret_protected/tcomsat
name = "\improper Telecoms Satellite"
icon_state = "tcomsatlob"
@@ -2285,7 +2282,7 @@ var/list/ghostteleportlocs = list()
*/
// CENTCOM
-var/list/centcom_areas = list (
+GLOBAL_LIST_INIT(centcom_areas, list(
/area/centcom,
/area/shuttle/escape_pod1/centcom,
/area/shuttle/escape_pod2/centcom,
@@ -2294,10 +2291,10 @@ var/list/centcom_areas = list (
/area/shuttle/transport1,
/area/shuttle/administration/centcom,
/area/shuttle/specops/centcom,
-)
+))
//SPACE STATION 13
-var/list/the_station_areas = list (
+GLOBAL_LIST_INIT(the_station_areas, list(
/area/shuttle/arrival,
/area/shuttle/escape,
/area/shuttle/escape_pod1/station,
@@ -2344,4 +2341,4 @@ var/list/the_station_areas = list (
/area/turret_protected/ai_upload, //do not try to simplify to "/area/turret_protected" --rastaf0
/area/turret_protected/ai_upload_foyer,
/area/turret_protected/ai,
-)
+))
diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm
index 2ca607921ff..8f65ac634f4 100644
--- a/code/game/area/ai_monitored.dm
+++ b/code/game/area/ai_monitored.dm
@@ -3,16 +3,14 @@
var/obj/machinery/camera/motioncamera = null
-/area/ai_monitored/New()
- ..()
+/area/ai_monitored/LateInitialize()
+ . = ..()
// locate and store the motioncamera
- spawn (20) // spawn on a delay to let turfs/objs load
- for(var/obj/machinery/camera/M in src)
- if(M.isMotion())
- motioncamera = M
- M.area_motion = src
- return
- return
+ for(var/obj/machinery/camera/M in src)
+ if(M.isMotion())
+ motioncamera = M
+ M.area_motion = src
+ break
/area/ai_monitored/Entered(atom/movable/O)
..()
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index dbc0a8c567b..6ad45532641 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -110,7 +110,7 @@
/area/proc/reg_in_areas_in_z()
if(contents.len)
- var/list/areas_in_z = space_manager.areas_in_z
+ var/list/areas_in_z = GLOB.space_manager.areas_in_z
var/z
for(var/i in 1 to contents.len)
var/atom/thing = contents[i]
@@ -155,9 +155,9 @@
for(var/obj/machinery/alarm/AA in src)
AA.update_icon()
- air_alarm_repository.update_cache(src)
+ GLOB.air_alarm_repository.update_cache(src)
return 1
- air_alarm_repository.update_cache(src)
+ GLOB.air_alarm_repository.update_cache(src)
return 0
/area/proc/air_doors_close()
@@ -434,7 +434,7 @@
else
// There's a gravity generator on our z level
// This would do well when integrated with the z level manager
- if(T && gravity_generators["[T.z]"] && length(gravity_generators["[T.z]"]))
+ if(T && GLOB.gravity_generators["[T.z]"] && length(GLOB.gravity_generators["[T.z]"]))
return 1
return 0
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index f9d66372df5..abd224e409b 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -52,8 +52,8 @@
//its inherent color, the colored paint applied on it, special color effect etc...
/atom/New(loc, ...)
- if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
- _preloader.load(src)
+ if(GLOB.use_preloader && (src.type == GLOB._preloader.target_path))//in case the instanciated atom is creating other atoms in New()
+ GLOB._preloader.load(src)
. = ..()
attempt_init(arglist(args))
@@ -202,9 +202,7 @@
else
return null
-/atom/proc/check_eye(user as mob)
- if(istype(user, /mob/living/silicon/ai)) // WHYYYY
- return 1
+/atom/proc/check_eye(user)
return
/atom/proc/on_reagent_change()
@@ -397,6 +395,17 @@
/atom/proc/get_spooked()
return
+/**
+ Base proc, intended to be overriden.
+
+ This should only be called from one place: inside the slippery component.
+ Called after a human mob slips on this atom.
+
+ If you want the person who slipped to have something special done to them, put it here.
+*/
+/atom/proc/after_slip(mob/living/carbon/human/H)
+ return
+
/atom/proc/add_hiddenprint(mob/living/M as mob)
if(isnull(M)) return
if(isnull(M.key)) return
@@ -516,7 +525,7 @@
A.fingerprintshidden |= fingerprintshidden.Copy() //admin
A.fingerprintslast = fingerprintslast
-var/list/blood_splatter_icons = list()
+GLOBAL_LIST_EMPTY(blood_splatter_icons)
/atom/proc/blood_splatter_index()
return "\ref[initial(icon)]-[initial(icon_state)]"
@@ -618,19 +627,19 @@ var/list/blood_splatter_icons = list()
if(wear_suit)
wear_suit.add_blood(blood_dna, color)
wear_suit.blood_color = color
- update_inv_wear_suit(1)
+ update_inv_wear_suit()
else if(w_uniform)
w_uniform.add_blood(blood_dna, color)
w_uniform.blood_color = color
- update_inv_w_uniform(1)
+ update_inv_w_uniform()
if(head)
head.add_blood(blood_dna, color)
head.blood_color = color
- update_inv_head(0,0)
+ update_inv_head()
if(glasses)
glasses.add_blood(blood_dna, color)
glasses.blood_color = color
- update_inv_glasses(0)
+ update_inv_glasses()
if(gloves)
var/obj/item/clothing/gloves/G = gloves
G.add_blood(blood_dna, color)
@@ -642,20 +651,20 @@ var/list/blood_splatter_icons = list()
transfer_blood_dna(blood_dna)
verbs += /mob/living/carbon/human/proc/bloody_doodle
- update_inv_gloves(1) //handles bloody hands overlays and updating
+ update_inv_gloves() //handles bloody hands overlays and updating
return 1
/obj/item/proc/add_blood_overlay(color)
if(initial(icon) && initial(icon_state))
//try to find a pre-processed blood-splatter. otherwise, make a new one
var/index = blood_splatter_index()
- var/icon/blood_splatter_icon = blood_splatter_icons[index]
+ var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
if(!blood_splatter_icon)
blood_splatter_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object
blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent)
blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
blood_splatter_icon = fcopy_rsc(blood_splatter_icon)
- blood_splatter_icons[index] = blood_splatter_icon
+ GLOB.blood_splatter_icons[index] = blood_splatter_icon
blood_overlay = image(blood_splatter_icon)
blood_overlay.color = color
@@ -722,12 +731,12 @@ var/list/blood_splatter_icons = list()
this.icon_state = "vomittox_[pick(1,4)]"
/atom/proc/get_global_map_pos()
- if(!islist(global_map) || isemptylist(global_map)) return
+ if(!islist(GLOB.global_map) || isemptylist(GLOB.global_map)) return
var/cur_x = null
var/cur_y = null
var/list/y_arr = null
- for(cur_x=1,cur_x<=global_map.len,cur_x++)
- y_arr = global_map[cur_x]
+ for(cur_x=1,cur_x<=GLOB.global_map.len,cur_x++)
+ y_arr = GLOB.global_map[cur_x]
cur_y = y_arr.Find(src.z)
if(cur_y)
break
@@ -795,7 +804,7 @@ var/list/blood_splatter_icons = list()
return
/atom/vv_edit_var(var_name, var_value)
- if(!Debug2)
+ if(!GLOB.debug2)
admin_spawned = TRUE
. = ..()
switch(var_name)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 0370fad0367..70926d7ba2b 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -1,6 +1,7 @@
/atom/movable
layer = 3
appearance_flags = TILE_BOUND
+ glide_size = 8 // Default, adjusted when mobs move based on their movement delays
var/last_move = null
var/anchored = 0
var/move_resist = MOVE_RESIST_DEFAULT
@@ -36,8 +37,8 @@
/atom/movable/attempt_init(loc, ...)
var/turf/T = get_turf(src)
- if(T && SSatoms.initialized != INITIALIZATION_INSSATOMS && space_manager.is_zlevel_dirty(T.z))
- space_manager.postpone_init(T.z, src)
+ if(T && SSatoms.initialized != INITIALIZATION_INSSATOMS && GLOB.space_manager.is_zlevel_dirty(T.z))
+ GLOB.space_manager.postpone_init(T.z, src)
return
. = ..()
@@ -131,13 +132,14 @@
/atom/movable/proc/setLoc(var/T, var/teleported=0)
loc = T
-/atom/movable/Move(atom/newloc, direct = 0)
+/atom/movable/Move(atom/newloc, direct = 0, movetime)
if(!loc || !newloc) return 0
var/atom/oldloc = loc
if(loc != newloc)
+ glide_for(movetime)
if(!(direct & (direct - 1))) //Cardinal move
- . = ..()
+ . = ..(newloc, direct) // don't pass up movetime
else //Diagonal move, split it into cardinal moves
moving_diagonally = FIRST_DIAG_STEP
var/first_step_dir
@@ -203,7 +205,7 @@
src.move_speed = world.time - src.l_move_time
src.l_move_time = world.time
- if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc, direct)) //movement failed due to buckled mob
+ if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc, direct, movetime)) //movement failed due to buckled mob
. = 0
// Called after a successful Move(). By this point, we've already moved
@@ -216,6 +218,15 @@
update_parallax_contents()
return TRUE
+// Change glide size for the duration of one movement
+/atom/movable/proc/glide_for(movetime)
+ if(movetime)
+ glide_size = world.icon_size/max(DS2TICKS(movetime), 1)
+ spawn(movetime)
+ glide_size = initial(glide_size)
+ else
+ glide_size = initial(glide_size)
+
// Previously known as HasEntered()
// This is automatically called when something enters your square
/atom/movable/Crossed(atom/movable/AM, oldloc)
@@ -319,7 +330,6 @@
SSspacedrift.processing[src] = src
return 1
-
//called when src is thrown into hit_atom
/atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum)
set waitfor = 0
@@ -428,10 +438,10 @@
/atom/movable/proc/water_act(volume, temperature, source, method = REAGENT_TOUCH) //amount of water acting : temperature of water in kelvin : object that called it (for shennagins)
return TRUE
-/atom/movable/proc/handle_buckled_mob_movement(newloc,direct)
+/atom/movable/proc/handle_buckled_mob_movement(newloc,direct,movetime)
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
- if(!buckled_mob.Move(newloc, direct))
+ if(!buckled_mob.Move(newloc, direct, movetime))
forceMove(buckled_mob.loc)
last_move = buckled_mob.last_move
inertia_dir = last_move
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 71e6867280c..08a7b77daff 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -7,10 +7,10 @@
/* DATA HUD DATUMS */
/atom/proc/add_to_all_human_data_huds()
- for(var/datum/atom_hud/data/human/hud in huds) hud.add_to_hud(src)
+ for(var/datum/atom_hud/data/human/hud in GLOB.huds) hud.add_to_hud(src)
/atom/proc/remove_from_all_data_huds()
- for(var/datum/atom_hud/data/hud in huds) hud.remove_from_hud(src)
+ for(var/datum/atom_hud/data/hud in GLOB.huds) hud.remove_from_hud(src)
/datum/atom_hud/data
@@ -142,7 +142,7 @@
//called when a human changes suit sensors
/mob/living/carbon/proc/update_suit_sensors()
- var/datum/atom_hud/data/human/medical/basic/B = huds[DATA_HUD_MEDICAL_BASIC]
+ var/datum/atom_hud/data/human/medical/basic/B = GLOB.huds[DATA_HUD_MEDICAL_BASIC]
B.update_suit_sensors(src)
@@ -220,22 +220,31 @@
var/perpname = get_visible_name(TRUE) //gets the name of the perp, works if they have an id or if their face is uncovered
if(!SSticker) return //wait till the game starts or the monkeys runtime....
if(perpname)
- var/datum/data/record/R = find_record("name", perpname, data_core.security)
+ var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.security)
if(R)
switch(R.fields["criminal"])
- if("*Execute*")
+ if(SEC_RECORD_STATUS_EXECUTE)
holder.icon_state = "hudexecute"
return
- if("*Arrest*")
+ if(SEC_RECORD_STATUS_ARREST)
holder.icon_state = "hudwanted"
return
- if("Incarcerated")
+ if(SEC_RECORD_STATUS_SEARCH)
+ holder.icon_state = "hudsearch"
+ return
+ if(SEC_RECORD_STATUS_MONITOR)
+ holder.icon_state = "hudmonitor"
+ return
+ if(SEC_RECORD_STATUS_DEMOTE)
+ holder.icon_state = "huddemote"
+ return
+ if(SEC_RECORD_STATUS_INCARCERATED)
holder.icon_state = "hudprisoner"
return
- if("Parolled")
+ if(SEC_RECORD_STATUS_PAROLLED)
holder.icon_state = "hudparolled"
return
- if("Released")
+ if(SEC_RECORD_STATUS_RELEASED)
holder.icon_state = "hudreleased"
return
holder.icon_state = null
diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index e6d80529651..1a92210f570 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -4,91 +4,35 @@
* @author N3X15 | When | Type | Who | What | Target | Where |
|---|---|---|---|---|---|
| [time] | [L.log_type] | \ +[L.who] | [L.what] | \ +[L.target] | [ADMIN_COORDJMP(L.where)] |
| [e.name] | [e.burn_dam] | [e.brute_dam] | [robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured] | " + dat += "[e.name] | [e.burn_dam] | [e.brute_dam] | [robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured][dead] | " dat += "" for(var/obj/item/organ/internal/i in occupant.internal_organs) var/mech = i.desc var/infection = "None" + var/dead = "" + if(i.status & ORGAN_DEAD) + dead = "DEAD:" switch(i.germ_level) if(1 to INFECTION_LEVEL_ONE + 200) infection = "Mild Infection:" @@ -483,18 +489,20 @@ infection = "Acute Infection:" if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300) infection = "Acute Infection+:" - if(INFECTION_LEVEL_TWO + 300 to INFINITY) + if(INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 399) infection = "Acute Infection++:" + if(INFECTION_LEVEL_TWO + 400 to INFINITY) + infection = "Septic:" dat += "||
| [i.name] | N/A | [i.damage] | [infection]:[mech] | " + dat += " | [i.name] | N/A | [i.damage] | [infection]:[mech][dead] | " dat += " |
" - if(occupant.disabilities & COLOURBLIND) + if(COLOURBLIND in occupant.mutations) dat += "Photoreceptor abnormalities detected.
" - if(occupant.disabilities & NEARSIGHTED) + if(NEARSIGHTED in occupant.mutations) dat += "Retinal misalignment detected.
" else dat += "[src] is empty." diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 24b8bb27735..446004f345b 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -227,7 +227,7 @@ if(SSradio) SSradio.remove_object(src, frequency) radio_connection = null - air_alarm_repository.update_cache(src) + GLOB.air_alarm_repository.update_cache(src) QDEL_NULL(wires) if(alarm_area && alarm_area.master_air_alarm == src) alarm_area.master_air_alarm = null @@ -241,7 +241,7 @@ if(name == "alarm") name = "[alarm_area.name] Air Alarm" apply_preset(1) // Don't cycle. - air_alarm_repository.update_cache(src) + GLOB.air_alarm_repository.update_cache(src) /obj/machinery/alarm/Initialize() ..() @@ -658,7 +658,7 @@ data["danger"] = danger return data -/obj/machinery/alarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/alarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/href_list = state.href_list(user) @@ -774,7 +774,7 @@ return thresholds -/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) +/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "air_alarm.tmpl", name, 570, 410, state = state) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 6d54135946b..442d1fac8a0 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -357,7 +357,7 @@ if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) return O:id_tag in sensors -/obj/machinery/computer/general_air_control/linkWith(mob/user, obj/O, link/context) +/obj/machinery/computer/general_air_control/linkWith(mob/user, obj/O, context) sensors[O:id_tag] = reject_bad_name(clean_input(user, "Choose a sensor label:", "Sensor Label"), allow_numbers=1) return 1 diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index efcdada302d..d91fba5fa5c 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -40,8 +40,7 @@ list("name" = "High temperature canister", "icon" = "hot"), list("name" = "Plasma containing canister", "icon" = "plasma") ) - -var/datum/canister_icons/canister_icon_container = new() +GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new()) /obj/machinery/portable_atmospherics/canister name = "canister" @@ -97,19 +96,19 @@ var/datum/canister_icons/canister_icon_container = new() //passed to the ui to render the color lists colorcontainer = list( "prim" = list( - "options" = canister_icon_container.possiblemaincolor, + "options" = GLOB.canister_icon_container.possiblemaincolor, "name" = "Primary color", ), "sec" = list( - "options" = canister_icon_container.possibleseccolor, + "options" = GLOB.canister_icon_container.possibleseccolor, "name" = "Secondary color", ), "ter" = list( - "options" = canister_icon_container.possibletertcolor, + "options" = GLOB.canister_icon_container.possibletertcolor, "name" = "Tertiary color", ), "quart" = list( - "options" = canister_icon_container.possiblequartcolor, + "options" = GLOB.canister_icon_container.possiblequartcolor, "name" = "Quaternary color", ) ) @@ -127,7 +126,7 @@ var/datum/canister_icons/canister_icon_container = new() possibledecals = list() var/i - var/list/L = canister_icon_container.possibledecals + var/list/L = GLOB.canister_icon_container.possibledecals for(i=1;i<=L.len;i++) var/list/LL = L[i] LL = LL.Copy() //make sure we don't edit the datum list @@ -220,25 +219,25 @@ update_flag //template modification exploit prevention, used in Topic() /obj/machinery/portable_atmospherics/canister/proc/is_a_color(var/inputVar, var/checkColor = "all") if(checkColor == "prim" || checkColor == "all") - for(var/list/L in canister_icon_container.possiblemaincolor) + for(var/list/L in GLOB.canister_icon_container.possiblemaincolor) if(L["icon"] == inputVar) return 1 if(checkColor == "sec" || checkColor == "all") - for(var/list/L in canister_icon_container.possibleseccolor) + for(var/list/L in GLOB.canister_icon_container.possibleseccolor) if(L["icon"] == inputVar) return 1 if(checkColor == "ter" || checkColor == "all") - for(var/list/L in canister_icon_container.possibletertcolor) + for(var/list/L in GLOB.canister_icon_container.possibletertcolor) if(L["icon"] == inputVar) return 1 if(checkColor == "quart" || checkColor == "all") - for(var/list/L in canister_icon_container.possiblequartcolor) + for(var/list/L in GLOB.canister_icon_container.possiblequartcolor) if(L["icon"] == inputVar) return 1 return 0 /obj/machinery/portable_atmospherics/canister/proc/is_a_decal(var/inputVar) - for(var/list/L in canister_icon_container.possibledecals) + for(var/list/L in GLOB.canister_icon_container.possibledecals) if(L["icon"] == inputVar) return 1 return 0 @@ -354,7 +353,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) return src.ui_interact(user) -/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.physical_state) if(src.destroyed) return diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index e4bdef2f147..0144a7f93c2 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -115,7 +115,7 @@ /obj/machinery/portable_atmospherics/pump/attack_hand(var/mob/user as mob) ui_interact(user) -/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.physical_state) // update the ui if it exists, returns null if no ui is passed/found ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -127,7 +127,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/portable_atmospherics/pump/ui_data(mob/user, ui_key = "main", datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/pump/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.physical_state) var/data[0] data["portConnected"] = connected_port ? 1 : 0 data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 1016e270f6d..36e340d1a12 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -116,7 +116,7 @@ ui_interact(user) return -/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.physical_state) // update the ui if it exists, returns null if no ui is passed/found ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -128,7 +128,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/portable_atmospherics/scrubber/ui_data(mob/user, ui_key = "main", datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/scrubber/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.physical_state) var/data[0] data["portConnected"] = connected_port ? 1 : 0 data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 9d9db841b1e..7a0c2483b40 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -38,7 +38,7 @@ var/list/categories = list("Tools", "Electronics", "Construction", "Communication", "Security", "Machinery", "Medical", "Miscellaneous", "Dinnerware", "Imported") /obj/machinery/autolathe/New() - AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert)) + AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), _show_on_examine=TRUE, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert)) ..() component_parts = list() component_parts += new /obj/item/circuitboard/autolathe(null) @@ -66,7 +66,7 @@ /obj/machinery/autolathe/Destroy() QDEL_NULL(wires) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.retrieve_all() return ..() @@ -86,8 +86,8 @@ ui = new(user, src, ui_key, "autolathe.tmpl", name, 800, 550) ui.open() -/obj/machinery/autolathe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) - GET_COMPONENT(materials, /datum/component/material_container) +/obj/machinery/autolathe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/data[0] data["screen"] = screen data["total_amount"] = materials.total_amount @@ -138,7 +138,7 @@ /obj/machinery/autolathe/proc/design_cost_data(datum/design/D) var/list/data = list() var/coeff = get_coeff(D) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/has_metal = 1 if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] / coeff))) has_metal = 0 @@ -152,7 +152,7 @@ return data /obj/machinery/autolathe/proc/queue_data(list/data) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/temp_metal = materials.amount(MAT_METAL) var/temp_glass = materials.amount(MAT_GLASS) data["processing"] = being_built.len ? get_processing_line() : null @@ -288,7 +288,7 @@ //multiplier checks : only stacks can have one and its value is 1, 10 ,25 or max_multiplier var/multiplier = text2num(href_list["multiplier"]) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/max_multiplier = min(design_last_ordered.maxstack, design_last_ordered.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/design_last_ordered.materials[MAT_METAL]):INFINITY,design_last_ordered.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/design_last_ordered.materials[MAT_GLASS]):INFINITY) var/is_stack = ispath(design_last_ordered.build_path, /obj/item/stack) @@ -342,7 +342,7 @@ for(var/obj/item/stock_parts/matter_bin/MB in component_parts) tot_rating += MB.rating tot_rating *= 25000 - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.max_amount = tot_rating * 3 for(var/obj/item/stock_parts/manipulator/M in component_parts) prod_coeff += M.rating - 1 @@ -355,7 +355,7 @@ desc = initial(desc)+"\nIt's building \a [initial(D.name)]." var/is_stack = ispath(D.build_path, /obj/item/stack) var/coeff = get_coeff(D) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/metal_cost = D.materials[MAT_METAL] var/glass_cost = D.materials[MAT_GLASS] var/power = max(2000, (metal_cost+glass_cost)*multiplier/5) @@ -387,7 +387,7 @@ return 0 var/coeff = get_coeff(D) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/metal_amount = materials.amount(MAT_METAL) if(custom_metal) metal_amount = custom_metal diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index c097a19f4f8..24ffb494422 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -34,20 +34,16 @@ var/in_use_lights = 0 // TO BE IMPLEMENTED var/toggle_sound = 'sound/items/wirecutter.ogg' - -/obj/machinery/camera/New() - ..() +/obj/machinery/camera/Initialize() + . = ..() wires = new(src) assembly = new(src) assembly.state = 4 assembly.anchored = 1 assembly.update_icon() - cameranet.cameras += src - cameranet.addCamera(src) - -/obj/machinery/camera/Initialize() - ..() + GLOB.cameranet.cameras += src + GLOB.cameranet.addCamera(src) if(is_station_level(z) && prob(3) && !start_active) toggle_cam(null, FALSE) wires.CutAll() @@ -61,8 +57,8 @@ bug.current = null bug = null QDEL_NULL(wires) - cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that - cameranet.cameras -= src + GLOB.cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that + GLOB.cameranet.cameras -= src var/area/ai_monitored/A = get_area(src) if(istype(A)) A.motioncamera = null @@ -77,7 +73,7 @@ update_icon() var/list/previous_network = network network = list() - cameranet.removeCamera(src) + GLOB.cameranet.removeCamera(src) stat |= EMPED set_light(0) emped = emped+1 //Increase the number of consecutive EMP's @@ -91,7 +87,7 @@ stat &= ~EMPED update_icon() if(can_use()) - cameranet.addCamera(src) + GLOB.cameranet.addCamera(src) emped = 0 //Resets the consecutive EMP count spawn(100) if(!QDELETED(src)) @@ -116,7 +112,7 @@ /obj/machinery/camera/proc/setViewRange(num = 7) view_range = num - cameranet.updateVisibility(src, 0) + GLOB.cameranet.updateVisibility(src, 0) /obj/machinery/camera/singularity_pull(S, current_size) if (status && current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects and the camera is still active, turn off the camera as it gets ripped off the wall. @@ -285,11 +281,11 @@ /obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE) status = !status if(can_use()) - cameranet.addCamera(src) + GLOB.cameranet.addCamera(src) else set_light(0) - cameranet.removeCamera(src) - cameranet.updateChunk(x, y, z) + GLOB.cameranet.removeCamera(src) + GLOB.cameranet.updateChunk(x, y, z) var/change_msg = "deactivates" if(status) change_msg = "reactivates" @@ -376,7 +372,7 @@ return null /obj/machinery/camera/proc/Togglelight(on = FALSE) - for(var/mob/living/silicon/ai/A in ai_list) + for(var/mob/living/silicon/ai/A in GLOB.ai_list) for(var/obj/machinery/camera/cam in A.lit_cameras) if(cam == src) return @@ -428,6 +424,6 @@ assembly.update_icon() /obj/machinery/camera/portable/process() //Updates whenever the camera is moved. - if(cameranet && get_turf(src) != prev_turf) - cameranet.updatePortableCamera(src) + if(GLOB.cameranet && get_turf(src) != prev_turf) + GLOB.cameranet.updatePortableCamera(src) prev_turf = get_turf(src) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 98f84cb75ec..c7d95370613 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -92,7 +92,7 @@ C.network = uniquelist(tempnetwork) tempnetwork = difflist(C.network,GLOB.restricted_camera_networks) if(!tempnetwork.len) // Camera isn't on any open network - remove its chunk from AI visibility. - cameranet.removeCamera(C) + GLOB.cameranet.removeCamera(C) C.c_tag = input diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 85b83b88c06..c0949fb3c9d 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -2,8 +2,8 @@ // EMP -/obj/machinery/camera/emp_proof/New() - ..() +/obj/machinery/camera/emp_proof/Initialize() + . = ..() upgradeEmpProof() // X-RAY @@ -11,20 +11,20 @@ /obj/machinery/camera/xray icon_state = "xraycam" // Thanks to Krutchen for the icons. -/obj/machinery/camera/xray/New() - ..() +/obj/machinery/camera/xray/Initialize() + . = ..() upgradeXRay() // MOTION -/obj/machinery/camera/motion/New() - ..() +/obj/machinery/camera/motion/Initialize() + . = ..() upgradeMotion() // ALL UPGRADES -/obj/machinery/camera/all/New() - ..() +/obj/machinery/camera/all/Initialize() + . = ..() upgradeEmpProof() upgradeXRay() upgradeMotion() @@ -74,7 +74,7 @@ assembly.upgrades.Add(new /obj/item/analyzer(assembly)) setPowerUsage() //Update what it can see. - cameranet.updateVisibility(src, 0) + GLOB.cameranet.updateVisibility(src, 0) // If you are upgrading Motion, and it isn't in the camera's New(), add it to the machines list. /obj/machinery/camera/proc/upgradeMotion() diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 5e6bd1640fb..1c247b23c03 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -17,7 +17,7 @@ return var/list/L = list() - for(var/obj/machinery/camera/C in cameranet.cameras) + for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) L.Add(C) camera_sort(L) @@ -226,9 +226,9 @@ return 0 if(isrobot(M)) var/mob/living/silicon/robot/R = M - if(!(R.camera && R.camera.can_use()) && !cameranet.checkCameraVis(M)) + if(!(R.camera && R.camera.can_use()) && !GLOB.cameranet.checkCameraVis(M)) return 0 - else if(!cameranet.checkCameraVis(M)) + else if(!GLOB.cameranet.checkCameraVis(M)) return 0 return 1 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 721162c0794..c622b12c94c 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -4,7 +4,19 @@ //Potential replacement for genetics revives or something I dunno (?) #define CLONE_BIOMASS 150 -#define BIOMASS_MEAT_AMOUNT 50 + +#define BIOMASS_BASE_AMOUNT 50 // How much biomass a BIOMASSABLE item gives the cloning pod + +// Not a comprehensive list: Further PRs should add appropriate items here. +// Meat as usual, monstermeat covers goliath, xeno, spider, bear meat +GLOBAL_LIST_INIT(cloner_biomass_items, list(\ +/obj/item/reagent_containers/food/snacks/meat,\ +/obj/item/reagent_containers/food/snacks/monstermeat, +/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/catfishmeat, +/obj/item/reagent_containers/food/snacks/tofurkey)) + #define MINIMUM_HEAL_LEVEL 40 #define CLONE_INITIAL_DAMAGE 190 #define BRAIN_INITIAL_DAMAGE 90 // our minds are too feeble for 190 @@ -15,8 +27,9 @@ desc = "An electronically-lockable pod for growing organic tissue." density = 1 icon = 'icons/obj/cloning.dmi' - icon_state = "pod_0" + icon_state = "pod_idle" req_access = list(ACCESS_GENETICS) //For premature unlocking. + var/mob/living/carbon/human/occupant var/heal_level //The clone is released once its health reaches this level. var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. @@ -153,7 +166,7 @@ for(var/i=new_SE.len;i<=DNA_SE_LENGTH;i++) new_SE += rand(1,1024) buf.dna.SE=new_SE - buf.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF) + buf.dna.SetSEValueRange(GLOB.monkeyblock,0xDAC, 0xFFF) //Disk stuff. /obj/item/disk/data/New() @@ -302,13 +315,14 @@ attempting = 0 return 1 -//Grow clones to maturity then kick them out. FREELOADERS +//Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() - var/show_message = 0 - for(var/obj/item/reagent_containers/food/snacks/meat/meat in range(1, src)) - qdel(meat) - biomass += BIOMASS_MEAT_AMOUNT - show_message = 1 + var/show_message = FALSE + for(var/obj/item/item in range(1, src)) + if(is_type_in_list(item, GLOB.cloner_biomass_items)) + qdel(item) + biomass += BIOMASS_BASE_AMOUNT + show_message = TRUE if(show_message) visible_message("[src] sucks in and processes the nearby biomass.") @@ -381,11 +395,11 @@ to_chat(user, "You force an emergency ejection.") go_out() -//Removing cloning pod biomass - else if(istype(I, /obj/item/reagent_containers/food/snacks/meat)) +// A user can feed in biomass sources manually. + else if(is_type_in_list(I, GLOB.cloner_biomass_items)) if(user.drop_item()) to_chat(user, "[src] processes [I].") - biomass += BIOMASS_MEAT_AMOUNT + biomass += BIOMASS_BASE_AMOUNT qdel(I) else return ..() @@ -405,7 +419,9 @@ /obj/machinery/clonepod/screwdriver_act(mob/user, obj/item/I) . = TRUE - default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", I) + // These icon states don't really matter since we need to call update_icon() to handle panel open/closed overlays anyway. + default_deconstruction_screwdriver(user, null, null, I) + update_icon() /obj/machinery/clonepod/wrench_act(mob/user, obj/item/I) . = TRUE @@ -531,11 +547,17 @@ /obj/machinery/clonepod/update_icon() ..() - icon_state = "pod_0" + cut_overlays() + + if(panel_open) + add_overlay("panel_open") + if(occupant && !(stat & NOPOWER)) - icon_state = "pod_1" - else if(mess && !panel_open) - icon_state = "pod_g" + icon_state = "pod_cloning" + else if(mess) + icon_state = "pod_mess" + else + icon_state = "pod_idle" /obj/machinery/clonepod/relaymove(mob/user) if(user.stat == CONSCIOUS) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index ad11d6fb7c5..21fddce64b7 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -61,7 +61,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/operating/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/operating/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/mob/living/carbon/human/occupant if(table) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index d53903857ef..ba139e50855 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -158,7 +158,7 @@ var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) if(open_for_latejoin) - empty_playable_ai_cores += D + GLOB.empty_playable_ai_cores += D else if(brain.brainmob.mind) SSticker.mode.remove_cultist(brain.brainmob.mind, 1) @@ -248,8 +248,8 @@ circuit = new(src) /obj/structure/AIcore/deactivated/Destroy() - if(src in empty_playable_ai_cores) - empty_playable_ai_cores -= src + if(src in GLOB.empty_playable_ai_cores) + GLOB.empty_playable_ai_cores -= src return ..() /client/proc/empty_ai_core_toggle_latejoin() @@ -269,11 +269,11 @@ var/obj/structure/AIcore/deactivated/D = cores[id] if(!D) return - if(D in empty_playable_ai_cores) - empty_playable_ai_cores -= D + if(D in GLOB.empty_playable_ai_cores) + GLOB.empty_playable_ai_cores -= D to_chat(src, "\The [id] is now not available for latejoining AIs.") else - empty_playable_ai_cores += D + GLOB.empty_playable_ai_cores += D to_chat(src, "\The [id] is now available for latejoining AIs.") diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index f8c2979e043..123cee3ae4e 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -1,5 +1,5 @@ -var/global/list/priority_air_alarms = list() -var/global/list/minor_air_alarms = list() +GLOBAL_LIST_EMPTY(priority_air_alarms) +GLOBAL_LIST_EMPTY(minor_air_alarms) /obj/machinery/computer/atmos_alert @@ -12,7 +12,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/New() ..() - SSalarms.atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/update_icon) + SSalarms.atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/.proc/update_icon) /obj/machinery/computer/atmos_alert/Destroy() SSalarms.atmosphere_alarm.unregister(src) @@ -67,12 +67,11 @@ var/global/list/minor_air_alarms = list() var/obj/machinery/alarm/air_alarm = alarm_source.source if(istype(air_alarm)) var/list/new_ref = list("atmos_reset" = 1) - air_alarm.Topic(href, new_ref, state = air_alarm_topic) + air_alarm.Topic(href, new_ref, state = GLOB.air_alarm_topic) update_icon() return 1 - -var/datum/topic_state/air_alarm_topic/air_alarm_topic = new() +GLOBAL_DATUM_INIT(air_alarm_topic, /datum/topic_state/air_alarm_topic, new) /datum/topic_state/air_alarm_topic/href_list(var/mob/user) var/list/extra_href = list() diff --git a/code/game/machinery/computer/brigcells.dm b/code/game/machinery/computer/brigcells.dm index 378c10d9783..a391bfa4021 100644 --- a/code/game/machinery/computer/brigcells.dm +++ b/code/game/machinery/computer/brigcells.dm @@ -30,7 +30,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/brigcells/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/brigcells/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/timers = list() for(var/obj/machinery/door_timer/T in GLOB.celltimers_list) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 2f8321b57bb..993a1c5cbaa 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -45,7 +45,6 @@ var/list/req_components = null var/powernet = null var/list/records = null - var/frame_desc = null var/contain_parts = 1 toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' @@ -64,7 +63,7 @@ var/atom/A = B if(!ispath(A)) continue - nice_list += list("[req_components[A]] [initial(A.name)]") + nice_list += list("[req_components[A]] [initial(A.name)]\s") . += "Required components: [english_list(nice_list)]." /obj/item/circuitboard/message_monitor @@ -296,19 +295,6 @@ name = "Circuit board (Operating Computer)" build_path = /obj/machinery/computer/operating origin_tech = "programming=2;biotech=3" -/obj/item/circuitboard/comm_monitor - name = "Circuit board (Telecommunications Monitor)" - build_path = /obj/machinery/computer/telecomms/monitor - origin_tech = "programming=3;magnets=3;bluespace=2" -/obj/item/circuitboard/comm_server - name = "Circuit board (Telecommunications Server Monitor)" - build_path = /obj/machinery/computer/telecomms/server - origin_tech = "programming=3;magnets=3;bluespace=2" -/obj/item/circuitboard/comm_traffic - name = "Circuitboard (Telecommunications Traffic Control)" - build_path = /obj/machinery/computer/telecomms/traffic - origin_tech = "programming=3;magnets=3;bluespace=2" - /obj/item/circuitboard/shuttle name = "circuit board (Shuttle)" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index f67158f82b0..3f8fc080bf8 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -53,6 +53,9 @@ return TRUE /obj/machinery/computer/security/check_eye(mob/user) + if((stat & (NOPOWER|BROKEN)) || user.incapacitated() || !user.has_vision()) + user.unset_machine() + return if(!(user in watchers)) user.unset_machine() return @@ -65,8 +68,6 @@ return if(!can_access_camera(C, user)) user.unset_machine() - return - return 1 /obj/machinery/computer/security/on_unset_machine(mob/user) watchers.Remove(user) @@ -113,7 +114,7 @@ access = get_all_accesses() // Assume captain level access when emagged else if(ishuman(user)) access = user.get_access() - else if((isAI(user) || isrobot(user)) && CanUseTopic(user, default_state) == STATUS_INTERACTIVE) + else if((isAI(user) || isrobot(user)) && CanUseTopic(user, GLOB.default_state) == STATUS_INTERACTIVE) access = get_all_accesses() // Assume captain level access when AI else if(user.can_admin_interact()) access = get_all_accesses() @@ -131,11 +132,11 @@ ui.open() -/obj/machinery/computer/security/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/security/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/cameras = list() - for(var/obj/machinery/camera/C in cameranet.cameras) + for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) if(isCameraFarAway(C)) continue if(!can_access_camera(C, user)) @@ -183,7 +184,7 @@ return 1 if(href_list["switchTo"]) - var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras + var/obj/machinery/camera/C = locate(href_list["switchTo"]) in GLOB.cameranet.cameras if(!C) return 1 @@ -209,7 +210,7 @@ // Check if camera is accessible when jumping /obj/machinery/computer/security/proc/can_access_camera(var/obj/machinery/camera/C, var/mob/M) - if(CanUseTopic(M, default_state) != STATUS_INTERACTIVE || M.incapacitated() || !M.has_vision()) + if(CanUseTopic(M, GLOB.default_state) != STATUS_INTERACTIVE || M.incapacitated() || !M.has_vision()) return 0 if(isrobot(M)) @@ -302,7 +303,7 @@ T = get_step(T, direct) console.jump_on_click(src, T) return - return ..(n,direct) + return ..() // Other computer monitors. /obj/machinery/computer/security/telescreen diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index b70addea909..bc1bfe6135b 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -37,17 +37,14 @@ eyeobj.RemoveImages() eyeobj.eye_user = null user.remote_control = null - user.remote_view = FALSE current_user = null user.unset_machine() playsound(src, 'sound/machines/terminal_off.ogg', 25, 0) /obj/machinery/computer/camera_advanced/check_eye(mob/user) - if((stat & (NOPOWER|BROKEN)) || !Adjacent(user) || !user.has_vision() || user.incapacitated()) + if((stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || !user.has_vision() || user.incapacitated()) user.unset_machine() - return 0 - return 1 /obj/machinery/computer/camera_advanced/Destroy() if(current_user) @@ -75,7 +72,7 @@ if(!eyeobj.eye_initialized) var/camera_location - for(var/obj/machinery/camera/C in cameranet.cameras) + for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) if(!C.can_use()) continue if(C.network&networks) @@ -99,8 +96,6 @@ current_user = user eyeobj.eye_user = user eyeobj.name = "Camera Eye ([user.name])" - // This should be able to be excised once the full view refactor rolls out - user.remote_view = 1 user.remote_control = eyeobj user.reset_perspective(eyeobj) @@ -139,7 +134,7 @@ T = get_turf(T) loc = T if(use_static) - cameranet.visibility(src, GetViewerClient()) + GLOB.cameranet.visibility(src, GetViewerClient()) if(visible_icon) if(eye_user.client) eye_user.client.images -= user_image @@ -189,7 +184,7 @@ var/list/L = list() - for(var/obj/machinery/camera/cam in cameranet.cameras) + for(var/obj/machinery/camera/cam in GLOB.cameranet.cameras) L.Add(cam) camera_sort(L) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 07ab3f5d62b..978ba25b8d3 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -1,6 +1,6 @@ //Keeps track of the time for the ID console. Having it as a global variable prevents people from dismantling/reassembling it to //increase the slots of many jobs. -var/time_last_changed_position = 0 +GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card name = "identification computer" @@ -25,7 +25,8 @@ var/time_last_changed_position = 0 /datum/job/ntnavyofficer, /datum/job/ntspecops, /datum/job/civilian, - /datum/job/syndicateofficer + /datum/job/syndicateofficer, + /datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work ) // Jobs that appear in the list, and you can prioritize, but not open/close slots for var/list/blacklisted_partial = list( @@ -133,7 +134,7 @@ var/time_last_changed_position = 0 if(!istype(id_card)) return ..() - if(!scan && ACCESS_CHANGE_IDS in id_card.access) + if(!scan && (ACCESS_CHANGE_IDS in id_card.access)) user.drop_item() id_card.loc = src scan = id_card @@ -160,7 +161,7 @@ var/time_last_changed_position = 0 if(job) if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE)) if((job.total_positions <= GLOB.player_list.len * (max_relative_positions / 100))) - var/delta = (world.time / 10) - time_last_changed_position + var/delta = (world.time / 10) - GLOB.time_last_changed_position if((change_position_cooldown < delta) || (opened_positions[job.title] < 0)) return 1 return -2 @@ -172,7 +173,7 @@ var/time_last_changed_position = 0 if(job) if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE)) if(job.total_positions > job.current_positions && !(job in SSjobs.prioritized_jobs)) - var/delta = (world.time / 10) - time_last_changed_position + var/delta = (world.time / 10) - GLOB.time_last_changed_position if((change_position_cooldown < delta) || (opened_positions[job.title] > 0)) return 1 return -2 @@ -236,13 +237,13 @@ var/time_last_changed_position = 0 ui = new(user, src, ui_key, "identification_computer.tmpl", src.name, 775, 700) ui.open() -/obj/machinery/computer/card/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/card/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["src"] = UID() data["station_name"] = station_name() data["mode"] = mode data["printing"] = printing - data["manifest"] = data_core ? data_core.get_manifest(0) : null + data["manifest"] = GLOB.data_core ? GLOB.data_core.get_manifest(0) : null data["target_name"] = modify ? modify.name : "-----" data["target_owner"] = modify && modify.registered_name ? modify.registered_name : "-----" data["target_rank"] = get_target_rank() @@ -260,19 +261,19 @@ var/time_last_changed_position = 0 var/list/job_formats = SSjobs.format_jobs_for_id_computer(modify) data["top_jobs"] = format_jobs(list("Captain", "Custom"), data["target_rank"], job_formats) - data["engineering_jobs"] = format_jobs(engineering_positions, data["target_rank"], job_formats) - data["medical_jobs"] = format_jobs(medical_positions, data["target_rank"], job_formats) - data["science_jobs"] = format_jobs(science_positions, data["target_rank"], job_formats) - data["security_jobs"] = format_jobs(security_positions, data["target_rank"], job_formats) - data["support_jobs"] = format_jobs(support_positions, data["target_rank"], job_formats) - data["civilian_jobs"] = format_jobs(civilian_positions, data["target_rank"], job_formats) - data["special_jobs"] = format_jobs(whitelisted_positions, data["target_rank"], job_formats) + data["engineering_jobs"] = format_jobs(GLOB.engineering_positions, data["target_rank"], job_formats) + data["medical_jobs"] = format_jobs(GLOB.medical_positions, data["target_rank"], job_formats) + data["science_jobs"] = format_jobs(GLOB.science_positions, data["target_rank"], job_formats) + data["security_jobs"] = format_jobs(GLOB.security_positions, data["target_rank"], job_formats) + data["support_jobs"] = format_jobs(GLOB.support_positions, data["target_rank"], job_formats) + data["civilian_jobs"] = format_jobs(GLOB.civilian_positions, data["target_rank"], job_formats) + data["special_jobs"] = format_jobs(GLOB.whitelisted_positions, data["target_rank"], job_formats) data["centcom_jobs"] = format_jobs(get_all_centcom_jobs(), data["target_rank"], job_formats) data["card_skins"] = format_card_skins(get_station_card_skins()) data["job_slots"] = format_job_slots() - var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - time_last_changed_position), 1) + var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1) var/mins = round(time_to_wait / 60) var/seconds = time_to_wait - (60*mins) data["cooldown_mins"] = mins @@ -321,7 +322,7 @@ var/time_last_changed_position = 0 switch(href_list["choice"]) if("modify") if(modify) - data_core.manifest_modify(modify.registered_name, modify.assignment) + GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment) modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])") if(ishuman(usr)) modify.forceMove(get_turf(src)) @@ -480,7 +481,7 @@ var/time_last_changed_position = 0 P.name = "crew manifest ([station_time_timestamp()])" P.info = {"
Crew Manifest
- [data_core ? data_core.get_manifest(0) : ""] + [GLOB.data_core ? GLOB.data_core.get_manifest(0) : ""] "} else if(modify && !mode) P.name = "access report" @@ -544,7 +545,7 @@ var/time_last_changed_position = 0 if(can_open_job(j) != 1) return 0 if(opened_positions[edit_job_target] >= 0) - time_last_changed_position = world.time / 10 + GLOB.time_last_changed_position = world.time / 10 j.total_positions++ opened_positions[edit_job_target]++ log_game("[key_name(usr)] has opened a job slot for job \"[j]\".") @@ -564,7 +565,7 @@ var/time_last_changed_position = 0 return 0 //Allow instant closing without cooldown if a position has been opened before if(opened_positions[edit_job_target] <= 0) - time_last_changed_position = world.time / 10 + GLOB.time_last_changed_position = world.time / 10 j.total_positions-- opened_positions[edit_job_target]-- log_game("[key_name(usr)] has closed a job slot for job \"[j]\".") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index c06cbb32a04..3091caa82a2 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -129,7 +129,7 @@ ui = new(user, src, ui_key, "cloning_console.tmpl", "Cloning Console UI", 640, 520) ui.open() -/obj/machinery/computer/cloning/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/cloning/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["menu"] = src.menu data["scanner"] = sanitize("[src.scanner]") @@ -358,35 +358,37 @@ return if(scan_brain && !can_brainscan()) return - if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (NO_SCAN in subject.dna.species.species_traits)) - scantemp = "Error: Unable to locate valid genetic data." - SSnanoui.update_uis(src) - return + if(isnull(subject) || (!(ishuman(subject))) || (!subject.dna)) + if(isalien(subject)) + scantemp = "Error: Xenomorphs are not scannable." + SSnanoui.update_uis(src) + return + // can add more conditions for specific non-human messages here + else + scantemp = "Error: Subject species is not scannable." + SSnanoui.update_uis(src) + return if(subject.get_int_organ(/obj/item/organ/internal/brain)) var/obj/item/organ/internal/brain/Brn = subject.get_int_organ(/obj/item/organ/internal/brain) if(istype(Brn)) if(NO_SCAN in Brn.dna.species.species_traits) - scantemp = "Error: Subject's brain is incompatible." + scantemp = "Error: [Brn.dna.species.name_plural] are not scannable." SSnanoui.update_uis(src) return if(!subject.get_int_organ(/obj/item/organ/internal/brain)) - scantemp = "Error: No signs of intelligence detected." + scantemp = "Error: No brain detected in subject." SSnanoui.update_uis(src) return if(subject.suiciding) - scantemp = "Error: Subject's brain is not responding to scanning stimuli." + scantemp = "Error: Subject has committed suicide and is not scannable." SSnanoui.update_uis(src) return if((!subject.ckey) || (!subject.client)) - scantemp = "Error: Mental interface failure." + scantemp = "Error: Subject's brain is not responding. Further attempts after a short delay may succeed." SSnanoui.update_uis(src) return if((NOCLONE in subject.mutations) && src.scanner.scan_level < 2) - scantemp = "Error: Mental interface failure." - SSnanoui.update_uis(src) - return - if(scan_brain && !subject.get_int_organ(/obj/item/organ/internal/brain)) - scantemp = "Error: No brain found." + scantemp = "Error: Subject has incompatible genetic mutations." SSnanoui.update_uis(src) return if(!isnull(find_record(subject.ckey))) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 3b663bbe549..9a1fd08d289 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -54,16 +54,16 @@ /obj/machinery/computer/communications/proc/change_security_level(var/new_level) tmp_alertlevel = new_level - var/old_level = security_level + var/old_level = GLOB.security_level if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this set_security_level(tmp_alertlevel) - if(security_level != old_level) + if(GLOB.security_level != old_level) //Only notify the admins if an actual change happened log_game("[key_name(usr)] has changed the security level to [get_security_level()].") message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") - switch(security_level) + switch(GLOB.security_level) if(SEC_LEVEL_GREEN) feedback_inc("alert_comms_green",1) if(SEC_LEVEL_BLUE) @@ -237,7 +237,7 @@ Nuke_request(input, usr) to_chat(usr, "Request sent.") log_game("[key_name(usr)] has requested the nuclear codes from Centcomm") - priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg') + GLOB.priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg') centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown centcomm_message_cooldown = 0 @@ -299,8 +299,8 @@ to_chat(usr, "Nano-Mob Hunter GO! game server is offline for extended maintenance. Contact your Central Command administrators for more info if desired.") if("ToggleATC") - atc.squelched = !atc.squelched - to_chat(usr, "ATC traffic is now: [atc.squelched ? "Disabled" : "Enabled"].") + GLOB.atc.squelched = !GLOB.atc.squelched + to_chat(usr, "ATC traffic is now: [GLOB.atc.squelched ? "Disabled" : "Enabled"].") SSnanoui.update_uis(src) return 1 @@ -337,7 +337,7 @@ // open the new ui window ui.open() -/obj/machinery/computer/communications/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/communications/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["is_ai"] = isAI(user) || isrobot(user) data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state @@ -364,7 +364,7 @@ ) ) - data["security_level"] = security_level + data["security_level"] = GLOB.security_level data["str_security_level"] = capitalize(get_security_level()) data["levels"] = list( list("id" = SEC_LEVEL_GREEN, "name" = "Green"), @@ -395,7 +395,7 @@ data["shuttle"] = shuttle - data["atcSquelched"] = atc.squelched + data["atcSquelched"] = GLOB.atc.squelched return data @@ -427,7 +427,7 @@ /proc/enable_prison_shuttle(var/mob/user); /proc/call_shuttle_proc(var/mob/user, var/reason) - if(sent_strike_team == 1) + if(GLOB.sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return @@ -456,7 +456,7 @@ to_chat(user, "Central Command does not currently have a shuttle available in your sector. Please try again later.") return - if(sent_strike_team == 1) + if(GLOB.sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return @@ -499,7 +499,6 @@ if(!frequency) return var/datum/signal/status_signal = new - status_signal.source = src status_signal.transmission_method = 1 status_signal.data["command"] = command @@ -507,13 +506,13 @@ if("message") status_signal.data["msg1"] = data1 status_signal.data["msg2"] = data2 - log_admin("STATUS: [user] set status screen message with [src]: [data1] [data2]") + log_admin("STATUS: [user] set status screen message: [data1] [data2]") //message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") if("alert") status_signal.data["picture_state"] = data1 spawn(0) - frequency.post_signal(src, status_signal) + frequency.post_signal(null, status_signal) /obj/machinery/computer/communications/Destroy() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index a3828af6be1..9464c43b107 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -52,7 +52,7 @@ ui = new(user, src, ui_key, "med_data.tmpl", name, 800, 380) ui.open() -/obj/machinery/computer/med_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/med_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -61,15 +61,15 @@ if(authenticated) switch(screen) if(MED_DATA_R_LIST) - if(!isnull(data_core.general)) + if(!isnull(GLOB.data_core.general)) var/list/records = list() data["records"] = records - for(var/datum/data/record/R in sortRecord(data_core.general)) + for(var/datum/data/record/R in sortRecord(GLOB.data_core.general)) records[++records.len] = list("ref" = "\ref[R]", "id" = R.fields["id"], "name" = R.fields["name"]) if(MED_DATA_RECORD) var/list/general = list() data["general"] = general - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) var/list/fields = list() general["fields"] = fields fields[++fields.len] = list("field" = "Name:", "value" = active1.fields["name"], "edit" = null) @@ -90,7 +90,7 @@ var/list/medical = list() data["medical"] = medical - if(istype(active2, /datum/data/record) && data_core.medical.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.medical.Find(active2)) var/list/fields = list() medical["fields"] = fields fields[++fields.len] = list("field" = "Blood Type:", "value" = active2.fields["blood_type"], "edit" = "blood_type", "line_break" = 0) @@ -144,9 +144,9 @@ if(..()) return 1 - if(!data_core.general.Find(active1)) + if(!GLOB.data_core.general.Find(active1)) active1 = null - if(!data_core.medical.Find(active2)) + if(!GLOB.data_core.medical.Find(active2)) active2 = null if(href_list["temp"]) @@ -157,7 +157,7 @@ var/temp_href = splittext(href_list["temp_action"], "=") switch(temp_href[1]) if("del_all2") - for(var/datum/data/record/R in data_core.medical) + for(var/datum/data/record/R in GLOB.data_core.medical) qdel(R) setTemp("
All records deleted.
") if("p_stat") @@ -421,10 +421,10 @@ if(href_list["d_rec"]) var/datum/data/record/R = locate(href_list["d_rec"]) var/datum/data/record/M = locate(href_list["d_rec"]) - if(!data_core.general.Find(R)) + if(!GLOB.data_core.general.Find(R)) setTemp("Record not found!
") return 1 - for(var/datum/data/record/E in data_core.medical) + for(var/datum/data/record/E in GLOB.data_core.medical) if(E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]) M = E active1 = R @@ -448,7 +448,7 @@ R.fields["cdi"] = "None" R.fields["cdi_d"] = "No diseases have been diagnosed at the moment." R.fields["notes"] = "No notes." - data_core.medical += R + GLOB.data_core.medical += R active2 = R screen = MED_DATA_RECORD @@ -459,7 +459,7 @@ var/t1 = copytext(trim(sanitize(input("Add Comment:", "Med. records", null, null) as message)), 1, MAX_MESSAGE_LEN) if(!t1 || ..() || active2 != a2) return 1 - active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [station_time_timestamp()][t1]" + active2.fields["comments"] += "Made by [authenticated] ([rank]) on [GLOB.current_date_string] [station_time_timestamp()]
[t1]" if(href_list["del_c"]) var/index = min(max(text2num(href_list["del_c"]) + 1, 1), length(active2.fields["comments"])) @@ -473,13 +473,13 @@ active1 = null active2 = null t1 = lowertext(t1) - for(var/datum/data/record/R in data_core.medical) + for(var/datum/data/record/R in GLOB.data_core.medical) if(t1 == lowertext(R.fields["name"]) || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])) active2 = R if(!active2) setTemp("
Could not locate record [t1].
") else - for(var/datum/data/record/E in data_core.general) + for(var/datum/data/record/E in GLOB.data_core.general) if(E.fields["name"] == active2.fields["name"] && E.fields["id"] == active2.fields["id"]) active1 = E screen = MED_DATA_RECORD @@ -491,7 +491,7 @@ sleep(50) var/obj/item/paper/P = new /obj/item/paper(loc) P.info = "" - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]]
\nSex: [active1.fields["sex"]]
\nAge: [active1.fields["age"]] @@ -500,7 +500,7 @@
\nMental Status: [active1.fields["m_stat"]]
"} else P.info += "General Record Lost!
" - if(istype(active2, /datum/data/record) && data_core.medical.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.medical.Find(active2)) P.info += {"
\n
\nBlood Type: [active2.fields["blood_type"]]
\nDNA: [active2.fields["b_dna"]]
\n @@ -532,7 +532,7 @@ if(stat & (BROKEN|NOPOWER)) return ..(severity) - for(var/datum/data/record/R in data_core.medical) + for(var/datum/data/record/R in GLOB.data_core.medical) if(prob(10/severity)) switch(rand(1,6)) if(1) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 55107809ce3..f2e4c5a7a52 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -18,7 +18,7 @@ var/noserver = "ALERT: No server detected." var/incorrectkey = "ALERT: Incorrect decryption key!" var/defaultmsg = "Welcome. Please select an option." - var/rebootmsg = "%$&(£: Critical %$$@ Error // !RestArting!
£%@%(*$%&(£&?*(%&£/{}" + MK.info += "
�%@%(*$%&(�&?*(%&�/{}" update_icon() spawn(100*length(src.linkedServer.decryptkey)) UnmagConsole() @@ -75,8 +75,8 @@ ..() //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. if(!linkedServer) - if(message_servers && message_servers.len > 0) - linkedServer = message_servers[1] + if(GLOB.message_servers && GLOB.message_servers.len > 0) + linkedServer = GLOB.message_servers[1] return /obj/machinery/computer/message_monitor/attack_hand(var/mob/user as mob) @@ -288,11 +288,11 @@ if(auth) linkedServer.active = !linkedServer.active //Find a server if(href_list["find"]) - if(message_servers && message_servers.len > 1) - src.linkedServer = input(usr,"Please select a server.", "Select a server.", null) as null|anything in message_servers + if(GLOB.message_servers && GLOB.message_servers.len > 1) + src.linkedServer = input(usr,"Please select a server.", "Select a server.", null) as null|anything in GLOB.message_servers message = "NOTICE: Server selected." - else if(message_servers && message_servers.len > 0) - linkedServer = message_servers[1] + else if(GLOB.message_servers && GLOB.message_servers.len > 0) + linkedServer = GLOB.message_servers[1] message = "NOTICE: Only Single Server Detected - Server selected." else message = noserver @@ -396,13 +396,13 @@ if("Recepient") //Get out list of viable PDAs var/list/obj/item/pda/sendPDAs = list() - for(var/obj/item/pda/P in PDAs) + for(var/obj/item/pda/P in GLOB.PDAs) var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) if(!PM || !PM.can_receive()) continue sendPDAs += P - if(PDAs && PDAs.len > 0) + if(GLOB.PDAs && GLOB.PDAs.len > 0) customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortAtom(sendPDAs) else customrecepient = null @@ -436,7 +436,7 @@ return src.attack_hand(usr) var/obj/item/pda/PDARec = null - for(var/obj/item/pda/P in PDAs) + for(var/obj/item/pda/P in GLOB.PDAs) var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) if(!PM || !PM.can_receive()) @@ -486,11 +486,11 @@ /obj/item/paper/monitorkey/New() ..() spawn(10) - if(message_servers) - for(var/obj/machinery/message_server/server in message_servers) + if(GLOB.message_servers) + for(var/obj/machinery/message_server/server in GLOB.message_servers) if(!isnull(server)) if(!isnull(server.decryptkey)) - info = "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." + info = "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." info_links = info overlays += "paper_words" break diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index cd6450c700c..c4a6d5d440b 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -20,7 +20,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/podtracker/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/podtracker/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/pods[0] for(var/obj/item/spacepod_equipment/misc/tracker/TR in world) diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index fce315a1db0..bb38e59c800 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -26,18 +26,18 @@ /obj/machinery/computer/monitor/Initialize() ..() - powermonitor_repository.update_cache() + GLOB.powermonitor_repository.update_cache() powernet = find_powernet() /obj/machinery/computer/monitor/Destroy() GLOB.power_monitors -= src - powermonitor_repository.update_cache() + GLOB.powermonitor_repository.update_cache() QDEL_NULL(power_monitor) return ..() /obj/machinery/computer/monitor/power_change() ..() - powermonitor_repository.update_cache() + GLOB.powermonitor_repository.update_cache() /obj/machinery/computer/monitor/proc/find_powernet() var/obj/structure/cable/attached = null diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 8ecd463bc35..6134860733a 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -36,7 +36,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/robotics/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/robotics/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/robots = get_cyborgs(user) if(robots.len) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index cb5e799b89e..8c815198d31 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -54,7 +54,7 @@ ui = new(user, src, ui_key, "secure_data.tmpl", name, 800, 800) ui.open() -/obj/machinery/computer/secure_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/secure_data/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -63,26 +63,32 @@ if(authenticated) switch(screen) if(SEC_DATA_R_LIST) - if(!isnull(data_core.general)) - for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) + if(!isnull(GLOB.data_core.general)) + for(var/datum/data/record/R in sortRecord(GLOB.data_core.general, sortBy, order)) var/crimstat = "null" - for(var/datum/data/record/E in data_core.security) + for(var/datum/data/record/E in GLOB.data_core.security) if(E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]) crimstat = E.fields["criminal"] break var/background = "''" switch(crimstat) - if("*Execute*") + if(SEC_RECORD_STATUS_EXECUTE) background = "'background-color:#5E0A1A'" - if("*Arrest*") + if(SEC_RECORD_STATUS_ARREST) background = "'background-color:#890E26'" - if("Incarcerated") + if(SEC_RECORD_STATUS_SEARCH) + background = "'background-color:#999900'" + if(SEC_RECORD_STATUS_MONITOR) + background = "'background-color:#004C99'" + if(SEC_RECORD_STATUS_DEMOTE) + background = "'background-color:#C2A111'" + if(SEC_RECORD_STATUS_INCARCERATED) background = "'background-color:#743B03'" - if("Parolled") + if(SEC_RECORD_STATUS_PAROLLED) background = "'background-color:#743B03'" - if("Released") + if(SEC_RECORD_STATUS_RELEASED) background = "'background-color:#216489'" - if("None") + if(SEC_RECORD_STATUS_NONE) background = "'background-color:#007f47'" if("null") crimstat = "No record." @@ -90,7 +96,7 @@ if(SEC_DATA_RECORD) var/list/general = list() data["general"] = general - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) var/list/fields = list() general["fields"] = fields fields[++fields.len] = list("field" = "Name:", "value" = active1.fields["name"], "edit" = "name") @@ -112,7 +118,7 @@ var/list/security = list() data["security"] = security - if(istype(active2, /datum/data/record) && data_core.security.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2)) var/list/fields = list() security["fields"] = fields fields[++fields.len] = list("field" = "Criminal Status:", "value" = active2.fields["criminal"], "edit" = "criminal", "line_break" = 1) @@ -133,9 +139,9 @@ if(..()) return 1 - if(!data_core.general.Find(active1)) + if(!GLOB.data_core.general.Find(active1)) active1 = null - if(!data_core.security.Find(active2)) + if(!GLOB.data_core.security.Find(active2)) active2 = null if(href_list["temp"]) @@ -145,7 +151,7 @@ var/temp_href = splittext(href_list["temp_action"], "=") switch(temp_href[1]) if("del_all2") - for(var/datum/data/record/R in data_core.security) + for(var/datum/data/record/R in GLOB.data_core.security) qdel(R) update_all_mob_security_hud() setTemp("
All records deleted.
") @@ -161,7 +167,7 @@ update_all_mob_security_hud() if("del_rg2") if(active1) - for(var/datum/data/record/R in data_core.medical) + for(var/datum/data/record/R in GLOB.data_core.medical) if(R.fields["name"] == active1.fields["name"] && R.fields["id"] == active1.fields["id"]) qdel(R) QDEL_NULL(active1) @@ -248,10 +254,10 @@ else if(href_list["d_rec"]) var/datum/data/record/R = locate(href_list["d_rec"]) var/datum/data/record/M = locate(href_list["d_rec"]) - if(!data_core.general.Find(R)) + if(!GLOB.data_core.general.Find(R)) setTemp("Record not found!
") return 1 - for(var/datum/data/record/E in data_core.security) + for(var/datum/data/record/E in GLOB.data_core.security) if(E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]) M = E active1 = R @@ -296,7 +302,7 @@ R.fields["ma_crim"] = "None" R.fields["ma_crim_d"] = "No major crime convictions." R.fields["notes"] = "No notes." - data_core.security += R + GLOB.data_core.security += R active2 = R screen = SEC_DATA_RECORD @@ -312,7 +318,7 @@ G.fields["p_stat"] = "Active" G.fields["m_stat"] = "Stable" G.fields["species"] = "Human" - data_core.general += G + GLOB.data_core.general += G active1 = G active2 = null @@ -323,7 +329,7 @@ sleep(50) var/obj/item/paper/P = new /obj/item/paper(loc) P.info = "" - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]]
\nSex: [active1.fields["sex"]]
\nAge: [active1.fields["age"]] @@ -332,7 +338,7 @@
\nMental Status: [active1.fields["m_stat"]]
"} else P.info += "General Record Lost!
" - if(istype(active2, /datum/data/record) && data_core.security.Find(active2)) + if(istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2)) P.info += {"
\n
\nCriminal Status: [active2.fields["criminal"]]
\n
\nMinor Crimes: [active2.fields["mi_crim"]] @@ -384,7 +390,7 @@ var/t1 = copytext(trim(sanitize(input("Add Comment:", "Secure. records", null, null) as message)), 1, MAX_MESSAGE_LEN) if(!t1 || ..() || active2 != a2) return 1 - active2.fields["comments"] += "Made by [authenticated] ([rank]) on [current_date_string] [station_time_timestamp()]
[t1]" + active2.fields["comments"] += "Made by [authenticated] ([rank]) on [GLOB.current_date_string] [station_time_timestamp()]
[t1]" else if(href_list["del_c"]) var/index = min(max(text2num(href_list["del_c"]) + 1, 1), length(active2.fields["comments"])) @@ -464,12 +470,15 @@ if("criminal") if(istype(active2, /datum/data/record)) var/list/buttons = list() - buttons[++buttons.len] = list("name" = "None", "icon" = "unlock", "href" = "criminal=none", "status" = (active2.fields["criminal"] == "None" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "*Arrest*", "icon" = "lock", "href" = "criminal=arrest", "status" = (active2.fields["criminal"] == "*Arrest*" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "Incarcerated", "icon" = "lock", "href" = "criminal=incarcerated", "status" = (active2.fields["criminal"] == "Incarcerated" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "*Execute*", "icon" = "lock", "href" = "criminal=execute", "status" = (active2.fields["criminal"] == "*Execute*" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "Parolled", "icon" = "unlock-alt", "href" = "criminal=parolled", "status" = (active2.fields["criminal"] == "Parolled" ? "selected" : null)) - buttons[++buttons.len] = list("name" = "Released", "icon" = "unlock", "href" = "criminal=released", "status" = (active2.fields["criminal"] == "Released" ? "selected" : null)) + buttons[++buttons.len] = list("name" = "None", "icon" = "unlock", "href" = "criminal=none", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_NONE ? "selected" : null)) + buttons[++buttons.len] = list("name" = "*Arrest*", "icon" = "lock", "href" = "criminal=arrest", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_ARREST ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Search", "icon" = "lock", "href" = "criminal=search", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_SEARCH ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Monitor", "icon" = "unlock", "href" = "criminal=monitor", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_MONITOR ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Demote", "icon" = "lock", "href" = "criminal=demote", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_DEMOTE ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Incarcerated", "icon" = "lock", "href" = "criminal=incarcerated", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_INCARCERATED ? "selected" : null)) + buttons[++buttons.len] = list("name" = "*Execute*", "icon" = "lock", "href" = "criminal=execute", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_EXECUTE ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Parolled", "icon" = "unlock-alt", "href" = "criminal=parolled", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_PAROLLED ? "selected" : null)) + buttons[++buttons.len] = list("name" = "Released", "icon" = "unlock", "href" = "criminal=released", "status" = (active2.fields["criminal"] == SEC_RECORD_STATUS_RELEASED ? "selected" : null)) setTemp("
Criminal Status
", buttons) if("rank") var/list/L = list("Head of Personnel", "Captain", "AI") @@ -538,7 +547,7 @@ ..(severity) return - for(var/datum/data/record/R in data_core.security) + for(var/datum/data/record/R in GLOB.data_core.security) if(prob(10/severity)) switch(rand(1,6)) if(1) @@ -548,7 +557,7 @@ if(3) R.fields["age"] = rand(5, 85) if(4) - R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released") + R.fields["criminal"] = pick(SEC_RECORD_STATUS_NONE, SEC_RECORD_STATUS_ARREST, SEC_RECORD_STATUS_SEARCH, SEC_RECORD_STATUS_MONITOR, SEC_RECORD_STATUS_DEMOTE, SEC_RECORD_STATUS_INCARCERATED, SEC_RECORD_STATUS_PAROLLED, SEC_RECORD_STATUS_RELEASED) if(5) R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") if(6) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index e3c2918f335..b7361db01a3 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -52,7 +52,7 @@ ui = new(user, src, ui_key, "skills_data.tmpl", name, 800, 380) ui.open() -/obj/machinery/computer/skills/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/computer/skills/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -61,13 +61,13 @@ if(authenticated) switch(screen) if(SKILL_DATA_R_LIST) - if(!isnull(data_core.general)) - for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) + if(!isnull(GLOB.data_core.general)) + for(var/datum/data/record/R in sortRecord(GLOB.data_core.general, sortBy, order)) data["records"] += list(list("ref" = "\ref[R]", "id" = R.fields["id"], "name" = R.fields["name"], "rank" = R.fields["rank"], "fingerprint" = R.fields["fingerprint"])) if(SKILL_DATA_RECORD) var/list/general = list() data["general"] = general - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) var/list/fields = list() general["fields"] = fields fields[++fields.len] = list("field" = "Name:", "value" = active1.fields["name"], "name" = "name") @@ -93,7 +93,7 @@ if(..()) return 1 - if(!data_core.general.Find(active1)) + if(!GLOB.data_core.general.Find(active1)) active1 = null if(href_list["temp"]) @@ -103,24 +103,24 @@ var/temp_list = splittext(href_list["temp_action"], "=") switch(temp_list[1]) if("del_all2") - if(PDA_Manifest && PDA_Manifest.len) - PDA_Manifest.Cut() - for(var/datum/data/record/R in data_core.security) + if(GLOB.PDA_Manifest && GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() + for(var/datum/data/record/R in GLOB.data_core.security) qdel(R) setTemp("All employment records deleted.
") if("del_rg2") if(active1) - if(PDA_Manifest && PDA_Manifest.len) - PDA_Manifest.Cut() - for(var/datum/data/record/R in data_core.medical) + if(GLOB.PDA_Manifest && GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() + for(var/datum/data/record/R in GLOB.data_core.medical) if(R.fields["name"] == active1.fields["name"] && R.fields["id"] == active1.fields["id"]) qdel(R) QDEL_NULL(active1) screen = SKILL_DATA_R_LIST if("rank") if(active1) - if(PDA_Manifest && PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest && GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() active1.fields["rank"] = temp_list[2] if(temp_list[2] in GLOB.joblist) active1.fields["real_rank"] = temp_list[2] @@ -182,7 +182,7 @@ else if(href_list["d_rec"]) var/datum/data/record/R = locate(href_list["d_rec"]) - if(!data_core.general.Find(R)) + if(!GLOB.data_core.general.Find(R)) setTemp("Record not found!
") return 1 active1 = R @@ -202,8 +202,8 @@ setTemp("Are you sure you wish to delete the record (ALL)?
", buttons) else if(href_list["new_g"]) - if(PDA_Manifest.len) - PDA_Manifest.Cut() + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() var/datum/data/record/G = new /datum/data/record() G.fields["name"] = "New Record" G.fields["id"] = "[add_zero(num2hex(rand(1, 1.6777215E7)), 6)]" @@ -215,7 +215,7 @@ G.fields["p_stat"] = "Active" G.fields["m_stat"] = "Stable" G.fields["species"] = "Human" - data_core.general += G + GLOB.data_core.general += G active1 = G else if(href_list["print_r"]) @@ -225,7 +225,7 @@ sleep(50) var/obj/item/paper/P = new /obj/item/paper(loc) P.info = "" - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]]
\nSex: [active1.fields["sex"]]
\nAge: [active1.fields["age"]] @@ -300,7 +300,7 @@ ..(severity) return - for(var/datum/data/record/R in data_core.security) + for(var/datum/data/record/R in GLOB.data_core.security) if(prob(10/severity)) switch(rand(1,6)) if(1) @@ -310,7 +310,7 @@ if(3) R.fields["age"] = rand(5, 85) if(4) - R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released") + R.fields["criminal"] = pick(SEC_RECORD_STATUS_NONE, SEC_RECORD_STATUS_ARREST, SEC_RECORD_STATUS_INCARCERATED, SEC_RECORD_STATUS_PAROLLED, SEC_RECORD_STATUS_RELEASED) if(5) R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") if(6) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 23658a3e939..f509ee42d34 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -4,12 +4,12 @@ #define SPECOPS_DOCK_AREATYPE "/area/shuttle/specops/centcom" //Type of the spec ops shuttle area for dock #define SPECOPS_RETURN_DELAY 6000 //Time between the shuttle is capable of moving. -var/specops_shuttle_moving_to_station = 0 -var/specops_shuttle_moving_to_centcom = 0 -var/specops_shuttle_at_station = 0 -var/specops_shuttle_can_send = 1 -var/specops_shuttle_time = 0 -var/specops_shuttle_timeleft = 0 +GLOBAL_VAR_INIT(specops_shuttle_moving_to_station, 0) +GLOBAL_VAR_INIT(specops_shuttle_moving_to_centcom, 0) +GLOBAL_VAR_INIT(specops_shuttle_at_station, 0) +GLOBAL_VAR_INIT(specops_shuttle_can_send, 1) +GLOBAL_VAR_INIT(specops_shuttle_time, 0) +GLOBAL_VAR_INIT(specops_shuttle_timeleft, 0) /obj/machinery/computer/specops_shuttle name = "\improper Spec. Ops. shuttle console" @@ -33,16 +33,16 @@ var/specops_shuttle_timeleft = 0 if(announcer) announcer.autosay(message, "A.L.I.C.E.", "Response Team", list(1,2)) - while(specops_shuttle_time - world.timeofday > 0) - var/ticksleft = specops_shuttle_time - world.timeofday + while(GLOB.specops_shuttle_time - world.timeofday > 0) + var/ticksleft = GLOB.specops_shuttle_time - world.timeofday if(ticksleft > 1e5) - specops_shuttle_time = world.timeofday + 10 // midnight rollover - specops_shuttle_timeleft = (ticksleft / 10) + GLOB.specops_shuttle_time = world.timeofday + 10 // midnight rollover + GLOB.specops_shuttle_timeleft = (ticksleft / 10) //All this does is announce the time before launch. if(announcer) - var/rounded_time_left = round(specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. + var/rounded_time_left = round(GLOB.specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. if(rounded_time_left in message_tracker)//If that time is in the list for message announce. message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" if(rounded_time_left==0) @@ -53,10 +53,10 @@ var/specops_shuttle_timeleft = 0 sleep(5) - specops_shuttle_moving_to_station = 0 - specops_shuttle_moving_to_centcom = 0 + GLOB.specops_shuttle_moving_to_station = 0 + GLOB.specops_shuttle_moving_to_centcom = 0 - specops_shuttle_at_station = 1 + GLOB.specops_shuttle_at_station = 1 var/area/start_location = locate(/area/shuttle/specops/station) var/area/end_location = locate(/area/shuttle/specops/centcom) @@ -91,7 +91,7 @@ var/specops_shuttle_timeleft = 0 var/mob/M = locate(/mob) in T to_chat(M, "You have arrived at Central Command. Operation has ended!") - specops_shuttle_at_station = 0 + GLOB.specops_shuttle_at_station = 0 for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -110,16 +110,16 @@ var/specops_shuttle_timeleft = 0 //message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" //announcer.autosay(message, "A.L.I.C.E.", "Response Team") - while(specops_shuttle_time - world.timeofday > 0) - var/ticksleft = specops_shuttle_time - world.timeofday + while(GLOB.specops_shuttle_time - world.timeofday > 0) + var/ticksleft = GLOB.specops_shuttle_time - world.timeofday if(ticksleft > 1e5) - specops_shuttle_time = world.timeofday + 10 // midnight rollover - specops_shuttle_timeleft = (ticksleft / 10) + GLOB.specops_shuttle_time = world.timeofday + 10 // midnight rollover + GLOB.specops_shuttle_timeleft = (ticksleft / 10) //All this does is announce the time before launch. if(announcer) - var/rounded_time_left = round(specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. + var/rounded_time_left = round(GLOB.specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. if(rounded_time_left in message_tracker)//If that time is in the list for message announce. message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" if(rounded_time_left==0) @@ -130,11 +130,11 @@ var/specops_shuttle_timeleft = 0 sleep(5) - specops_shuttle_moving_to_station = 0 - specops_shuttle_moving_to_centcom = 0 + GLOB.specops_shuttle_moving_to_station = 0 + GLOB.specops_shuttle_moving_to_centcom = 0 - specops_shuttle_at_station = 1 - if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return + GLOB.specops_shuttle_at_station = 1 + if(GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return if(!specops_can_move()) to_chat(usr, "The Special Operations shuttle is unable to leave.") @@ -239,7 +239,7 @@ var/specops_shuttle_timeleft = 0 qdel(announcer) /proc/specops_can_move() - if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) + if(GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return 0 for(var/obj/machinery/computer/specops_shuttle/S in world) if(world.timeofday <= S.specops_shuttle_timereset) @@ -275,8 +275,8 @@ var/specops_shuttle_timeleft = 0 dat = temp else dat += {"
Special Operations Shuttle
- \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] + \nLocation: [GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([GLOB.specops_shuttle_timeleft] seconds.)":GLOB.specops_shuttle_at_station ? "Station":"Dock"]
+ [GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":GLOB.specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -291,7 +291,7 @@ var/specops_shuttle_timeleft = 0 usr.machine = src if(href_list["sendtodock"]) - if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return + if(!GLOB.specops_shuttle_at_station|| GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return if(!specops_can_move()) to_chat(usr, "Central Command will not allow the Special Operations shuttle to return yet.") @@ -306,13 +306,13 @@ var/specops_shuttle_timeleft = 0 temp += "Shuttle departing.
OK" updateUsrDialog() - specops_shuttle_moving_to_centcom = 1 - specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME + GLOB.specops_shuttle_moving_to_centcom = 1 + GLOB.specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME spawn(0) specops_return() else if(href_list["sendtostation"]) - if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return + if(GLOB.specops_shuttle_at_station || GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return if(!specops_can_move()) to_chat(usr, "The Special Operations shuttle is unable to leave.") @@ -326,9 +326,9 @@ var/specops_shuttle_timeleft = 0 var/area/centcom/specops/special_ops = locate() if(special_ops) special_ops.readyalert()//Trigger alarm for the spec ops area. - specops_shuttle_moving_to_station = 1 + GLOB.specops_shuttle_moving_to_station = 1 - specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME + GLOB.specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME spawn(0) specops_process() diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index fb630d7a251..607918442ea 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -20,7 +20,7 @@ /obj/machinery/computer/station_alert/New() ..() alarm_monitor = new monitor_type(src) - alarm_monitor.register(src, /obj/machinery/computer/station_alert/update_icon) + alarm_monitor.register(src, /obj/machinery/computer/station_alert/.proc/update_icon) /obj/machinery/computer/station_alert/Destroy() alarm_monitor.unregister(src) diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index f49d91c53b3..856e2322f71 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -102,11 +102,11 @@ th.cost.toomuch {background:maroon;} "} - for(var/datum/storeitem/item in centcomm_store.items) + for(var/datum/storeitem/item in GLOB.centcomm_store.items) var/cost_class="affordable" if(item.cost>balance) cost_class="toomuch" - var/itemID=centcomm_store.items.Find(item) + var/itemID=GLOB.centcomm_store.items.Find(item) var/row_color="light" if(itemID%2 == 0) row_color="dark" @@ -143,7 +143,7 @@ th.cost.toomuch {background:maroon;} if(href_list["buy"]) var/itemID = text2num(href_list["buy"]) - var/datum/storeitem/item = centcomm_store.items[itemID] + var/datum/storeitem/item = GLOB.centcomm_store.items[itemID] var/sure = alert(usr,"Are you sure you wish to purchase [item.name] for $[item.cost]?","You sure?","Yes","No") in list("Yes","No") if(!Adjacent(usr)) to_chat(usr, "You are not close enough to do that.") @@ -151,7 +151,7 @@ th.cost.toomuch {background:maroon;} if(sure=="No") updateUsrDialog() return - if(!centcomm_store.PlaceOrder(usr,itemID)) + if(!GLOB.centcomm_store.PlaceOrder(usr,itemID)) to_chat(usr, "Unable to charge your account.") else to_chat(usr, "You've successfully purchased the item. It should be in your hands or on the floor.") diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index aefeaaa864b..0a65b6be408 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -3,12 +3,12 @@ #define SYNDICATE_ELITE_STATION_AREATYPE "/area/shuttle/syndicate_elite/station" //Type of the spec ops shuttle area for station #define SYNDICATE_ELITE_DOCK_AREATYPE "/area/shuttle/syndicate_elite/mothership" //Type of the spec ops shuttle area for dock -var/syndicate_elite_shuttle_moving_to_station = 0 -var/syndicate_elite_shuttle_moving_to_mothership = 0 -var/syndicate_elite_shuttle_at_station = 0 -var/syndicate_elite_shuttle_can_send = 1 -var/syndicate_elite_shuttle_time = 0 -var/syndicate_elite_shuttle_timeleft = 0 +GLOBAL_VAR_INIT(syndicate_elite_shuttle_moving_to_station, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_moving_to_mothership, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_at_station, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_can_send, 1) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_time, 0) +GLOBAL_VAR_INIT(syndicate_elite_shuttle_timeleft, 0) /obj/machinery/computer/syndicate_elite_shuttle name = "\improper Elite Syndicate Squad shuttle console" @@ -33,16 +33,16 @@ var/syndicate_elite_shuttle_timeleft = 0 // message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" // announcer.say(message) - while(syndicate_elite_shuttle_time - world.timeofday > 0) - var/ticksleft = syndicate_elite_shuttle_time - world.timeofday + while(GLOB.syndicate_elite_shuttle_time - world.timeofday > 0) + var/ticksleft = GLOB.syndicate_elite_shuttle_time - world.timeofday if(ticksleft > 1e5) - syndicate_elite_shuttle_time = world.timeofday // midnight rollover - syndicate_elite_shuttle_timeleft = (ticksleft / 10) + GLOB.syndicate_elite_shuttle_time = world.timeofday // midnight rollover + GLOB.syndicate_elite_shuttle_timeleft = (ticksleft / 10) //All this does is announce the time before launch. if(announcer) - var/rounded_time_left = round(syndicate_elite_shuttle_timeleft)//Round time so that it will report only once, not in fractions. + var/rounded_time_left = round(GLOB.syndicate_elite_shuttle_timeleft)//Round time so that it will report only once, not in fractions. if(rounded_time_left in message_tracker)//If that time is in the list for message announce. message = "ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN" if(rounded_time_left==0) @@ -53,11 +53,11 @@ var/syndicate_elite_shuttle_timeleft = 0 sleep(5) - syndicate_elite_shuttle_moving_to_station = 0 - syndicate_elite_shuttle_moving_to_mothership = 0 + GLOB.syndicate_elite_shuttle_moving_to_station = 0 + GLOB.syndicate_elite_shuttle_moving_to_mothership = 0 - syndicate_elite_shuttle_at_station = 1 - if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return + GLOB.syndicate_elite_shuttle_at_station = 1 + if(GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return if(!syndicate_elite_can_move()) to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") @@ -174,7 +174,7 @@ var/syndicate_elite_shuttle_timeleft = 0 to_chat(M, "You have arrived to [station_name()]. Commence operation!") /proc/syndicate_elite_can_move() - if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 + if(GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return 0 else return 1 /obj/machinery/computer/syndicate_elite_shuttle/attack_ai(var/mob/user as mob) @@ -205,8 +205,8 @@ var/syndicate_elite_shuttle_timeleft = 0 dat = temp else dat = {"
Special Operations Shuttle
- \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
- [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"] + \nLocation: [GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([GLOB.syndicate_elite_shuttle_timeleft] seconds.)":GLOB.syndicate_elite_shuttle_at_station ? "Station":"Dock"]
+ [GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":GLOB.syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -221,13 +221,13 @@ var/syndicate_elite_shuttle_timeleft = 0 usr.set_machine(src) if(href_list["sendtodock"]) - if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return + if(!GLOB.syndicate_elite_shuttle_at_station|| GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return to_chat(usr, "The Syndicate will not allow the Elite Squad shuttle to return.") return else if(href_list["sendtostation"]) - if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return + if(GLOB.syndicate_elite_shuttle_at_station || GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return if(!specops_can_move()) to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") @@ -241,9 +241,9 @@ var/syndicate_elite_shuttle_timeleft = 0 var/area/syndicate_mothership/elite_squad/elite_squad = locate() if(elite_squad) elite_squad.readyalert()//Trigger alarm for the spec ops area. - syndicate_elite_shuttle_moving_to_station = 1 + GLOB.syndicate_elite_shuttle_moving_to_station = 1 - syndicate_elite_shuttle_time = world.timeofday + SYNDICATE_ELITE_MOVETIME + GLOB.syndicate_elite_shuttle_time = world.timeofday + SYNDICATE_ELITE_MOVETIME spawn(0) syndicate_elite_process() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index efee10767ba..96863c3e54d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -218,7 +218,7 @@ //Machine Frame Circuit Boards /*Common Parts: Parts List: Ignitor, Timer, Infra-red laser, Infra-red sensor, t_scanner, Capacitor, Valve, sensor unit, -micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. +micro-manipulator, glass sheets, beaker, Microlaser, matter bin, power cells. Note: Once everything is added to the public areas, will add MAT_METAL and MAT_GLASS to circuit boards since autolathe won't be able to destroy them and players will be able to make replacements. */ @@ -226,7 +226,6 @@ to destroy them and players will be able to make replacements. name = "circuit board (Booze-O-Mat Vendor)" board_type = "machine" origin_tech = "programming=1" - frame_desc = "Requires 1 Resupply Canister." build_path = /obj/machinery/vending/boozeomat req_components = list(/obj/item/vending_refill/boozeomat = 1) @@ -282,7 +281,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/power/smes board_type = "machine" origin_tech = "programming=3;powerstorage=3;engineering=3" - frame_desc = "Requires 5 pieces of cable, 5 Power Cells and 1 Capacitor." req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/cell = 5, @@ -321,7 +319,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer board_type = "machine" origin_tech = "programming=3;plasmatech=3" - frame_desc = "Requires 2 Matter Bins, 2 Micro Lasers, 1 piece of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/micro_laser = 2, @@ -346,7 +343,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/recharger board_type = "machine" origin_tech = "powerstorage=3;materials=2" - frame_desc = "Requires 1 Capacitor" req_components = list(/obj/item/stock_parts/capacitor = 1) /obj/item/circuitboard/snow_machine @@ -354,7 +350,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/snow_machine board_type = "machine" origin_tech = "programming=2;materials=2" - frame_desc = "Requires 1 Matter Bin and 1 Micro Laser." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/micro_laser = 1) @@ -364,7 +359,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/biogenerator board_type = "machine" origin_tech = "programming=2;biotech=3;materials=3" - frame_desc = "Requires 1 Matter Bin, 1 Manipulator, 1 piece of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -376,7 +370,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/plantgenes board_type = "machine" origin_tech = "programming=3;biotech=3" - frame_desc = "Requires 1 Manipulator, 1 Micro Laser, 1 Console Screen, and 1 Scanning Module." req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/micro_laser = 1, @@ -390,7 +383,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/seed_extractor board_type = "machine" origin_tech = "programming=1" - frame_desc = "Requires 1 Matter Bin and 1 Manipulator." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1) @@ -400,7 +392,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/hydroponics/constructable board_type = "machine" origin_tech = "programming=1;biotech=2" - frame_desc = "Requires 2 Matter Bins, 1 Manipulator, and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -411,7 +402,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/microwave board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 1 Micro Laser, 2 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 1, /obj/item/stack/cable_coil = 2, @@ -422,7 +412,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/oven board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 2 Micro Lasers, 5 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stack/cable_coil = 5, @@ -433,7 +422,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/grill board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 2 Micro Lasers, 5 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stack/cable_coil = 5, @@ -444,7 +432,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/kitchen_machine/candy_maker board_type = "machine" origin_tech = "programming=2;magnets=2" - frame_desc = "Requires 1 Manipulator, 5 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stack/cable_coil = 5, @@ -455,7 +442,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/cooker/deepfryer board_type = "machine" origin_tech = "programming=1" - frame_desc = "Requires 2 Micro Lasers and 5 pieces of cable." req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stack/cable_coil = 5) @@ -568,7 +554,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/chem_dispenser board_type = "machine" origin_tech = "materials=4;programming=4;plasmatech=4;biotech=3" - frame_desc = "Requires 2 Matter Bins, 1 Capacitor, 1 Manipulator, 1 Console Screen, and 1 Power Cell." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/manipulator = 1, @@ -609,7 +594,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/chem_heater board_type = "machine" origin_tech = "programming=2;engineering=2;biotech=2" - frame_desc = "Requires 1 Micro Laser and 1 Console Screen." req_components = list( /obj/item/stock_parts/micro_laser = 1, /obj/item/stack/sheet/glass = 1) @@ -619,7 +603,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/reagentgrinder/empty board_type = "machine" origin_tech = "materials=2;engineering=2;biotech=2" - frame_desc = "Requires 2 Manipulators and 1 Matter Bin." req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/matter_bin = 1) @@ -640,7 +623,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/destructive_analyzer board_type = "machine" origin_tech = "magnets=2;engineering=2;programming=2" - frame_desc = "Requires 1 Scanning Module, 1 Manipulator, and 1 Micro-Laser." req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/manipulator = 1, @@ -651,7 +633,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/autolathe board_type = "machine" origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 3 Matter Bins, 1 Manipulator, and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 3, /obj/item/stock_parts/manipulator = 1, @@ -662,7 +643,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/protolathe board_type = "machine" origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 2 Matter Bins, 2 Manipulators, and 2 Beakers." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2, @@ -681,7 +661,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/circuit_imprinter board_type = "machine" origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 1 Matter Bin, 1 Manipulator, and 2 Beakers." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -692,7 +671,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/power/port_gen/pacman board_type = "machine" origin_tech = "programming=2;powerstorage=3;plasmatech=3;engineering=3" - frame_desc = "Requires 1 Matter Bin, 1 Micro-Laser, 2 Pieces of Cable, and 1 Capacitor." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/micro_laser = 1, @@ -714,7 +692,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/r_n_d/server board_type = "machine" origin_tech = "programming=3" - frame_desc = "Requires 2 pieces of cable, and 1 Scanning Module." req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/scanning_module = 1) @@ -724,7 +701,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/mecha_part_fabricator board_type = "machine" origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Matter Bins, 1 Manipulator, 1 Micro-Laser and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -736,7 +712,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/mecha_part_fabricator/spacepod board_type = "machine" origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Matter Bins, 1 Manipulators, 1 Micro-Lasers, and 1 Console Screen." req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -749,7 +724,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/clonepod board_type = "machine" origin_tech = "programming=2;biotech=2" - frame_desc = "Requires 2 Manipulator, 2 Scanning Module, 2 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/scanning_module = 2, @@ -761,7 +735,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/dna_scannernew board_type = "machine" origin_tech = "programming=2;biotech=2" - frame_desc = "Requires 1 Scanning Module, 1 Manipulator, 1 Micro-Laser, 2 pieces of cable and 1 Console Screen." req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/manipulator = 1, @@ -774,7 +747,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/mech_bay_recharge_port board_type = "machine" origin_tech = "programming=3;powerstorage=3;engineering=3" - frame_desc = "Requires 1 piece of cable and 5 Capacitors." req_components = list( /obj/item/stack/cable_coil = 1, /obj/item/stock_parts/capacitor = 5) @@ -784,7 +756,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/teleport/hub board_type = "machine" origin_tech = "programming=3;engineering=4;bluespace=4;materials=4" - frame_desc = "Requires 3 Bluespace Crystals and 1 Matter Bin." req_components = list( /obj/item/stack/ore/bluespace_crystal = 3, /obj/item/stock_parts/matter_bin = 1) @@ -794,7 +765,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/teleport/station board_type = "machine" origin_tech = "programming=4;engineering=4;bluespace=4;plasmatech=3" - frame_desc = "Requires 2 Bluespace Crystals, 2 Capacitors and 1 Console Screen." req_components = list( /obj/item/stack/ore/bluespace_crystal = 2, /obj/item/stock_parts/capacitor = 2, @@ -805,7 +775,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/teleport/perma board_type = "machine" origin_tech = "programming=3;engineering=4;bluespace=4;materials=4" - frame_desc = "Requires 3 Bluespace Crystals and 1 Matter Bin." req_components = list( /obj/item/stack/ore/bluespace_crystal = 3, /obj/item/stock_parts/matter_bin = 1) @@ -825,7 +794,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/telepad board_type = "machine" origin_tech = "programming=4;engineering=3;plasmatech=4;bluespace=4" - frame_desc = "Requires 2 Bluespace Crystals, 1 Capacitor, 1 piece of cable and 1 Console Screen." req_components = list( /obj/item/stack/ore/bluespace_crystal = 2, /obj/item/stock_parts/capacitor = 1, @@ -837,7 +805,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/quantumpad board_type = "machine" origin_tech = "programming=3;engineering=3;plasmatech=3;bluespace=4" - frame_desc = "Requires 1 Bluespace Crystal, 1 Capacitor, 1 piece of cable and 1 Manipulator." req_components = list( /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/stock_parts/capacitor = 1, @@ -849,7 +816,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/sleeper board_type = "machine" origin_tech = "programming=3;biotech=2;engineering=3" - frame_desc = "Requires 1 Matter Bin, 1 Manipulator, 1 piece of cable and 2 Console Screens." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -870,7 +836,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/bodyscanner board_type = "machine" origin_tech = "programming=3;biotech=2;engineering=3" - frame_desc = "Requires 1 Scanning Module, 2 pieces of cable and 2 Console Screens." req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stack/cable_coil = 2, @@ -881,7 +846,6 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/atmospherics/unary/cryo_cell board_type = "machine" origin_tech = "programming=4;biotech=3;engineering=4;plasmatech=3" - frame_desc = "Requires 1 Matter Bin, 1 piece of cable and 4 Console Screens." req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 1, @@ -892,96 +856,26 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/recharge_station board_type = "machine" origin_tech = "powerstorage=3;engineering=3" - frame_desc = "Requires 2 Capacitors, 1 Power Cell and 1 Manipulator." req_components = list( /obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/cell = 1, /obj/item/stock_parts/manipulator = 1) // Telecomms circuit boards: -/obj/item/circuitboard/telecomms/receiver - name = "Circuit Board (Subspace Receiver)" - build_path = /obj/machinery/telecomms/receiver - board_type = "machine" - origin_tech = "programming=2;engineering=2;bluespace=1" - frame_desc = "Requires 1 Subspace Ansible, 1 Hyperwave Filter, 2 Manipulators, and 1 Micro-Laser." - req_components = list( - /obj/item/stock_parts/subspace/ansible = 1, - /obj/item/stock_parts/subspace/filter = 1, - /obj/item/stock_parts/manipulator = 2, - /obj/item/stock_parts/micro_laser = 1) - -/obj/item/circuitboard/telecomms/hub - name = "Circuit Board (Hub Mainframe)" - build_path = /obj/machinery/telecomms/hub - board_type = "machine" - origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filter." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/subspace/filter = 2) - -/obj/item/circuitboard/telecomms/relay - name = "Circuit Board (Relay Mainframe)" - build_path = /obj/machinery/telecomms/relay +/obj/item/circuitboard/tcomms/relay + name = "Circuit Board (Telecommunications Relay)" + build_path = /obj/machinery/tcomms/relay board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=2" - frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filters." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/subspace/filter = 2) + req_components = list(/obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2) -/obj/item/circuitboard/telecomms/bus - name = "Circuit Board (Bus Mainframe)" - build_path = /obj/machinery/telecomms/bus +/obj/item/circuitboard/tcomms/core + name = "Circuit Board (Telecommunications Core)" + build_path = /obj/machinery/tcomms/core board_type = "machine" origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/subspace/filter = 1) - -/obj/item/circuitboard/telecomms/processor - name = "Circuit Board (Processor Unit)" - build_path = /obj/machinery/telecomms/processor - board_type = "machine" - origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 3 Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier." - req_components = list( - /obj/item/stock_parts/manipulator = 3, - /obj/item/stock_parts/subspace/filter = 1, - /obj/item/stock_parts/subspace/treatment = 2, - /obj/item/stock_parts/subspace/analyzer = 1, - /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/subspace/amplifier = 1) - -/obj/item/circuitboard/telecomms/server - name = "Circuit Board (Telecommunication Server)" - build_path = /obj/machinery/telecomms/server - board_type = "machine" - origin_tech = "programming=2;engineering=2" - frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/subspace/filter = 1) - -/obj/item/circuitboard/telecomms/broadcaster - name = "Circuit Board (Subspace Broadcaster)" - build_path = /obj/machinery/telecomms/broadcaster - board_type = "machine" - origin_tech = "programming=2;engineering=2;bluespace=1" - frame_desc = "Requires 2 Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal and 2 High-Powered Micro-Lasers. " - req_components = list( - /obj/item/stock_parts/manipulator = 2, - /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/subspace/filter = 1, - /obj/item/stock_parts/subspace/crystal = 1, - /obj/item/stock_parts/micro_laser/high = 2) - + req_components = list(/obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2) +// End telecomms circuit boards /obj/item/circuitboard/ore_redemption name = "circuit board (Ore Redemption)" build_path = /obj/machinery/mineral/ore_redemption @@ -1050,7 +944,6 @@ to destroy them and players will be able to make replacements. board_type = "machine" origin_tech = "programming=1" //This stuff is pretty much the absolute basis of programming, so it's mostly useless for research req_components = list(/obj/item/stack/cable_coil = 1) - var/list/names_paths = list( "NOT Gate" = /obj/machinery/logic_gate/not, "OR Gate" = /obj/machinery/logic_gate/or, diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 3ce6a8702f5..c7dc139446a 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -1,3 +1,6 @@ +#define AUTO_EJECT_DEAD (1<<0) +#define AUTO_EJECT_HEALTHY (1<<1) + /obj/machinery/atmospherics/unary/cryo_cell name = "cryo cell" desc = "Lowers the body temperature so certain medications may take effect." @@ -10,11 +13,12 @@ interact_offline = 1 max_integrity = 350 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30) - var/on = 0 + var/on = FALSE var/temperature_archived var/mob/living/carbon/occupant = null var/obj/item/reagent_containers/glass/beaker = null - var/autoeject = 0 + /// Holds two bitflags, AUTO_EJECT_DEAD and AUTO_EJECT_HEALTHY. Used to determine if the cryo cell will auto-eject dead and/or completely health patients. + var/auto_eject_prefs = NONE var/next_trans = 0 var/current_heat_capacity = 50 @@ -68,7 +72,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/atmos_init() ..() if(node) return - for(var/cdir in cardinal) + for(var/cdir in GLOB.cardinal) node = findConnecting(cdir) if(node) break @@ -139,18 +143,20 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() - if(autoeject) - if(occupant) - if(!occupant.has_organic_damage() && !occupant.has_mutated_organs()) - on = 0 - go_out() - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + if(!occupant) + return + + if((auto_eject_prefs & AUTO_EJECT_DEAD) && occupant.stat == DEAD) + auto_eject(AUTO_EJECT_DEAD) + return + if((auto_eject_prefs & AUTO_EJECT_HEALTHY) && !occupant.has_organic_damage() && !occupant.has_mutated_organs()) + auto_eject(AUTO_EJECT_HEALTHY) + return if(air_contents) - if(occupant) - process_occupant() + process_occupant() - return 1 + return TRUE /obj/machinery/atmospherics/unary/cryo_cell/process_atmos() ..() @@ -208,13 +214,13 @@ if(!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 420) + ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 480) // open the new ui window ui.open() // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/atmospherics/unary/cryo_cell/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/atmospherics/unary/cryo_cell/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["isOperating"] = on data["hasOccupant"] = occupant ? 1 : 0 @@ -249,7 +255,8 @@ for(var/datum/reagent/R in beaker.reagents.reagent_list) data["beakerVolume"] += R.volume - data["autoeject"] = autoeject + data["auto_eject_healthy"] = (auto_eject_prefs & AUTO_EJECT_HEALTHY) ? TRUE : FALSE + data["auto_eject_dead"] = (auto_eject_prefs & AUTO_EJECT_DEAD) ? TRUE : FALSE return data /obj/machinery/atmospherics/unary/cryo_cell/Topic(href, href_list) @@ -260,18 +267,24 @@ return 0 // don't update UIs attached to this object if(href_list["switchOn"]) - on = 1 + on = TRUE update_icon() if(href_list["switchOff"]) - on = 0 + on = FALSE update_icon() - if(href_list["autoejectOn"]) - autoeject = 1 + if(href_list["auto_eject_healthy_on"]) + auto_eject_prefs |= AUTO_EJECT_HEALTHY - if(href_list["autoejectOff"]) - autoeject = 0 + if(href_list["auto_eject_healthy_off"]) + auto_eject_prefs &= ~AUTO_EJECT_HEALTHY + + if(href_list["auto_eject_dead_on"]) + auto_eject_prefs |= AUTO_EJECT_DEAD + + if(href_list["auto_eject_dead_off"]) + auto_eject_prefs &= ~AUTO_EJECT_DEAD if(href_list["ejectBeaker"]) if(beaker) @@ -430,6 +443,16 @@ for(var/atom/movable/A in contents - component_parts - list(beaker)) A.forceMove(get_step(loc, SOUTH)) +/// Called when either the occupant is dead and the AUTO_EJECT_DEAD flag is present, OR the occupant is alive, has no external damage, and the AUTO_EJECT_HEALTHY flag is present. +/obj/machinery/atmospherics/unary/cryo_cell/proc/auto_eject(eject_flag) + on = FALSE + go_out() + switch(eject_flag) + if(AUTO_EJECT_HEALTHY) + playsound(loc, 'sound/machines/ding.ogg', 50, 1) + if(AUTO_EJECT_DEAD) + playsound(loc, 'sound/machines/buzz-sigh.ogg', 40) + /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if(!istype(M)) to_chat(usr, "The cryo cell cannot handle such a lifeform!") @@ -510,8 +533,17 @@ /datum/data/function/proc/display() return -/obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user) +/obj/machinery/atmospherics/unary/cryo_cell/get_remote_view_fullscreens(mob/user) user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) -/obj/machinery/atmospherics/components/unary/cryo_cell/update_remote_sight(mob/living/user) +/obj/machinery/atmospherics/unary/cryo_cell/update_remote_sight(mob/living/user) return //we don't see the pipe network while inside cryo. + +/obj/machinery/atmospherics/unary/cryo_cell/can_crawl_through() + return // can't ventcrawl in or out of cryo. + +/obj/machinery/atmospherics/unary/cryo_cell/can_see_pipes() + return FALSE // you can't see the pipe network when inside a cryo cell. + +#undef AUTO_EJECT_HEALTHY +#undef AUTO_EJECT_DEAD diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index b1a78f2825f..49b75588468 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -40,7 +40,7 @@ /obj/machinery/computer/cryopod/New() ..() - for(var/T in potential_theft_objectives) + for(var/T in GLOB.potential_theft_objectives) theft_cache += new T /obj/machinery/computer/cryopod/attack_ai() @@ -275,6 +275,12 @@ return control_computer != null +// So the user can use movement keys to get out of the cryopod +/obj/machinery/cryopod/relaymove(mob/user) + if(user.incapacitated()) + return FALSE + go_out() + /obj/machinery/cryopod/proc/check_occupant_allowed(mob/M) var/correct_type = 0 for(var/type in allow_occupant_types) @@ -416,15 +422,15 @@ // Delete them from datacore. var/announce_rank = null - if(PDA_Manifest.len) - PDA_Manifest.Cut() - for(var/datum/data/record/R in data_core.medical) + if(GLOB.PDA_Manifest.len) + GLOB.PDA_Manifest.Cut() + for(var/datum/data/record/R in GLOB.data_core.medical) if((R.fields["name"] == occupant.real_name)) qdel(R) - for(var/datum/data/record/T in data_core.security) + for(var/datum/data/record/T in GLOB.data_core.security) if((T.fields["name"] == occupant.real_name)) qdel(T) - for(var/datum/data/record/G in data_core.general) + for(var/datum/data/record/G in GLOB.data_core.general) if((G.fields["name"] == occupant.real_name)) announce_rank = G.fields["rank"] qdel(G) @@ -438,7 +444,7 @@ control_computer.frozen_crew += "[occupant.real_name]" var/ailist[] = list() - for(var/mob/living/silicon/ai/A in GLOB.living_mob_list) + for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list) ailist += A if(ailist.len) var/mob/living/silicon/ai/announcer = pick(ailist) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 1fb2dfc422d..baf32ab742c 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -400,7 +400,7 @@ while(time) sleep(speed) for(var/i in 1 to speed) - M.setDir(pick(cardinal)) + M.setDir(pick(GLOB.cardinal)) M.resting = !M.resting M.update_canmove() time-- diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm index 738fc115734..9ee32716e53 100644 --- a/code/game/machinery/defib_mount.dm +++ b/code/game/machinery/defib_mount.dm @@ -15,6 +15,9 @@ var/obj/item/defibrillator/defib //this mount's defibrillator var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps +/obj/machinery/defibrillator_mount/attack_ai() + return + /obj/machinery/defibrillator_mount/get_cell() if(defib) return defib.get_cell() @@ -45,7 +48,7 @@ . = ..() if(defib) . += "There is a defib unit hooked up. Alt-click to remove it." - if(security_level >= SEC_LEVEL_RED) + if(GLOB.security_level >= SEC_LEVEL_RED) . += "Due to a security situation, its locking clamps can be toggled by swiping any ID." else . += "Its locking clamps can be [clamps_locked ? "dis" : ""]engaged by swiping an ID with access." @@ -100,7 +103,7 @@ return var/obj/item/card/id = I.GetID() if(id) - if(check_access(id) || security_level >= SEC_LEVEL_RED) //anyone can toggle the clamps in red alert! + if(check_access(id) || GLOB.security_level >= SEC_LEVEL_RED) //anyone can toggle the clamps in red alert! if(!defib) to_chat(user, "You can't engage the clamps on a defibrillator that isn't there.") return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 1d97056912f..94a3219c159 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -30,6 +30,8 @@ new stacktype(get_turf(src), drop_amount) /obj/structure/barricade/welder_act(mob/user, obj/item/I) + if(bar_material != METAL) + return if(obj_integrity >= max_integrity) to_chat(user, "[src] does not need repairs.") return @@ -71,6 +73,7 @@ bar_material = WOOD stacktype = /obj/item/stack/sheet/wood + /obj/structure/barricade/wooden/attackby(obj/item/I, mob/user) if(istype(I,/obj/item/stack/sheet/wood)) var/obj/item/stack/sheet/wood/W = I diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5ba3885faff..73d0e9281e1 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -38,7 +38,7 @@ #define AIRLOCK_DAMAGE_DEFLECTION_N 21 // Normal airlock damage deflection #define AIRLOCK_DAMAGE_DEFLECTION_R 30 // Reinforced airlock damage deflection -var/list/airlock_overlays = list() +GLOBAL_LIST_EMPTY(airlock_overlays) /obj/machinery/door/airlock name = "airlock" @@ -276,6 +276,7 @@ About the new airlock wires panel: if(usr) shockedby += text("\[[time_stamp()]\] - [usr](ckey:[usr.ckey])") usr.create_attack_log("Electrified the [name] at [x] [y] [z]") + add_attack_logs(usr, src, "Electrified", ATKLOG_ALL) else shockedby += text("\[[time_stamp()]\] - EMP)") message = "The door is now electrified [duration == -1 ? "permanently" : "for [duration] second\s"]." @@ -288,8 +289,8 @@ About the new airlock wires panel: // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise // The preceding comment was borrowed from the grille's shock script -/obj/machinery/door/airlock/shock(mob/user, prb) - if(!arePowerSystemsOn()) +/obj/machinery/door/airlock/shock(mob/living/user, prb) + if(!istype(user) || !arePowerSystemsOn()) return FALSE if(shockCooldown > world.time) return FALSE //Already shocked someone recently? @@ -483,10 +484,10 @@ About the new airlock wires panel: /proc/get_airlock_overlay(icon_state, icon_file) var/iconkey = "[icon_state][icon_file]" - if(airlock_overlays[iconkey]) - return airlock_overlays[iconkey] - airlock_overlays[iconkey] = image(icon_file, icon_state) - return airlock_overlays[iconkey] + if(GLOB.airlock_overlays[iconkey]) + return GLOB.airlock_overlays[iconkey] + GLOB.airlock_overlays[iconkey] = image(icon_file, icon_state) + return GLOB.airlock_overlays[iconkey] /obj/machinery/door/airlock/do_animate(animation) switch(animation) @@ -550,7 +551,7 @@ About the new airlock wires panel: ui.open() ui.set_auto_update(1) -/obj/machinery/door/airlock/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/door/airlock/ui_data(mob/user, datum/topic_state/state = GLOB.default_state) var/data[0] data["main_power_loss"] = round(main_power_lost_until > 0 ? max(main_power_lost_until - world.time, 0) / 10 : main_power_lost_until, 1) @@ -763,6 +764,7 @@ About the new airlock wires panel: else if(activate) //electrify door for 30 seconds shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.create_attack_log("Electrified the [name] at [x] [y] [z]") + add_attack_logs(usr, src, "Electrified", ATKLOG_ALL) to_chat(usr, "The door is now electrified for thirty seconds.") electrify(30) if("electrify_permanently") @@ -774,6 +776,7 @@ About the new airlock wires panel: else if(activate) shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.create_attack_log("Electrified the [name] at [x] [y] [z]") + add_attack_logs(usr, src, "Electrified", ATKLOG_ALL) to_chat(usr, "The door is now electrified.") electrify(-1) if("open") @@ -861,7 +864,7 @@ About the new airlock wires panel: update_icon() return - else if(istype(C, /obj/item/assembly/signaler)) + if(istype(C, /obj/item/assembly/signaler)) return interact_with_panel(user) else if(istype(C, /obj/item/pai_cable)) // -- TLE var/obj/item/pai_cable/cable = C @@ -946,7 +949,7 @@ About the new airlock wires panel: if(note) remove_airlock_note(user, TRUE) else - return interact_with_panel(user) + interact_with_panel(user) /obj/machinery/door/airlock/multitool_act(mob/user, obj/item/I) if(!headbutt_shock_check(user)) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 260d26493c0..660c6df683e 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -29,12 +29,12 @@ t1 += " Unrestricted Access Settings
" var/list/Directions = list("North","South",,"East",,,,"West") - for(var/direction in cardinal) + for(var/direction in GLOB.cardinal) if (unres_direction && unres_direction == direction) t1 += "[Directions[direction]]
" else t1 += "[Directions[direction]]
" - + t1 += "
" t1 += "Access requirement is set to " t1 += one_access ? "ONE
" : "ALL
" @@ -74,7 +74,7 @@ if(href_list["access"]) toggle_access(href_list["access"]) - + if(href_list["unres_direction"]) unres_direction = text2num(href_list["unres_direction"]) if (unres_sides == unres_direction) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index dbc76ade250..8d842179db5 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -2,6 +2,7 @@ #define FONT_SIZE "5pt" #define FONT_COLOR "#09f" #define FONT_STYLE "Small Fonts" +#define CELL_NONE "None" /////////////////////////////////////////////////////////////////////////////////////////////// // Brig Door control displays. @@ -31,10 +32,13 @@ maptext_height = 26 maptext_width = 32 maptext_y = -1 - var/occupant = "None" - var/crimes = "None" + var/occupant = CELL_NONE + var/crimes = CELL_NONE var/time = 0 - var/officer = "None" + var/officer = CELL_NONE + var/prisoner_name = "" + var/prisoner_charge = "" + var/prisoner_time = "" /obj/machinery/door_timer/New() GLOB.celltimers_list += src @@ -45,33 +49,29 @@ return ..() /obj/machinery/door_timer/proc/print_report() - var/logname = input(usr, "Name of the guilty?","[id] log name") - var/logcharges = stripped_multiline_input(usr, "What have they been charged with?","[id] log charges") - - if(!logname || !logcharges) + if(occupant == CELL_NONE || crimes == CELL_NONE) return 0 - occupant = logname - crimes = logcharges + time = timetoset officer = usr.name for(var/obj/machinery/computer/prisoner/C in GLOB.prisoncomputer_list) var/obj/item/paper/P = new /obj/item/paper(C.loc) - P.name = "[id] log - [logname] [station_time_timestamp()]" + P.name = "[id] log - [occupant] [station_time_timestamp()]" P.info = "
" P.info += {"
Log generated at: [station_time_timestamp()]
- Detainee: [logname]
+ Detainee: [occupant]
Duration: [seconds_to_time(timetoset / 10)]
- Charge(s): [logcharges]
+ Charge(s): [crimes]
Arresting Officer: [usr.name]
This log file was generated automatically upon activation of a cell timer."} playsound(C.loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) GLOB.cell_logs += P - var/datum/data/record/G = find_record("name", logname, data_core.general) + var/datum/data/record/G = find_record("name", occupant, GLOB.data_core.general) var/prisoner_drank = "unknown" var/prisoner_trank = "unknown" if(G) @@ -80,9 +80,9 @@ if(G.fields["real_rank"]) // Ignore alt job titles - necessary for lookups prisoner_trank = G.fields["real_rank"] - var/datum/data/record/R = find_security_record("name", logname) + var/datum/data/record/R = find_security_record("name", occupant) - var/announcetext = "Detainee [logname] ([prisoner_drank]) has been incarcerated for [seconds_to_time(timetoset / 10)] for the charges of, '[logcharges]'. \ + var/announcetext = "Detainee [occupant] ([prisoner_drank]) has been incarcerated for [seconds_to_time(timetoset / 10)] for the charges of: '[crimes]'. \ Arresting Officer: [usr.name].[R ? "" : " Detainee record not found, manual record update required."]" Radio.autosay(announcetext, name, "Security", list(z)) @@ -91,7 +91,7 @@ if(R) prisoner = R - R.fields["criminal"] = "Incarcerated" + R.fields["criminal"] = SEC_RECORD_STATUS_INCARCERATED var/mob/living/carbon/human/M = usr var/rank = "UNKNOWN RANK" if(istype(M) && M.wear_id) @@ -99,7 +99,7 @@ rank = I.assignment if(!R.fields["comments"] || !islist(R.fields["comments"])) //copied from security computer code because apparently these need to be initialized R.fields["comments"] = list() - R.fields["comments"] += "Autogenerated by [name] on [current_date_string] [station_time_timestamp()]
Sentenced to [timetoset/10] seconds for the charges of \"[logcharges]\" by [rank] [usr.name]." + R.fields["comments"] += "Autogenerated by [name] on [GLOB.current_date_string] [station_time_timestamp()]
Sentenced to [timetoset/10] seconds for the charges of \"[crimes]\" by [rank] [usr.name]." update_all_mob_security_hud() return 1 @@ -118,7 +118,7 @@ var/boss_title = brigged_job.department_head[1] var/obj/item/pda/target_pda - for(var/obj/item/pda/check_pda in PDAs) + for(var/obj/item/pda/check_pda in GLOB.PDAs) if(check_pda.ownrank == boss_title) target_pda = check_pda if(!target_pda) @@ -175,12 +175,10 @@ if(timing) if(timeleft() <= 0) Radio.autosay("Timer has expired. Releasing prisoner.", name, "Security", list(z)) - occupant = "None" + occupant = CELL_NONE timer_end() // open doors, reset timer, clear status screen timing = 0 . = PROCESS_KILL - - updateUsrDialog() update_icon() else timer_end() @@ -203,8 +201,8 @@ if(!printed) if(!print_report()) - timing = 0 - return 0 + timing = FALSE + return FALSE // Set releasetime releasetime = world.timeofday + timetoset @@ -237,14 +235,14 @@ return 0 // Reset vars - occupant = "None" - crimes = "None" + occupant = CELL_NONE + crimes = CELL_NONE time = 0 - officer = "None" + officer = CELL_NONE releasetime = 0 printed = 0 if(prisoner) - prisoner.fields["criminal"] = "Released" + prisoner.fields["criminal"] = SEC_RECORD_STATUS_RELEASED update_all_mob_security_hud() prisoner = null @@ -290,10 +288,11 @@ //Allows AIs to use door_timer, see human attack_hand function below /obj/machinery/door_timer/attack_ai(mob/user) - interact(user) + attack_hand(user) + ui_interact(user) /obj/machinery/door_timer/attack_ghost(mob/user) - interact(user) + ui_interact(user) //Allows humans to use door_timer //Opens dialog window when someone clicks on door timer @@ -302,98 +301,71 @@ /obj/machinery/door_timer/attack_hand(mob/user) if(..()) return - interact(user) + ui_interact(user) -/obj/machinery/door_timer/interact(mob/user) - // Used for the 'time left' display - var/second = round(timeleft() % 60) - var/minute = round((timeleft() - second) / 60) +/obj/machinery/door_timer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "brig_timer.tmpl", "Brig Timer", 500, 400) + ui.open() + ui.set_auto_update(TRUE) - // Used for 'set timer' - var/setsecond = round((timetoset / 10) % 60) - var/setminute = round(((timetoset / 10) - setsecond) / 60) +/obj/machinery/door_timer/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) + var/data[0] + data["cell_id"] = name + data["occupant"] = occupant + data["crimes"] = crimes + data["brigged_by"] = officer + data["time_set"] = seconds_to_clock(time / 10) + data["time_left"] = seconds_to_clock(timeleft()) + data["timing"] = timing + data["isAllowed"] = allowed(user) + data["prisoner_name"] = prisoner_name + data["prisoner_charge"] = prisoner_charge + data["prisoner_time"] = prisoner_time - user.set_machine(src) + return data - // dat - var/dat = "
Timer System:" - dat += " Door [id] controls
" - - // Start/Stop timer - if(timing) - dat += "Stop Timer and open door
" - else - dat += "Activate Timer and close door
" - - // Time Left display (uses releasetime) - dat += "Time Left: [(minute ? text("[minute]:") : null)][second]
" - dat += "
" - - // Set Timer display (uses timetoset) - if(timing) - dat += "Set Timer: [(setminute ? text("[setminute]:") : null)][setsecond] Set
" - else - dat += "Set Timer: [(setminute ? text("[setminute]:") : null)][setsecond]
" - - // Controls - dat += "Input Time" - - // Mounted flash controls - for(var/obj/machinery/flasher/F in targets) - if(F.last_flash && (F.last_flash + 150) > world.time) - dat += "
Flash Charging" - else - dat += "
Activate Flash" - - dat += "
Close" - - var/datum/browser/popup = new(user, "door_timer", name, 400, 500) - popup.set_content(dat) - popup.open() - - -//Function for using door_timer dialog input, checks if user has permission -// href_list to -// "timing" turns on timer -// "tp" value to modify timer -// "fc" activates flasher -// "change" resets the timer to the timetoset amount while the timer is counting down -// Also updates dialog window and timer icon /obj/machinery/door_timer/Topic(href, href_list) - if(..()) - return 1 - if(!allowed(usr) && !usr.can_admin_interact()) return 1 - usr.set_machine(src) - - if(href_list["timing"]) - timing = text2num(href_list["timing"]) - - if(timing) - timer_start() - else - timer_end() - if(!isobserver(usr)) //spooky admin ghosts are in your brig, releasing your prisoners - Radio.autosay("Timer stopped manually by [usr.name].", name, "Security", list(z)) - - else - if(href_list["settime"]) - var/time = min(max(round(return_time_input(usr)), 0), 3600) - timeset(time) - - if(href_list["fc"]) - for(var/obj/machinery/flasher/F in targets) + if(href_list["flash"]) + for(var/obj/machinery/flasher/F in targets) + if(F.last_flash && (F.last_flash + 150) > world.time) + to_chat(usr, "Flash still charging.") + else F.flash() - if(href_list["change"]) - printed = 1 - timer_start() + if(href_list["release"]) + if(timing) + timer_end() + Radio.autosay("Timer stopped manually from cell control.", name, "Security", list(z)) + ui_interact(usr) - add_fingerprint(usr) - updateUsrDialog() - update_icon() + if(href_list["prisoner_name"]) + prisoner_name = input("Prisoner Name:", name, prisoner_name) as text|null + + if(href_list["prisoner_charge"]) + prisoner_charge = input("Prisoner Charge:", name, prisoner_charge) as text|null + + if(href_list["prisoner_time"]) + prisoner_time = input("Prisoner Time (in minutes):", name, prisoner_time) as num|null + prisoner_time = min(max(round(prisoner_time), 0), 60) + + if(href_list["set_timer"]) + if(!prisoner_name || !prisoner_charge || !prisoner_time) + return + timeset(prisoner_time * 60) + occupant = prisoner_name + crimes = prisoner_charge + prisoner_name = "" + prisoner_charge = "" + prisoner_time = "" + timing = TRUE + timer_start() + ui_interact(usr) + update_icon() //icon update function @@ -502,3 +474,4 @@ #undef FONT_COLOR #undef FONT_STYLE #undef CHARS_PER_LINE +#undef CELL_NONE diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index d7f66f4630b..7884e3be989 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -12,5 +12,5 @@ for(var/obj/machinery/door/D in locate(x,y,z)) if(!istype(D, /obj/machinery/door/window) && D.density) return 0 - //There are no false wall checks because that would be fucking retarded + //There are no false wall checks because that would be foolish return 1 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 718efdb414c..2d6fac3bb81 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -204,7 +204,7 @@ . = TRUE if(operating) return - if(!I.use_tool(src, user, 0, volume = I.tool_volume)) + if(!I.use_tool(src, user, 0, volume = 0)) return try_to_crowbar(user, I) @@ -352,8 +352,8 @@ addtimer(CALLBACK(src, .proc/autoclose), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE) /obj/machinery/door/proc/update_freelook_sight() - if(!glass && cameranet) - cameranet.updateVisibility(src, 0) + if(!glass && GLOB.cameranet) + GLOB.cameranet.updateVisibility(src, 0) /obj/machinery/door/BlockSuperconductivity() // All non-glass airlocks block heat, this is intended. if(opacity || heat_proof) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 6f4a84a7535..c0dce817189 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -59,9 +59,18 @@ /obj/machinery/door/poddoor/try_to_activate_door(mob/user) return -/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user) +/obj/machinery/door/poddoor/try_to_crowbar(mob/user, obj/item/I) + if(!density) + return if(!hasPower()) - open() + to_chat(user, "You start forcing [src] open...") + if(do_after(user, 50 * I.toolspeed, target = src)) + if(!hasPower()) + open() + else + to_chat(user, "[src] resists your efforts to force it!") + else + to_chat(user, "[src] resists your efforts to force it!") // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. - Unknown // Wise words. - Bxil diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 7af8ebe88f3..05198a7a55f 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -1,4 +1,4 @@ -var/list/doppler_arrays = list() +GLOBAL_LIST_EMPTY(doppler_arrays) /obj/machinery/doppler_array name = "tachyon-doppler array" @@ -28,12 +28,12 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/New() ..() - doppler_arrays += src + GLOB.doppler_arrays += src explosion_target = rand(8, 20) toxins_tech = new /datum/tech/toxins(src) /obj/machinery/doppler_array/Destroy() - doppler_arrays -= src + GLOB.doppler_arrays -= src logged_explosions.Cut() return ..() @@ -95,7 +95,7 @@ var/list/doppler_arrays = list() to_chat(user, "[src] is already printing something, please wait.") return atom_say("Printing explosive log. Standby...") - addtimer(CALLBACK(src, .print), 50) + addtimer(CALLBACK(src, .proc/print), 50) /obj/machinery/doppler_array/proc/print() visible_message("[src] prints a piece of paper!") @@ -183,7 +183,7 @@ var/list/doppler_arrays = list() ui.open() ui.set_auto_update(1) -/obj/machinery/doppler_array/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/doppler_array/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/list/explosion_data = list() for(var/D in logged_explosions) diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index b1a6f96e2eb..32924690d97 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -27,7 +27,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data = list( @@ -98,7 +98,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data = list( @@ -160,7 +160,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data = list( diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 7ae268fca46..9beba3f4789 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -236,14 +236,14 @@ FIRE ALARM ui_interact(user) -/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) +/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "firealarm.tmpl", name, 400, 400, state = state) ui.open() ui.set_auto_update(1) -/obj/machinery/firealarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/firealarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/area/A = get_area(src) @@ -318,7 +318,7 @@ FIRE ALARM pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 if(is_station_contact(z) && show_alert_level) - if(security_level) + if(GLOB.security_level) overlays += image('icons/obj/monitors.dmi', "overlay_[get_security_level()]") else overlays += image('icons/obj/monitors.dmi', "overlay_green") diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index b7b7e35eef6..57057ad510a 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -58,6 +58,8 @@ playsound(loc, 'sound/weapons/flash.ogg', 100, 1) flick("[base_state]_flash", src) + set_light(2, 1, COLOR_WHITE) + addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2) last_flash = world.time use_power(1000) diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 2c37a3274c7..165c8dbe4cb 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -193,5 +193,5 @@ /obj/machinery/computer/guestpass/hop/get_changeable_accesses() . = ..() - if(. && ACCESS_CHANGE_IDS in .) + if(. && (ACCESS_CHANGE_IDS in .)) return get_all_accesses() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 03b28423830..fcd6de4020c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -33,7 +33,7 @@ Possible to do for anyone motivated enough: #define HOLOPAD_MODE RANGE_BASED -var/list/holopads = list() +GLOBAL_LIST_EMPTY(holopads) /obj/machinery/hologram/holopad name = "holopad" @@ -61,7 +61,7 @@ var/list/holopads = list() /obj/machinery/hologram/holopad/New() ..() - holopads += src + GLOB.holopads += src component_parts = list() component_parts += new /obj/item/circuitboard/holopad(null) component_parts += new /obj/item/stock_parts/capacitor(null) @@ -77,7 +77,7 @@ var/list/holopads = list() for(var/I in masters) clear_holo(I) - holopads -= src + GLOB.holopads -= src return ..() /obj/machinery/hologram/holopad/power_change() @@ -192,7 +192,7 @@ var/list/holopads = list() temp = "You requested an AI's presence.
" temp += "Main Menu" var/area/area = get_area(src) - for(var/mob/living/silicon/ai/AI in ai_list) + for(var/mob/living/silicon/ai/AI in GLOB.ai_list) if(!AI.client) continue to_chat(AI, "Your presence is requested at \the [area].") @@ -210,7 +210,7 @@ var/list/holopads = list() temp += "Main Menu" if(usr.loc == loc) var/list/callnames = list() - for(var/I in holopads) + for(var/I in GLOB.holopads) var/area/A = get_area(I) if(A) LAZYADD(callnames[A], I) @@ -297,7 +297,7 @@ var/list/holopads = list() /obj/machinery/hologram/holopad/proc/transfer_to_nearby_pad(turf/T, mob/holo_owner) if(!isAI(holo_owner)) return - for(var/pad in holopads) + for(var/pad in GLOB.holopads) var/obj/machinery/hologram/holopad/another = pad if(another == src) continue diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 6f97856a227..740c3affaba 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -293,7 +293,7 @@ Class Procs: update_multitool_menu(usr) return TRUE -/obj/machinery/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state) +/obj/machinery/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = GLOB.default_state) if(..(href, href_list, nowindow, state)) return 1 @@ -555,14 +555,18 @@ Class Procs: if(check_records && !R) threatcount += 4 - if(check_arrest && R && (R.fields["criminal"] == "*Arrest*")) - threatcount += 4 + if(R && R.fields["criminal"]) + switch(R.fields["criminal"]) + if(SEC_RECORD_STATUS_EXECUTE) + threatcount += 7 + if(SEC_RECORD_STATUS_ARREST) + threatcount += 5 return threatcount -/obj/machinery/proc/shock(mob/user, prb) - if(inoperable()) +/obj/machinery/proc/shock(mob/living/user, prb) + if(!istype(user) || inoperable()) return FALSE if(!prob(prb)) return FALSE diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 61d96602343..c2396ab1d9f 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -55,9 +55,9 @@ var/list/datum/feed_channel/network_channels = list() var/datum/feed_message/wanted_issue -var/datum/feed_network/news_network = new /datum/feed_network //The global news-network, which is coincidentally a global list. +GLOBAL_DATUM_INIT(news_network, /datum/feed_network, new()) //The global news-network, which is coincidentally a global list. -var/list/obj/machinery/newscaster/allCasters = list() //Global list that will contain reference to all newscasters in existence. +GLOBAL_LIST_EMPTY(allNewscasters) //Global list that will contain reference to all newscasters in existence. #define NEWSCASTER_MAIN 0 // Main menu #define NEWSCASTER_FC_LIST 1 // Feed channel list @@ -128,13 +128,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co securityCaster = 1 /obj/machinery/newscaster/New() - allCasters += src - unit_no = allCasters.len + GLOB.allNewscasters += src + unit_no = GLOB.allNewscasters.len update_icon() //for any custom ones on the map... ..() /obj/machinery/newscaster/Destroy() - allCasters -= src + GLOB.allNewscasters -= src viewing_channel = null QDEL_NULL(photo) return ..() @@ -144,7 +144,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(inoperable()) icon_state = "newscaster_off" else - if(!news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message + if(!GLOB.news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message icon_state = "newscaster_normal" if(alert) //new message alert overlay add_overlay("newscaster_alert") @@ -194,7 +194,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co switch(screen) if(0) - data["wanted_issue"] = news_network.wanted_issue ? 1 : 0 + data["wanted_issue"] = GLOB.news_network.wanted_issue ? 1 : 0 data["silence"] = silence data["securityCaster"] = securityCaster if(securityCaster) @@ -202,7 +202,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(1, 6, 7) var/list/channels = list() data["channels"] = channels - for(var/datum/feed_channel/C in news_network.network_channels) + for(var/datum/feed_channel/C in GLOB.news_network.network_channels) channels[++channels.len] = list("name" = C.channel_name, "ref" = "\ref[C]", "censored" = C.censored, "admin" = C.is_admin_channel) if(2) data["scanned_user"] = scanned_user @@ -215,10 +215,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co data["msg"] = msg data["photo"] = photo ? 1 : 0 if(4) - var/total_num = length(news_network.network_channels) + var/total_num = length(GLOB.news_network.network_channels) var/active_num = total_num var/message_num=0 - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(!FC.censored) message_num += length(FC.messages) else @@ -254,7 +254,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(10) var/wanted_already = 0 var/end_param = 1 - if(news_network.wanted_issue) + if(GLOB.news_network.wanted_issue) wanted_already = 1 end_param = 2 data["wanted_already"] = wanted_already @@ -263,16 +263,16 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co data["msg"] = msg data["photo"] = photo ? 1 : 0 if(wanted_already) - data["author"] = news_network.wanted_issue.backup_author + data["author"] = GLOB.news_network.wanted_issue.backup_author else data["scanned_user"] = scanned_user if(11) - data["author"] = news_network.wanted_issue.backup_author - data["criminal"] = news_network.wanted_issue.author - data["description"] = news_network.wanted_issue.body - if(news_network.wanted_issue.img) - user << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") - data["photo"] = news_network.wanted_issue.img ? news_network.wanted_issue.img : 0 + data["author"] = GLOB.news_network.wanted_issue.backup_author + data["criminal"] = GLOB.news_network.wanted_issue.author + data["description"] = GLOB.news_network.wanted_issue.body + if(GLOB.news_network.wanted_issue.img) + user << browse_rsc(GLOB.news_network.wanted_issue.img, "tmp_photow.png") + data["photo"] = GLOB.news_network.wanted_issue.img ? GLOB.news_network.wanted_issue.img : 0 if(12) var/list/jobs = list() data["jobs"] = jobs @@ -295,13 +295,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else if(href_list["submit_new_channel"]) var/list/existing_authors = list() - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(FC.author == REDACTED) existing_authors += FC.backup_author else existing_authors += FC.author var/check = 0 - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(FC.channel_name == channel_name) check = 1 break @@ -325,13 +325,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co newChannel.author = scanned_user newChannel.locked = c_locked feedback_inc("newscaster_channels", 1) - news_network.network_channels += newChannel //Adding channel to the global network + GLOB.news_network.network_channels += newChannel //Adding channel to the global network temp = "Feed channel '[channel_name]' created successfully." temp_back_screen = NEWSCASTER_MAIN else if(href_list["set_channel_receiving"]) var/list/available_channels = list() - for(var/datum/feed_channel/F in news_network.network_channels) + for(var/datum/feed_channel/F in GLOB.news_network.network_channels) if((!F.locked || F.author == scanned_user) && !F.censored) available_channels += F.channel_name channel_name = strip_html_simple(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels) @@ -366,14 +366,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co newMsg.img = photo.img feedback_inc("newscaster_stories",1) var/announcement = "" - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel announcement = FC.announce_news(msg_title) break temp = "Feed story successfully submitted to [channel_name]." temp_back_screen = NEWSCASTER_MAIN - for(var/obj/machinery/newscaster/NC in allCasters) + for(var/obj/machinery/newscaster/NC in GLOB.allNewscasters) NC.newsAlert(announcement) else if(href_list["create_channel"]) @@ -405,12 +405,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else if(href_list["menu_wanted"]) var/already_wanted = 0 - if(news_network.wanted_issue) + if(GLOB.news_network.wanted_issue) already_wanted = 1 if(already_wanted) - channel_name = news_network.wanted_issue.author - msg = news_network.wanted_issue.body + channel_name = GLOB.news_network.wanted_issue.author + msg = GLOB.news_network.wanted_issue.body screen = NEWSCASTER_W_ISSUE_H else if(href_list["set_wanted_name"]) @@ -441,32 +441,32 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co W.backup_author = scanned_user //I know, a bit wacky if(photo) W.img = photo.img - news_network.wanted_issue = W - for(var/obj/machinery/newscaster/NS in allCasters) + GLOB.news_network.wanted_issue = W + for(var/obj/machinery/newscaster/NS in GLOB.allNewscasters) NS.newsAlert() NS.update_icon() temp = "Wanted issue for [channel_name] is now in Network Circulation." temp_back_screen = NEWSCASTER_MAIN else - if(news_network.wanted_issue.is_admin_message) + if(GLOB.news_network.wanted_issue.is_admin_message) alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot edit it.","Ok") return - news_network.wanted_issue.author = channel_name - news_network.wanted_issue.body = msg - news_network.wanted_issue.backup_author = scanned_user + GLOB.news_network.wanted_issue.author = channel_name + GLOB.news_network.wanted_issue.body = msg + GLOB.news_network.wanted_issue.backup_author = scanned_user if(photo) - news_network.wanted_issue.img = photo.img + GLOB.news_network.wanted_issue.img = photo.img temp = "Wanted issue for [channel_name] successfully edited." temp_back_screen = NEWSCASTER_MAIN else if(href_list["cancel_wanted"]) - if(news_network.wanted_issue.is_admin_message) + if(GLOB.news_network.wanted_issue.is_admin_message) alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot take it down.", "Ok") return var/choice = alert("Please confirm wanted issue removal", "Network Security Handler", "Confirm", "Cancel") if(choice == "Confirm") - news_network.wanted_issue = null - for(var/obj/machinery/newscaster/NC in allCasters) + GLOB.news_network.wanted_issue = null + for(var/obj/machinery/newscaster/NC in GLOB.allNewscasters) NC.update_icon() temp = "Wanted Issue successfully deleted from Circulation" temp_back_screen = NEWSCASTER_MAIN @@ -826,10 +826,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/proc/print_paper() feedback_inc("newscaster_newspapers_printed",1) var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) NEWSPAPER.news_content += FC - if(news_network.wanted_issue) - NEWSPAPER.important_message = news_network.wanted_issue + if(GLOB.news_network.wanted_issue) + NEWSPAPER.important_message = GLOB.news_network.wanted_issue NEWSPAPER.loc = get_turf(src) paper_remaining-- return diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 13ad44215bb..42452a9f8e2 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -216,7 +216,7 @@ /obj/item/pipe/Move() ..() if(is_bent_pipe() \ - && (src.dir in cardinal)) + && (src.dir in GLOB.cardinal)) src.dir = src.dir|turn(src.dir, 90) else if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) if(dir==2) @@ -305,7 +305,7 @@ return 0 /obj/item/pipe/proc/unflip(var/direction) - if(!(direction in cardinal)) + if(!(direction in GLOB.cardinal)) return turn(direction, 45) return direction diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index 53dd0135c54..b910b1272ff 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -157,7 +157,7 @@ ui = new(user, src, ui_key, "poolcontroller.tmpl", "Pool Controller Interface", 520, 410) ui.open() -/obj/machinery/poolcontroller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/poolcontroller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] var/currenttemp switch(temperature) //So we can output nice things like "Cool" to nanoUI diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm index 0bd368bd75b..12bae1bbf5a 100644 --- a/code/game/machinery/portable_tag_turret.dm +++ b/code/game/machinery/portable_tag_turret.dm @@ -13,8 +13,8 @@ lasercolor = "b" installation = /obj/item/gun/energy/laser/tag/blue -/obj/machinery/porta_turret/tag/New() - ..() +/obj/machinery/porta_turret/tag/Initialize(mapload) + . = ..() icon_state = "[lasercolor]grey_target_prism" /obj/machinery/porta_turret/tag/weapon_setup(var/obj/item/gun/energy/E) @@ -49,7 +49,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/porta_turret/tag/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/porta_turret/tag/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["access"] = !isLocked(user) data["locked"] = locked diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index a77cbe6c184..b63f4ab7f8b 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -87,8 +87,8 @@ lethal = 1 installation = /obj/item/gun/energy/laser -/obj/machinery/porta_turret/New() - ..() +/obj/machinery/porta_turret/Initialize(mapload) + . = ..() if(req_access && req_access.len) req_access.Cut() req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS) @@ -105,8 +105,8 @@ QDEL_NULL(spark_system) return ..() -/obj/machinery/porta_turret/centcom/New() - ..() +/obj/machinery/porta_turret/centcom/Initialize(mapload) + . = ..() if(req_one_access && req_one_access.len) req_one_access.Cut() req_access = list(ACCESS_CENT_SPECOPS) @@ -161,14 +161,14 @@ eprojectile = /obj/item/projectile/beam/pulse eshot_sound = 'sound/weapons/pulse.ogg' -var/list/turret_icons +GLOBAL_LIST_EMPTY(turret_icons) /obj/machinery/porta_turret/update_icon() - if(!turret_icons) - turret_icons = list() - turret_icons["open"] = image(icon, "openTurretCover") + if(!GLOB.turret_icons) + GLOB.turret_icons = list() + GLOB.turret_icons["open"] = image(icon, "openTurretCover") underlays.Cut() - underlays += turret_icons["open"] + underlays += GLOB.turret_icons["open"] if(stat & BROKEN) icon_state = "destroyed_target_prism" @@ -218,7 +218,7 @@ var/list/turret_icons ui.open() ui.set_auto_update(1) -/obj/machinery/porta_turret/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/porta_turret/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["access"] = !isLocked(user) data["screen"] = screen @@ -1015,8 +1015,8 @@ var/list/turret_icons depotarea.declare_started() return ..(target) -/obj/machinery/porta_turret/syndicate/New() - ..() +/obj/machinery/porta_turret/syndicate/Initialize(mapload) + . = ..() if(req_one_access && req_one_access.len) req_one_access.Cut() req_access = list(ACCESS_SYNDICATE) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 081a48c3da1..e4e37ae1bcb 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -19,8 +19,7 @@ var/item_recycle_sound = 'sound/machines/recycler.ogg' /obj/machinery/recycler/New() - AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_PLASTIC, MAT_BLUESPACE), 0, - TRUE, null, null, null, TRUE) + AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_PLASTIC, MAT_BLUESPACE), 0, TRUE, null, null, null, TRUE) ..() component_parts = list() component_parts += new /obj/item/circuitboard/recycler(null) @@ -37,7 +36,7 @@ mat_mod *= 50000 for(var/obj/item/stock_parts/manipulator/M in component_parts) amt_made = 25 * M.rating //% of materials salvaged - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.max_amount = mat_mod amount_produced = min(100, amt_made) @@ -135,7 +134,7 @@ /obj/machinery/recycler/proc/recycle_item(obj/item/I) I.forceMove(loc) - GET_COMPONENT(materials, /datum/component/material_container) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/material_amount = materials.get_item_material_amount(I) if(!material_amount) qdel(I) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index db913f171c3..095b2e7d56e 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -27,10 +27,10 @@ #define COM_ROLES list("Blueshield","NT Representative","Head of Personnel's Desk","Captain's Desk","Bridge") #define SCI_ROLES list("Robotics","Science","Research Director's Desk") -var/req_console_assistance = list() -var/req_console_supplies = list() -var/req_console_information = list() -var/list/obj/machinery/requests_console/allConsoles = list() +GLOBAL_LIST_EMPTY(req_console_assistance) +GLOBAL_LIST_EMPTY(req_console_supplies) +GLOBAL_LIST_EMPTY(req_console_information) +GLOBAL_LIST_EMPTY(allRequestConsoles) /obj/machinery/requests_console name = "Requests Console" @@ -93,30 +93,30 @@ var/list/obj/machinery/requests_console/allConsoles = list() announcement.newscast = 0 name = "[department] Requests Console" - allConsoles += src + GLOB.allRequestConsoles += src if(departmentType & RC_ASSIST) - req_console_assistance |= department + GLOB.req_console_assistance |= department if(departmentType & RC_SUPPLY) - req_console_supplies |= department + GLOB.req_console_supplies |= department if(departmentType & RC_INFO) - req_console_information |= department + GLOB.req_console_information |= department set_light(1) /obj/machinery/requests_console/Destroy() - allConsoles -= src + GLOB.allRequestConsoles -= src var/lastDeptRC = 1 - for(var/obj/machinery/requests_console/Console in allConsoles) + for(var/obj/machinery/requests_console/Console in GLOB.allRequestConsoles) if(Console.department == department) lastDeptRC = 0 break if(lastDeptRC) if(departmentType & RC_ASSIST) - req_console_assistance -= department + GLOB.req_console_assistance -= department if(departmentType & RC_SUPPLY) - req_console_supplies -= department + GLOB.req_console_supplies -= department if(departmentType & RC_INFO) - req_console_information -= department + GLOB.req_console_information -= department QDEL_NULL(Radio) return ..() @@ -138,7 +138,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() ui.open() ui.set_auto_update(1) -/obj/machinery/requests_console/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/requests_console/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["department"] = department @@ -148,9 +148,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() data["silent"] = silent data["announcementConsole"] = announcementConsole - data["assist_dept"] = req_console_assistance - data["supply_dept"] = req_console_supplies - data["info_dept"] = req_console_information + data["assist_dept"] = GLOB.req_console_assistance + data["supply_dept"] = GLOB.req_console_supplies + data["info_dept"] = GLOB.req_console_information data["ship_dept"] = GLOB.TAGGERLOCATIONS data["message"] = message @@ -233,7 +233,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(tempScreen == RCS_ANNOUNCE && !announcementConsole) return if(tempScreen == RCS_VIEWMSGS) - for(var/obj/machinery/requests_console/Console in allConsoles) + for(var/obj/machinery/requests_console/Console in GLOB.allRequestConsoles) if(Console.department == department) Console.newmessagepriority = 0 Console.icon_state = "req_comp0" diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index adbc3d67605..d0cf38a272d 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -27,7 +27,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/slot_machine/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/machinery/slot_machine/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["working"] = working data["money"] = account ? account.money : null @@ -52,18 +52,18 @@ icon_state = "slots-on" playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) addtimer(CALLBACK(src, .proc/spin_slots, usr.name), 25) - + /obj/machinery/slot_machine/proc/spin_slots(userName) switch(rand(1,4050)) if(1) // .02% atom_say("JACKPOT! [userName] has won a MILLION CREDITS!") - event_announcement.Announce("Congratulations to [userName] on winning the Jackpot of ONE MILLION CREDITS!", "Jackpot Winner") + GLOB.event_announcement.Announce("Congratulations to [userName] on winning the Jackpot of ONE MILLION CREDITS!", "Jackpot Winner") result = "JACKPOT! You win one million credits!" resultlvl = "highlight" win_money(1000000, 'sound/goonstation/misc/airraid_loop.ogg') if(2 to 5) // .07% atom_say("Big Winner! [userName] has won a hundred thousand credits!") - event_announcement.Announce("Congratulations to [userName] on winning a hundred thousand credits!", "Big Winner") + GLOB.event_announcement.Announce("Congratulations to [userName] on winning a hundred thousand credits!", "Big Winner") result = "Big Winner! You win a hundred thousand credits!" resultlvl = "good" win_money(100000, 'sound/goonstation/misc/klaxon.ogg') diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 99642db320e..b3745f947cd 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -78,7 +78,7 @@ try_detonate(TRUE) //Counter terrorists win else if(!active || defused) - if(defused && payload in src) + if(defused && (payload in src)) payload.defuse() countdown.stop() STOP_PROCESSING(SSfastprocess, src) diff --git a/code/game/machinery/tcomms/_base.dm b/code/game/machinery/tcomms/_base.dm new file mode 100644 index 00000000000..a857afcef89 --- /dev/null +++ b/code/game/machinery/tcomms/_base.dm @@ -0,0 +1,459 @@ +/* + + ParadiseSS13 Telecommunications System + + Rewritten from the ground up because I was totally unhappy with how laggy and complicated the current implementation was + The system is made up of two objects. A main core and relays. + + The main core is basically the same as all of the machines from the previous implementation, apart from the relay + The core handles recieving and sending messages, logging messages, the NTTC configuration, and serves as the linkage hub for relays + + Relays function much in the same way as the old ones. They just expand the reach of tcomms from one z-level to another. + + This file contains extra datums and helper procs which the system utilises. + Unlike old telecomms, everything in here **should** be well documented. If not, feel free to add your own + -aa07 + +*/ + +/// Global list for all telecomms machines in the world +GLOBAL_LIST_EMPTY(tcomms_machines) + +/** + * # Telecommunications Device + * + * This is the base machine for both tcomms devices (core + relay) + * + * This holds a few base procs (Icon updates, enable/disable, etc) + * It also has the initial overrides for Initialize() and Destroy() + */ +/obj/machinery/tcomms + name = "Telecommunications Device" + desc = "Someone forgot to say what this thingy does. Please yell at a coder" + icon = 'icons/obj/tcomms.dmi' + icon_state = "error" + density = TRUE + anchored = TRUE + use_power = IDLE_POWER_USE + idle_power_usage = 500 + /// Network ID used for names + auto linkage + var/network_id = "None" + /// Is the machine active + var/active = TRUE + +/** + * Base Initializer + * + * Ensures that the machine is put into the global list of tcomms devices, and then its made sure that the icon is correct if the machine starts offline + */ +/obj/machinery/tcomms/Initialize(mapload) + . = ..() + GLOB.tcomms_machines += src + update_icon() + +/** + * Base Destructor + * + * Ensures that the machine is taken out of the global list when destroyed + */ +/obj/machinery/tcomms/Destroy() + GLOB.tcomms_machines -= src + return ..() + +/** + * Icon Updater + * + * Ensures that the icon updates properly based on if the machine is active or not. This removes the need for this check in many other places. + */ +/obj/machinery/tcomms/update_icon() + . = ..() + if(!active || (stat & NOPOWER)) + icon_state = "[initial(icon_state)]_off" + else + icon_state = initial(icon_state) + + +// Attack overrides. These are needed so the UIs can be opened up // +/obj/machinery/tcomms/attack_ai(mob/user) + add_hiddenprint(user) + ui_interact(user) + +/obj/machinery/tcomms/attack_ghost(mob/user) + ui_interact(user) + +/obj/machinery/tcomms/attack_hand(mob/user) + if(..(user)) + return + ui_interact(user) + + +/** + * Machine Enabler + * + * Quick and dirty proc to allow for the machine to be programatically enabled easily. Used for the anomaly event + */ +/obj/machinery/tcomms/proc/enable_machine() + active = TRUE + update_icon() + +/** + * Machine Disabler + * + * Quick and dirty proc to allow for the machine to be programatically disabled easily. Used for the anomaly event + */ +/obj/machinery/tcomms/proc/disable_machine() + active = FALSE + update_icon() + +/** + * Logging helper + * + * Proc which allows easy logging of changs made to tcomms machines + * Arguments: + * * user - The user who did the action + * * msg - The log message + * * adminmsg - Should an admin log be sent when this happens + */ +/obj/machinery/tcomms/proc/log_action(user, msg, adminmsg = FALSE) + log_game("NTTC: [key_name(user)] [msg]") + log_investigate("[key_name(user)] [msg]", "nttc") + if(adminmsg) + message_admins("[key_name_admin(user)] [msg]") +/** + * Power Change Handler + * + * Proc which ensures icons are updated when machines lose power + */ +/obj/machinery/tcomms/power_change() + ..() + update_icon() + +/** + * # Telecommunications Message + * + * Datum which holds all the data for a message being sent + * + * This used to be a single associative list with just keys and values + * It had no typepath or presence checking, and was absolutely awful to work with + * This fixes that + * + */ +/datum/tcomms_message + /// Who sent the message + var/sender_name = "Error" + /// What job are they + var/sender_job = "Error" + /// Pieces of the message + var/list/message_pieces = list() + /// Source Z-level + var/source_level = 0 + /// What frequency the message is sent on + var/freq = 0 + /// Was it sent with a voice changer + var/vmask = FALSE + /// Did the signal come from a device that requires tcomms to function + var/needs_tcomms = TRUE + /// Origin of the signal + var/datum/radio_frequency/connection + /// Who sent it + var/mob/sender + /// The radio it was sent from + var/obj/item/radio/radio + /// The signal data (See defines/radio.dm) + var/data + /// Verbage used + var/verbage = "says" + /// Follow target for AI use + var/atom/follow_target = null + /// Is this signal meant to be rejected + var/reject = FALSE + /// Voice name if the person doesnt have a name (diona, alien, etc) + var/vname + /// List of all channels this can be sent or recieved on + var/list/zlevels = list() + +/** + * Destructor for the TCM datum. + * + * This needs to happen like this so that things dont keep references held in place + */ +/datum/tcomms_message/Destroy() + connection = null + radio = null + follow_target = null + return ..() + + +#define CREW_RADIO_TYPE 0 +#define CENTCOMM_RADIO_TYPE 1 +#define SYNDICATE_RADIO_TYPE 2 + +/** + * Connection checker + * + * Checks the connection frequency against the intended frequency for the message + * NOTE: I barely know what on earth this does, but it works and it scares me + * Arguments: + * * old_freq - Frequency of the connection + * * new_freq - Frequency of the message + */ +/proc/is_bad_connection(old_freq, new_freq) + var/old_type = CREW_RADIO_TYPE + var/new_type = CREW_RADIO_TYPE + for(var/antag_freq in SSradio.ANTAG_FREQS) + if(old_freq == antag_freq) + old_type = SYNDICATE_RADIO_TYPE + if(new_freq == antag_freq) + new_type = SYNDICATE_RADIO_TYPE + + for(var/cent_freq in SSradio.CENT_FREQS) + if(old_freq == cent_freq) + old_type = CENTCOMM_RADIO_TYPE + if(new_freq == cent_freq) + new_type = CENTCOMM_RADIO_TYPE + + return new_type > old_type + +#undef CREW_RADIO_TYPE +#undef CENTCOMM_RADIO_TYPE +#undef SYNDICATE_RADIO_TYPE + + +/** + * Message Broadcast Proc + * + * This big fat disaster is responsible for sending the message out to all headsets and radios on the station + * It is absolutely disgusting, but used to take about 20 arguments before I slimmed it down to just one + * Arguments: + * * tcm - The tcomms message datum + */ +/proc/broadcast_message(datum/tcomms_message/tcm) + + + /* ###### Prepare the radio connection ###### */ + + var/display_freq = tcm.freq + + var/bad_connection = FALSE + var/datum/radio_frequency/new_connection = tcm.connection + + if(tcm.connection.frequency != display_freq) + bad_connection = is_bad_connection(tcm.connection.frequency, display_freq) + new_connection = SSradio.return_frequency(display_freq) + + var/list/radios = list() + + // --- Broadcast only to intercom devices --- + + if(tcm.data == SIGNALTYPE_INTERCOM && !bad_connection) + + for(var/obj/item/radio/intercom/R in new_connection.devices["[RADIO_CHAT]"]) + if(R.receive_range(display_freq, tcm.zlevels) > -1) + radios += R + + // --- Broadcast only to intercoms and station-bounced radios --- + + else if(tcm.data == SIGNALTYPE_INTERCOM_SBR && !bad_connection) + + for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) + + if(istype(R, /obj/item/radio/headset)) + continue + + if(R.receive_range(display_freq, tcm.zlevels) > -1) + radios += R + + // --- Broadcast to ALL radio devices --- + + else if(!bad_connection) + + for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) + if(R.receive_range(display_freq, tcm.zlevels) > -1) + radios += R + + // Add syndie radios for intercepts if its a regular department frequency + for(var/antag_freq in SSradio.ANTAG_FREQS) + var/datum/radio_frequency/antag_connection = SSradio.return_frequency(antag_freq) + for(var/obj/item/radio/R in antag_connection.devices["[RADIO_CHAT]"]) + if(R.receive_range(antag_freq, tcm.zlevels) > -1) + // Only add if it wasnt there already + radios |= R + + // Get a list of mobs who can hear from the radios we collected. + var/list/receive = get_mobs_in_radio_ranges(radios) + + /* ###### Organize the receivers into categories for displaying the message ###### */ + + // Understood the message: + var/list/heard_masked = list() // masked name or no real name + var/list/heard_normal = list() // normal message + + // Did not understand the message: + var/list/heard_voice = list() // voice message (ie "chimpers") + var/list/heard_garbled = list() // garbled message (ie "f*c* **u, **i*er!") + var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!") + + for(var/M in receive) + var/mob/R = M + + /* --- Loop through the receivers and categorize them --- */ + + if(is_admin(R) && !R.get_preference(CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. + continue + + if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. + continue + + // --- Can understand the speech --- + if(!tcm.sender || R.say_understands(tcm.sender)) + + // - Not human or wearing a voice mask - + if(!tcm.sender || !ishuman(tcm.sender) || tcm.vmask) + heard_masked += R + + // - Human and not wearing voice mask - + else + heard_normal += R + + // --- Can't understand the speech --- + + else + // - Just display a garbled message - + heard_garbled += R + + + /* ###### Begin formatting and sending the message ###### */ + if(length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled) || length(heard_gibberish)) + + /* --- Some miscellaneous variables to format the string output --- */ + var/freq_text = get_frequency_name(display_freq) + + var/part_b_extra = "" + var/part_a = "\[[freq_text]\][part_b_extra] " // goes in the actual output + + // --- Some more pre-message formatting --- + var/part_b = " " + + + // --- Filter the message; place it in quotes apply a verb --- + var/quotedmsg = null + if(tcm.sender) + quotedmsg = "[tcm.sender.say_quote(multilingual_to_message(tcm.message_pieces))], \"[multilingual_to_message(tcm.message_pieces)]\"" + else + quotedmsg = "says, \"[multilingual_to_message(tcm.message_pieces)]\"" + + // --- This following recording is intended for research and feedback in the use of department radio channels --- + + var/part_blackbox_b = " \[[freq_text]\] [ckey] attempted to upload an NTTC configuration containing JS abusable tags!") + log_admin("EXPLOIT WARNING: [ckey] attempted to upload an NTTC configuration containing JS abusable tags") + return FALSE + var/list/var_list = json_decode(text) + for(var/variable in var_list) + if(variable in to_serialize) // Don't just accept any random vars jesus christ! + var/sanitize_method = serialize_sanitize[variable] + var/variable_value = var_list[variable] + variable_value = nttc_sanitize(variable_value, sanitize_method) + if(variable_value != null) + vars[variable] = variable_value + return TRUE + +// Sanitizing user input. Don't blindly trust the JSON. +/datum/nttc_configuration/proc/nttc_sanitize(variable, sanitize_method) + if(!sanitize_method) + return null + + switch(sanitize_method) + if("bool") + return variable ? TRUE : FALSE + // if("table", "array") + if("array") + if(!islist(variable)) + return list() + // Insert html filtering for the regexes here if you're boring + var/newlist = json_decode(html_decode(json_encode(variable))) + if(!islist(newlist)) + return null + return newlist + if("string") + return "[variable]" + + return variable + +// Primary signal modification. This is where all of the variables behavior are actually implemented. +/datum/nttc_configuration/proc/modify_message(datum/tcomms_message/tcm) + // All job and coloring shit + if(toggle_job_color || toggle_name_color) + var/job = tcm.sender_job + job_class = all_jobs[job] + + if(toggle_name_color) + var/new_name = "" + tcm.sender_name + "" + tcm.sender_name = new_name + tcm.vname = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on + + if(toggle_jobs) + var/new_name = "" + var/job = tcm.sender_job + if(job in ert_jobs) + job = "ERT" + if(toggle_job_color) + switch(job_indicator_type) + // These must have trailing spaces. No exceptions. + if(JOB_STYLE_1) + new_name = "[tcm.sender_name] ([job]) " + if(JOB_STYLE_2) + new_name = "[tcm.sender_name] - [job] " + if(JOB_STYLE_3) + new_name = "\[[job]\] [tcm.sender_name] " + if(JOB_STYLE_4) + new_name = "([job]) [tcm.sender_name] " + else + switch(job_indicator_type) + if(JOB_STYLE_1) + new_name = "[tcm.sender_name] ([job]) " + if(JOB_STYLE_2) + new_name = "[tcm.sender_name] - [job] " + if(JOB_STYLE_3) + new_name = "\[[job]\] [tcm.sender_name] " + if(JOB_STYLE_4) + new_name = "([job]) [tcm.sender_name] " + + // Only change the name if they have a job tag set, otherwise everyone becomes unknown, and thats bad + if(new_name != "") + tcm.sender_name = new_name + tcm.vname = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on + // This is hacky stuff for multilingual messages... + var/list/message_pieces = tcm.message_pieces + + // Makes heads of staff bold + if(toggle_command_bold) + var/job = tcm.sender_job + if((job in ert_jobs) || (job in heads)) + for(var/datum/multilingual_say_piece/S in message_pieces) + S.message = "[capitalize(S.message)]" // This only capitalizes the first word + + // Language Conversion + if(setting_language && valid_languages[setting_language]) + if(setting_language == "--DISABLE--") + setting_language = null + else + for(var/datum/multilingual_say_piece/S in message_pieces) + if(S.speaking != GLOB.all_languages["Noise"]) // check if they are emoting, these do not need to be translated + S.speaking = GLOB.all_languages[setting_language] + + return tcm + +#undef JOB_STYLE_1 +#undef JOB_STYLE_2 +#undef JOB_STYLE_3 +#undef JOB_STYLE_4 diff --git a/code/game/machinery/tcomms/presets.dm b/code/game/machinery/tcomms/presets.dm new file mode 100644 index 00000000000..efc98866f62 --- /dev/null +++ b/code/game/machinery/tcomms/presets.dm @@ -0,0 +1,32 @@ +/* + All machine presets go in here +*/ + +// STATION CORE // +/obj/machinery/tcomms/core/station + network_id = "STATION-CORE" + +// MINING RELAY // +/obj/machinery/tcomms/relay/mining + network_id = "MINING-RELAY" + autolink_id = "STATION-CORE" + +// ENGINEERING RELAY // +/obj/machinery/tcomms/relay/engineering + network_id = "ENGINEERING-RELAY" + autolink_id = "STATION-CORE" + active = FALSE + +// RUSKIE RELAY // +/obj/machinery/tcomms/relay/ruskie + network_id = "RUSKIE-RELAY" + autolink_id = "STATION-CORE" + active = FALSE + hidden_link = TRUE + +// CC RELAY // +/obj/machinery/tcomms/relay/cc + network_id = "CENTCOMM-RELAY" + autolink_id = "STATION-CORE" + hidden_link = TRUE + diff --git a/code/game/machinery/tcomms/relay.dm b/code/game/machinery/tcomms/relay.dm new file mode 100644 index 00000000000..8c2bbf28bf2 --- /dev/null +++ b/code/game/machinery/tcomms/relay.dm @@ -0,0 +1,180 @@ +/** + * # Telecommunications Relay + * + * Extends the reach of telecomms to the z-level it is built on + * + * Relays themselves dont do any processing, they just tell the core that this z-level is available in the tcomms network. + */ +/obj/machinery/tcomms/relay + name = "Telecommunications Relay" + desc = "A large device with several radio antennas on it." + icon_state = "relay" + /// The host core for this relay + var/obj/machinery/tcomms/core/linked_core + /// ID of the hub to auto link to + var/autolink_id + /// Is this linked to anything at all + var/linked = FALSE + /// Is this link invisible on the hub? + var/hidden_link = FALSE + +/** + * Initializer for the relay. + * + * Calls parent to ensure its added to the GLOB of tcomms machines, before checking if there is an autolink that needs to be added. + */ +/obj/machinery/tcomms/relay/Initialize(mapload) + . = ..() + if(mapload && autolink_id) + return INITIALIZE_HINT_LATELOAD + +/** + * Descrutor for the relay. + * + * Ensures that the machine is taken out of the global list when destroyed, and also removes the link to the core. + */ +/obj/machinery/tcomms/relay/Destroy() + Reset() + return ..() + +/** + * Late Initialize for the relay. + * + * Calls parent, then adds links to the cores. This is a LateInitialize because the core MUST be initialized first + */ +/obj/machinery/tcomms/relay/LateInitialize() + . = ..() + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + if(C.network_id == autolink_id) + AddLink(C) + // Only ONE of these with one ID should exist per world + break + +/** + * Proc to link the relay to the core. + * + * Sets the linked core to the target (argument below), before adding it to the list of linked relays, then re-freshing the zlevel list + * The relay is then marked as linked + * Arguments: + * * target - The telecomms core that this relay should be linked to + */ +/obj/machinery/tcomms/relay/proc/AddLink(obj/machinery/tcomms/core/target) + linked_core = target + target.linked_relays |= src + target.refresh_zlevels() + linked = TRUE + +/** + * Proc to rest the relay. + * + * Resets the relay, removing its linkage status, and refreshing the core's list of z-levels + */ +/obj/machinery/tcomms/relay/proc/Reset() + if(linked_core) + linked_core.linked_relays -= src + linked_core.refresh_zlevels() + linked_core = null + linked = FALSE + +/** + * Relay Enabler + * + * Modification to the standard one so that the links get updated + */ +/obj/machinery/tcomms/relay/enable_machine() + ..() + if(linked_core) + linked_core.refresh_zlevels() + +/** + * Relay Disabler + * + * Modification to the standard one so that the links get updated + */ +/obj/machinery/tcomms/relay/disable_machine() + ..() + if(linked_core) + linked_core.refresh_zlevels() + + +////////////// +// UI STUFF // +////////////// + +/obj/machinery/tcomms/relay/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "tcomms_relay.tmpl", "Telecommunications Relay", 600, 400) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/tcomms/relay/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) + var/data[0] + // Are we on or not + data["active"] = active + // What is our network ID + data["network_id"] = network_id + // Are we linked + data["linked"] = linked + // Is the link hidden + data["hidden_link"] = hidden_link + + // Only send linked tab stuff if we are linked. This saves on sending overhead. + if(linked) + data["linked_core_id"] = linked_core.network_id + data["linked_core_addr"] = "\ref[linked_core]" + + else + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + data["entries"] += list(list("addr" = "\ref[C]", "net_id" = C.network_id, "sector" = C.loc.z)) + + return data + +/obj/machinery/tcomms/relay/Topic(href, href_list) + // Check against href exploits + if(..()) + return + + // All the toggle on/offs go here + if(href_list["toggle_active"]) + active = !active + update_icon() + if(linked_core) + linked_core.refresh_zlevels() + + // Set network ID + if(href_list["network_id"]) + var/new_id = input(usr, "Please enter a new network ID", "Network ID", network_id) + log_action(usr, "renamed core with ID [network_id] to [new_id]") + to_chat(usr, "Device ID changed from [network_id] to [new_id].") + network_id = new_id + + if(linked) + // Only do these hrefs if we are linked to prevent bugs/exploits + if(href_list["toggle_hidden_link"]) + hidden_link = !hidden_link + log_action(usr, "Modified hidden link for [network_id] (Now [hidden_link])") + + if(href_list["unlink"]) + var/choice = alert(usr, "Are you SURE you want to unlink this relay?\nYou wont be able to re-link without the core password", "Unlink","Yes","No") + if(choice == "Yes") + log_action(usr, "Unlinked [network_id] from [linked_core.network_id]") + Reset() + else + // You should only be able to link if its not linked, to prevent weirdness + if(href_list["link"]) + var/obj/machinery/tcomms/core/C = locate(href_list["link"]) + if(istype(C, /obj/machinery/tcomms/core)) + var/user_pass = input(usr, "Please enter core password","Password Entry") + // Check the password + if(user_pass == C.link_password) + AddLink(C) + to_chat(usr, "Successfully linked to [C.network_id].") + else + to_chat(usr, "ERROR: Password incorrect.") + else + to_chat(usr, "ERROR: Core not found. Please file an issue report.") + + + // Hack to speed update the nanoUI + SSnanoui.update_uis(src) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm deleted file mode 100644 index 8cd285c994a..00000000000 --- a/code/game/machinery/telecomms/broadcaster.dm +++ /dev/null @@ -1,665 +0,0 @@ -/* - The broadcaster sends processed messages to all radio devices in the game. They - do not have to be headsets; intercoms and station-bounced radios suffice. - - They receive their message from a server after the message has been logged. -*/ - -var/list/recentmessages = list() // global list of recent messages broadcasted : used to circumvent massive radio spam -var/message_delay = 0 // To make sure restarting the recentmessages list is kept in sync - -/obj/machinery/telecomms/broadcaster - name = "Subspace Broadcaster" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "broadcaster" - desc = "A dish-shaped machine used to broadcast processed subspace signals." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 25 - machinetype = 5 - circuitboard = /obj/item/circuitboard/telecomms/broadcaster - -/obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - // Don't broadcast rejected signals - if(signal.data["reject"]) - return - - if(signal.data["message"]) - - // Prevents massive radio spam - signal.data["done"] = 1 // mark the signal as being broadcasted - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - original.data["compression"] = signal.data["compression"] - original.data["level"] = signal.data["level"] - - var/signal_message = "[signal.frequency]:[signal.data["message"]]:[signal.data["realname"]]" - if(signal_message in recentmessages) - return - recentmessages.Add(signal_message) - - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary - - signal.data["level"] |= listening_level - - /** #### - Normal Broadcast - #### **/ - - if(signal.data["type"] == 0) - - /* ###### Broadcast a message using signal.data ###### */ - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"],, - signal.data["compression"], signal.data["level"], signal.frequency, - signal.data["verb"] ) - - - /** #### - Simple Broadcast - #### **/ - - if(signal.data["type"] == 1) - - /* ###### Broadcast a message using signal.data ###### */ - Broadcast_SimpleMessage(signal.data["name"], signal.frequency, - signal.data["message"],null, null, - signal.data["compression"], listening_level) - - - /** #### - Artificial Broadcast - #### **/ - // (Imitates a mob) - - if(signal.data["type"] == 2) - - /* ###### Broadcast a message using signal.data ###### */ - // Parameter "data" as 4: AI can't track this person/mob - - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"], 4, signal.data["compression"], signal.data["level"], signal.frequency, - signal.data["verb"]) - - if(!message_delay) - message_delay = 1 - spawn(10) - message_delay = 0 - recentmessages = list() - - /* --- Do a snazzy animation! --- */ - flick("broadcaster_send", src) - -/obj/machinery/telecomms/broadcaster/Destroy() - // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. - if(message_delay) - message_delay = 0 - return ..() - - -/* - Basically just an empty shell for receiving and broadcasting radio messages. Not - very flexible, but it gets the job done. -*/ - -/obj/machinery/telecomms/allinone - name = "Telecommunications Mainframe" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "comm_server" - desc = "A compact machine used for portable subspace telecommuniations processing." - density = 1 - anchored = 1 - use_power = NO_POWER_USE - idle_power_usage = 0 - machinetype = 6 - var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel - -/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal) - - if(!on) // has to be on to receive messages - return - - if(is_freq_listening(signal)) // detect subspace signals - - signal.data["done"] = 1 // mark the signal as being broadcasted - signal.data["compression"] = 0 - - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary - - /* ###### Broadcast a message using signal.data ###### */ - - var/datum/radio_frequency/connection = signal.data["connection"] - - if(connection.frequency in SSradio.ANTAG_FREQS) // if antag broadcast, just - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"],, signal.data["compression"], list(0), connection.frequency, - signal.data["verb"]) - else - if(intercept) - Broadcast_Message(signal.data["connection"], signal.data["mob"], - signal.data["vmask"], signal.data["vmessage"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], signal.data["vname"], 3, signal.data["compression"], list(0), connection.frequency, - signal.data["verb"]) - -#define CREW_RADIO_TYPE 0 -#define CENTCOMM_RADIO_TYPE 1 -#define SYNDICATE_RADIO_TYPE 2 -/proc/Is_Bad_Connection(old_freq, new_freq) //Makes sure players cant read radios of a higher level than they are - var/old_type = CREW_RADIO_TYPE - var/new_type = CREW_RADIO_TYPE - for(var/antag_freq in SSradio.ANTAG_FREQS) - if(old_freq == antag_freq) - old_type = SYNDICATE_RADIO_TYPE - if(new_freq == antag_freq) - new_type = SYNDICATE_RADIO_TYPE - - for(var/cent_freq in SSradio.CENT_FREQS) - if(old_freq == cent_freq) - old_type = CENTCOMM_RADIO_TYPE - if(new_freq == cent_freq) - new_type = CENTCOMM_RADIO_TYPE - - return new_type > old_type - -/** - - Here is the big, bad function that broadcasts a message given the appropriate - parameters. - - @param connection: - The datum generated in radio.dm, stored in signal.data["connection"]. - - @param M: - Reference to the mob/speaker, stored in signal.data["mob"] - - @param vmask: - Boolean value if the mob is "hiding" its identity via voice mask, stored in - signal.data["vmask"] - - @param vmessage: - If specified, will display this as the message; such as "chimpering" - for monkies if the mob is not understood. Stored in signal.data["vmessage"]. - - @param radio: - Reference to the radio broadcasting the message, stored in signal.data["radio"] - - @param message: - The actual string message to display to mobs who understood mob M. Stored in - signal.data["message"] - - @param name: - The name to display when a mob receives the message. signal.data["name"] - - @param job: - The name job to display for the AI when it receives the message. signal.data["job"] - - @param realname: - The "real" name associated with the mob. signal.data["realname"] - - @param vname: - If specified, will use this name when mob M is not understood. signal.data["vname"] - - @param data: - If specified: - 1 -- Will only broadcast to intercoms - 2 -- Will only broadcast to intercoms and station-bounced radios - 3 -- Broadcast to syndicate frequency - 4 -- AI can't track down this person. Useful for imitation broadcasts where you can't find the actual mob - - @param compression: - If 0, the signal is audible - If nonzero, the signal may be partially inaudible or just complete gibberish. - - @param level: - The list of Z levels that the sending radio is broadcasting to. Having 0 in the list broadcasts on all levels - - @param freq - The frequency of the signal - -**/ - -/proc/Broadcast_Message(var/datum/radio_frequency/connection, var/mob/M, - var/vmask, list/vmessage_pieces, var/obj/item/radio/radio, - list/message_pieces, var/name, var/job, var/realname, var/vname, - var/data, var/compression, var/list/level, var/freq, var/verbage = "says", - var/atom/follow_target = null) - - - /* ###### Prepare the radio connection ###### */ - - var/display_freq = freq - - var/bad_connection = FALSE - var/datum/radio_frequency/new_connection = connection - - if(connection.frequency != display_freq) - bad_connection = Is_Bad_Connection(connection.frequency, display_freq) - new_connection = SSradio.return_frequency(display_freq) - - var/list/obj/item/radio/radios = list() - - // --- Broadcast only to intercom devices --- - - if(data == 1 && !bad_connection) - - for(var/obj/item/radio/intercom/R in new_connection.devices["[RADIO_CHAT]"]) - if(R.receive_range(display_freq, level) > -1) - radios += R - - // --- Broadcast only to intercoms and station-bounced radios --- - - else if(data == 2 && !bad_connection) - - for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) - - if(istype(R, /obj/item/radio/headset)) - continue - - if(R.receive_range(display_freq, level) > -1) - radios += R - - // --- Broadcast to antag radios! --- - - else if(data == 3) - for(var/antag_freq in SSradio.ANTAG_FREQS) - var/datum/radio_frequency/antag_connection = SSradio.return_frequency(antag_freq) - for(var/obj/item/radio/R in antag_connection.devices["[RADIO_CHAT]"]) - if(R.receive_range(antag_freq, level) > -1) - radios += R - - // --- Broadcast to ALL radio devices --- - - else if(!bad_connection) - - for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"]) - if(R.receive_range(display_freq, level) > -1) - radios += R - - // Get a list of mobs who can hear from the radios we collected. - var/list/receive = get_mobs_in_radio_ranges(radios) - - /* ###### Organize the receivers into categories for displaying the message ###### */ - - // Understood the message: - var/list/heard_masked = list() // masked name or no real name - var/list/heard_normal = list() // normal message - - // Did not understand the message: - var/list/heard_voice = list() // voice message (ie "chimpers") - var/list/heard_garbled = list() // garbled message (ie "f*c* **u, **i*er!") - var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!") - - for(var/mob/R in receive) - - /* --- Loop through the receivers and categorize them --- */ - - if(is_admin(R) && !R.get_preference(CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. - continue - - if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. - continue - - // Ghosts hearing all radio chat don't want to hear syndicate intercepts, they're duplicates - if(data == 3 && istype(R, /mob/dead/observer) && R.get_preference(CHAT_GHOSTRADIO)) - continue - - // --- Check for compression --- - if(compression > 0) - heard_gibberish += R - continue - - // --- Can understand the speech --- - - if(!M || R.say_understands(M)) - - // - Not human or wearing a voice mask - - if(!M || !ishuman(M) || vmask) - heard_masked += R - - // - Human and not wearing voice mask - - else - heard_normal += R - - // --- Can't understand the speech --- - - else - // - The speaker has a prespecified "voice message" to display if not understood - - if(vmessage_pieces) - heard_voice += R - - // - Just display a garbled message - - else - heard_garbled += R - - - /* ###### Begin formatting and sending the message ###### */ - if(length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled) || length(heard_gibberish)) - - /* --- Some miscellaneous variables to format the string output --- */ - var/freq_text = get_frequency_name(display_freq) - - var/part_b_extra = "" - if(data == 3) // intercepted radio message - part_b_extra = " (Intercepted)" - var/part_a = "\[[freq_text]\][part_b_extra] " // goes in the actual output - - // --- Some more pre-message formatting --- - var/part_b = " " - - - // --- Filter the message; place it in quotes apply a verb --- - var/quotedmsg = null - if(M) - quotedmsg = "[M.say_quote(multilingual_to_message(message_pieces))], \"[multilingual_to_message(message_pieces)]\"" - else - quotedmsg = "says, \"[multilingual_to_message(message_pieces)]\"" - - // --- This following recording is intended for research and feedback in the use of department radio channels --- - - var/part_blackbox_b = " \[[freq_text]\] [ckey] attempted to upload an NTTC configuration containing JS abusable tags!") - log_admin("EXPLOIT WARNING: [ckey] attempted to upload an NTTC configuration containing JS abusable tags") - return FALSE - var/list/var_list = json_decode(text) - for(var/variable in var_list) - if(variable in to_serialize) // Don't just accept any random vars jesus christ! - if(requires_unlock[variable] && (source && !source.unlocked)) - continue - var/sanitize_method = serialize_sanitize[variable] - var/variable_value = var_list[variable] - variable_value = nttc_sanitize(variable_value, sanitize_method) - if(variable_value != null) - vars[variable] = variable_value - return TRUE - -// Sanitizing user input. Don't blindly trust the JSON. -/datum/nttc_configuration/proc/nttc_sanitize(variable, sanitize_method) - if(!sanitize_method) - return null - - switch(sanitize_method) - if("bool") - return variable ? TRUE : FALSE - // if("table", "array") - if("array") - if(!islist(variable)) - return list() - // Insert html filtering for the regexes here if you're boring - var/newlist = json_decode(html_decode(json_encode(variable))) - if(!islist(newlist)) - return null - return newlist - if("string") - return "[variable]" - - return variable - -// Primary signal modification. This is where all of the variables behavior are actually implemented. -/datum/nttc_configuration/proc/modify_signal(datum/signal/signal) - // Servers are deliberately turned off. Mark every signal as rejected. - if(!toggle_activated) - signal.data["reject"] = TRUE - return - - // Firewall - // This must happen before anything else modifies the signal ["name"]. - if(islist(firewall) && firewall.len > 0) - if(firewall.Find(signal.data["name"])) - signal.data["reject"] = 1 - - // All job and coloring shit - if(toggle_job_color || toggle_name_color) - var/job = signal.data["job"] - job_class = all_jobs[job] - - if(toggle_name_color) - var/new_name = "" + signal.data["name"] + "" - signal.data["name"] = new_name - signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on - - if(toggle_jobs) - var/new_name = "" - var/job = signal.data["job"] - if(job in ert_jobs) - job = "ERT" - if(toggle_job_color) - switch(job_indicator_type) - if(JOB_STYLE_1) - new_name = signal.data["name"] + " ([job]) " - if(JOB_STYLE_2) - new_name = signal.data["name"] + " - [job] " - if(JOB_STYLE_3) - new_name = "\[[job]\] " + signal.data["name"] + " " - if(JOB_STYLE_4) - new_name = "([job]) " + signal.data["name"] + " " - else - switch(job_indicator_type) - if(JOB_STYLE_1) - new_name = signal.data["name"] + " ([job]) " - if(JOB_STYLE_2) - new_name = signal.data["name"] + " - [job] " - if(JOB_STYLE_3) - new_name = "\[[job]\] " + signal.data["name"] + " " - if(JOB_STYLE_4) - new_name = "([job]) " + signal.data["name"] + " " - - signal.data["name"] = new_name - signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on - - // Add the current station time like a time code. - if(toggle_timecode) - var/new_name = "\[[station_time_timestamp()]] " + signal.data["name"] - signal.data["name"] = new_name - signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on - - // This is hacky stuff for multilingual messages... - var/list/message_pieces = signal.data["message"] - - // Makes heads of staff bold - if(toggle_command_bold) - var/job = signal.data["job"] - if((job in ert_jobs) || (job in heads)) - for(var/datum/multilingual_say_piece/S in message_pieces) - S.message = "[capitalize(S.message)]" // This only capitalizes the first word - - // Hacks! - // Censor dat shit like nobody's business - if(toggle_gibberish) - Gibberish_all(message_pieces, 80) - - // Replace everything with HONK! - if(toggle_honk) - var/list/split = splittext(signal.data["message"], " ") - var/honklength = split.len - var/new_message = "" - for(var/i in 1 to honklength) - new_message += pick("HoNK!", "HONK", "HOOOoONK", "HONKHONK!", "HoNnnkKK!!!", "HOOOOOOOOOOONK!!!!11!", "henk!") + " " - signal.data["message"] = message_to_multilingual(new_message) - - // Language Conversion - if(setting_language && valid_languages[setting_language]) - if(setting_language == "--DISABLE--") - setting_language = null - else - for(var/datum/multilingual_say_piece/S in message_pieces) - if(S.speaking != GLOB.all_languages["Noise"]) // check if they are emoting, these do not need to be translated - S.speaking = GLOB.all_languages[setting_language] - - // Regex replacements - // if(islist(regex) && regex.len > 0) - // for(var/datum/multilingual_say_piece/S in message_pieces) - // var/new_message = S.message - // for(var/reg in regex) - // var/replacePattern = pencode_to_html(regex[reg]) - // var/regex/start = regex("[reg]", "gi") - // new_message = start.Replace(new_message, replacePattern) - // S.message = new_message - - // Make sure the message is valid after we tinkered with it, otherwise reject it - if(signal.data["message"] == "" || !signal.data["message"]) - signal.data["reject"] = 1 - -/datum/nttc_configuration/Topic(mob/user, href_list, window_id, obj/machinery/computer/telecomms/traffic/source) - // Toggles - if(href_list["toggle"]) - var/var_to_toggle = href_list["toggle"] - if(requires_unlock[var_to_toggle] && !source.unlocked) - return - if(!(var_to_toggle in to_serialize)) - return - vars[var_to_toggle] = !vars[var_to_toggle] - log_action(user, "toggled NTTC variable [var_to_toggle] [vars[var_to_toggle] ? "on" : "off"]") - - // Job Format - if(href_list["setting_job_card_style"]) - var/card_style = input(user, "Pick a job card format.", "Job Card Format") as null|anything in job_card_styles - if(!card_style) - return - job_indicator_type = card_style - to_chat(user, "Jobs will now have the style of [card_style].") - log_action(user, "has set NTTC job card format to [card_style]", TRUE) - - // Strings - if(href_list["setting_language"]) - var/new_language = input(user, "Pick a language to convert messages to.", "Language Conversion") as null|anything in valid_languages - if(!new_language) - return - if(new_language == "--DISABLE--") - setting_language = null - to_chat(user, "Language conversion disabled.") - else - setting_language = new_language - to_chat(user, "Messages will now be converted to [new_language].") - - log_action(user, new_language == "--DISABLE--" ? "disabled NTTC language conversion" : "set NTTC language conversion to [new_language]", TRUE) - - // Tables - // if(href_list["create_row"]) - // if(href_list["table"] && href_list["table"] in tables) - // if(requires_unlock[href_list["table"]] && !source.unlocked) - // return - // var/new_key = clean_input(user, "Provide a key for the new row.", "New Row") - // if(!new_key) - // return - // var/new_value = clean_input(user, "Provide a new value for the key [new_key]", "New Row") - // if(new_value == null) - // return - // if(word_blacklist.Find(new_value)) //uh oh, they tried to be naughty - // message_admins("EXPLOIT WARNING: [user.ckey] attempted to add a NTTC regex row containing JS abusable tags!") - // log_admin("EXPLOIT WARNING: [user.ckey] attempted to add a NTTC regex row containing JS abusable tags") - // to_chat(user, "ERROR: Regex contained bad strings. Upload cancelled.") - // return - // var/list/table = vars[href_list["table"]] - // table[new_key] = new_value - // to_chat(user, "Added row [new_key] -> [new_value].") - // log_action(user, "updated [href_list["table"]] - new row [new_key] -> [new_value]") - - // if(href_list["delete_row"]) - // if(href_list["table"] && href_list["table"] in tables) - // if(requires_unlock[href_list["table"]] && !source.unlocked) - // return - // var/list/table = vars[href_list["table"]] - // table.Remove(href_list["delete_row"]) - // to_chat(user, "Removed row [href_list["delete_row"]] from [href_list["table"]]") - // log_action(user, "updated [href_list["table"]] - removed row [href_list["delete_row"]]") - - // Arrays - if(href_list["create_item"]) - if(href_list["array"] && href_list["array"] in arrays) - if(requires_unlock[href_list["array"]] && !source.unlocked) - return - var/new_value = clean_input(user, "Provide a value for the new index.", "New Index") - if(new_value == null) - return - var/list/array = vars[href_list["array"]] - array.Add(new_value) - to_chat(user, "Added row [new_value].") - log_action(user, "updated [href_list["array"]] - new value [new_value]", TRUE) - - if(href_list["delete_item"]) - if(href_list["array"] && href_list["array"] in arrays) - if(requires_unlock[href_list["array"]] && !source.unlocked) - return - var/list/array = vars[href_list["array"]] - array.Remove(href_list["delete_item"]) - to_chat(user, "Removed [href_list["delete_item"]] from [href_list["array"]]") - log_action(user, "updated [href_list["array"]] - removed [href_list["delete_item"]]") - - // Spit out the serialized config to the user - if(href_list["save_config"]) - user << browse(nttc_serialize(), "window=save_nttc") - - if(href_list["load_config"]) - var/json = input(user, "Provide configuration JSON below.", "Load Config", nttc_serialize()) as message - if(nttc_deserialize(json, source, user.ckey)) - log_action(user, "has uploaded a NTTC JSON configuration: [ADMIN_SHOWDETAILS("Show", json)]", TRUE) - - user << output(list2params(list(nttc_serialize())), "[window_id].browser:updateConfig") - -/datum/nttc_configuration/proc/log_action(user, msg, adminmsg = FALSE) - log_game("NTTC: [key_name(user)] [msg]") - log_investigate("[key_name(user)] [msg]", "ntsl") - if(adminmsg) - message_admins("[key_name_admin(user)] [msg]") - -/* Asset datum for the UI */ -/datum/asset/simple/nttc - assets = list( - "bundle.css" = 'html/nttc/dist/bundle.css', - "bundle.js" = 'html/nttc/dist/bundle.js', - "tab_home.html" = 'html/nttc/dist/tab_home.html', - "tab_hack.html" = 'html/nttc/dist/tab_hack.html', - "tab_filtering.html" = 'html/nttc/dist/tab_filtering.html', - "tab_firewall.html" = 'html/nttc/dist/tab_firewall.html', - // "tab_regex.html" = 'html/nttc/dist/tab_regex.html', - "uiTitleFluff.png" = 'html/nttc/dist/uiTitleFluff.png' - ) - -/* Custom subtype of /datum/browser that behaves as we want for our project */ -/datum/browser/nttc - var/initial_config // Initial NTTC configuration - -/datum/browser/nttc/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null, nttc_config) - . = ..() - initial_config = nttc_config -// Prevent all stylesheets from being added, we have our own CSS that's bundled with gulp -/datum/browser/nttc/add_stylesheet() - return -// No header, we're running a fully complete .html file -/datum/browser/nttc/get_header() - return -// We inject a little code at the bottom of the file, similar to NanoUI, but more limited. -// This code is used for delivering live updates of config changes & allowing the UI to provide Topic data. -/datum/browser/nttc/get_footer() - var/byondSrc = "byond://?src=[ref.UID()];" - var/dat = "" - return dat - diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm deleted file mode 100644 index 212d8592e92..00000000000 --- a/code/game/machinery/telecomms/presets.dm +++ /dev/null @@ -1,234 +0,0 @@ -// ### Preset machines ### - -//Relay - -/obj/machinery/telecomms/relay/preset - network = "tcommsat" - -/obj/machinery/telecomms/relay/preset/station - id = "Station Relay" - listening_level = 1 - autolinkers = list("s_relay") - -/obj/machinery/telecomms/relay/preset/telecomms - id = "Telecomms Relay" - autolinkers = list("relay") - -/obj/machinery/telecomms/relay/preset/mining - id = "Mining Relay" - autolinkers = list("m_relay") - -/obj/machinery/telecomms/relay/preset/ruskie - id = "Ruskie Relay" - hide = 1 - toggled = 0 - autolinkers = list("r_relay") - -/obj/machinery/telecomms/relay/preset/engioutpost - id = "Engineering Outpost" - hide = 1 - toggled = 0 - autolinkers = list("e_relay") - -/obj/machinery/telecomms/relay/preset/centcom - id = "Centcom Relay" - hide = 1 - toggled = 1 - //anchored = 1 - use_power = NO_POWER_USE - //idle_power_usage = 0 - autolinkers = list("c_relay") - -//HUB - -/obj/machinery/telecomms/hub/preset - id = "Hub" - network = "tcommsat" - autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "e_relay", "science", "medical", - "supply", "service", "common", "command", "engineering", "security", - "receiverA", "receiverB", "broadcasterA", "broadcasterB") - -/obj/machinery/telecomms/hub/preset_cent - id = "CentComm Hub" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", "e_relay", - "centcomm", "receiverCent", "broadcasterCent") - -//Receivers - -//--PRESET LEFT--// - -/obj/machinery/telecomms/receiver/preset_left - id = "Receiver A" - network = "tcommsat" - autolinkers = list("receiverA") // link to relay - freq_listening = list(SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ) - - -//--PRESET RIGHT--// - -/obj/machinery/telecomms/receiver/preset_right - id = "Receiver B" - network = "tcommsat" - autolinkers = list("receiverB") // link to relay - freq_listening = list(AI_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ) - - //Common and other radio frequencies for people to freely use -/obj/machinery/telecomms/receiver/preset_right/New() - for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2) - freq_listening |= i - ..() - -/obj/machinery/telecomms/receiver/preset_cent - id = "CentComm Receiver" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("receiverCent") - freq_listening = list(ERT_FREQ, DTH_FREQ) - -//Buses - -/obj/machinery/telecomms/bus/preset_one - id = "Bus 1" - network = "tcommsat" - freq_listening = list(SCI_FREQ, MED_FREQ) - autolinkers = list("processor1", "science", "medical") - -/obj/machinery/telecomms/bus/preset_two - id = "Bus 2" - network = "tcommsat" - freq_listening = list(SUP_FREQ, SRV_FREQ) - autolinkers = list("processor2", "supply", "service") - -/obj/machinery/telecomms/bus/preset_three - id = "Bus 3" - network = "tcommsat" - freq_listening = list(SEC_FREQ, COMM_FREQ) - autolinkers = list("processor3", "security", "command") - -/obj/machinery/telecomms/bus/preset_four - id = "Bus 4" - network = "tcommsat" - freq_listening = list(ENG_FREQ, AI_FREQ, PUB_FREQ) - autolinkers = list("processor4", "engineering", "common") - -/obj/machinery/telecomms/bus/preset_four/New() - for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2) - freq_listening |= i - ..() - -/obj/machinery/telecomms/bus/preset_cent - id = "CentComm Bus" - network = "tcommsat" - use_power = NO_POWER_USE - freq_listening = list(ERT_FREQ, DTH_FREQ) - autolinkers = list("processorCent", "centcomm") - -//Processors - -/obj/machinery/telecomms/processor/preset_one - id = "Processor 1" - network = "tcommsat" - autolinkers = list("processor1") // processors are sort of isolated; they don't need backward links - -/obj/machinery/telecomms/processor/preset_two - id = "Processor 2" - network = "tcommsat" - autolinkers = list("processor2") - -/obj/machinery/telecomms/processor/preset_three - id = "Processor 3" - network = "tcommsat" - autolinkers = list("processor3") - -/obj/machinery/telecomms/processor/preset_four - id = "Processor 4" - network = "tcommsat" - autolinkers = list("processor4") - -/obj/machinery/telecomms/processor/preset_cent - id = "CentComm Processor" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("processorCent") - -//Servers - -/obj/machinery/telecomms/server/presets - - network = "tcommsat" - -/obj/machinery/telecomms/server/presets/science - id = "Science Server" - freq_listening = list(SCI_FREQ) - autolinkers = list("science") - -/obj/machinery/telecomms/server/presets/medical - id = "Medical Server" - freq_listening = list(MED_FREQ) - autolinkers = list("medical") - -/obj/machinery/telecomms/server/presets/supply - id = "Supply Server" - freq_listening = list(SUP_FREQ) - autolinkers = list("supply") - -/obj/machinery/telecomms/server/presets/service - id = "Service Server" - freq_listening = list(SRV_FREQ) - autolinkers = list("service") - -/obj/machinery/telecomms/server/presets/common - id = "Common Server" - freq_listening = list(PUB_FREQ, AI_FREQ) - autolinkers = list("common") - -//Common and other radio frequencies for people to freely use -/obj/machinery/telecomms/server/presets/common/New() - for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2) - freq_listening |= i - ..() - -/obj/machinery/telecomms/server/presets/command - id = "Command Server" - freq_listening = list(COMM_FREQ) - autolinkers = list("command") - -/obj/machinery/telecomms/server/presets/engineering - id = "Engineering Server" - freq_listening = list(ENG_FREQ) - autolinkers = list("engineering") - -/obj/machinery/telecomms/server/presets/security - id = "Security Server" - freq_listening = list(SEC_FREQ) - autolinkers = list("security") - -/obj/machinery/telecomms/server/presets/centcomm - id = "CentComm Server" - freq_listening = list(ERT_FREQ, DTH_FREQ) - use_power = NO_POWER_USE - autolinkers = list("centcomm") - -//Broadcasters - -//--PRESET LEFT--// - -/obj/machinery/telecomms/broadcaster/preset_left - id = "Broadcaster A" - network = "tcommsat" - autolinkers = list("broadcasterA") - -//--PRESET RIGHT--// - -/obj/machinery/telecomms/broadcaster/preset_right - id = "Broadcaster B" - network = "tcommsat" - autolinkers = list("broadcasterB") - -/obj/machinery/telecomms/broadcaster/preset_cent - id = "CentComm Broadcaster" - network = "tcommsat" - use_power = NO_POWER_USE - autolinkers = list("broadcasterCent") diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm deleted file mode 100644 index 06eacdd8da1..00000000000 --- a/code/game/machinery/telecomms/telecomunications.dm +++ /dev/null @@ -1,529 +0,0 @@ -/* - Hello, friends, this is Doohl from sexylands. You may be wondering what this - monstrous code file is. Sit down, boys and girls, while I tell you the tale. - - - The machines defined in this file were designed to be compatible with any radio - signals, provided they use subspace transmission. Currently they are only used for - headsets, but they can eventually be outfitted for real COMPUTER networks. This - is just a skeleton, ladies and gentlemen. - - Look at radio.dm for the prequel to this code. -*/ - -var/global/list/obj/machinery/telecomms/telecomms_list = list() - -/obj/machinery/telecomms - var/list/links = list() // list of machines this machine is linked to - var/traffic = 0 // value increases as traffic increases - var/netspeed = 5 // how much traffic to lose per tick (50 gigabytes/second * netspeed) - var/list/autolinkers = list() // list of text/number values to link with - var/id = "NULL" // identification string - var/network = "NULL" // the network of the machinery - - var/list/freq_listening = list() // list of frequencies to tune into: if none, will listen to all - - var/machinetype = 0 // just a hacky way of preventing alike machines from pairing - var/toggled = 1 // Is it toggled on - var/on = 1 - var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub) - var/circuitboard = null // type pointing to a circuitboard type - var/hide = 0 // Is it a hidden machine? - var/listening_level = 0 // 0 = auto set in New() - this is the z level that the machine is listening to. - Mtoollink = 1 - -/obj/machinery/telecomms/proc/relay_information(datum/signal/signal, filter, copysig, amount = 20) - // relay signal to all linked machinery that are of type [filter]. If signal has been sent [amount] times, stop sending - - if(!on) - return -// to_chat(world, "[src] ([src.id]) - [signal.debug_print()]") - var/send_count = 0 - - - // Apply some lag based on traffic rates - var/netlag = round(traffic / 50) - if(netlag > signal.data["slow"]) - signal.data["slow"] = netlag - -// Loop through all linked machines and send the signal or copy. - for(var/obj/machinery/telecomms/machine in links) - if(filter && !istype( machine, text2path(filter) )) - continue - if(!machine.on) - continue - if(amount && send_count >= amount) - break - // TODO: Make the radio system cooperate with the space manager - if(machine.loc.z != listening_level) - if(long_range_link == 0 && machine.long_range_link == 0) - continue - // If we're sending a copy, be sure to create the copy for EACH machine and paste the data - var/datum/signal/copy - if(copysig) - copy = new - copy.transmission_method = 2 - copy.frequency = signal.frequency - copy.data = signal.data.Copy() - - // Keep the "original" signal constant - if(!signal.data["original"]) - copy.data["original"] = signal - else - copy.data["original"] = signal.data["original"] - - send_count++ - if(machine.is_freq_listening(signal)) - machine.traffic++ - - if(copysig) - machine.receive_information(copy, src) - else - machine.receive_information(signal, src) - - - if(send_count > 0 && is_freq_listening(signal)) - traffic++ - - return send_count - -/obj/machinery/telecomms/proc/relay_direct_information(datum/signal/signal, obj/machinery/telecomms/machine) - // send signal directly to a machine - machine.receive_information(signal, src) - -/obj/machinery/telecomms/proc/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - // receive information from linked machinery - ..() - -/obj/machinery/telecomms/proc/is_freq_listening(datum/signal/signal) - // return 1 if found, 0 if not found - if(!signal) - return 0 - if((signal.frequency in freq_listening) || (!freq_listening.len)) - return 1 - else - return 0 - - -/obj/machinery/telecomms/New() - telecomms_list += src - ..() - - //Set the listening_level if there's none. - if(!listening_level) - //Defaults to our Z level! - var/turf/position = get_turf(src) - // TODO: Make the radio system cooperate with the space manager - listening_level = position.z - -/obj/machinery/telecomms/Initialize() - ..() - if(autolinkers.len) - // Links nearby machines - if(!long_range_link) - for(var/obj/machinery/telecomms/T in orange(20, src)) - add_link(T) - else - for(var/obj/machinery/telecomms/T in telecomms_list) - add_link(T) - - -/obj/machinery/telecomms/Destroy() - telecomms_list -= src - for(var/obj/machinery/telecomms/comm in telecomms_list) - comm.links -= src - links.Cut() - return ..() - -// Used in auto linking -/obj/machinery/telecomms/proc/add_link(var/obj/machinery/telecomms/T) - var/turf/position = get_turf(src) - var/turf/T_position = get_turf(T) - // TODO: Make the radio system cooperate with the space manager - if((position.z == T_position.z) || (src.long_range_link && T.long_range_link)) - for(var/x in autolinkers) - if(T.autolinkers.Find(x)) - if(src != T) - links |= T - -/obj/machinery/telecomms/update_icon() - if(on) - icon_state = initial(icon_state) - else - icon_state = "[initial(icon_state)]_off" - -/obj/machinery/telecomms/proc/update_power() - - if(toggled) - if(stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off - on = 0 - else - on = 1 - else - on = 0 - -/obj/machinery/telecomms/process() - update_power() - - // Update the icon - update_icon() - - if(traffic > 0) - traffic -= netspeed - -/obj/machinery/telecomms/emp_act(severity) - if(prob(100/severity)) - if(!(stat & EMPED)) - stat |= EMPED - var/duration = (300 * 10)/severity - spawn(rand(duration - 20, duration + 20)) // Takes a long time for the machines to reboot. - stat &= ~EMPED - ..() - -/* - The receiver idles and receives messages from subspace-compatible radio equipment; - primarily headsets. They then just relay this information to all linked devices, - which can would probably be network hubs. - - Link to Processor Units in case receiver can't send to bus units. -*/ - -/obj/machinery/telecomms/receiver - name = "Subspace Receiver" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "broadcast receiver" - desc = "This machine has a dish-like shape and green lights. It is designed to detect and process subspace radio activity." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 30 - machinetype = 1 - circuitboard = /obj/item/circuitboard/telecomms/receiver - -/obj/machinery/telecomms/receiver/receive_signal(datum/signal/signal) - - if(!on) // has to be on to receive messages - return - if(!signal) - return - if(!check_receive_level(signal)) - return - - if(signal.transmission_method == 2) - - if(is_freq_listening(signal)) // detect subspace signals - - //Remove the level and then start adding levels that it is being broadcasted in. - signal.data["level"] = list() - - var/can_send = relay_information(signal, "/obj/machinery/telecomms/hub") // ideally relay the copied information to relays - if(!can_send) - relay_information(signal, "/obj/machinery/telecomms/bus") // Send it to a bus instead, if it's linked to one - -/obj/machinery/telecomms/receiver/proc/check_receive_level(datum/signal/signal) - - if(signal.data["level"] != listening_level) - for(var/obj/machinery/telecomms/hub/H in links) - var/list/connected_levels = list() - for(var/obj/machinery/telecomms/relay/R in H.links) - if(R.can_receive(signal)) - connected_levels |= R.listening_level - if(signal.data["level"] in connected_levels) - return 1 - return 0 - return 1 - - -/* - The HUB idles until it receives information. It then passes on that information - depending on where it came from. - - This is the heart of the Telecommunications Network, sending information where it - is needed. It mainly receives information from long-distance Relays and then sends - that information to be processed. Afterwards it gets the uncompressed information - from Servers/Buses and sends that back to the relay, to then be broadcasted. -*/ - -/obj/machinery/telecomms/hub - name = "Telecommunication Hub" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "hub" - desc = "A mighty piece of hardware used to send/receive massive amounts of data." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 80 - machinetype = 7 - circuitboard = /obj/item/circuitboard/telecomms/hub - long_range_link = 1 - netspeed = 40 - - -/obj/machinery/telecomms/hub/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - if(is_freq_listening(signal)) - if(istype(machine_from, /obj/machinery/telecomms/receiver)) - //If the signal is compressed, send it to the bus. - relay_information(signal, "/obj/machinery/telecomms/bus", 1) // ideally relay the copied information to bus units - else - // Get a list of relays that we're linked to, then send the signal to their levels. - relay_information(signal, "/obj/machinery/telecomms/relay", 1) - relay_information(signal, "/obj/machinery/telecomms/broadcaster", 1) // Send it to a broadcaster. - - -/* - The relay idles until it receives information. It then passes on that information - depending on where it came from. - - The relay is needed in order to send information pass Z levels. It must be linked - with a HUB, the only other machine that can send/receive pass Z levels. -*/ - -/obj/machinery/telecomms/relay - name = "Telecommunication Relay" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "relay" - desc = "A mighty piece of hardware used to send massive amounts of data far away." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 30 - machinetype = 8 - circuitboard = /obj/item/circuitboard/telecomms/relay - netspeed = 5 - long_range_link = 1 - var/broadcasting = 1 - var/receiving = 1 - -/obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - - // Add our level and send it back - if(can_send(signal)) - signal.data["level"] |= listening_level - -// Checks to see if it can send/receive. - -/obj/machinery/telecomms/relay/proc/can(datum/signal/signal) - if(!on) - return 0 - if(!is_freq_listening(signal)) - return 0 - return 1 - -/obj/machinery/telecomms/relay/proc/can_send(datum/signal/signal) - if(!can(signal)) - return 0 - return broadcasting - -/obj/machinery/telecomms/relay/proc/can_receive(datum/signal/signal) - if(!can(signal)) - return 0 - return receiving - -/* - The bus mainframe idles and waits for hubs to relay them signals. They act - as junctions for the network. - - They transfer uncompressed subspace packets to processor units, and then take - the processed packet to a server for logging. - - Link to a subspace hub if it can't send to a server. -*/ - -/obj/machinery/telecomms/bus - name = "Bus Mainframe" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "bus" - desc = "A mighty piece of hardware used to send massive amounts of data quickly." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 50 - machinetype = 2 - circuitboard = /obj/item/circuitboard/telecomms/bus - netspeed = 40 - var/change_frequency = 0 - -/obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - - if(is_freq_listening(signal)) - - if(change_frequency) - signal.frequency = change_frequency - - if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it - // send to one linked processor unit - var/send_to_processor = relay_information(signal, "/obj/machinery/telecomms/processor") - - if(send_to_processor) - return - // failed to send to a processor, relay information anyway - signal.data["slow"] += rand(1, 5) // slow the signal down only slightly - src.receive_information(signal, src) - - // Try sending it! - var/list/try_send = list("/obj/machinery/telecomms/server", "/obj/machinery/telecomms/hub", "/obj/machinery/telecomms/broadcaster") - var/i = 0 - for(var/send in try_send) - if(i) - signal.data["slow"] += rand(0, 1) // slow the signal down only slightly - i++ - var/can_send = relay_information(signal, send) - if(can_send) - break - - - -/* - The processor is a very simple machine that decompresses subspace signals and - transfers them back to the original bus. It is essential in producing audible - data. - - Link to servers if bus is not present -*/ - -/obj/machinery/telecomms/processor - name = "Processor Unit" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "processor" - desc = "This machine is used to process large quantities of information." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 30 - machinetype = 3 - circuitboard = /obj/item/circuitboard/telecomms/processor - var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals - - receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - - if(is_freq_listening(signal)) - - if(process_mode) - signal.data["compression"] = 0 // uncompress subspace signal - else - signal.data["compression"] = 100 // even more compressed signal - - if(istype(machine_from, /obj/machinery/telecomms/bus)) - relay_direct_information(signal, machine_from) // send the signal back to the machine - else // no bus detected - send the signal to servers instead - signal.data["slow"] += rand(5, 10) // slow the signal down - relay_information(signal, "/obj/machinery/telecomms/server") - - -/* - The server logs all traffic and signal data. Once it records the signal, it sends - it to the subspace broadcaster. - - Store a maximum of 100 logs and then deletes them. -*/ - - -/obj/machinery/telecomms/server - name = "Telecommunication Server" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "comm_server" - desc = "A machine used to store data and network statistics." - density = 1 - anchored = 1 - use_power = IDLE_POWER_USE - idle_power_usage = 15 - machinetype = 4 - circuitboard = /obj/item/circuitboard/telecomms/server - var/list/log_entries = list() - var/list/stored_names = list() - var/list/TrafficActions = list() - var/logs = 0 // number of logs - var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes) - - var/encryption = "null" // encryption key: ie "password" - var/salt = "null" // encryption salt: ie "123comsat" - // would add up to md5("password123comsat") - var/obj/item/radio/headset/server_radio = null - -/obj/machinery/telecomms/server/Initialize() - ..() - server_radio = new() - -/obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - if(signal.data["message"]) - if(is_freq_listening(signal)) - if(traffic > 0) - totaltraffic += traffic // add current traffic to total traffic - - //Is this a test signal? Bypass logging - if(signal.data["type"] != 4) - // If signal has a message and appropriate frequency - update_logs() - - var/datum/comm_log_entry/log = new - var/mob/M = signal.data["mob"] - - // Copy the signal.data entries we want - log.parameters["mobtype"] = signal.data["mobtype"] - log.parameters["race"] = signal.data["race"] - log.parameters["job"] = signal.data["job"] - log.parameters["key"] = signal.data["key"] - log.parameters["vmessage"] = multilingual_to_message(signal.data["message"]) - log.parameters["vname"] = signal.data["vname"] - log.parameters["message"] = multilingual_to_message(signal.data["message"]) - log.parameters["name"] = signal.data["name"] - log.parameters["realname"] = signal.data["realname"] - - if(!istype(M, /mob/new_player) && M) - log.parameters["uspeech"] = M.universal_speak - else - log.parameters["uspeech"] = 0 - - // If the signal is still compressed, make the log entry gibberish - if(signal.data["compression"] > 0) - log.parameters["message"] = Gibberish(multilingual_to_message(signal.data["message"]), signal.data["compression"] + 50) - log.parameters["job"] = Gibberish(signal.data["job"], signal.data["compression"] + 50) - log.parameters["name"] = Gibberish(signal.data["name"], signal.data["compression"] + 50) - log.parameters["realname"] = Gibberish(signal.data["realname"], signal.data["compression"] + 50) - log.parameters["vname"] = Gibberish(signal.data["vname"], signal.data["compression"] + 50) - log.input_type = "Corrupt File" - - // Log and store everything that needs to be logged - log_entries.Add(log) - if(!(signal.data["name"] in stored_names)) - stored_names.Add(signal.data["name"]) - logs++ - signal.data["server"] = src - - // Give the log a name - var/identifier = num2text( rand(-1000,1000) + world.time ) - log.name = "data packet ([md5(identifier)])" - - // Run NTTC against the signal - if(GLOB.nttc_config) - GLOB.nttc_config.modify_signal(signal) - - var/can_send = relay_information(signal, "/obj/machinery/telecomms/hub") - if(!can_send) - relay_information(signal, "/obj/machinery/telecomms/broadcaster") - -/obj/machinery/telecomms/server/proc/update_logs() - // start deleting the very first log entry - if(logs >= 400) - for(var/i = 1, i <= logs, i++) // locate the first garbage collectable log entry and remove it - var/datum/comm_log_entry/L = log_entries[i] - if(L.garbage_collector) - log_entries.Remove(L) - logs-- - break - -/obj/machinery/telecomms/server/proc/add_entry(var/content, var/input) - var/datum/comm_log_entry/log = new - var/identifier = num2text( rand(-1000,1000) + world.time ) - log.name = "[input] ([md5(identifier)])" - log.input_type = input - log.parameters["message"] = content - log_entries.Add(log) - update_logs() - -// Simple log entry datum -/datum/comm_log_entry - var/parameters = list() // carbon-copy to signal.data[] - var/name = "data packet (#)" - var/garbage_collector = 1 // if set to 0, will not be garbage collected - var/input_type = "Speech File" diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm deleted file mode 100644 index 73a9261feb0..00000000000 --- a/code/game/machinery/telecomms/telemonitor.dm +++ /dev/null @@ -1,161 +0,0 @@ -/* - Telecomms monitor tracks the overall trafficing of a telecommunications network - and displays a heirarchy of linked machines. -*/ - - -/obj/machinery/computer/telecomms/monitor - name = "telecommunications monitor" - icon_screen = "comm_monitor" - - var/screen = 0 // the screen number: - var/list/machinelist = list() // the machines located by the computer - var/obj/machinery/telecomms/SelectedMachine - - var/network = "NULL" // the network to probe - - var/temp = "" // temporary feedback messages - circuit = /obj/item/circuitboard/comm_monitor - - light_color = LIGHT_COLOR_DARKGREEN - - attack_hand(mob/user as mob) - if(stat & (BROKEN|NOPOWER)) - return - user.set_machine(src) - var/dat = "
[temp]
" - dat += "
Current Network: [network]
" - if(machinelist.len) - dat += "
Detected Network Entities:
- "
- for(var/obj/machinery/telecomms/T in machinelist)
- dat += "
- \ref[T] [T.name] ([T.id]) " - dat += "
\[Flush Buffer\]" - else - dat += "\[Probe Network\]" - - - // --- Viewing Machine --- - - if(1) - dat += "
[temp]
" - dat += "
Current Network: [network]
" - dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
" - dat += "Linked Entities:
- "
- for(var/obj/machinery/telecomms/T in SelectedMachine.links)
- if(!T.hide)
- dat += "
- \ref[T.id] [T.name] ([T.id]) " - dat += "
Name of Deceased: [dead_name]
Rank of Deceased: [dead_rank]
Time of Death: [dead_tod]
Cause of Death: [dead_cause]
Trace Chemicals: [dead_chems]
Additional Coroner's Notes: [dead_notes]
Coroner's Signature: " + R.info = "Nanotrasen Science Station [GLOB.using_map.station_short] - Coroner's Report
Name of Deceased: [dead_name]
Rank of Deceased: [dead_rank]
Time of Death: [dead_tod]
Cause of Death: [dead_cause]
Trace Chemicals: [dead_chems]
Additional Coroner's Notes: [dead_notes]
Coroner's Signature: " playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) sleep(10) user.put_in_hands(R) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 3ca37a3f662..7724d499e7e 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -54,26 +54,26 @@ user.set_machine(src) interact(user) -/obj/item/camera_bug/check_eye(var/mob/user as mob) - if(user.stat || loc != user || !user.canmove || !user.has_vision() || !current) - user.reset_perspective(null) +/obj/item/camera_bug/check_eye(mob/user) + if(loc != user || user.incapacitated() || !user.has_vision() || !current) user.unset_machine() - return null - - var/turf/T = get_turf(user.loc) - if(T.z != current.z || !current.can_use()) + return FALSE + var/turf/T_user = get_turf(user.loc) + var/turf/T_current = get_turf(current) + if(!atoms_share_level(T_user, T_current) || !current.can_use()) to_chat(user, "[src] has lost the signal.") current = null - user.reset_perspective(null) user.unset_machine() - return null + return FALSE + return TRUE - return 1 +/obj/item/camera_bug/on_unset_machine(mob/user) + user.reset_perspective(null) /obj/item/camera_bug/proc/get_cameras() if(world.time > (last_net_update + 100)) bugged_cameras = list() - for(var/obj/machinery/camera/camera in cameranet.cameras) + for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras) if(camera.stat || !camera.can_use()) continue if(length(list("SS13","MINE")&camera.network)) @@ -182,7 +182,6 @@ /obj/item/camera_bug/Topic(var/href,var/list/href_list) if(usr != loc) usr.unset_machine() - usr.reset_perspective(null) usr << browse(null, "window=camerabug") return usr.set_machine(src) @@ -233,7 +232,6 @@ interact() else usr.unset_machine() - usr.reset_perspective(null) usr << browse(null, "window=camerabug") return else diff --git a/code/game/objects/items/devices/enginepicker.dm b/code/game/objects/items/devices/enginepicker.dm index fe6bb7e8717..0fd3a591560 100644 --- a/code/game/objects/items/devices/enginepicker.dm +++ b/code/game/objects/items/devices/enginepicker.dm @@ -14,8 +14,12 @@ var/list/list_enginebeacons = list() var/isactive = FALSE +/obj/item/enginepicker/Destroy() + list_enginebeacons.Cut() + return ..() + /obj/item/enginepicker/attack_self(mob/living/carbon/user) - if(usr.stat || !usr.canmove || usr.restrained()) + if(user.incapacitated()) return if(!isactive) @@ -72,7 +76,7 @@ new G(T) //Spawns the switch-selected engine on the chosen beacon's turf var/ailist[] = list() - for(var/mob/living/silicon/ai/A in GLOB.living_mob_list) + for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list) ailist += A if(ailist.len) var/mob/living/silicon/ai/announcer = pick(ailist) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index af673c7b285..58848f3f7e4 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -67,44 +67,48 @@ times_used = max(0, times_used) //sanity -/obj/item/flash/proc/try_use_flash(var/mob/user = null) +/obj/item/flash/proc/try_use_flash(mob/user = null) flash_recharge(user) if(broken) - return 0 + return FALSE - playsound(src.loc, use_sound, 100, 1) + playsound(loc, use_sound, 100, 1) flick("[initial(icon_state)]2", src) + set_light(2, 1, COLOR_WHITE) + addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2) times_used++ if(user && !clown_check(user)) - return 0 + return FALSE - return 1 + return TRUE /obj/item/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1) - add_attack_logs(user, M, "Flashed with [src]") - if(user && targeted) - if(M.weakeyes) - M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash - if(M.flash_eyes(1, 1)) - M.AdjustConfused(power) - terrible_conversion_proc(M, user) - M.Stun(1) - visible_message("[user] blinds [M] with the flash!") - to_chat(user, "You blind [M] with the flash!") - to_chat(M, "[user] blinds you with the flash!") + if(user) + add_attack_logs(user, M, "Flashed with [src]") + if(targeted) if(M.weakeyes) - M.Stun(2) - M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shields your eyes!") - else - visible_message("[user] fails to blind [M] with the flash!") - to_chat(user, "You fail to blind [M] with the flash!") - to_chat(M, "[user] fails to blind you with the flash!") - else - if(M.flash_eyes()) - M.AdjustConfused(power) + M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash + if(M.flash_eyes(1, 1)) + M.AdjustConfused(power) + terrible_conversion_proc(M, user) + M.Stun(1) + visible_message("[user] blinds [M] with the flash!") + to_chat(user, "You blind [M] with the flash!") + to_chat(M, "[user] blinds you with the flash!") + if(M.weakeyes) + M.Stun(2) + M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shield your eyes!") + else + visible_message("[user] fails to blind [M] with the flash!") + to_chat(user, "You fail to blind [M] with the flash!") + to_chat(M, "[user] fails to blind you with the flash!") + return + + if(M.flash_eyes()) + M.AdjustConfused(power) /obj/item/flash/attack(mob/living/M, mob/user) if(!try_use_flash(user)) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4ce64a859ec..307964ca25c 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -74,7 +74,7 @@ if(istype(H)) //robots and aliens are unaffected var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes) - if(M.stat == DEAD || !eyes || M.disabilities & BLIND) //mob is dead or fully blind + if(M.stat == DEAD || !eyes || (BLINDNESS in M.mutations)) //mob is dead or fully blind to_chat(user, "[M]'s pupils are unresponsive to the light!") else if((XRAY in M.mutations) || eyes.see_in_dark >= 8) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms). to_chat(user, "[M]'s pupils glow eerily!") diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index a296e465a59..53ead129836 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -35,7 +35,7 @@ song.ui_interact(user, ui_key, ui, force_open) -/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) return song.ui_data(user, ui_key, state) /obj/item/instrument/Topic(href, href_list) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 21b71e7668c..cfaea9f32f9 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -138,6 +138,7 @@ log_admin("[key_name(user)] EMPd a camera with a laser pointer") user.create_attack_log("[key_name(user)] EMPd a camera with a laser pointer") + add_attack_logs(user, C, "EMPd with [src]", ATKLOG_ALL) else outmsg = "You missed the lens of [C] with [src]." diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 5f987bdce45..b3695229790 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -264,7 +264,7 @@ return last_request = world.time / 10 looking_for_personality = 1 - paiController.findPAI(src, usr) + GLOB.paiController.findPAI(src, usr) if(href_list["wipe"]) var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No") if(confirm == "Yes") diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 69beb04f67c..842a96c2af2 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -9,7 +9,7 @@ /obj/item/pipe_painter/New() ..() modes = new() - for(var/C in pipe_colors) + for(var/C in GLOB.pipe_colors) modes += "[C]" mode = pick(modes) @@ -23,7 +23,7 @@ to_chat(user, "You must remove the plating first.") return - P.change_color(pipe_colors[mode]) + P.change_color(GLOB.pipe_colors[mode]) /obj/item/pipe_painter/attack_self(mob/user as mob) mode = input("Which colour do you want to use?", "Pipe Painter", mode) in modes diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 517f9f595c5..aa123930323 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -69,8 +69,8 @@ to_chat(user, "Locked In") new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + user.drop_item() qdel(src) - return /obj/item/radio/beacon/syndicate/bomb name = "suspicious beacon" @@ -82,16 +82,21 @@ to_chat(user, "Locked In") new /obj/machinery/syndicatebomb( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + user.drop_item() qdel(src) - return /obj/item/radio/beacon/engine desc = "A label on it reads: Warning: This device is used for transportation of high-density objects used for high-yield power generation. Stay away!." anchored = 1 //Let's not move these around. Some folk might get the idea to use these for assassinations var/list/enginetype = list() -/obj/item/radio/beacon/engine/Initialize() +/obj/item/radio/beacon/engine/Initialize(mapload) LAZYADD(GLOB.engine_beacon_list, src) + return ..() + +/obj/item/radio/beacon/engine/Destroy() + GLOB.engine_beacon_list -= src + return ..() /obj/item/radio/beacon/engine/tesling name = "Engine Beacon for Tesla and Singularity" diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 4b5716d73eb..083720f0e22 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -103,7 +103,7 @@ ui.open() ui.set_auto_update(1) -/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["power"] = on diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 72e584e91aa..691c12e1347 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -21,6 +21,7 @@ var/ks1type = null var/ks2type = null dog_fashion = null + requires_tcomms = TRUE /obj/item/radio/headset/New() ..() @@ -88,6 +89,8 @@ /obj/item/radio/headset/syndicate origin_tech = "syndicate=3" ks1type = /obj/item/encryptionkey/syndicate/nukeops + requires_tcomms = FALSE + instant = TRUE // Work instantly if there are no comms /obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection name = "syndicate headset" @@ -103,6 +106,13 @@ /obj/item/radio/headset/syndicate/alt/syndteam ks1type = /obj/item/encryptionkey/syndteam +/obj/item/radio/headset/syndicate/alt/lavaland + name = "syndicate lavaland headset" + +/obj/item/radio/headset/syndicate/alt/lavaland/New() + . = ..() + set_frequency(SYND_FREQ) + /obj/item/radio/headset/binary origin_tech = "syndicate=3" ks1type = /obj/item/encryptionkey/binary diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index fbfe984d35f..13c97f26730 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -63,7 +63,7 @@ /obj/item/radio/intercom/department/medbay/New() ..() - internal_channels = default_medbay_channels.Copy() + internal_channels = GLOB.default_medbay_channels.Copy() /obj/item/radio/intercom/department/security/New() ..() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 23d897d491f..4c2aaa82c1e 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -1,4 +1,4 @@ -var/global/list/default_internal_channels = list( +GLOBAL_LIST_INIT(default_internal_channels, list( num2text(PUB_FREQ) = list(), num2text(AI_FREQ) = list(ACCESS_CAPTAIN), num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS), @@ -11,13 +11,13 @@ var/global/list/default_internal_channels = list( num2text(SCI_FREQ) = list(ACCESS_RESEARCH), num2text(SUP_FREQ) = list(ACCESS_CARGO), num2text(SRV_FREQ) = list(ACCESS_HOP, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLOWN, ACCESS_MIME) -) +)) -var/global/list/default_medbay_channels = list( +GLOBAL_LIST_INIT(default_medbay_channels, list( num2text(PUB_FREQ) = list(), num2text(MED_FREQ) = list(ACCESS_MEDICAL), num2text(MED_I_FREQ) = list(ACCESS_MEDICAL) -) +)) /obj/item/radio icon = 'icons/obj/radio.dmi' @@ -58,6 +58,9 @@ var/global/list/default_medbay_channels = list( var/datum/radio_frequency/radio_connection var/list/datum/radio_frequency/secure_radio_connections = new + var/requires_tcomms = FALSE // Does this device require tcomms to work.If TRUE it wont function at all without tcomms. If FALSE, it will work without tcomms, just slowly + var/instant = FALSE // Should this device instantly communicate if there isnt tcomms + /obj/item/radio/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) @@ -69,7 +72,7 @@ var/global/list/default_medbay_channels = list( ..() wires = new(src) - internal_channels = default_internal_channels.Copy() + internal_channels = GLOB.default_internal_channels.Copy() GLOB.global_radios |= src /obj/item/radio/Destroy() @@ -116,7 +119,7 @@ var/global/list/default_medbay_channels = list( ui.open() ui.set_auto_update(1) -/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["mic_status"] = broadcasting @@ -233,7 +236,7 @@ var/global/list/default_medbay_channels = list( add_fingerprint(usr) -/obj/item/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = config.contact_levels, var/role = "Unknown") //BS12 EDIT +/obj/item/radio/proc/autosay(message, from, channel, role = "Unknown") //BS12 EDIT var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if(channel == "department") @@ -258,10 +261,29 @@ var/global/list/default_medbay_channels = list( if(jammed) message = Gibberish(message, 100) var/list/message_pieces = message_to_multilingual(message) - Broadcast_Message(connection, A, - 0, "*garbled automated announcement*", src, - message_pieces, from, "Automated Announcement", from, "synthesized voice", - 4, 0, zlevel, connection.frequency, follow_target = follow_target) + + // Make us a message datum! + var/datum/tcomms_message/tcm = new + tcm.connection = connection + tcm.sender = A + tcm.radio = src + tcm.sender_name = from + tcm.message_pieces = message_pieces + tcm.sender_job = "Automated Announcement" + tcm.vname = "synthesized voice" + tcm.data = SIGNALTYPE_AINOTRACK + // Datum radios dont have a location (obviously + if(loc && loc.z) + tcm.source_level = loc.z // For anyone that reads this: This used to pull from a LIST from the CONFIG DATUM. WHYYYYYYYYY!!!!!!!! -aa + else + tcm.source_level = 1 // Assume Z1 if we dont have an actual Z level available to us. + tcm.freq = connection.frequency + tcm.follow_target = follow_target + + // Now put that through the stuff + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + C.handle_message(tcm) + qdel(tcm) // Delete the message datum qdel(A) // Just a dummy mob used for making announcements, so we don't create AIs to do this @@ -318,48 +340,32 @@ var/global/list/default_medbay_channels = list( if(!M.IsVocal()) return 0 - /* Quick introduction: - This new radio system uses a very robust FTL signaling technology unoriginally - dubbed "subspace" which is somewhat similar to 'blue-space' but can't - actually transmit large mass. Headsets are the only radio devices capable - of sending subspace transmissions to the Communications Satellite. - - A headset sends a signal to a subspace listener/receiver elsewhere in space, - the signal gets processed and logged, and an audible transmission gets sent - to each individual headset. - */ - - //#### Grab the connection datum ####// - var/message_mode = handle_message_mode(M, message_pieces, channel) - switch(message_mode) //special cases - if(RADIO_CONNECTION_FAIL) - return 0 - if(RADIO_CONNECTION_NON_SUBSPACE) - return 1 - - if(!istype(message_mode, /datum/radio_frequency)) //if not a special case, it should be returning a radio connection - return 0 - - var/datum/radio_frequency/connection = message_mode - var/turf/position = get_turf(src) - var/jammed = FALSE - for(var/obj/item/jammer/jammer in GLOB.active_jammers) + var/turf/position = get_turf(src) + for(var/J in GLOB.active_jammers) + var/obj/item/jammer/jammer = J if(get_dist(position, get_turf(jammer)) < jammer.range) jammed = TRUE break - //#### Tagging the signal with all appropriate identity values ####// + var/message_mode = handle_message_mode(M, message_pieces, channel) + switch(message_mode) //special cases + // This is if the connection fails + if(RADIO_CONNECTION_FAIL) + return 0 + // This is if were using either a binary key, or a hivemind through a headset somehow. Dont ask. + if(RADIO_CONNECTION_NON_SUBSPACE) + return 1 + + if(!istype(message_mode, /datum/radio_frequency)) //if not a special case, it should be returning a radio connection + return + + var/datum/radio_frequency/connection = message_mode + // ||-- The mob's name identity --|| var/displayname = M.name // grab the display name (name you get when you hover over someone's icon) - var/real_name = M.real_name // mob's real name - var/mobkey = "none" // player key associated with mob var/voicemask = 0 // the speaker is wearing a voice mask - if(M.client) - mobkey = M.key // assign the mob's key - - var/jobname // the mob's "job" if(jammed) @@ -397,7 +403,7 @@ var/global/list/default_medbay_channels = list( if(ishuman(M)) var/mob/living/carbon/human/H = M displayname = H.voice - if(H.voice != real_name) + if(H.voice != M.real_name) voicemask = TRUE if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ) @@ -405,124 +411,45 @@ var/global/list/default_medbay_channels = list( jobname = "Unknown" voicemask = TRUE + // Make us a message datum! + var/datum/tcomms_message/tcm = new + tcm.sender_name = displayname + tcm.sender_job = jobname + tcm.message_pieces = message_pieces + tcm.source_level = position.z + tcm.freq = connection.frequency + tcm.vmask = voicemask + tcm.needs_tcomms = requires_tcomms + tcm.connection = connection + tcm.vname = M.voice_name + tcm.sender = M + // Now put that through the stuff + var/handled = FALSE + if(connection) + for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) + if(C.handle_message(tcm)) + handled = TRUE + qdel(tcm) // Delete the message datum + return TRUE - /* ###### Radio headsets can only broadcast through subspace ###### */ + // If we dont need tcomms and we have no connection + if(!requires_tcomms && !handled) + // If they dont need tcomms for their signal, set the type to intercoms + tcm.data = SIGNALTYPE_INTERCOM_SBR + tcm.zlevels = list(position.z) + if(!instant) + // Simulate two seconds of lag + addtimer(CALLBACK(GLOBAL_PROC, .proc/broadcast_message, tcm), 20) + QDEL_IN(tcm, 20) + else + // Nukeops + Deathsquad headsets are instant and should work the same, whether there is comms or not + broadcast_message(tcm) + qdel(tcm) // Delete the message datum + return TRUE - if(subspace_transmission) - // First, we want to generate a new radio signal - var/datum/signal/signal = new - signal.transmission_method = 2 // 2 would be a subspace transmission. - // transmission_method could probably be enumerated through #define. Would be neater. - - // --- Finally, tag the actual signal with the appropriate values --- - signal.data = list( - // Identity-associated tags: - "mob" = M, // store a reference to the mob - "mobtype" = M.type, // the mob's type - "race" = signal.get_race(M), - "realname" = real_name, // the mob's real name - "name" = displayname, // the mob's display name - "job" = jobname, // the mob's job - "key" = mobkey, // the mob's key - "vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood - "vname" = M.voice_name, // the name to display if the voice wasn't understood - "vmask" = voicemask, // 1 if the mob is using a voice gas mask - - // We store things that would otherwise be kept in the actual mob - // so that they can be logged even AFTER the mob is deleted or something - - // Other tags: - "compression" = rand(45,50), // compressed radio signal - "message" = message_pieces, // the actual sent message - "connection" = connection, // the radio connection to use - "radio" = src, // stores the radio used for transmission - "slow" = 0, // how much to sleep() before broadcasting - simulates net lag - "traffic" = 0, // dictates the total traffic sum that the signal went through - "type" = 0, // determines what type of radio input it is: normal broadcast - "server" = null, // the last server to log this signal - "reject" = 0, // if nonzero, the signal will not be accepted by any broadcasting machinery - "level" = position.z, // The source's z level - "verb" = verb - ) - signal.frequency = connection.frequency // Quick frequency set - - //#### Sending the signal to all subspace receivers ####// - - for(var/obj/machinery/telecomms/receiver/R in telecomms_list) - spawn(0) - R.receive_signal(signal) - - // Allinone can act as receivers. - for(var/obj/machinery/telecomms/allinone/R in telecomms_list) - spawn(0) - R.receive_signal(signal) - - // Receiving code can be located in Telecommunications.dm - return signal.data["done"] && position.z in signal.data["level"] - - - /* ###### Intercoms and station-bounced radios ###### */ - - var/filter_type = 2 - - /* --- Intercoms can only broadcast to other intercoms, but bounced radios can broadcast to bounced radios and intercoms --- */ - if(istype(src, /obj/item/radio/intercom)) - filter_type = 1 - - - var/datum/signal/signal = new - signal.transmission_method = 2 - - - /* --- Try to send a normal subspace broadcast first */ - - signal.data = list( - - "mob" = M, // store a reference to the mob - "mobtype" = M.type, // the mob's type - "race" = signal.get_race(M), // text to show next to mob in comms log console - "realname" = real_name, // the mob's real name - "name" = displayname, // the mob's display name - "job" = jobname, // the mob's job - "key" = mobkey, // the mob's key - "vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood - "vname" = M.voice_name, // the name to display if the voice wasn't understood - "vmask" = voicemask, // 1 if the mob is using a voice gas mas - - "compression" = 0, // uncompressed radio signal - "message" = message_pieces, // the actual sent message - "connection" = connection, // the radio connection to use - "radio" = src, // stores the radio used for transmission - "slow" = 0, - "traffic" = 0, - "type" = 0, - "server" = null, - "reject" = 0, - "level" = position.z, - "verb" = verb - ) - signal.frequency = connection.frequency // Quick frequency set - - for(var/obj/machinery/telecomms/receiver/R in telecomms_list) - spawn(0) - R.receive_signal(signal) - - - sleep(rand(10,25)) // wait a little... - - if(signal.data["done"] && position.z in signal.data["level"]) - // we're done here. - return 1 - - // Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level. - // Send a mundane broadcast with limited targets: - - //THIS IS TEMPORARY. YEAH RIGHT - if(!connection) return 0 //~Carn - - return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote), - src, message_pieces, displayname, jobname, real_name, M.voice_name, - filter_type, signal.data["compression"], list(position.z), connection.frequency,verb) + // If we didnt get here, oh fuck + qdel(tcm) // Delete the message datum + return FALSE /obj/item/radio/hear_talk(mob/M as mob, list/message_pieces, var/verb = "says") @@ -812,7 +739,7 @@ var/global/list/default_medbay_channels = list( ui.open() ui.set_auto_update(1) -/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["mic_status"] = broadcasting @@ -863,4 +790,4 @@ var/global/list/default_medbay_channels = list( /obj/item/radio/phone/medbay/New() ..() - internal_channels = default_medbay_channels.Copy() + internal_channels = GLOB.default_medbay_channels.Copy() diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 34183a81102..0d8873a6377 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -212,7 +212,7 @@ REAGENT SCANNER if(H.getBrainLoss() >= 100) to_chat(user, "Subject is brain dead.") else if(H.getBrainLoss() >= 60) - to_chat(user, "Severe brain damage detected. Subject likely to have mental retardation.") + to_chat(user, "Severe brain damage detected. Subject likely to have dementia.") else if(H.getBrainLoss() >= 10) to_chat(user, "Significant brain damage detected. Subject may have had a concussion.") else @@ -859,11 +859,11 @@ REAGENT SCANNER dat += "
" - if(target.disabilities & COLOURBLIND) + if(COLOURBLIND in target.mutations) dat += "Photoreceptor abnormalities detected.
" - if(target.disabilities & NEARSIGHTED) + if(NEARSIGHTED in target.mutations) dat += "Retinal misalignment detected.
" return dat diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 7a8766ebb3c..3eeb992c87e 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -194,13 +194,11 @@ if(mytape.storedinfo.len < i + 1) playsleepseconds = 1 sleep(10) - T = get_turf(src) atom_say("End of recording.") else playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i] if(playsleepseconds > 14) sleep(10) - T = get_turf(src) atom_say("Skipping [playsleepseconds] seconds of silence.") playsleepseconds = 1 i++ diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 40eea3a9856..acba0087caf 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -100,7 +100,7 @@ // auto update every Master Controller tick //ui.set_auto_update(1) -/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/data[0] data["attachmentOne"] = tank_one ? tank_one.name : null diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index ab4387a988e..c5c8f67e34d 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -6,7 +6,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid */ -var/list/world_uplinks = list() +GLOBAL_LIST_EMPTY(world_uplinks) /obj/item/uplink var/welcome // Welcoming menu message @@ -35,10 +35,10 @@ var/list/world_uplinks = list() uses = SSticker.mode.uplink_uses uplink_items = get_uplink_items() - world_uplinks += src + GLOB.world_uplinks += src /obj/item/uplink/Destroy() - world_uplinks -= src + GLOB.world_uplinks -= src return ..() /obj/item/uplink/proc/generate_items(mob/user as mob) @@ -168,7 +168,6 @@ var/list/world_uplinks = list() to_chat(user, "[I] refunded.") qdel(I) return - ..() // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it. /* How to create an uplink in 3 easy steps! @@ -216,7 +215,7 @@ var/list/world_uplinks = list() /* NANO UI FOR UPLINK WOOP WOOP */ -/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) +/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state) var/title = "Remote Uplink" // update the ui if it exists, returns null if no ui is passed/found ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) @@ -227,7 +226,7 @@ var/list/world_uplinks = list() // open the new ui window ui.open() -/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) +/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state) var/data[0] data["welcome"] = welcome @@ -277,14 +276,14 @@ var/list/world_uplinks = list() /obj/item/uplink/hidden/proc/update_nano_data(var/id) if(nanoui_menu == 1) var/permanentData[0] - for(var/datum/data/record/L in sortRecord(data_core.general)) + for(var/datum/data/record/L in sortRecord(GLOB.data_core.general)) permanentData[++permanentData.len] = list(Name = sanitize(L.fields["name"]),"id" = L.fields["id"]) nanoui_data["exploit_records"] = permanentData if(nanoui_menu == 11) nanoui_data["exploit_exists"] = 0 - for(var/datum/data/record/L in data_core.general) + for(var/datum/data/record/L in GLOB.data_core.general) if(L.fields["id"] == id) nanoui_data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value. nanoui_data["exploit"]["name"] = html_encode(L.fields["name"]) diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 0edcafd64b5..14bb468e049 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -222,7 +222,7 @@ var/input_flag = input(user, "Choose a flag to disguise as.", "Choose a flag.") in show_flag - if(user && src in user.contents) + if(user && (src in user.contents)) var/obj/item/flag/chosen_flag = flag[input_flag] diff --git a/code/game/objects/items/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm index 7120f8c880d..cfb4d18473c 100644 --- a/code/game/objects/items/mountable_frames/mountables.dm +++ b/code/game/objects/items/mountable_frames/mountables.dm @@ -20,7 +20,7 @@ return if(proximity_flag != 1) //if we aren't next to the wall return - if(!( get_dir(on_wall,user) in cardinal)) + if(!( get_dir(on_wall,user) in GLOB.cardinal)) to_chat(user, "You need to be standing next to a wall to place \the [src].") return diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 6ce10294940..46bc15a2ffe 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -14,7 +14,7 @@ ..(newloc) if(model_info && model) model_info = model - var/datum/robolimb/R = all_robolimbs[model] + var/datum/robolimb/R = GLOB.all_robolimbs[model] if(R) name = "[R.company] [initial(name)]" desc = "[R.desc]" @@ -24,7 +24,7 @@ name = "robot [initial(name)]" /obj/item/robot_parts/attack_self(mob/user) - var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in selectable_robolimbs + var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in GLOB.selectable_robolimbs if(!choice) return if(loc != user) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index a13bce6fb61..43178a85ef8 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -74,7 +74,7 @@ R.stat = CONSCIOUS GLOB.dead_mob_list -= R //please never forget this ever kthx - GLOB.living_mob_list += R + GLOB.alive_mob_list += R R.notify_ai(1) return 1 diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 8b85d8821d9..9b24b1efce6 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -4,24 +4,23 @@ desc = "A shooting target." icon = 'icons/obj/objects.dmi' icon_state = "target_h" - density = 0 + density = FALSE var/hp = 1800 - var/icon/virtualIcon - var/list/bulletholes = list() /obj/item/target/Destroy() + cut_overlays() // if a target is deleted and associated with a stake, force stake to forget - for(var/obj/structure/target_stake/T in view(3,src)) + for(var/obj/structure/target_stake/T in view(3, src)) if(T.pinned_target == src) T.pinned_target = null - T.density = 1 + T.density = TRUE break return ..() // delete target /obj/item/target/Move() ..() // After target moves, check for nearby stakes. If associated, move to target - for(var/obj/structure/target_stake/M in view(3,src)) + for(var/obj/structure/target_stake/M in view(3, src)) if(M.density == 0 && M.pinned_target == src) M.loc = loc @@ -33,12 +32,12 @@ /obj/item/target/welder_act(mob/user, obj/item/I) . = TRUE - if(!use_tool(src, user, 0,, volume = I.tool_volume)) + if(!use_tool(src, user, 0, volume = I.tool_volume)) return overlays.Cut() - to_chat(usr, "You slice off [src]'s uneven chunks of aluminum and scorch marks.") + to_chat(user, "You slice off [src]'s uneven chunks of aluminium and scorch marks.") -/obj/item/target/attack_hand(mob/user as mob) +/obj/item/target/attack_hand(mob/user) // taking pinned targets off! var/obj/structure/target_stake/stake for(var/obj/structure/target_stake/T in view(3,src)) @@ -48,8 +47,8 @@ if(stake) if(stake.pinned_target) - stake.density = 1 - density = 0 + stake.density = TRUE + density = FALSE layer = OBJ_LAYER loc = user.loc @@ -77,101 +76,37 @@ desc = "A shooting target that looks like a xenomorphic alien." hp = 2350 // alium onest too kinda -/obj/item/target/bullet_act(var/obj/item/projectile/Proj) - var/p_x = Proj.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset Proj.p_x!" - var/p_y = Proj.p_y + pick(0,0,0,0,0,-1,1) - var/decaltype = 1 // 1 - scorch, 2 - bullet +#define DECALTYPE_SCORCH 1 +#define DECALTYPE_BULLET 2 - if(istype(/obj/item/projectile/bullet, Proj)) - decaltype = 2 +/obj/item/target/bullet_act(obj/item/projectile/P) + var/p_x = P.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset P.p_x!" + var/p_y = P.p_y + pick(0,0,0,0,0,-1,1) + var/decaltype = DECALTYPE_SCORCH + if(istype(P, /obj/item/projectile/bullet)) + decaltype = DECALTYPE_BULLET - - virtualIcon = new(icon, icon_state) - - if( virtualIcon.GetPixel(p_x, p_y) ) // if the located pixel isn't blank (null) - - hp -= Proj.damage + var/icon/C = icon(icon, icon_state) + if(LAZYLEN(overlays) <= 35 && C.GetPixel(p_x, p_y)) // if the located pixel isn't blank (null) + hp -= P.damage if(hp <= 0) - visible_message("[src] breaks into tiny pieces and collapses!") + visible_message("[src] breaks into tiny pieces and collapses!") qdel(src) - - // Create a temporary object to represent the damage - var/obj/bmark = new - bmark.pixel_x = p_x - bmark.pixel_y = p_y - bmark.icon = 'icons/effects/effects.dmi' - bmark.layer = 3.5 - bmark.icon_state = "scorch" - - if(decaltype == 1) - // Energy weapons are hot. they scorch! - - // offset correction - bmark.pixel_x-- - bmark.pixel_y-- - - if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice)) - bmark.icon_state = "scorch" - bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design - - + return + var/image/bullet_hole = image('icons/effects/effects.dmi', "scorch", OBJ_LAYER + 0.5) + bullet_hole.pixel_x = p_x - 1 //offset correction + bullet_hole.pixel_y = p_y - 1 + if(decaltype == DECALTYPE_SCORCH) + if(P.damage >= 20 || istype(P, /obj/item/projectile/beam/practice)) + bullet_hole.setDir(pick(NORTH,SOUTH,EAST,WEST))// random scorch design. light_scorch does not have different directions else - bmark.icon_state = "light_scorch" + bullet_hole.icon_state = "light_scorch" else - - // Bullets are hard. They make dents! - bmark.icon_state = "dent" - - if(Proj.damage >= 10 && bulletholes.len <= 35) // maximum of 35 bullet holes - if(decaltype == 2) // bullet - if(prob(Proj.damage+30)) // bullets make holes more commonly! - new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole - else // Lasers! - if(prob(Proj.damage-10)) // lasers make holes less commonly - new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole - - // draw bullet holes - for(var/datum/bullethole/B in bulletholes) - - virtualIcon.DrawBox(null, B.b1x1, B.b1y, B.b1x2, B.b1y) // horizontal line, left to right - virtualIcon.DrawBox(null, B.b2x, B.b2y1, B.b2x, B.b2y2) // vertical line, top to bottom - - overlays += bmark // add the decal - - icon = virtualIcon // apply bulletholes over decals - + bullet_hole.icon_state = "dent" + add_overlay(bullet_hole) return return -1 // the bullet/projectile goes through the target! Ie, you missed - -// Small memory holder entity for transparent bullet holes -/datum/bullethole - // First box - var/b1x1 = 0 - var/b1x2 = 0 - var/b1y = 0 - - // Second box - var/b2x = 0 - var/b2y1 = 0 - var/b2y2 = 0 - -/datum/bullethole/New(obj/item/target/Target, pixel_x = 0, pixel_y = 0) - if(!Target) return - - // Randomize the first box - b1x1 = pixel_x - pick(1,1,1,1,2,2,3,3,4) - b1x2 = pixel_x + pick(1,1,1,1,2,2,3,3,4) - b1y = pixel_y - if(prob(35)) - b1y += rand(-4,4) - - // Randomize the second box - b2x = pixel_x - if(prob(35)) - b2x += rand(-4,4) - b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4) - b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4) - - Target.bulletholes.Add(src) +#undef DECALTYPE_SCORCH +#undef DECALTYPE_BULLET diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 59dad865acb..708070e1478 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -4,6 +4,7 @@ desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." icon = 'icons/obj/nanopaste.dmi' icon_state = "tube" + w_class = WEIGHT_CLASS_TINY origin_tech = "materials=2;engineering=3" amount = 6 max_amount = 6 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 3b214f87940..3911ab51cc7 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -1,7 +1,7 @@ -var/global/list/datum/stack_recipe/rod_recipes = list ( \ +GLOBAL_LIST_INIT(rod_recipes, list ( \ new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - ) + )) /obj/item/stack/rods name = "metal rod" @@ -36,7 +36,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ /obj/item/stack/rods/New(loc, amount=null) ..() - recipes = rod_recipes + recipes = GLOB.rod_recipes update_icon() /obj/item/stack/rods/update_icon() diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index d79c31467bf..5fc457dae62 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -9,13 +9,13 @@ singular_name = "human skin piece" icon_state = "sheet-hide" -var/global/list/datum/stack_recipe/human_recipes = list( \ - new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = 1), \ - new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = 1), \ - ) +GLOBAL_LIST_INIT(human_recipes, list( \ + new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = TRUE), \ + new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = TRUE), \ + )) /obj/item/stack/sheet/animalhide/human/New(var/loc, var/amount=null) - recipes = human_recipes + recipes = GLOB.human_recipes return ..() /obj/item/stack/sheet/animalhide/generic @@ -48,6 +48,14 @@ var/global/list/datum/stack_recipe/human_recipes = list( \ singular_name = "lizard skin piece" icon_state = "sheet-lizard" +GLOBAL_LIST_INIT(lizard_recipes, list( \ + new/datum/stack_recipe("lizard skin handbag", /obj/item/storage/backpack/satchel/lizard, 5, on_floor = TRUE), \ + )) + +/obj/item/stack/sheet/animalhide/lizard/Initialize(mapload, new_amount, merge = TRUE) + recipes = GLOB.lizard_recipes + return ..() + /obj/item/stack/sheet/animalhide/xeno name = "alien hide" desc = "The skin of a terrible creature." @@ -132,12 +140,12 @@ GLOBAL_LIST_INIT(leather_recipes, list ( icon_state = "sinew" origin_tech = "biotech=4" -var/global/list/datum/stack_recipe/sinew_recipes = list ( \ +GLOBAL_LIST_INIT(sinew_recipes, list ( \ new/datum/stack_recipe("sinew restraints", /obj/item/restraints/handcuffs/sinew, 1, on_floor = 1), \ - ) + )) /obj/item/stack/sheet/sinew/New(var/loc, var/amount=null) - recipes = sinew_recipes + recipes = GLOB.sinew_recipes return ..() /obj/item/stack/sheet/animalhide/goliath_hide diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 0791bb760dc..54d42176f52 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -15,16 +15,16 @@ Mineral Sheets - Adamantine */ -var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ +GLOBAL_LIST_INIT(sandstone_recipes, list ( \ new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/silver_recipes = list ( \ +GLOBAL_LIST_INIT(silver_recipes, list ( \ new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \ @@ -34,9 +34,9 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Med Doctor Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/diamond_recipes = list ( \ +GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \ @@ -44,18 +44,18 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/uranium_recipes = list ( \ +GLOBAL_LIST_INIT(uranium_recipes, list ( \ new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \ null, \ new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/gold_recipes = list ( \ +GLOBAL_LIST_INIT(gold_recipes, list ( \ new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \ @@ -67,51 +67,51 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \ new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \ - ) + )) -var/global/list/datum/stack_recipe/plasma_recipes = list ( \ +GLOBAL_LIST_INIT(plasma_recipes, list ( \ new/datum/stack_recipe/dangerous("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe/dangerous("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \ null, \ new/datum/stack_recipe/dangerous("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/dangerous("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/bananium_recipes = list ( \ +GLOBAL_LIST_INIT(bananium_recipes, list ( \ new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \ null, \ new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("bananium grenade casing", /obj/item/grenade/bananade/casing, 4, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \ +GLOBAL_LIST_INIT(tranquillite_recipes, list ( \ new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \ null, \ new/datum/stack_recipe("silent tile", /obj/item/stack/tile/mineral/tranquillite, 1, 4, 20), \ null, \ new/datum/stack_recipe("Mime Statue", /obj/structure/statue/tranquillite/mime, 5, one_per_turf = 1, on_floor = 1), \ - ) + )) -var/global/list/datum/stack_recipe/abductor_recipes = list ( \ +GLOBAL_LIST_INIT(abductor_recipes, list ( \ new/datum/stack_recipe("alien bed", /obj/structure/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \ - ) + )) -var/global/list/datum/stack_recipe/adamantine_recipes = list( +GLOBAL_LIST_INIT(adamantine_recipes, list( new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount = 1, res_amount = 1), \ - ) + )) -var/global/list/datum/stack_recipe/snow_recipes = list( +GLOBAL_LIST_INIT(snow_recipes, list( new/datum/stack_recipe("snowman", /obj/structure/snowman, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Snowball", /obj/item/snowball, 1) - ) + )) /obj/item/stack/sheet/mineral force = 5 @@ -135,7 +135,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list( /obj/item/stack/sheet/mineral/sandstone/New() ..() - recipes = sandstone_recipes + recipes = GLOB.sandstone_recipes /* * Sandbags @@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/diamond/New() ..() - recipes = diamond_recipes + recipes = GLOB.diamond_recipes /obj/item/stack/sheet/mineral/uranium name = "uranium" @@ -199,7 +199,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/uranium/New() ..() - recipes = uranium_recipes + recipes = GLOB.uranium_recipes /obj/item/stack/sheet/mineral/plasma name = "solid plasma" @@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/plasma/New() ..() - recipes = plasma_recipes + recipes = GLOB.plasma_recipes /obj/item/stack/sheet/mineral/plasma/welder_act(mob/user, obj/item/I) if(I.use_tool(src, user, volume = I.tool_volume)) @@ -239,7 +239,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/gold/New() ..() - recipes = gold_recipes + recipes = GLOB.gold_recipes /obj/item/stack/sheet/mineral/silver name = "silver" @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/silver/New() ..() - recipes = silver_recipes + recipes = GLOB.silver_recipes /obj/item/stack/sheet/mineral/bananium name = "bananium" @@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/bananium/New(loc, amount=null) ..() - recipes = bananium_recipes + recipes = GLOB.bananium_recipes /obj/item/stack/sheet/mineral/tranquillite name = "tranquillite" @@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null) ..() - recipes = tranquillite_recipes + recipes = GLOB.tranquillite_recipes /* * Titanium @@ -298,13 +298,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT) point_value = 20 -var/global/list/datum/stack_recipe/titanium_recipes = list ( +GLOBAL_LIST_INIT(titanium_recipes, list( new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), new/datum/stack_recipe("surgical tray", /obj/structure/table/tray, 2, one_per_turf = 1, on_floor = 1), - ) + )) /obj/item/stack/sheet/mineral/titanium/New(loc, amount=null) - recipes = titanium_recipes + recipes = GLOB.titanium_recipes ..() /obj/item/stack/sheet/mineral/titanium/fifty @@ -328,12 +328,12 @@ var/global/list/datum/stack_recipe/titanium_recipes = list ( materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000) point_value = 45 -var/global/list/datum/stack_recipe/plastitanium_recipes = list ( +GLOBAL_LIST_INIT(plastitanium_recipes, list( new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20), - ) + )) /obj/item/stack/sheet/mineral/plastitanium/New(loc, amount=null) - recipes = plastitanium_recipes + recipes = GLOB.plastitanium_recipes ..() /obj/item/stack/sheet/mineral/enruranium @@ -356,7 +356,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list ( sheettype = "abductor" /obj/item/stack/sheet/mineral/abductor/New(loc, amount=null) - recipes = abductor_recipes + recipes = GLOB.abductor_recipes ..() /obj/item/stack/sheet/mineral/adamantine @@ -369,7 +369,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list ( wall_allowed = FALSE /obj/item/stack/sheet/mineral/adamantine/New(loc, amount = null) - recipes = adamantine_recipes + recipes = GLOB.adamantine_recipes ..() /* @@ -385,5 +385,5 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list ( merge_type = /obj/item/stack/sheet/mineral/snow /obj/item/stack/sheet/mineral/snow/New(loc, amount = null) - recipes = snow_recipes + recipes = GLOB.snow_recipes ..() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 30085f8dad2..ac635eebef7 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -13,7 +13,7 @@ /* * Metal */ -var/global/list/datum/stack_recipe/metal_recipes = list( +GLOBAL_LIST_INIT(metal_recipes, list( new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1), @@ -94,7 +94,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list( new /datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2), new /datum/stack_recipe("extinguisher cabinet frame", /obj/item/mounted/frame/extinguisher, 2), null -) +)) /obj/item/stack/sheet/metal name = "metal" @@ -124,13 +124,13 @@ var/global/list/datum/stack_recipe/metal_recipes = list( qdel(src) /obj/item/stack/sheet/metal/New(var/loc, var/amount=null) - recipes = metal_recipes + recipes = GLOB.metal_recipes return ..() /* * Plasteel */ -var/global/list/datum/stack_recipe/plasteel_recipes = list( +GLOBAL_LIST_INIT(plasteel_recipes, list( new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), new /datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 3, time = 50), new /datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1), @@ -141,7 +141,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1), )), -) +)) /obj/item/stack/sheet/plasteel name = "plasteel" @@ -159,13 +159,13 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( point_value = 23 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null) - recipes = plasteel_recipes + recipes = GLOB.plasteel_recipes return ..() /* * Wood */ -var/global/list/datum/stack_recipe/wood_recipes = list( +GLOBAL_LIST_INIT(wood_recipes, list( new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), new /datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \ @@ -178,7 +178,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list( new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), - new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50), new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10), @@ -189,7 +189,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list( new /datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50), new /datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100) -) +)) /obj/item/stack/sheet/wood name = "wooden planks" @@ -203,13 +203,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list( merge_type = /obj/item/stack/sheet/wood /obj/item/stack/sheet/wood/New(var/loc, var/amount=null) - recipes = wood_recipes + recipes = GLOB.wood_recipes return ..() /* * Cloth */ -var/global/list/datum/stack_recipe/cloth_recipes = list ( \ +GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), \ new/datum/stack_recipe("white shoes", /obj/item/clothing/shoes/white, 2), \ new/datum/stack_recipe("white scarf", /obj/item/clothing/accessory/scarf/white, 1), \ @@ -234,7 +234,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \ new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \ null, \ new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 3), \ - ) + )) /obj/item/stack/sheet/cloth name = "cloth" @@ -248,7 +248,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \ merge_type = /obj/item/stack/sheet/cloth /obj/item/stack/sheet/cloth/New(loc, amount=null) - recipes = cloth_recipes + recipes = GLOB.cloth_recipes ..() /obj/item/stack/sheet/cloth/ten @@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ /* * Cardboard */ -var/global/list/datum/stack_recipe/cardboard_recipes = list ( +GLOBAL_LIST_INIT(cardboard_recipes, list ( new /datum/stack_recipe("box", /obj/item/storage/box), new /datum/stack_recipe("large box", /obj/item/storage/box/large, 4), new /datum/stack_recipe("patch pack", /obj/item/storage/pill_bottle/patch_pack, 2), @@ -314,7 +314,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( new /datum/stack_recipe("cardboard tube", /obj/item/c_tube), new /datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4), new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), -) +)) /obj/item/stack/sheet/cardboard/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/stamp/clown) && !istype(loc, /obj/item/storage)) @@ -336,21 +336,21 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( merge_type = /obj/item/stack/sheet/cardboard /obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null) - recipes = cardboard_recipes + recipes = GLOB.cardboard_recipes return ..() /* * Runed Metal */ -var/global/list/datum/stack_recipe/cult = list ( \ +GLOBAL_LIST_INIT(cult_recipes, list ( \ new/datum/stack_recipe/cult("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), new/datum/stack_recipe/cult("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("pylon", /obj/structure/cult/functional/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("forge", /obj/structure/cult/functional/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("archives", /obj/structure/cult/functional/archives, 2, time = 40, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe/cult("altar", /obj/structure/cult/functional/altar, 5, time = 40, one_per_turf = 1, on_floor = 1), \ - ) + )) /obj/item/stack/sheet/runed_metal name = "runed metal" @@ -393,13 +393,13 @@ var/global/list/datum/stack_recipe/cult = list ( \ amount = 50 /obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null) - recipes = cult + recipes = GLOB.cult_recipes return ..() /* * Brass */ -var/global/list/datum/stack_recipe/brass_recipes = list (\ +GLOBAL_LIST_INIT(brass_recipes, list (\ new/datum/stack_recipe("wall gear", /obj/structure/clockwork/wall_gear, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ null, new/datum/stack_recipe/window("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \ @@ -408,7 +408,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\ new/datum/stack_recipe/window("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \ - ) + )) /obj/item/stack/tile/brass name = "brass" @@ -428,7 +428,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\ qdel(src) /obj/item/stack/tile/brass/New(loc, amount=null) - recipes = brass_recipes + recipes = GLOB.brass_recipes . = ..() pixel_x = 0 pixel_y = 0 diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index c568e66c86a..1c499a7d6af 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -27,9 +27,9 @@ mineralType = "uranium" materials = list(MAT_URANIUM=500) -var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \ +GLOBAL_LIST_INIT(gold_tile_recipes, list ( \ new/datum/stack_recipe("fancy gold tile", /obj/item/stack/tile/mineral/gold/fancy, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/gold name = "gold tile" @@ -42,11 +42,11 @@ var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \ /obj/item/stack/tile/mineral/gold/New(loc, amount=null) ..() - recipes = gold_tile_recipes + recipes = GLOB.gold_tile_recipes -var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \ +GLOBAL_LIST_INIT(goldfancy_tile_recipes, list ( \ new/datum/stack_recipe("regular gold tile", /obj/item/stack/tile/mineral/gold, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/gold/fancy icon_state = "tile_goldfancy" @@ -54,11 +54,11 @@ var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \ /obj/item/stack/tile/mineral/gold/fancy/New(loc, amount=null) ..() - recipes = goldfancy_tile_recipes + recipes = GLOB.goldfancy_tile_recipes -var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \ +GLOBAL_LIST_INIT(silver_tile_recipes, list ( \ new/datum/stack_recipe("fancy silver tile", /obj/item/stack/tile/mineral/silver/fancy, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/silver name = "silver tile" @@ -71,11 +71,11 @@ var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \ /obj/item/stack/tile/mineral/silver/New(loc, amount=null) ..() - recipes = silver_tile_recipes + recipes = GLOB.silver_tile_recipes -var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \ +GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \ new/datum/stack_recipe("regular silver tile", /obj/item/stack/tile/mineral/silver, max_res_amount = 20), \ - ) + )) /obj/item/stack/tile/mineral/silver/fancy icon_state = "tile_silverfancy" @@ -83,7 +83,7 @@ var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \ /obj/item/stack/tile/mineral/silver/fancy/New(loc, amount=null) ..() - recipes = silverfancy_tile_recipes + recipes = GLOB.silverfancy_tile_recipes /obj/item/stack/tile/mineral/diamond name = "diamond tile" diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index 22c9861da6e..c31f0666f50 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -73,13 +73,13 @@ /obj/item/multitool/ai_detect/proc/multitool_detect() var/turf/our_turf = get_turf(src) - for(var/mob/living/silicon/ai/AI in ai_list) + for(var/mob/living/silicon/ai/AI in GLOB.ai_list) if(AI.cameraFollow == src) detect_state = PROXIMITY_ON_SCREEN break - if(!detect_state && cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z)) - var/datum/camerachunk/chunk = cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) + if(!detect_state && GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z)) + var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) if(chunk) if(chunk.seenby.len) for(var/mob/camera/aiEye/A in chunk.seenby) diff --git a/code/game/objects/items/tools/tool_behaviour.dm b/code/game/objects/items/tools/tool_behaviour.dm index c937f80c30d..986e3a981b2 100644 --- a/code/game/objects/items/tools/tool_behaviour.dm +++ b/code/game/objects/items/tools/tool_behaviour.dm @@ -16,11 +16,11 @@ var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, target, amount, extra_checks) if(ismob(target)) - if(!do_mob(user, target, delay, extra_checks=tool_check)) + if(!do_mob(user, target, delay, extra_checks = list(tool_check))) return else - if(!do_after(user, delay, target=target, extra_checks=tool_check)) + if(!do_after(user, delay, target=target, extra_checks = list(tool_check))) return else // Invoke the extra checks once, just in case. @@ -57,4 +57,4 @@ // Used in a callback that is passed by use_tool into do_after call. Do not override, do not call manually. /obj/item/proc/tool_check_callback(mob/living/user, atom/target, amount, datum/callback/extra_checks) - return tool_use_check(user, amount) && (!extra_checks || extra_checks.Invoke()) + return tool_use_check(user, amount) && (extra_checks && !extra_checks.Invoke()) diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index b002ed32205..49f5bb4073b 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -35,10 +35,12 @@ ..() create_reagents(maximum_fuel) reagents.add_reagent("fuel", maximum_fuel) - if(refills_over_time) - reagents.reagents_generated_per_cycle += list("fuel" = 1) update_icon() +/obj/item/weldingtool/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + /obj/item/weldingtool/examine(mob/user) . = ..() if(get_dist(user, src) <= 0) @@ -49,10 +51,15 @@ return FIRELOSS /obj/item/weldingtool/process() - var/turf/T = get_turf(src) - T.hotspot_expose(2500, 5) - if(prob(5)) - remove_fuel(1) + if(tool_enabled) + var/turf/T = get_turf(src) + if(T) // Implants for instance won't find a turf + T.hotspot_expose(2500, 5) + if(prob(5)) + remove_fuel(1) + if(refills_over_time) + if(GET_FUEL < maximum_fuel) + reagents.add_reagent("fuel", 1) ..() /obj/item/weldingtool/attack_self(mob/user) @@ -76,7 +83,8 @@ playsound(loc, activation_sound, 50, 1) set_light(light_intensity) else - STOP_PROCESSING(SSobj, src) + if(!refills_over_time) + STOP_PROCESSING(SSobj, src) damtype = BRUTE force = 3 hitsound = "swing_hit" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a4d54f12ab0..21795fb738c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1023,6 +1023,18 @@ obj/item/toy/cards/deck/syndicate/black name = "orange fox plushie" icon_state = "orangefox" +/obj/item/toy/plushie/orange_fox/grump + name = "grumpy fox" + desc = "An ancient plushie that seems particularly grumpy." + +/obj/item/toy/plushie/orange_fox/grump/ComponentInitialize() + . = ..() + var/static/list/grumps = list("Ahh, yes, you're so clever, var editing that.", "Really?", "If you make a runtime with var edits, it's your own damn fault.", + "Don't you dare post issues on the git when you don't even know how this works.", "Was that necessary?", "Ohhh, setting admin edited var must be your favorite pastime!", + "Oh, so you have time to var edit, but you don't have time to ban that greytider?", "Oh boy, is this another one of those 'events'?", "Seriously, just stop.", "You do realize this is incurring proc call overhead.", + "Congrats, you just left a reference with your dirty client and now that thing you edited will never garbage collect properly.", "Is it that time of day, again, for unecessary adminbus?") + AddComponent(/datum/component/edit_complainer, grumps) + /obj/item/toy/plushie/coffee_fox name = "coffee fox plushie" icon_state = "coffeefox" @@ -1087,6 +1099,21 @@ obj/item/toy/cards/deck/syndicate/black return ..() +/obj/item/toy/plushie/ipcplushie + name = "IPC plushie" + desc = "An adorable IPC plushie, straight from New Canaan. Arguably more durable than the real deal. Toaster functionality included." + icon_state = "plushie_ipc" + item_state = "plushie_ipc" + +/obj/item/toy/plushie/ipcplushie/attackby(obj/item/B, mob/user, params) + if(istype(B, /obj/item/reagent_containers/food/snacks/breadslice)) + new /obj/item/reagent_containers/food/snacks/toast(get_turf(loc)) + to_chat(user, " You insert bread into the toaster. ") + playsound(loc, 'sound/machines/ding.ogg', 50, 1) + qdel(B) + else + return ..() + //New generation TG plushies /obj/item/toy/plushie/lizardplushie @@ -1117,15 +1144,15 @@ obj/item/toy/cards/deck/syndicate/black * Foam Armblade */ - /obj/item/toy/foamblade - name = "foam armblade" - desc = "it says \"Sternside Changs #1 fan\" on it. " - icon = 'icons/obj/toy.dmi' - icon_state = "foamblade" - item_state = "arm_blade" - attack_verb = list("pricked", "absorbed", "gored") - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE +/obj/item/toy/foamblade + name = "foam armblade" + desc = "it says \"Sternside Changs #1 fan\" on it. " + icon = 'icons/obj/toy.dmi' + icon_state = "foamblade" + item_state = "arm_blade" + attack_verb = list("pricked", "absorbed", "gored") + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE /* * Toy/fake flash @@ -1208,10 +1235,10 @@ obj/item/toy/cards/deck/syndicate/black var/list/messages = list() var/datum/devilinfo/devil = randomDevilInfo() messages += "Some fun facts about: [devil.truename]" - messages += "[lawlorify[LORE][devil.bane]]" - messages += "[lawlorify[LORE][devil.obligation]]" - messages += "[lawlorify[LORE][devil.ban]]" - messages += "[lawlorify[LORE][devil.banish]]" + messages += "[GLOB.lawlorify[LORE][devil.bane]]" + messages += "[GLOB.lawlorify[LORE][devil.obligation]]" + messages += "[GLOB.lawlorify[LORE][devil.ban]]" + messages += "[GLOB.lawlorify[LORE][devil.banish]]" playsound(loc, 'sound/machines/click.ogg', 20, 1) cooldown = TRUE for(var/message in messages) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 1f89bd03336..1e34561c441 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -84,7 +84,7 @@ AI MODULES /obj/item/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) var/time = time2text(world.realtime,"hh:mm:ss") - lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])") + GLOB.lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])") log_and_message_admins("used [src.name] on [target.name]([target.key])") /obj/item/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) @@ -114,7 +114,7 @@ AI MODULES var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) to_chat(target, law) target.add_supplied_law(4, law) - lawchanges.Add("The law specified [targetName]") + GLOB.lawchanges.Add("The law specified [targetName]") /******************** oneCrewMember ********************/ /obj/item/aiModule/oneCrewMember @@ -141,12 +141,11 @@ AI MODULES if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite to_chat(target, law) target.set_zeroth_law(law) - lawchanges.Add("The law specified [targetName]") + GLOB.lawchanges.Add("The law specified [targetName]") else - to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite - - to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]") - lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") + to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite + to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]") + GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") /******************** ProtectStation ********************/ /obj/item/aiModule/protectStation @@ -203,7 +202,7 @@ AI MODULES if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER) lawpos = MIN_SUPPLIED_LAW_NUMBER target.add_supplied_law(lawpos, law) - lawchanges.Add("The law was '[newFreeFormLaw]'") + GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'") /obj/item/aiModule/freeform/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) @@ -222,11 +221,11 @@ AI MODULES log_law_changes(target, sender) if(!is_special_character(target)) - target.set_zeroth_law("") + target.clear_zeroth_law() target.laws.clear_supplied_laws() target.laws.clear_ion_laws() - to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") + to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") target.show_laws() /******************** Purge ********************/ @@ -238,8 +237,8 @@ AI MODULES /obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) ..() if(!is_special_character(target)) - target.set_zeroth_law("") - to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.") + target.clear_zeroth_law() + to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.") target.clear_supplied_laws() target.clear_ion_laws() target.clear_inherent_laws() @@ -332,7 +331,7 @@ AI MODULES ..() var/law = "[newFreeFormLaw]" target.add_inherent_law(law) - lawchanges.Add("The law is '[newFreeFormLaw]'") + GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'") /obj/item/aiModule/freeformcore/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) @@ -358,7 +357,7 @@ AI MODULES // ..() //We don't want this module reporting to the AI who dun it. --NEO log_law_changes(target, sender) - lawchanges.Add("The law is '[newFreeFormLaw]'") + GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'") to_chat(target, "BZZZZT") var/law = "[newFreeFormLaw]" target.add_ion_law(law) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index fda3418fd11..d6397025424 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -167,14 +167,14 @@ GLOBAL_LIST_INIT(rcd_door_types, list( /obj/item/rcd/attack_self_tk(mob/user) radial_menu(user) -/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) +/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state) ui.open() ui.set_auto_update(1) -/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) +/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state) var/data[0] data["mode"] = mode data["door_type"] = door_type @@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list( QDEL_NULL(A) for(var/obj/structure/window/W in T1.contents) qdel(W) - for(var/cdir in cardinal) + for(var/cdir in GLOB.cardinal) var/turf/T2 = get_step(T1, cdir) if(locate(/obj/structure/window/full/shuttle) in T2) continue // Shuttle windows? Nah. We don't need extra windows there. @@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list( new /obj/structure/grille(A) for(var/obj/structure/window/W in A) qdel(W) - for(var/cdir in cardinal) + for(var/cdir in GLOB.cardinal) var/turf/T = get_step(A, cdir) if(locate(/obj/structure/grille) in T) for(var/obj/structure/window/W in T) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 58258687fc7..405ce47a033 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -495,17 +495,17 @@ else if(department != "Civilian") switch(department) if("Engineering") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in engineering_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.engineering_positions if("Medical") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in medical_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.medical_positions if("Science") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in science_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.science_positions if("Security") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in security_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.security_positions if("Support") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in support_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.support_positions if("Command") - new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in command_positions + new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.command_positions if(!Adjacent(user)) return diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 91bb84f880b..bf46343b963 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -32,7 +32,7 @@ if(PA) qdel(PA) else - PA = new(src) + PA = new(user, src) user.put_in_hands(PA) /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user) @@ -55,7 +55,7 @@ var/obj/structure/chrono_field/field = null var/turf/startpos = null -/obj/item/gun/energy/chrono_gun/New(var/obj/item/chrono_eraser/T) +/obj/item/gun/energy/chrono_gun/Initialize(mapload, obj/item/chrono_eraser/T) . = ..() if(istype(T)) TED = T diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 24c904bc9d3..98a7b769642 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -360,7 +360,7 @@ LIGHTERS ARE IN LIGHTERS.DM lit = FALSE icon_state = icon_off item_state = icon_off - M.update_inv_wear_mask(0) + M.update_inv_wear_mask() STOP_PROCESSING(SSobj, src) return smoke() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 7f9cd2f1663..8815ad6a20f 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -108,7 +108,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M var/obj/item/organ/external/head/C = H.get_organ("head") - var/datum/robolimb/robohead = all_robolimbs[C.model] + var/datum/robolimb/robohead = GLOB.all_robolimbs[C.model] if(user.zone_selected == "mouth") if(!get_location_accessible(H, "mouth")) to_chat(user, "The mask is in the way.") diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm index 09d43434560..4a9e3c2b7cf 100644 --- a/code/game/objects/items/weapons/courtroom.dm +++ b/code/game/objects/items/weapons/courtroom.dm @@ -27,10 +27,12 @@ throwforce = 2.0 w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE + var/next_gavel_hit /obj/item/gavelblock/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/gavelhammer)) - playsound(loc, 'sound/items/gavel.ogg', 100, 1) - user.visible_message("[user] strikes \the [src] with \the [I].") - else + if(!istype(I, /obj/item/gavelhammer)) return + if(world.time > next_gavel_hit) + playsound(loc, 'sound/items/gavel.ogg', 100, 1) + next_gavel_hit = world.time + 5 SECONDS + user.visible_message("[user] strikes \the [src] with \the [I].") diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 82b885c03d1..bc6a98a9b1f 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -178,9 +178,9 @@ spawn(40) var/cap = 0 - if(result > MAX_EX_LIGHT_RANGE && result != 20) + if(result > GLOB.max_ex_light_range && result != 20) cap = 1 - result = min(result, MAX_EX_LIGHT_RANGE) //Apply the bombcap + result = min(result, GLOB.max_ex_light_range) //Apply the bombcap else if(result == 20) //Roll a nat 20, screw the bombcap result = 24 var/turf/epicenter = get_turf(src) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 295d17efc39..8f11f65fe71 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -127,12 +127,12 @@ if(buf && buf.types & DNA2_BUF_SE) if(block) - if(GetState() && block == MONKEYBLOCK && ishuman(M)) + if(GetState() && block == GLOB.monkeyblock && ishuman(M)) attack_log = "injected with the Isolated [name] (MONKEY)" message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") else - if(GetState(MONKEYBLOCK) && ishuman(M)) + if(GetState(GLOB.monkeyblock) && ishuman(M)) attack_log = "injected with the Isolated [name] (MONKEY)" message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") @@ -165,7 +165,7 @@ forcedmutation = TRUE /obj/item/dnainjector/hulkmut/Initialize() - block = HULKBLOCK + block = GLOB.hulkblock ..() /obj/item/dnainjector/antihulk @@ -176,7 +176,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antihulk/Initialize() - block = HULKBLOCK + block = GLOB.hulkblock ..() /obj/item/dnainjector/xraymut @@ -187,7 +187,7 @@ forcedmutation = TRUE /obj/item/dnainjector/xraymut/Initialize() - block = XRAYBLOCK + block = GLOB.xrayblock ..() /obj/item/dnainjector/antixray @@ -198,7 +198,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antixray/Initialize() - block = XRAYBLOCK + block = GLOB.xrayblock ..() /obj/item/dnainjector/firemut @@ -209,7 +209,7 @@ forcedmutation = TRUE /obj/item/dnainjector/firemut/Initialize() - block = FIREBLOCK + block = GLOB.fireblock ..() /obj/item/dnainjector/antifire @@ -220,7 +220,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antifire/Initialize() - block = FIREBLOCK + block = GLOB.fireblock ..() /obj/item/dnainjector/telemut @@ -231,7 +231,7 @@ forcedmutation = TRUE /obj/item/dnainjector/telemut/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/telemut/darkbundle @@ -247,7 +247,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antitele/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/nobreath @@ -258,7 +258,7 @@ forcedmutation = TRUE /obj/item/dnainjector/nobreath/Initialize() - block = BREATHLESSBLOCK + block = GLOB.breathlessblock ..() /obj/item/dnainjector/antinobreath @@ -269,7 +269,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antinobreath/Initialize() - block = BREATHLESSBLOCK + block = GLOB.breathlessblock ..() /obj/item/dnainjector/remoteview @@ -280,7 +280,7 @@ forcedmutation = TRUE /obj/item/dnainjector/remoteview/Initialize() - block = REMOTEVIEWBLOCK + block = GLOB.remoteviewblock ..() /obj/item/dnainjector/antiremoteview @@ -291,7 +291,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiremoteview/Initialize() - block = REMOTEVIEWBLOCK + block = GLOB.remoteviewblock ..() /obj/item/dnainjector/regenerate @@ -302,7 +302,7 @@ forcedmutation = TRUE /obj/item/dnainjector/regenerate/Initialize() - block = REGENERATEBLOCK + block = GLOB.regenerateblock ..() /obj/item/dnainjector/antiregenerate @@ -313,7 +313,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiregenerate/Initialize() - block = REGENERATEBLOCK + block = GLOB.regenerateblock ..() /obj/item/dnainjector/runfast @@ -324,7 +324,7 @@ forcedmutation = TRUE /obj/item/dnainjector/runfast/Initialize() - block = INCREASERUNBLOCK + block = GLOB.increaserunblock ..() /obj/item/dnainjector/antirunfast @@ -335,7 +335,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antirunfast/Initialize() - block = INCREASERUNBLOCK + block = GLOB.increaserunblock ..() /obj/item/dnainjector/morph @@ -346,7 +346,7 @@ forcedmutation = TRUE /obj/item/dnainjector/morph/Initialize() - block = MORPHBLOCK + block = GLOB.morphblock ..() /obj/item/dnainjector/antimorph @@ -357,7 +357,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antimorph/Initialize() - block = MORPHBLOCK + block = GLOB.morphblock ..() /obj/item/dnainjector/noprints @@ -368,7 +368,7 @@ forcedmutation = TRUE /obj/item/dnainjector/noprints/Initialize() - block = NOPRINTSBLOCK + block = GLOB.noprintsblock ..() /obj/item/dnainjector/antinoprints @@ -379,7 +379,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antinoprints/Initialize() - block = NOPRINTSBLOCK + block = GLOB.noprintsblock ..() /obj/item/dnainjector/insulation @@ -390,7 +390,7 @@ forcedmutation = TRUE /obj/item/dnainjector/insulation/Initialize() - block = SHOCKIMMUNITYBLOCK + block = GLOB.shockimmunityblock ..() /obj/item/dnainjector/antiinsulation @@ -401,7 +401,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiinsulation/Initialize() - block = SHOCKIMMUNITYBLOCK + block = GLOB.shockimmunityblock ..() /obj/item/dnainjector/midgit @@ -412,7 +412,7 @@ forcedmutation = TRUE /obj/item/dnainjector/midgit/Initialize() - block = SMALLSIZEBLOCK + block = GLOB.smallsizeblock ..() /obj/item/dnainjector/antimidgit @@ -423,7 +423,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antimidgit/Initialize() - block = SMALLSIZEBLOCK + block = GLOB.smallsizeblock ..() ///////////////////////////////////// @@ -435,7 +435,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiglasses/Initialize() - block = GLASSESBLOCK + block = GLOB.glassesblock ..() /obj/item/dnainjector/glassesmut @@ -446,7 +446,7 @@ forcedmutation = TRUE /obj/item/dnainjector/glassesmut/Initialize() - block = GLASSESBLOCK + block = GLOB.glassesblock ..() /obj/item/dnainjector/epimut @@ -457,7 +457,7 @@ forcedmutation = TRUE /obj/item/dnainjector/epimut/Initialize() - block = EPILEPSYBLOCK + block = GLOB.epilepsyblock ..() /obj/item/dnainjector/antiepi @@ -468,7 +468,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiepi/Initialize() - block = EPILEPSYBLOCK + block = GLOB.epilepsyblock ..() /obj/item/dnainjector/anticough @@ -479,7 +479,7 @@ forcedmutation = TRUE /obj/item/dnainjector/anticough/Initialize() - block = COUGHBLOCK + block = GLOB.coughblock ..() /obj/item/dnainjector/coughmut @@ -490,7 +490,7 @@ forcedmutation = TRUE /obj/item/dnainjector/coughmut/Initialize() - block = COUGHBLOCK + block = GLOB.coughblock ..() /obj/item/dnainjector/clumsymut @@ -501,7 +501,7 @@ forcedmutation = TRUE /obj/item/dnainjector/clumsymut/Initialize() - block = CLUMSYBLOCK + block = GLOB.clumsyblock ..() /obj/item/dnainjector/anticlumsy @@ -512,7 +512,7 @@ forcedmutation = TRUE /obj/item/dnainjector/anticlumsy/Initialize() - block = CLUMSYBLOCK + block = GLOB.clumsyblock ..() /obj/item/dnainjector/antitour @@ -523,7 +523,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antitour/Initialize() - block = TWITCHBLOCK + block = GLOB.twitchblock ..() /obj/item/dnainjector/tourmut @@ -534,7 +534,7 @@ forcedmutation = TRUE /obj/item/dnainjector/tourmut/Initialize() - block = TWITCHBLOCK + block = GLOB.twitchblock ..() /obj/item/dnainjector/stuttmut @@ -545,7 +545,7 @@ forcedmutation = TRUE /obj/item/dnainjector/stuttmut/Initialize() - block = NERVOUSBLOCK + block = GLOB.nervousblock ..() @@ -557,7 +557,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antistutt/Initialize() - block = NERVOUSBLOCK + block = GLOB.nervousblock ..() /obj/item/dnainjector/blindmut @@ -568,7 +568,7 @@ forcedmutation = TRUE /obj/item/dnainjector/blindmut/Initialize() - block = BLINDBLOCK + block = GLOB.blindblock ..() /obj/item/dnainjector/antiblind @@ -579,7 +579,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antiblind/Initialize() - block = BLINDBLOCK + block = GLOB.blindblock ..() /obj/item/dnainjector/telemut @@ -590,7 +590,7 @@ forcedmutation = TRUE /obj/item/dnainjector/telemut/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/antitele @@ -601,7 +601,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antitele/Initialize() - block = TELEBLOCK + block = GLOB.teleblock ..() /obj/item/dnainjector/deafmut @@ -612,7 +612,7 @@ forcedmutation = TRUE /obj/item/dnainjector/deafmut/Initialize() - block = DEAFBLOCK + block = GLOB.deafblock ..() /obj/item/dnainjector/antideaf @@ -623,7 +623,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antideaf/Initialize() - block = DEAFBLOCK + block = GLOB.deafblock ..() /obj/item/dnainjector/hallucination @@ -634,7 +634,7 @@ forcedmutation = TRUE /obj/item/dnainjector/hallucination/Initialize() - block = HALLUCINATIONBLOCK + block = GLOB.hallucinationblock ..() /obj/item/dnainjector/antihallucination @@ -645,7 +645,7 @@ forcedmutation = TRUE /obj/item/dnainjector/antihallucination/Initialize() - block = HALLUCINATIONBLOCK + block = GLOB.hallucinationblock ..() /obj/item/dnainjector/h2m @@ -656,7 +656,7 @@ forcedmutation = TRUE /obj/item/dnainjector/h2m/Initialize() - block = MONKEYBLOCK + block = GLOB.monkeyblock ..() /obj/item/dnainjector/m2h @@ -667,7 +667,7 @@ forcedmutation = TRUE /obj/item/dnainjector/m2h/Initialize() - block = MONKEYBLOCK + block = GLOB.monkeyblock ..() @@ -679,7 +679,7 @@ forcedmutation = TRUE /obj/item/dnainjector/comic/Initialize() - block = COMICBLOCK + block = GLOB.comicblock ..() /obj/item/dnainjector/anticomic @@ -690,5 +690,5 @@ forcedmutation = TRUE /obj/item/dnainjector/anticomic/Initialize() - block = COMICBLOCK + block = GLOB.comicblock ..() diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index c2dc8e285ab..1dcc4a942c2 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -45,7 +45,7 @@ scramble(1, H, 100) H.real_name = random_name(H.gender, H.dna.species.name) //Give them a name that makes sense for their species. H.sync_organ_dna(assimilate = 1) - H.update_body(0) + H.update_body() H.reset_hair() //No more winding up with hairstyles you're not supposed to have, and blowing your cover. H.reset_markings() //...Or markings. H.dna.ResetUIFrom(H) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index c534a89277c..5c69a59aba9 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -229,6 +229,7 @@ desc = "A C4 charge with an altered chemical composition, designed to blind and deafen the occupants of a room before breaching." /obj/item/grenade/plastic/c4_shaped/flash/prime() + var/turf/T if(target && target.density) T = get_step(get_turf(target), aim_dir) else if(target) @@ -266,6 +267,7 @@ addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3) else + var/turf/T = get_step(location, aim_dir) addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3) addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 5a3286bfc05..48edcc826e6 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -49,8 +49,7 @@ to_chat(user, "You cut open the present.") for(var/mob/M in src) //Should only be one but whatever. - M.loc = src.loc - M.reset_perspective(null) + M.forceMove(loc) qdel(src) diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index 26a1f3ede0d..96a3a8e1400 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -1,5 +1,5 @@ -var/turf/T +// var/turf/T | This was made 14th September 2013, and has no use at all. Its being removed /obj/item/grenade/bananade name = "bananade" diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm index bce9861fb72..1dcf250dfe4 100644 --- a/code/game/objects/items/weapons/grenades/clowngrenade.dm +++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm @@ -13,22 +13,12 @@ /obj/item/grenade/clown_grenade/prime() ..() playsound(src.loc, 'sound/items/bikehorn.ogg', 25, -3) - /* - for(var/turf/simulated/floor/T in view(affected_area, src.loc)) - if(prob(75)) - banana(T) - */ var/i = 0 var/number = 0 - for(var/direction in alldirs) + for(var/direction in GLOB.alldirs) for(i = 0; i < 2; i++) number++ var/obj/item/grown/bananapeel/traitorpeel/peel = new /obj/item/grown/bananapeel/traitorpeel(get_turf(src.loc)) - /* var/direction = pick(alldirs) - var/spaces = pick(1;150, 2) - var/a = 0 - for(a = 0; a < spaces; a++) - step(peel,direction)*/ var/a = 1 if(number & 2) for(a = 1; a <= 2; a++) @@ -39,21 +29,17 @@ qdel(src) return -/obj/item/grown/bananapeel/traitorpeel - trip_stun = 0 - trip_weaken = 7 - trip_tiles = 4 - trip_walksafe = FALSE - - trip_chance = 100 - - -/obj/item/grown/bananapeel/traitorpeel/on_trip(mob/living/carbon/human/H) +/obj/item/grown/bananapeel/traitorpeel/New(newloc, obj/item/seeds/new_seed) . = ..() - if(.) - to_chat(H, "Your feet feel like they're on fire!") - H.take_overall_damage(0, rand(2,8)) - H.take_organ_damage(2) // Was 5 -- TLE + // The reason this AddComponent is here and not in ComponentInitialize() is because if it's put there, it will be ran before the parent New proc for /grown types. + // And then be overriden by the generic component placed onto it by the `/datum/plant_gene/trait/slip`. + AddComponent(/datum/component/slippery, src, 0, 7, 100, 4, FALSE) + +/obj/item/grown/bananapeel/traitorpeel/after_slip(mob/living/carbon/human/H) + to_chat(H, "Your feet feel like they're on fire!") + H.take_overall_damage(0, rand(2,8)) + H.take_organ_damage(2) + return ..() /obj/item/grown/bananapeel/traitorpeel/throw_impact(atom/hit_atom) var/burned = rand(1,3) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index e188279eb8c..1f73e5c7062 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -37,6 +37,9 @@ cuff(C, user) /obj/item/restraints/handcuffs/proc/cuff(mob/living/carbon/C, mob/user, remove_src = TRUE) + if(!istype(C)) // Shouldn't be able to cuff anything but carbons. + return + if(ishuman(C)) var/mob/living/carbon/human/H = C if(!(H.has_left_hand() || H.has_right_hand())) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 95cf1e7026a..4efb6994e8d 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -37,7 +37,7 @@ user.visible_message("[src] slips out of the grip of [user] as they try to pick it up, bouncing upwards and smacking [user.p_them()] in the face!", \ "[src] slips out of your grip as you pick it up, bouncing upwards and smacking you in the face!") playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1) - throw_at(get_edge_target_turf(user, pick(alldirs)), rand(1, 3), 5) + throw_at(get_edge_target_turf(user, pick(GLOB.alldirs)), rand(1, 3), 5) /obj/item/nullrod/attack_self(mob/user) diff --git a/code/game/objects/items/weapons/implants/implant_death_alarm.dm b/code/game/objects/items/weapons/implants/implant_death_alarm.dm index d27d6dd5f7e..e8330c0c5cd 100644 --- a/code/game/objects/items/weapons/implants/implant_death_alarm.dm +++ b/code/game/objects/items/weapons/implants/implant_death_alarm.dm @@ -47,7 +47,7 @@ a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm") qdel(src) if("emp") - var/name = prob(50) ? t.name : pick(teleportlocs) + var/name = prob(50) ? t.name : pick(GLOB.teleportlocs) a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm") else a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm") diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/implants/implant_storage.dm index 18b08bba283..b530fd860fa 100644 --- a/code/game/objects/items/weapons/implants/implant_storage.dm +++ b/code/game/objects/items/weapons/implants/implant_storage.dm @@ -20,6 +20,10 @@ ..() storage = new /obj/item/storage/hidden/implant(src) +/obj/item/implant/storage/emp_act(severity) + ..() + storage.emp_act(severity) + /obj/item/implant/storage/activate() storage.MouseDrop(imp_in) diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm index 05d2363ee01..40998caa774 100644 --- a/code/game/objects/items/weapons/implants/implant_traitor.dm +++ b/code/game/objects/items/weapons/implants/implant_traitor.dm @@ -40,14 +40,13 @@ L.adjustBrainLoss(20) removed(mindslave_target) qdel(src) - return -1 + return -1 if(ismindshielded(mindslave_target)) mindslave_target.visible_message("[mindslave_target] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.") removed(mindslave_target) qdel(src) return -1 - mindslave_target.implanting = 1 to_chat(mindslave_target, "You feel completely loyal to [user.name].") if(!(user.mind in SSticker.mode.implanter)) SSticker.mode.implanter[user.mind] = list() @@ -56,7 +55,7 @@ SSticker.mode.implanted.Add(mindslave_target.mind) SSticker.mode.implanted[mindslave_target.mind] = user.mind SSticker.mode.implanter[user.mind] = implanters - + to_chat(mindslave_target, "You're now completely loyal to [user.name]! You now must lay down your life to protect [user.p_them()] and assist in [user.p_their()] goals at any cost.") var/datum/objective/protect/mindslave/MS = new diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index e24346c1ee9..740079db8e1 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -1,29 +1,19 @@ -///////// -//ZIPPO// -///////// +// Basic lighters /obj/item/lighter name = "cheap lighter" desc = "A cheap-as-free lighter." icon = 'icons/obj/items.dmi' icon_state = "lighter-g" item_state = "lighter-g" - var/icon_on = "lighter-g-on" - var/icon_off = "lighter-g" w_class = WEIGHT_CLASS_TINY throwforce = 4 flags = CONDUCT slot_flags = SLOT_BELT attack_verb = null resistance_flags = FIRE_PROOF - var/lit = 0 - -/obj/item/lighter/zippo - name = "zippo lighter" - desc = "The zippo." - icon_state = "zippo" - item_state = "zippo" - icon_on = "zippoon" - icon_off = "zippo" + var/lit = FALSE + var/icon_on = "lighter-g-on" + var/icon_off = "lighter-g" /obj/item/lighter/random/New() ..() @@ -33,54 +23,51 @@ icon_state = icon_off /obj/item/lighter/attack_self(mob/living/user) - if(user.r_hand == src || user.l_hand == src || isrobot(user)) - if(!lit) - lit = 1 - w_class = WEIGHT_CLASS_BULKY - icon_state = icon_on - item_state = icon_on - force = 5 - damtype = "fire" - hitsound = 'sound/items/welder.ogg' - attack_verb = list("burnt", "singed") - if(istype(src, /obj/item/lighter/zippo) ) - user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") - playsound(src.loc, 'sound/items/zippolight.ogg', 25, 1) - else - if(prob(75)) - user.visible_message("After a few attempts, [user] manages to light the [src].") - else - to_chat(user, "You burn yourself while lighting the lighter.") - var/mob/living/M = user - if(ishuman(M)) - var/mob/living/carbon/human/H = M - var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") - if(affecting.receive_damage( 0, 5 )) //INFERNO - H.UpdateDamageIcon() - user.visible_message("After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.") - - set_light(2) - START_PROCESSING(SSobj, src) - else - lit = 0 - w_class = WEIGHT_CLASS_TINY - icon_state = icon_off - item_state = icon_off - hitsound = "swing_hit" - force = 0 - attack_verb = null //human_defense.dm takes care of it - if(istype(src, /obj/item/lighter/zippo) ) - user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.") - playsound(src.loc, 'sound/items/zippoclose.ogg', 25, 1) - else - user.visible_message("[user] quietly shuts off the [src].") - - set_light(0) - STOP_PROCESSING(SSobj, src) + . = ..() + if(!lit) + turn_on_lighter(user) else - return ..() - return + turn_off_lighter(user) +/obj/item/lighter/proc/turn_on_lighter(mob/living/user) + lit = TRUE + w_class = WEIGHT_CLASS_BULKY + icon_state = icon_on + item_state = icon_on + force = 5 + damtype = BURN + hitsound = 'sound/items/welder.ogg' + attack_verb = list("burnt", "singed") + + attempt_light(user) + set_light(2) + START_PROCESSING(SSobj, src) + +/obj/item/lighter/proc/attempt_light(mob/living/user) + if(prob(75) || issilicon(user)) // Robots can never burn themselves trying to light it. + to_chat(user, "You light [src].") + else + var/mob/living/carbon/human/H = user + var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") + if(affecting.receive_damage( 0, 5 )) //INFERNO + H.UpdateDamageIcon() + to_chat(user,"You light [src], but you burn your hand in the process.") + +/obj/item/lighter/proc/turn_off_lighter(mob/living/user) + lit = FALSE + w_class = WEIGHT_CLASS_TINY + icon_state = icon_off + item_state = icon_off + hitsound = "swing_hit" + force = 0 + attack_verb = null //human_defense.dm takes care of it + + show_off_message(user) + set_light(0) + STOP_PROCESSING(SSobj, src) + +/obj/item/lighter/proc/show_off_message(mob/living/user) + to_chat(user, "You shut off [src].") /obj/item/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!isliving(M)) @@ -108,6 +95,41 @@ location.hotspot_expose(700, 5) return +// Zippo lighters +/obj/item/lighter/zippo + name = "zippo lighter" + desc = "The zippo." + icon_state = "zippo" + item_state = "zippo" + icon_on = "zippoon" + icon_off = "zippo" + var/next_on_message + var/next_off_message + +/obj/item/lighter/zippo/turn_on_lighter(mob/living/user) + . = ..() + if(world.time > next_on_message) + user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") + playsound(src.loc, 'sound/items/zippolight.ogg', 25, 1) + next_on_message = world.time + 5 SECONDS + else + to_chat(user, "You light [src].") + +/obj/item/lighter/zippo/turn_off_lighter(mob/living/user) + . = ..() + if(world.time > next_off_message) + user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.") + playsound(src.loc, 'sound/items/zippoclose.ogg', 25, 1) + next_off_message = world.time + 5 SECONDS + else + to_chat(user, "You shut off [src].") + +/obj/item/lighter/zippo/show_off_message(mob/living/user) + return + +/obj/item/lighter/zippo/attempt_light(mob/living/user) + return + //EXTRA LIGHTERS /obj/item/lighter/zippo/nt_rep name = "gold engraved zippo" diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index c3f2e50174b..006de63af17 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -37,7 +37,7 @@ return BRUTELOSS|FIRELOSS /obj/item/melee/energy/attack_self(mob/living/carbon/user) - if(user.disabilities & CLUMSY && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") user.take_organ_damage(5,5) active = !active @@ -290,7 +290,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.disabilities & CLUMSY && prob(50)) + if((CLUMSY in H.mutations) && prob(50)) to_chat(H, "You accidentally cut yourself with [src], like a doofus!") H.take_organ_damage(10,10) active = !active diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 0732c0fdd1d..40d68cc8fc6 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -77,6 +77,10 @@ item_state = "gift" w_class = WEIGHT_CLASS_BULKY +/obj/item/gift/emp_act(severity) + ..() + gift.emp_act(severity) + /obj/item/kidanglobe name = "Kidan homeworld globe" icon = 'icons/obj/decorations.dmi' diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index 073ae0941e4..415a02f4456 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -39,6 +39,21 @@ var/primary_sound = 'sound/machines/click.ogg' var/alt_sound = null + //Lists of things + var/list/mainmenu = list( + list("category" = "Atmospherics", "mode" = RPD_ATMOS_MODE, "icon" = "wrench"), + list("category" = "Disposals", "mode" = RPD_DISPOSALS_MODE, "icon" = "recycle"), + list("category" = "Rotate", "mode" = RPD_ROTATE_MODE, "icon" = "rotate-right"), + list("category" = "Flip", "mode" = RPD_FLIP_MODE, "icon" = "exchange"), + list("category" = "Recycle", "mode" = RPD_DELETE_MODE, "icon" = "trash")) + var/list/pipemenu = list( + list("category" = "Normal", "pipemode" = RPD_ATMOS_PIPING), + list("category" = "Supply", "pipemode" = RPD_SUPPLY_PIPING), + list("category" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING), + list("category" = "Devices", "pipemode" = RPD_DEVICES), + list("category" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING)) + + /obj/item/rpd/New() ..() spark_system = new /datum/effect_system/spark_spread() @@ -91,7 +106,7 @@ P = new(T, whatpipe, iconrotation) //Make the pipe, BUT WAIT! There's more! if(!iconrotation && P.is_bent_pipe()) //Automatically rotates dispensed pipes if the user selected auto-rotation P.dir = turn(user.dir, 135) - else if(!iconrotation && P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT)) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction + else if(!iconrotation && (P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT))) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction P.dir = turn(user.dir, -180) else if(iconrotation && P.is_bent_pipe()) //If user selected a rotation and the pipe is bent P.dir = turn(iconrotation, -45) @@ -150,27 +165,12 @@ QDEL_NULL(P) activate_rpd() -//Lists of things - -var/list/mainmenu = list( - list("category" = "Atmospherics", "mode" = RPD_ATMOS_MODE, "icon" = "wrench"), - list("category" = "Disposals", "mode" = RPD_DISPOSALS_MODE, "icon" = "recycle"), - list("category" = "Rotate", "mode" = RPD_ROTATE_MODE, "icon" = "rotate-right"), - list("category" = "Flip", "mode" = RPD_FLIP_MODE, "icon" = "exchange"), - list("category" = "Recycle", "mode" = RPD_DELETE_MODE, "icon" = "trash")) -var/list/pipemenu = list( - list("category" = "Normal", "pipemode" = RPD_ATMOS_PIPING), - list("category" = "Supply", "pipemode" = RPD_SUPPLY_PIPING), - list("category" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING), - list("category" = "Devices", "pipemode" = RPD_DEVICES), - list("category" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING)) - //NanoUI stuff /obj/item/rpd/attack_self(mob/user) ui_interact(user) -/obj/item/rpd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) +/obj/item/rpd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "rpd.tmpl", "[name]", 400, 650, state = state) @@ -180,7 +180,7 @@ var/list/pipemenu = list( /obj/item/rpd/AltClick(mob/user) radial_menu(user) -/obj/item/rpd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) +/obj/item/rpd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state) var/data[0] data["iconrotation"] = iconrotation data["mainmenu"] = mainmenu diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 70add3839ef..14f3b0ab91f 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -47,12 +47,12 @@ var/A - A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs + A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in GLOB.teleportlocs if(!A) return - var/area/thearea = teleportlocs[A] + var/area/thearea = GLOB.teleportlocs[A] if(user.stat || user.restrained()) return @@ -60,7 +60,7 @@ return if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) - to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") + to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") return var/datum/effect_system/smoke_spread/smoke = new @@ -79,7 +79,7 @@ L+=T if(!L.len) - to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") + to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") return if(user && user.buckled) @@ -100,7 +100,8 @@ break if(!success) - user.loc = pick(L) + user.forceMove(pick(L)) smoke.start() src.uses -= 1 + user.update_action_buttons_icon() //Update action buttons as some spells might now be castable diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 362ab601685..19e56e161e3 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -76,7 +76,7 @@ return (active) /obj/item/shield/energy/attack_self(mob/living/carbon/human/user) - if(user.disabilities & CLUMSY && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You beat yourself in the head with [src].") user.take_organ_damage(5) active = !active diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 62f65b5a6cc..cb220ff9565 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -11,15 +11,11 @@ throw_speed = 4 throw_range = 20 discrete = 1 - - trip_stun = 4 - trip_weaken = 2 - trip_chance = 100 - trip_walksafe = FALSE - trip_verb = TV_SLIP - var/cleanspeed = 50 //slower than mop +/obj/item/soap/ComponentInitialize() + AddComponent(/datum/component/slippery, src, 4, 2, 100, 0, FALSE) + /obj/item/soap/afterattack(atom/target, mob/user, proximity) if(!proximity) return //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm index 1cc2b25edf0..0d5591bbc16 100644 --- a/code/game/objects/items/weapons/stock_parts.dm +++ b/code/game/objects/items/weapons/stock_parts.dm @@ -235,57 +235,6 @@ rating = 4 materials = list(MAT_METAL=80) -// Subspace stock parts - -/obj/item/stock_parts/subspace/ansible - name = "subspace ansible" - icon_state = "subspace_ansible" - desc = "A compact module capable of sensing extradimensional activity." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=1" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/filter - name = "hyperwave filter" - icon_state = "hyperwave_filter" - desc = "A tiny device capable of filtering and converting super-intense radiowaves." - origin_tech = "programming=2;magnets=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/amplifier - name = "subspace amplifier" - icon_state = "subspace_amplifier" - desc = "A compact micro-machine capable of amplifying weak subspace transmissions." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/treatment - name = "subspace treatment disk" - icon_state = "treatment_disk" - desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/analyzer - name = "subspace wavelength analyzer" - icon_state = "wavelength_analyzer" - desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." - origin_tech = "programming=2;magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=30, MAT_GLASS=10) - -/obj/item/stock_parts/subspace/crystal - name = "ansible crystal" - icon_state = "ansible_crystal" - desc = "A crystal made from pure glass used to transmit laser databursts to subspace." - origin_tech = "magnets=2;materials=2;bluespace=2;plasmatech=2" - materials = list(MAT_GLASS=50) - -/obj/item/stock_parts/subspace/transmitter - name = "subspace transmitter" - icon_state = "subspace_transmitter" - desc = "A large piece of equipment used to open a window into the subspace dimension." - origin_tech = "magnets=2;materials=2;bluespace=2" - materials = list(MAT_METAL=50) - /obj/item/research//Makes testing much less of a pain -Sieve name = "research" icon = 'icons/obj/stock_parts.dmi' diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 757d2b05757..26045731bd9 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -230,6 +230,11 @@ desc = "An NT Deluxe satchel, with the finest quality leather and the company logo in a thin gold stitch" icon_state = "nt_deluxe" +/obj/item/storage/backpack/satchel/lizard + name = "lizard skin handbag" + desc = "A handbag made out of what appears to be supple green Unathi skin. A face can be vaguely seen on the front." + icon_state = "satchel-lizard" + /obj/item/storage/backpack/satchel/withwallet/New() ..() new /obj/item/storage/wallet/random(src) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 755b0076c3c..403088e2b71 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -134,7 +134,8 @@ /obj/item/rad_laser, /obj/item/sensor_device, /obj/item/wrench/medical, - /obj/item/handheld_defibrillator + /obj/item/handheld_defibrillator, + /obj/item/reagent_containers/applicator ) /obj/item/storage/belt/medical/surgery diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index dceab93330a..da0094bb2ef 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1059,6 +1059,7 @@ name = "clown box" desc = "A colorful cardboard box for the clown" icon_state = "box_clown" + var/robot_arm // This exists for bot construction /obj/item/storage/box/emptysandbags name = "box of empty sandbags" @@ -1123,6 +1124,11 @@ playsound(loc, "rustle", 50, 1, -5) user.visible_message("[user] hugs \the [src].","You hug \the [src].") +/obj/item/storage/box/wizard + name = "magical box" + desc = "It's just an ordinary magical box." + icon_state = "box_wizard" + #undef NODESIGN #undef NANOTRASEN #undef SYNDI diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index bc1e90dac8e..4ff769a7d3f 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -14,7 +14,7 @@ icon_state = "firstaid" throw_speed = 2 throw_range = 8 - var/empty = 0 + var/empty = FALSE req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots. var/treatment_brute = "salglu_solution" var/treatment_oxy = "salbutamol" @@ -23,6 +23,7 @@ var/treatment_virus = "spaceacillin" var/med_bot_skin = null var/syndicate_aligned = FALSE + var/robot_arm // This is for robot construction /obj/item/storage/firstaid/fire @@ -32,39 +33,51 @@ item_state = "firstaid-ointment" med_bot_skin = "ointment" - New() - ..() - if(empty) return - - icon_state = pick("ointment","firefirstaid") - - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/healthanalyzer( src ) - new /obj/item/reagent_containers/hypospray/autoinjector( src ) - new /obj/item/reagent_containers/food/pill/salicylic( src ) +/obj/item/storage/firstaid/fire/New() + ..() + if(empty) return + icon_state = pick("ointment", "firefirstaid") + new /obj/item/reagent_containers/applicator/burn(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf/small(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/food/pill/salicylic(src) /obj/item/storage/firstaid/fire/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/regular desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" icon_state = "firstaid" - New() - ..() - if(empty) return - new /obj/item/reagent_containers/food/pill/patch/styptic( src ) - new /obj/item/reagent_containers/food/pill/patch/styptic( src ) - new /obj/item/reagent_containers/food/pill/salicylic( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/reagent_containers/food/pill/patch/silver_sulf( src ) - new /obj/item/healthanalyzer( src ) - new /obj/item/reagent_containers/hypospray/autoinjector( src ) +/obj/item/storage/firstaid/regular/New() + ..() + if(empty) return + new /obj/item/reagent_containers/food/pill/patch/styptic(src) + new /obj/item/reagent_containers/food/pill/patch/styptic(src) + new /obj/item/reagent_containers/food/pill/salicylic(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + +/obj/item/storage/firstaid/doctor + desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" + icon_state = "firstaid" + +/obj/item/storage/firstaid/doctor/New() + ..() + if(empty) + return + new /obj/item/reagent_containers/applicator/brute(src) + new /obj/item/reagent_containers/applicator/burn(src) + new /obj/item/reagent_containers/food/pill/patch/styptic(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) + new /obj/item/reagent_containers/food/pill/salicylic(src) + new /obj/item/healthanalyzer/advanced(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) /obj/item/storage/firstaid/toxin name = "toxin first aid kit" @@ -73,23 +86,21 @@ item_state = "firstaid-toxin" med_bot_skin = "tox" - New() - ..() - if(empty) return - - icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") - - new /obj/item/reagent_containers/syringe/charcoal( src ) - new /obj/item/reagent_containers/syringe/charcoal( src ) - new /obj/item/reagent_containers/syringe/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/healthanalyzer( src ) +/obj/item/storage/firstaid/toxin/New() + ..() + if(empty) return + icon_state = pick("antitoxin", "antitoxfirstaid", "antitoxfirstaid2", "antitoxfirstaid3") + new /obj/item/reagent_containers/syringe/charcoal(src) + new /obj/item/reagent_containers/syringe/charcoal(src) + new /obj/item/reagent_containers/syringe/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/healthanalyzer(src) /obj/item/storage/firstaid/toxin/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/o2 name = "oxygen deprivation first aid kit" @@ -98,18 +109,18 @@ item_state = "firstaid-o2" med_bot_skin = "o2" - New() - ..() - if(empty) return - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/reagent_containers/food/pill/salbutamol( src ) - new /obj/item/healthanalyzer( src ) +/obj/item/storage/firstaid/o2/New() + ..() + if(empty) return + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/reagent_containers/food/pill/salbutamol(src) + new /obj/item/healthanalyzer(src) /obj/item/storage/firstaid/o2/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/brute name = "brute trauma treatment kit" @@ -118,23 +129,19 @@ item_state = "firstaid-brute" med_bot_skin = "brute" - New() - ..() - if(empty) return - - icon_state = pick("brute","brute2") - - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/reagent_containers/food/pill/patch/styptic(src) - new /obj/item/healthanalyzer(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) - new /obj/item/stack/medical/bruise_pack(src) +/obj/item/storage/firstaid/brute/New() + ..() + if(empty) return + icon_state = pick("brute", "brute2") + new /obj/item/reagent_containers/applicator/brute(src) + new /obj/item/reagent_containers/food/pill/patch/styptic/small(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/stack/medical/bruise_pack(src) /obj/item/storage/firstaid/brute/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/adv name = "advanced first-aid kit" @@ -156,7 +163,7 @@ new /obj/item/healthanalyzer(src) /obj/item/storage/firstaid/adv/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/machine name = "machine repair kit" @@ -177,7 +184,7 @@ new /obj/item/robotanalyzer(src) /obj/item/storage/firstaid/machine/empty - empty = 1 + empty = TRUE /obj/item/storage/firstaid/tactical @@ -195,18 +202,15 @@ /obj/item/storage/firstaid/tactical/New() ..() - if(empty) return + if(empty) + return new /obj/item/reagent_containers/hypospray/combat(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) // Because you ain't got no time to look at what damage dey taking yo - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) - new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) + new /obj/item/reagent_containers/applicator/dual(src) // Because you ain't got no time to look at what damage dey taking yo new /obj/item/defibrillator/compact/combat/loaded(src) new /obj/item/clothing/glasses/hud/health/night(src) - return /obj/item/storage/firstaid/tactical/empty - empty =1 + empty = TRUE /obj/item/storage/firstaid/surgery name = "field surgery kit" @@ -346,15 +350,15 @@ desc = "Contains pills used to counter toxins." wrapper_color = COLOR_GREEN - New() - ..() - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) - new /obj/item/reagent_containers/food/pill/charcoal( src ) +/obj/item/storage/pill_bottle/charcoal/New() + ..() + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) /obj/item/storage/pill_bottle/painkillers name = "Pill Bottle (Salicylic Acid)" diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index d38c3c97dac..357cb043ca4 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -98,6 +98,7 @@ add_fingerprint(usr) to_chat(usr, "It's locked!") return FALSE + return TRUE /obj/item/storage/secure/attack_self(mob/user as mob) user.set_machine(src) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index d79a121e685..55b25ad725a 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -83,11 +83,14 @@ return /obj/item/storage/AltClick(mob/user) - if(Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE)) + if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE)) orient2hud(user) if(user.s_active) user.s_active.close(user) show_to(user) + playsound(loc, "rustle", 50, 1, -5) + add_fingerprint(user) + return ..() /obj/item/storage/proc/return_inv() @@ -479,10 +482,10 @@ return ..() /obj/item/storage/emp_act(severity) - if(!istype(loc, /mob/living)) - for(var/obj/O in contents) - O.emp_act(severity) ..() + for(var/i in contents) + var/atom/A = i + A.emp_act(severity) /obj/item/storage/hear_talk(mob/living/M as mob, list/message_pieces) ..() diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index a0dd6aa485d..9ded7947202 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -156,7 +156,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/item/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) +/obj/item/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state) var/using_internal if(iscarbon(loc)) var/mob/living/carbon/C = loc diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 2375c42db65..55dc189fc9b 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -119,7 +119,7 @@ amount_per_transfer_from_this = 50 possible_transfer_amounts = list(25,50,100) volume = 500 - flags = NODROP | NOBLUDGEON + flags = NOBLUDGEON container_type = OPENCONTAINER var/obj/item/watertank/tank diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 57c9a5301f6..ed857c18ded 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -179,6 +179,7 @@ slot_flags = SLOT_BACK force_unwielded = 5 force_wielded = 24 + toolspeed = 0.25 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' usesound = 'sound/items/crowbar.ogg' @@ -542,6 +543,7 @@ w_class = WEIGHT_CLASS_BULKY // can't fit in backpacks force_unwielded = 15 //still pretty robust force_wielded = 40 //you'll gouge their eye out! Or a limb...maybe even their entire body! + hitsound = null // Handled in the snowflaked attack proc wieldsound = 'sound/weapons/chainsawstart.ogg' hitsound = null armour_penetration = 35 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 6ef379ffcad..32158a9a3ab 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -205,7 +205,7 @@ else if(prob(30)) visible_message("[owner] swings! And [p_they()] miss[p_es()]! How embarassing.", "You swing! You miss! Oh no!") playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - do_attack_animation(get_step(owner, pick(alldirs)), ATTACK_EFFECT_DISARM) + do_attack_animation(get_step(owner, pick(GLOB.alldirs)), ATTACK_EFFECT_DISARM) deflectmode = FALSE if(!istype(I, /obj/item/beach_ball)) lastdeflect = world.time + 3000 @@ -214,7 +214,7 @@ visible_message("[owner] swings and deflects [I]!", "You swing and deflect the [I]!") playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1) do_attack_animation(I, ATTACK_EFFECT_DISARM) - I.throw_at(get_edge_target_turf(owner, pick(cardinal)), rand(8,10), 14, owner) + I.throw_at(get_edge_target_turf(owner, pick(GLOB.cardinal)), rand(8,10), 14, owner) deflectmode = FALSE if(!istype(I, /obj/item/beach_ball)) lastdeflect = world.time + 3000 diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 1816357d450..e1464e47e48 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -205,7 +205,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF)) resistance_flags |= ON_FIRE SSfires.processing[src] = src - add_overlay(fire_overlay, TRUE) + add_overlay(GLOB.fire_overlay, TRUE) return 1 ///called when the obj is destroyed by fire @@ -218,7 +218,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e /obj/proc/extinguish() if(resistance_flags & ON_FIRE) resistance_flags &= ~ON_FIRE - cut_overlay(fire_overlay, TRUE) + cut_overlay(GLOB.fire_overlay, TRUE) SSfires.processing -= src ///Called when the obj is hit by a tesla bolt. diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e30c8c5c4c2..951eb79f853 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -44,7 +44,7 @@ else T.add_blueprints_preround(src) -/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state) +/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = GLOB.default_state) // Calling Topic without a corresponding window open causes runtime errors if(!nowindow && ..()) return 1 @@ -192,13 +192,13 @@ /obj/proc/multitool_menu(var/mob/user,var/obj/item/multitool/P) return "NO MULTITOOL_MENU!" -/obj/proc/linkWith(var/mob/user, var/obj/buffer, var/link/context) +/obj/proc/linkWith(var/mob/user, var/obj/buffer, var/context) return 0 /obj/proc/unlinkFrom(var/mob/user, var/obj/buffer) return 0 -/obj/proc/canLink(var/obj/O, var/link/context) +/obj/proc/canLink(var/obj/O, var/context) return 0 /obj/proc/isLinkedWith(var/obj/O) @@ -251,9 +251,7 @@ a { if(P) if(P.buffer) var/id = null - if(istype(P.buffer, /obj/machinery/telecomms)) - id=P.buffer:id - else if("id_tag" in P.buffer.vars) + if("id_tag" in P.buffer.vars) id=P.buffer:id_tag dat += "
MULTITOOL BUFFER: [P.buffer] [id ? "([id])" : ""]"
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 3d727142db5..663f210df3e 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -18,11 +18,11 @@
if(climbable)
verbs += /obj/structure/proc/climb_on
if(SSticker)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
/obj/structure/Destroy()
if(SSticker)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
if(smooth)
var/turf/T = get_turf(src)
spawn(0)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
index bba8dc2a866..5ffbdd0cda7 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
@@ -36,7 +36,7 @@
depotarea.armory_locker_looted()
/obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M)
- if(isanimal(M) && "syndicate" in M.faction)
+ if(isanimal(M) && ("syndicate" in M.faction))
to_chat(M, "The [src] resists your attack!")
return
return ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 7616aa90877..f0a7336389b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -16,7 +16,7 @@
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/duffel/engineering(src)
new /obj/item/clothing/head/beret/ce(src)
- new /obj/item/areaeditor/blueprints(src)
+ new /obj/item/areaeditor/blueprints/ce(src)
new /obj/item/storage/box/permits(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 096133b6e0d..7eab5858772 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -54,36 +54,33 @@
new /obj/item/storage/backpack/satchel/withwallet( src )
new /obj/item/radio/headset( src )
-/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob, params)
- if(src.opened)
- if(istype(W, /obj/item/grab))
- src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet
- user.drop_item()
- if(W) W.forceMove(loc)
- else if(istype(W, /obj/item/card/id))
- if(src.broken)
- to_chat(user, "It appears to be broken.")
- return
- var/obj/item/card/id/I = W
- if(!I || !I.registered_name) return
- if(src == user.loc)
- to_chat(user, "You can't reach the lock from inside.")
- else if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name)))
- //they can open all lockers, or nobody owns this, or they own this locker
- src.locked = !( src.locked )
- if(src.locked)
- src.icon_state = src.icon_locked
- else
- src.icon_state = src.icon_closed
- registered_name = null
- desc = initial(desc)
-
- if(!src.registered_name && src.locked)
- src.registered_name = I.registered_name
- src.desc = "Owned by [I.registered_name]."
- else
- to_chat(user, "Access Denied")
- else if((istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade)) && !broken)
- emag_act(user)
- else
+/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
+ if(opened || !istype(W, /obj/item/card/id))
return ..()
+
+ if(broken)
+ to_chat(user, "It appears to be broken.")
+ return
+
+ var/obj/item/card/id/I = W
+ if(!I || !I.registered_name)
+ return
+
+ if(src == user.loc)
+ to_chat(user, "You can't reach the lock from inside.")
+
+ else if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
+ //they can open all lockers, or nobody owns this, or they own this locker
+ locked = !locked
+ if(locked)
+ icon_state = icon_locked
+ else
+ icon_state = icon_closed
+ registered_name = null
+ desc = initial(desc)
+
+ if(!registered_name && locked)
+ registered_name = I.registered_name
+ desc = "Owned by [I.registered_name]."
+ else
+ to_chat(user, "Access Denied")
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 501abd4922d..e285c6a0ae9 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -19,7 +19,7 @@
L.buckled = 0
L.anchored = 0
L.forceMove(src)
- L.disabilities += MUTE
+ L.mutations |= MUTE
max_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues
intialTox = L.getToxLoss()
intialFire = L.getFireLoss()
@@ -69,7 +69,7 @@
for(var/mob/living/M in src)
M.forceMove(loc)
- M.disabilities -= MUTE
+ M.mutations -= MUTE
M.take_overall_damage((M.health - obj_integrity - 100),0) //any new damage the statue incurred is transfered to the mob
..()
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 45aaf76fb07..f9010c19415 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -212,7 +212,7 @@
/obj/structure/closet/crate/proc/notifyRecipient(var/destination)
var/msg = "[capitalize(name)] has arrived at [destination]."
if(destination in announce_beacons)
- for(var/obj/machinery/requests_console/D in allConsoles)
+ for(var/obj/machinery/requests_console/D in GLOB.allRequestConsoles)
if(D.department in src.announce_beacons[destination])
D.createMessage(name, "Your Crate has Arrived!", msg, 1)
diff --git a/code/game/objects/structures/decor/machinery/telecomms.dm b/code/game/objects/structures/decor/machinery/telecomms.dm
deleted file mode 100644
index 1068cfb0b4e..00000000000
--- a/code/game/objects/structures/decor/machinery/telecomms.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/obj/structure/decor/machinery/telecomms/processor
- name = "Processor Unit"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "processor"
- desc = "This machine is used to process large quantities of information."
-
-/obj/structure/decor/machinery/telecomms/hub
- name = "Telecommunication Hub"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "hub"
- desc = "A mighty piece of hardware used to send/receive massive amounts of data."
-
-/obj/structure/decor/machinery/telecomms/server
- name = "Telecommunication Server"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "comm_server"
- desc = "A machine used to store data and network statistics."
-
-/obj/structure/decor/machinery/telecomms/relay
- name = "Telecommunication Relay"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "relay"
- desc = "A mighty piece of hardware used to send massive amounts of data far away."
diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm
index e970ac911dc..11eb03c94c5 100644
--- a/code/game/objects/structures/depot.dm
+++ b/code/game/objects/structures/depot.dm
@@ -79,7 +79,6 @@
var/beepsound = 'sound/items/timer.ogg'
var/deliberate = FALSE
var/max_cycles = 10
- var/max_fire_range = 9
var/area/syndicate_depot/core/depotarea
/obj/effect/overload/New()
@@ -101,10 +100,6 @@
if(!deliberate)
playsound(loc, beepsound, 50, 0)
cycles++
- var/fire_range = min(cycles, max_fire_range)
-
- for(var/turf/simulated/turf in range(fire_range, T))
- new /obj/effect/hotspot(turf)
return
if(!istype(depotarea))
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 7626abb9a7d..cdc5cdb58c4 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -245,6 +245,7 @@
/obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params)
if(is_hot(W) > 300)
+ var/turf/T = locate(user)
message_admins("Plasma falsewall ignited by [key_name_admin(user)] in [ADMIN_VERBOSEJMP(T)]")
log_game("Plasma falsewall ignited by [key_name(user)] in [AREACOORD(T)]")
investigate_log("was ignited by [key_name(user)]","atmos")
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 592e67e466d..c657e0056e8 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -131,17 +131,19 @@
AC.ui_interact(user)
if("Voice")
- var/voice_choice = input(user, "Perhaps...", "Voice effects") as null|anything in list("Comic Sans", "Wingdings", "Swedish", "Chav")
+ var/voice_choice = input(user, "Perhaps...", "Voice effects") as null|anything in list("Comic Sans", "Wingdings", "Swedish", "Chav", "Mute")
var/voice_mutation
switch(voice_choice)
if("Comic Sans")
- voice_mutation = COMICBLOCK
+ voice_mutation = GLOB.comicblock
if("Wingdings")
- voice_mutation = WINGDINGSBLOCK
+ voice_mutation = GLOB.wingdingsblock
if("Swedish")
- voice_mutation = SWEDEBLOCK
+ voice_mutation = GLOB.swedeblock
if("Chav")
- voice_mutation = CHAVBLOCK
+ voice_mutation = GLOB.chavblock
+ if("Mute")
+ voice_mutation = GLOB.muteblock
if(voice_mutation)
if(H.dna.GetSEState(voice_mutation))
H.dna.SetSEState(voice_mutation, FALSE)
diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm
index 1497344d5c8..44cbf6c52c9 100644
--- a/code/game/objects/structures/misc.dm
+++ b/code/game/objects/structures/misc.dm
@@ -33,7 +33,7 @@
if(user.z != src.z) return
user.loc.loc.Exited(user)
- user.loc = pick(carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
+ user.loc = pick(GLOB.carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index 7458c0a4b3b..c3d63c47862 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -121,7 +121,7 @@
ui.open()
ui.set_auto_update(1)
-/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["lines"] = lines
@@ -309,7 +309,7 @@
song.ui_interact(user, ui_key, ui, force_open)
-/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
return song.ui_data(user, ui_key, state)
/obj/structure/piano/Topic(href, href_list)
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index f891aff5592..1102901c8bd 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(safes)
var/number_of_tumblers = 3 // The amount of tumblers that will be generated.
var/list/tumblers = list() // The list of tumbler dial positions that need to be hit.
- var/list/current_tumbler_index = 1 // The index in the tumblers list of the tumbler dial position that needs to be hit.
+ var/current_tumbler_index = 1 // The index in the tumblers list of the tumbler dial position that needs to be hit.
var/space = 0 // The combined w_class of everything in the safe.
var/maxspace = 24 // The maximum combined w_class of stuff in the safe.
@@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(safes)
ui.open()
ui.set_auto_update(1)
-/obj/structure/safe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+/obj/structure/safe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
var/list/contents_names = list()
if(open)
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 3f5d667a356..ba5258004a0 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -169,7 +169,7 @@
/obj/structure/sign/kiddieplaque
name = "AI developers plaque"
- desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"."
+ desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child's eyes are crossed, and is drooling. Beneath the image, someone has scratched the word \"PACKETS\"."
icon_state = "kiddieplaque"
/obj/structure/sign/atmosplaque
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index c4c36d788e2..692d15d79ec 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -1,3 +1,5 @@
+#define MAX_TANK_STORAGE 10
+
/obj/structure/dispenser
name = "tank storage unit"
desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten plasma tanks."
@@ -5,29 +7,51 @@
icon_state = "dispenser"
density = 1
anchored = 1.0
- var/oxygentanks = 10
- var/plasmatanks = 10
- var/list/oxytanks = list() //sorry for the similar var names
- var/list/platanks = list()
+ var/starting_oxygen_tanks = MAX_TANK_STORAGE // The starting amount of oxygen tanks the dispenser gets when it's spawned
+ var/starting_plasma_tanks = MAX_TANK_STORAGE // Starting amount of plasma tanks
+ var/list/stored_oxygen_tanks = list() // List of currently stored oxygen tanks
+ var/list/stored_plasma_tanks = list() // And plasma tanks
/obj/structure/dispenser/oxygen
- plasmatanks = 0
+ starting_plasma_tanks = 0
/obj/structure/dispenser/plasma
- oxygentanks = 0
+ starting_oxygen_tanks = 0
/obj/structure/dispenser/New()
..()
+ initialize_tanks()
update_icon()
+/obj/structure/dispenser/Destroy()
+ QDEL_LIST(stored_plasma_tanks)
+ QDEL_LIST(stored_oxygen_tanks)
+ return ..()
+
+/obj/structure/dispenser/proc/initialize_tanks()
+ for(var/I in 1 to starting_plasma_tanks)
+ var/obj/item/tank/plasma/P = new(src)
+ stored_plasma_tanks.Add(P)
+
+ for(var/I in 1 to starting_oxygen_tanks)
+ var/obj/item/tank/oxygen/O = new(src)
+ stored_oxygen_tanks.Add(O)
+
/obj/structure/dispenser/update_icon()
- overlays.Cut()
- switch(oxygentanks)
- if(1 to 3) overlays += "oxygen-[oxygentanks]"
- if(4 to INFINITY) overlays += "oxygen-4"
- switch(plasmatanks)
- if(1 to 4) overlays += "plasma-[plasmatanks]"
- if(5 to INFINITY) overlays += "plasma-5"
+ cut_overlays()
+ var/oxy_tank_amount = LAZYLEN(stored_oxygen_tanks)
+ switch(oxy_tank_amount)
+ if(1 to 3)
+ overlays += "oxygen-[oxy_tank_amount]"
+ if(4 to INFINITY)
+ overlays += "oxygen-4"
+
+ var/pla_tank_amount = LAZYLEN(stored_plasma_tanks)
+ switch(pla_tank_amount)
+ if(1 to 4)
+ overlays += "plasma-[pla_tank_amount]"
+ if(5 to INFINITY)
+ overlays += "plasma-5"
/obj/structure/dispenser/attack_hand(mob/user)
if(..())
@@ -38,7 +62,7 @@
/obj/structure/dispenser/attack_ghost(mob/user)
ui_interact(user)
-/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, master_ui = null, datum/topic_state/state = GLOB.default_state)
user.set_machine(src)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -47,35 +71,19 @@
/obj/structure/dispenser/ui_data(user)
var/list/data = list()
- data["o_tanks"] = oxygentanks
- data["p_tanks"] = plasmatanks
+ data["o_tanks"] = LAZYLEN(stored_oxygen_tanks)
+ data["p_tanks"] = LAZYLEN(stored_plasma_tanks)
return data
/obj/structure/dispenser/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic))
- if(oxygentanks < 10)
- user.drop_item()
- I.forceMove(src)
- oxytanks.Add(I)
- oxygentanks++
- update_icon()
- to_chat(user, "You put [I] in [src].")
- else
- to_chat(user, "[src] is full.")
- SSnanoui.update_uis(src)
+ try_insert_tank(user, stored_oxygen_tanks, I)
return
+
if(istype(I, /obj/item/tank/plasma))
- if(plasmatanks < 10)
- user.drop_item()
- I.forceMove(src)
- platanks.Add(I)
- plasmatanks++
- update_icon()
- to_chat(user, "You put [I] in [src].")
- else
- to_chat(user, "[src] is full.")
- SSnanoui.update_uis(src)
+ try_insert_tank(user, stored_plasma_tanks, I)
return
+
if(istype(I, /obj/item/wrench))
if(anchored)
to_chat(user, "You lean down and unwrench [src].")
@@ -88,40 +96,55 @@
/obj/structure/dispenser/Topic(href, href_list)
if(..())
- return 1
+ return TRUE
if(Adjacent(usr))
usr.set_machine(src)
+
+ // The oxygen tank button
if(href_list["oxygen"])
- if(oxygentanks > 0)
- var/obj/item/tank/oxygen/O
- if(oxytanks.len == oxygentanks)
- O = oxytanks[1]
- oxytanks.Remove(O)
- else
- O = new /obj/item/tank/oxygen(loc)
- O.loc = loc
- to_chat(usr, "You take [O] out of [src].")
- oxygentanks--
- update_icon()
+ try_remove_tank(usr, stored_oxygen_tanks)
+
+ // The plasma tank button
if(href_list["plasma"])
- if(plasmatanks > 0)
- var/obj/item/tank/plasma/P
- if(platanks.len == plasmatanks)
- P = platanks[1]
- platanks.Remove(P)
- else
- P = new /obj/item/tank/plasma(loc)
- P.loc = loc
- to_chat(usr, "You take [P] out of [src].")
- plasmatanks--
- update_icon()
+ try_remove_tank(usr, stored_plasma_tanks)
+
add_fingerprint(usr)
updateUsrDialog()
- SSnanoui.update_uis(src)
+ SSnanoui.try_update_ui(usr, src)
else
SSnanoui.close_user_uis(usr,src)
- return 1
+ return TRUE
+
+/// Called when the user clicks on the oxygen or plasma tank UI buttons, and tries to withdraw a tank.
+/obj/structure/dispenser/proc/try_remove_tank(mob/living/user, list/tank_list)
+ if(!LAZYLEN(tank_list))
+ return // There are no tanks left to withdraw.
+
+ var/obj/item/tank/T = tank_list[1]
+ tank_list.Remove(T)
+
+ if(!user.put_in_hands(T))
+ T.forceMove(loc) // If the user's hands are full, place it on the tile of the dispenser.
+
+ to_chat(user, "You take [T] out of [src].")
+ update_icon()
+
+/// Called when the user clicks on the dispenser with a tank. Tries to insert the tank into the dispenser, and updates the UI if successful.
+/obj/structure/dispenser/proc/try_insert_tank(mob/living/user, list/tank_list, obj/item/tank/T)
+ if(LAZYLEN(tank_list) >= MAX_TANK_STORAGE)
+ to_chat(user, "[src] is full.")
+ return
+
+ if(!user.drop_item()) // Antidrop check
+ to_chat(user, "[T] is stuck to your hand!")
+ return
+
+ T.forceMove(src)
+ tank_list.Add(T)
+ update_icon()
+ to_chat(user, "You put [T] in [src].")
+ SSnanoui.try_update_ui(user, src)
/obj/structure/tank_dispenser/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
@@ -130,3 +153,5 @@
I.forceMove(loc)
new /obj/item/stack/sheet/metal(loc, 2)
qdel(src)
+
+#undef MAX_TANK_STORAGE
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index f8f406d1381..9d06f870fc3 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -38,7 +38,7 @@
if(pod.contents.len)
to_chat(AM, "")
return
- else if(!pod.moving && pod.dir in directions())
+ else if(!pod.moving && (pod.dir in directions()))
AM.forceMove(pod)
return
@@ -47,7 +47,7 @@
/obj/structure/transit_tube/station/attack_hand(mob/user as mob)
if(!pod_moving)
for(var/obj/structure/transit_tube_pod/pod in loc)
- if(!pod.moving && pod.dir in directions())
+ if(!pod.moving && (pod.dir in directions()))
if(icon_state == "closed")
open_animation()
@@ -100,7 +100,7 @@
/obj/structure/transit_tube/station/proc/launch_pod()
for(var/obj/structure/transit_tube_pod/pod in loc)
- if(!pod.moving && pod.dir in directions())
+ if(!pod.moving && (pod.dir in directions()))
spawn(5)
pod_moving = 1
close_animation()
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index 7095fd4eeda..8984dc60a52 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -144,9 +144,7 @@
if(istype(mob, /mob) && mob.client)
// If the pod is not in a tube at all, you can get out at any time.
if(!(locate(/obj/structure/transit_tube) in loc))
- mob.loc = loc
- mob.client.Move(get_step(loc, direction), direction)
- mob.reset_perspective(null)
+ mob.forceMove(loc)
//if(moving && istype(loc, /turf/space))
// Todo: If you get out of a moving pod in space, you should move as well.
@@ -158,9 +156,7 @@
if(!station.pod_moving)
if(direction == station.dir)
if(station.icon_state == "open")
- mob.loc = loc
- mob.client.Move(get_step(loc, direction), direction)
- mob.reset_perspective(null)
+ mob.forceMove(loc)
else
station.open_animation()
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 32c9daf3c76..87107f97abe 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -411,7 +411,7 @@
M.l_hand.clean_blood()
if(M.back)
if(M.back.clean_blood())
- M.update_inv_back(0)
+ M.update_inv_back()
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/washgloves = 1
@@ -437,38 +437,38 @@
if(H.head)
if(H.head.clean_blood())
- H.update_inv_head(0,0)
+ H.update_inv_head()
if(H.wear_suit)
if(H.wear_suit.clean_blood())
- H.update_inv_wear_suit(0,0)
+ H.update_inv_wear_suit()
else if(H.w_uniform)
if(H.w_uniform.clean_blood())
- H.update_inv_w_uniform(0,0)
+ H.update_inv_w_uniform()
if(H.gloves && washgloves)
if(H.gloves.clean_blood())
- H.update_inv_gloves(0,0)
+ H.update_inv_gloves()
if(H.shoes && washshoes)
if(H.shoes.clean_blood())
- H.update_inv_shoes(0,0)
+ H.update_inv_shoes()
if(H.wear_mask && washmask)
if(H.wear_mask.clean_blood())
- H.update_inv_wear_mask(0)
+ H.update_inv_wear_mask()
if(H.glasses && washglasses)
if(H.glasses.clean_blood())
- H.update_inv_glasses(0)
+ H.update_inv_glasses()
if(H.l_ear && washears)
if(H.l_ear.clean_blood())
- H.update_inv_ears(0)
+ H.update_inv_ears()
if(H.r_ear && washears)
if(H.r_ear.clean_blood())
- H.update_inv_ears(0)
+ H.update_inv_ears()
if(H.belt)
if(H.belt.clean_blood())
- H.update_inv_belt(0)
+ H.update_inv_belt()
else
if(M.wear_mask) //if the mob is not human, it cleans the mask without asking for bitflags
if(M.wear_mask.clean_blood())
- M.update_inv_wear_mask(0)
+ M.update_inv_wear_mask()
else
O.clean_blood()
@@ -704,7 +704,7 @@
return
if(proximity_flag != 1) //if we aren't next to the wall
return
- if(!(get_dir(on_wall, user) in cardinal))
+ if(!(get_dir(on_wall, user) in GLOB.cardinal))
to_chat(user, "You need to be standing next to a wall to place \the [src].")
return
return 1
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 01136ea1046..9faab45cf97 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -1,6 +1,6 @@
-var/global/wcBar = pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff"))
-var/global/wcBrig = pick(list("#aa0808", "#7f0606", "#ff0000"))
-var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff"))
+GLOBAL_LIST_INIT(wcBar, pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff")))
+GLOBAL_LIST_INIT(wcBrig, pick(list("#aa0808", "#7f0606", "#ff0000")))
+GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff")))
/obj/proc/color_windows(obj/W)
var/list/wcBarAreas = list(/area/crew_quarters/bar)
@@ -13,11 +13,11 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
var/area/A = T.loc
if(is_type_in_list(A,wcBarAreas))
- newcolor = wcBar
+ newcolor = GLOB.wcBar
else if(is_type_in_list(A,wcBrigAreas))
- newcolor = wcBrig
+ newcolor = GLOB.wcBrig
else
- newcolor = wcCommon
+ newcolor = GLOB.wcCommon
return newcolor
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 6c10921e6bd..19717991593 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -35,7 +35,12 @@
assume_air(lowertemp)
qdel(hotspot)
-/turf/simulated/proc/MakeSlippery(wet_setting = TURF_WET_WATER, infinite = FALSE) // 1 = Water, 2 = Lube, 3 = Ice, 4 = Permafrost
+/*
+ * Makes a turf slippery using the given parameters
+ * @param wet_setting The type of slipperyness used
+ * @param time Time the turf is slippery. If null it will pick a random time between 790 and 820 ticks. If INFINITY then it won't dry up ever
+*/
+/turf/simulated/proc/MakeSlippery(wet_setting = TURF_WET_WATER, time = null) // 1 = Water, 2 = Lube, 3 = Ice, 4 = Permafrost
if(wet >= wet_setting)
return
wet = wet_setting
@@ -55,13 +60,13 @@
else
wet_overlay = image('icons/effects/water.dmi', src, "wet_static")
overlays += wet_overlay
- if(!infinite)
- spawn(rand(790, 820)) // Purely so for visual effect
- if(!istype(src, /turf/simulated)) //Because turfs don't get deleted, they change, adapt, transform, evolve and deform. they are one and they are all.
- return
- MakeDry(wet_setting)
+ if(time == INFINITY)
+ return
+ if(!time)
+ time = rand(790, 820)
+ addtimer(CALLBACK(src, .proc/MakeDry, wet_setting), time)
-/turf/simulated/proc/MakeDry(wet_setting = TURF_WET_WATER)
+/turf/simulated/MakeDry(wet_setting = TURF_WET_WATER)
if(wet > wet_setting)
return
wet = TURF_DRY
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 72513b2e8b3..2d886f44bfd 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -1,5 +1,5 @@
//This is so damaged or burnt tiles or platings don't get remembered as the default tile
-var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","damaged4",
+GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","damaged3","damaged4",
"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2",
"platingdmg3","plating","light_on","light_on_flicker1","light_on_flicker2",
"warnplate", "warnplatecorner","metalfoam", "ironfoam",
@@ -11,7 +11,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
"oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken", "carpet",
"carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5",
"ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11",
- "ironsand12", "ironsand13", "ironsand14", "ironsand15")
+ "ironsand12", "ironsand13", "ironsand14", "ironsand15"))
/turf/simulated/floor
name = "floor"
@@ -34,7 +34,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
/turf/simulated/floor/New()
..()
- if(icon_state in icons_to_ignore_at_floor_init) //so damaged/burned tiles or plating icons aren't saved as the default
+ if(icon_state in GLOB.icons_to_ignore_at_floor_init) //so damaged/burned tiles or plating icons aren't saved as the default
icon_regular_floor = "floor"
else
icon_regular_floor = icon_state
@@ -187,7 +187,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
if(T.turf_type == type)
return
var/obj/item/thing = user.get_inactive_hand()
- if(!prying_tool_list.Find(thing.tool_behaviour))
+ if(!thing || !prying_tool_list.Find(thing.tool_behaviour))
return
var/turf/simulated/floor/plating/P = pry_tile(thing, user, TRUE)
if(!istype(P))
diff --git a/code/game/turfs/simulated/floor/asteroid.dm b/code/game/turfs/simulated/floor/asteroid.dm
index 983b5abaced..6d5d95dff0e 100644
--- a/code/game/turfs/simulated/floor/asteroid.dm
+++ b/code/game/turfs/simulated/floor/asteroid.dm
@@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me
length = set_length
// Get our directiosn
- forward_cave_dir = pick(alldirs - exclude_dir)
+ forward_cave_dir = pick(GLOB.alldirs - exclude_dir)
// Get the opposite direction of our facing direction
backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm
index 1fb97430026..d8ed888bc27 100644
--- a/code/game/turfs/simulated/floor/chasm.dm
+++ b/code/game/turfs/simulated/floor/chasm.dm
@@ -186,7 +186,7 @@
AM.alpha = oldalpha
AM.color = oldcolor
AM.transform = oldtransform
- AM.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1, 10),rand(1, 10))
+ AM.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1, 10),rand(1, 10))
/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air
oxygen = MOLES_O2STANDARD
diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm
index 57e90840920..aa1be2200fa 100644
--- a/code/game/turfs/simulated/floor/lava.dm
+++ b/code/game/turfs/simulated/floor/lava.dm
@@ -113,6 +113,9 @@
/turf/simulated/floor/plating/lava/attackby(obj/item/C, mob/user, params) //Lava isn't a good foundation to build on
return
+/turf/simulated/floor/plating/lava/screwdriver_act()
+ return
+
/turf/simulated/floor/plating/lava/welder_act()
return
diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm
index 5eb387abbae..ffb1cce0b5c 100644
--- a/code/game/turfs/simulated/floor/mineral.dm
+++ b/code/game/turfs/simulated/floor/mineral.dm
@@ -186,7 +186,7 @@
/turf/simulated/floor/mineral/bananium/lubed/Initialize(mapload)
. = ..()
- MakeSlippery(TURF_WET_LUBE, TRUE)
+ MakeSlippery(TURF_WET_LUBE, INFINITY)
/turf/simulated/floor/mineral/bananium/lubed/pry_tile(obj/item/C, mob/user, silent = FALSE) //I want to get off Mr Honk's Wild Ride
if(ishuman(user))
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 33ae636090d..0ca6494497c 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -118,7 +118,7 @@
/turf/simulated/floor/lubed/Initialize(mapload)
. = ..()
- MakeSlippery(TURF_WET_LUBE, TRUE)
+ MakeSlippery(TURF_WET_LUBE, INFINITY)
/turf/simulated/floor/lubed/pry_tile(obj/item/C, mob/user, silent = FALSE) //I want to get off Mr Honk's Wild Ride
if(ishuman(user))
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 85b03d3378d..588a8387474 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -104,7 +104,7 @@
broken = FALSE
update_icon()
-/turf/simulated/floor/plating/proc/remove_plating(mob/user)
+/turf/simulated/floor/plating/remove_plating(mob/user)
if(baseturf == /turf/space)
ReplaceWithLattice()
else
@@ -353,7 +353,7 @@
/turf/simulated/floor/plating/ice/Initialize(mapload)
. = ..()
- MakeSlippery(TURF_WET_PERMAFROST, TRUE)
+ MakeSlippery(TURF_WET_PERMAFROST, INFINITY)
/turf/simulated/floor/plating/ice/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index d1f7a287c70..ebad3554f18 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -32,7 +32,7 @@
icon = smooth_icon
. = ..()
if(mineralType && mineralAmt && spread && spreadChance)
- for(var/dir in cardinal)
+ for(var/dir in GLOB.cardinal)
if(prob(spreadChance))
var/turf/T = get_step(src, dir)
if(istype(T, /turf/simulated/mineral/random))
diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm
index c7a3e742b6c..f463f3fb564 100644
--- a/code/game/turfs/simulated/river.dm
+++ b/code/game/turfs/simulated/river.dm
@@ -82,7 +82,7 @@
var/turf/simulated/mineral/M = T
logged_turf_type = M.turf_type
- if(get_dir(src, F) in cardinal)
+ if(get_dir(src, F) in GLOB.cardinal)
cardinal_turfs += F
else
diagonal_turfs += F
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 078a1b8e513..c18acf19d0a 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -139,7 +139,7 @@
P.setAngle(new_angle_s)
return TRUE
-/turf/simulated/wall/proc/dismantle_wall(devastated = 0, explode = 0)
+/turf/simulated/wall/dismantle_wall(devastated = FALSE, explode = FALSE)
if(devastated)
devastate_wall()
else
@@ -156,6 +156,7 @@
O.forceMove(src)
ChangeTurf(/turf/simulated/floor/plating)
+ return TRUE
/turf/simulated/wall/proc/break_wall()
new sheet_type(src, sheet_amount)
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index bc04a695da7..8b60be916c3 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -277,6 +277,9 @@
/turf/simulated/wall/mineral/titanium/nodecon/burn_down()
return
+/turf/simulated/wall/mineral/titanium/nodecon/welder_act()
+ return
+
/////////////////////Plastitanium walls/////////////////////
/turf/simulated/wall/mineral/plastitanium
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index e43ea15f53f..d2d7f8386ee 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -109,6 +109,7 @@
P.roll_and_drop(src)
else
O.forceMove(src)
+ return TRUE
/turf/simulated/wall/clockwork/devastate_wall()
for(var/i in 1 to 2)
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 502803bc7d3..a3e9c9ae0f2 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -43,7 +43,7 @@
update_icon()
to_chat(user, "You press firmly on the cover, dislodging it.")
return
- else if(RWALL_SUPPORT_RODS && istype(I, /obj/item/gun/energy/plasmacutter))
+ else if(d_state == RWALL_SUPPORT_RODS && istype(I, /obj/item/gun/energy/plasmacutter))
to_chat(user, "You begin slicing through the support rods...")
if(I.use_tool(src, user, 70, volume = I.tool_volume) && d_state == RWALL_SUPPORT_RODS)
d_state = RWALL_SHEATH
@@ -132,11 +132,11 @@
to_chat(user, "You pry off the cover.")
if(RWALL_SHEATH)
to_chat(user, "You struggle to pry off the outer sheath...")
- if(!I.use_tool(src, user, 100, volume = I.tool_volume) || d_state != RWALL_SHEATH)
+ if(!I.use_tool(src, user, 100, volume = I.tool_volume))
return
- to_chat(user, "You pry off the outer sheath.")
- dismantle_wall()
- return
+ if(dismantle_wall())
+ to_chat(user, "You pry off the outer sheath.")
+
if(RWALL_BOLTS)
to_chat(user, "You start to pry the cover back into place...")
playsound(src, I.usesound, 100, 1)
@@ -199,6 +199,9 @@
to_chat(user, "You tighten the bolts anchoring the support rods.")
update_icon()
+/turf/simulated/wall/r_wall/try_decon(obj/item/I, mob/user, params) //Plasma cutter only works in the deconstruction steps!
+ return FALSE
+
/turf/simulated/wall/r_wall/try_destroy(obj/item/I, mob/user, params)
if(istype(I, /obj/item/pickaxe/drill/diamonddrill))
to_chat(user, "You begin to drill though the wall...")
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index c797601d8e1..f78f520cfd3 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -42,14 +42,14 @@
/turf/space/BeforeChange()
..()
- var/datum/space_level/S = space_manager.get_zlev(z)
+ var/datum/space_level/S = GLOB.space_manager.get_zlev(z)
S.remove_from_transit(src)
if(light_sources) // Turn off starlight, if present
set_light(0)
/turf/space/AfterChange(ignore_air, keep_cabling = FALSE)
..()
- var/datum/space_level/S = space_manager.get_zlev(z)
+ var/datum/space_level/S = GLOB.space_manager.get_zlev(z)
S.add_to_transit(src)
S.apply_transition(src)
@@ -137,8 +137,8 @@
if(!cur_pos) return
cur_x = cur_pos["x"]
cur_y = cur_pos["y"]
- next_x = (--cur_x||global_map.len)
- y_arr = global_map[next_x]
+ next_x = (--cur_x||GLOB.global_map.len)
+ y_arr = GLOB.global_map[next_x]
target_z = y_arr[cur_y]
/*
//debug
@@ -162,8 +162,8 @@
if(!cur_pos) return
cur_x = cur_pos["x"]
cur_y = cur_pos["y"]
- next_x = (++cur_x > global_map.len ? 1 : cur_x)
- y_arr = global_map[next_x]
+ next_x = (++cur_x > GLOB.global_map.len ? 1 : cur_x)
+ y_arr = GLOB.global_map[next_x]
target_z = y_arr[cur_y]
/*
//debug
@@ -186,7 +186,7 @@
if(!cur_pos) return
cur_x = cur_pos["x"]
cur_y = cur_pos["y"]
- y_arr = global_map[cur_x]
+ y_arr = GLOB.global_map[cur_x]
next_y = (--cur_y||y_arr.len)
target_z = y_arr[next_y]
/*
@@ -211,7 +211,7 @@
if(!cur_pos) return
cur_x = cur_pos["x"]
cur_y = cur_pos["y"]
- y_arr = global_map[cur_x]
+ y_arr = GLOB.global_map[cur_x]
next_y = (++cur_y > y_arr.len ? 1 : cur_y)
target_z = y_arr[next_y]
/*
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index d589c3dcb64..aa3f7b898a1 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -70,7 +70,7 @@
/turf/Destroy()
// Adds the adjacent turfs to the current atmos processing
if(SSair)
- for(var/direction in cardinal)
+ for(var/direction in GLOB.cardinal)
if(atmos_adjacent_turfs & direction)
var/turf/simulated/T = get_step(src, direction)
if(istype(T))
@@ -180,6 +180,9 @@
if(L)
qdel(L)
+/turf/proc/dismantle_wall(devastated = FALSE, explode = FALSE)
+ return
+
/turf/proc/TerraformTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE)
return ChangeTurf(path, defer_change, keep_icon, ignore_air)
@@ -187,7 +190,7 @@
/turf/proc/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE)
if(!path)
return
- if(!use_preloader && path == type) // Don't no-op if the map loader requires it to be reconstructed
+ if(!GLOB.use_preloader && path == type) // Don't no-op if the map loader requires it to be reconstructed
return src
set_light(0)
@@ -266,7 +269,7 @@
var/atemp = 0
var/turf_count = 0
- for(var/direction in cardinal)//Only use cardinals to cut down on lag
+ for(var/direction in GLOB.cardinal)//Only use cardinals to cut down on lag
var/turf/T = get_step(src,direction)
if(istype(T,/turf/space))//Counted as no air
turf_count++//Considered a valid turf for air calcs
@@ -292,6 +295,9 @@
ChangeTurf(baseturf)
new /obj/structure/lattice(locate(x, y, z))
+/turf/proc/remove_plating(mob/user)
+ return
+
/turf/proc/kill_creatures(mob/U = null)//Will kill people/creatures and damage mechs./N
//Useful to batch-add creatures to the list.
for(var/mob/living/M in src)
@@ -309,6 +315,10 @@
for(var/atom/movable/AM in contents)
AM.get_spooked()
+// Defined here to avoid runtimes
+/turf/proc/MakeDry(wet_setting = TURF_WET_WATER)
+ return
+
/turf/proc/burn_down()
return
@@ -327,7 +337,7 @@
var/list/L = new()
var/turf/simulated/T
- for(var/dir in cardinal)
+ for(var/dir in GLOB.cardinal)
T = get_step(src, dir)
if(istype(T) && !T.density)
if(!LinkBlockedWithAccess(src, T, ID))
@@ -340,7 +350,7 @@
var/list/L = new()
var/turf/simulated/T
- for(var/dir in cardinal)
+ for(var/dir in GLOB.cardinal)
T = get_step(src, dir)
if(istype(T) && !T.density)
if(!CanAtmosPass(T))
@@ -452,7 +462,7 @@
/turf/proc/visibilityChanged()
if(SSticker)
- cameranet.updateVisibility(src)
+ GLOB.cameranet.updateVisibility(src)
/turf/attackby(obj/item/I, mob/user, params)
if(can_lay_cable())
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index e94d04f5dfb..824159487eb 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -1,8 +1,8 @@
-var/global/normal_ooc_colour = "#002eb8"
-var/global/member_ooc_colour = "#035417"
-var/global/mentor_ooc_colour = "#0099cc"
-var/global/moderator_ooc_colour = "#184880"
-var/global/admin_ooc_colour = "#b82e00"
+GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
+GLOBAL_VAR_INIT(member_ooc_colour, "#035417")
+GLOBAL_VAR_INIT(mentor_ooc_colour, "#0099cc")
+GLOBAL_VAR_INIT(moderator_ooc_colour, "#184880")
+GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00")
//Checks if the client already has a text input open
/client/proc/checkTyping()
@@ -54,21 +54,21 @@ var/global/admin_ooc_colour = "#b82e00"
log_ooc(msg, src)
- var/display_colour = normal_ooc_colour
+ var/display_colour = GLOB.normal_ooc_colour
if(holder && !holder.fakekey)
- display_colour = mentor_ooc_colour
+ display_colour = GLOB.mentor_ooc_colour
if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0))
- display_colour = moderator_ooc_colour
+ display_colour = GLOB.moderator_ooc_colour
else if(check_rights(R_ADMIN,0))
if(config.allow_admin_ooccolor)
display_colour = src.prefs.ooccolor
else
- display_colour = admin_ooc_colour
+ display_colour = GLOB.admin_ooc_colour
if(prefs.unlock_content)
- if(display_colour == normal_ooc_colour)
+ if(display_colour == GLOB.normal_ooc_colour)
if((prefs.toggles & MEMBER_PUBLIC))
- display_colour = member_ooc_colour
+ display_colour = GLOB.member_ooc_colour
for(var/client/C in GLOB.clients)
if(C.prefs.toggles & CHAT_OOC)
@@ -114,7 +114,7 @@ var/global/admin_ooc_colour = "#b82e00"
if(!check_rights(R_SERVER)) return
- normal_ooc_colour = newColor
+ GLOB.normal_ooc_colour = newColor
message_admins("[key_name_admin(usr)] has set the default player OOC color to [newColor]")
log_admin("[key_name(usr)] has set the default player OOC color to [newColor]")
@@ -128,7 +128,7 @@ var/global/admin_ooc_colour = "#b82e00"
if(!check_rights(R_SERVER)) return
- normal_ooc_colour = initial(normal_ooc_colour)
+ GLOB.normal_ooc_colour = initial(GLOB.normal_ooc_colour)
message_admins("[key_name_admin(usr)] has reset the default player OOC color")
log_admin("[key_name(usr)] has reset the default player OOC color")
diff --git a/code/game/world.dm b/code/game/world.dm
index 83407a6ae46..c1f6a076677 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,8 +1,12 @@
#define RECOMMENDED_VERSION 510
-var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
+GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG)
/world/New()
+ //temporary file used to record errors with loading config, moved to log directory once logging is set up
+ GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log"
+ load_configuration()
+ // Setup all log paths and stamp them with startups
SetupLogs()
enable_debugger() // Enable the extools debugger
log_world("World loaded at [time_stamp()]")
@@ -22,7 +26,7 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
src.update_status()
- space_manager.initialize() //Before the MC starts up
+ GLOB.space_manager.initialize() //Before the MC starts up
. = ..()
@@ -47,8 +51,8 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
// to_chat(world, "End of Topic() call.")
// ..()
-var/world_topic_spam_protect_ip = "0.0.0.0"
-var/world_topic_spam_protect_time = world.timeofday
+GLOBAL_VAR_INIT(world_topic_spam_protect_ip, "0.0.0.0")
+GLOBAL_VAR_INIT(world_topic_spam_protect_time, world.timeofday)
/world/Topic(T, addr, master, key)
log_misc("WORLD/TOPIC: \"[T]\", from:[addr], master:[master], key:[key]")
@@ -72,10 +76,10 @@ var/world_topic_spam_protect_time = world.timeofday
else if("status" in input)
var/list/s = list()
var/list/admins = list()
- s["version"] = game_version
- s["mode"] = master_mode
- s["respawn"] = config ? abandon_allowed : 0
- s["enter"] = enter_allowed
+ s["version"] = GLOB.game_version
+ s["mode"] = GLOB.master_mode
+ s["respawn"] = config ? GLOB.abandon_allowed : 0
+ s["enter"] = GLOB.enter_allowed
s["vote"] = config.allow_vote_mode
s["ai"] = config.allow_ai
s["host"] = host ? host : null
@@ -123,18 +127,18 @@ var/world_topic_spam_protect_time = world.timeofday
else if("manifest" in input)
var/list/positions = list()
var/list/set_names = list(
- "heads" = command_positions,
- "sec" = security_positions,
- "eng" = engineering_positions,
- "med" = medical_positions,
- "sci" = science_positions,
- "car" = supply_positions,
- "srv" = service_positions,
- "civ" = civilian_positions,
- "bot" = nonhuman_positions
+ "heads" = GLOB.command_positions,
+ "sec" = GLOB.security_positions,
+ "eng" = GLOB.engineering_positions,
+ "med" = GLOB.medical_positions,
+ "sci" = GLOB.science_positions,
+ "car" = GLOB.supply_positions,
+ "srv" = GLOB.service_positions,
+ "civ" = GLOB.civilian_positions,
+ "bot" = GLOB.nonhuman_positions
)
- for(var/datum/data/record/t in data_core.general)
+ for(var/datum/data/record/t in GLOB.data_core.general)
var/name = t.fields["name"]
var/rank = t.fields["rank"]
var/real_rank = t.fields["real_rank"]
@@ -251,18 +255,22 @@ var/world_topic_spam_protect_time = world.timeofday
return "Set listed status to invisible."
/proc/keySpamProtect(var/addr)
- if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50)
+ if(GLOB.world_topic_spam_protect_ip == addr && abs(GLOB.world_topic_spam_protect_time - world.time) < 50)
spawn(50)
- world_topic_spam_protect_time = world.time
+ GLOB.world_topic_spam_protect_time = world.time
return "Bad Key (Throttled)"
- world_topic_spam_protect_time = world.time
- world_topic_spam_protect_ip = addr
+ GLOB.world_topic_spam_protect_time = world.time
+ GLOB.world_topic_spam_protect_ip = addr
return "Bad Key"
/world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time)
if(reason == 1) //special reboot, do none of the normal stuff
if(usr)
+ if(!check_rights(R_SERVER))
+ message_admins("[key_name_admin(usr)] attempted to restart the server via the Profiler, without access.")
+ log_admin("[key_name(usr)] attempted to restart the server via the Profiler, without access.")
+ return
message_admins("[key_name_admin(usr)] has requested an immediate world restart via client side debugging tools")
log_admin("[key_name(usr)] has requested an immediate world restart via client side debugging tools")
spawn(0)
@@ -270,8 +278,8 @@ var/world_topic_spam_protect_time = world.timeofday
shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss.
if(config && config.shutdown_on_reboot)
sleep(0)
- if(shutdown_shell_command)
- shell(shutdown_shell_command)
+ if(GLOB.shutdown_shell_command)
+ shell(GLOB.shutdown_shell_command)
del(world)
return
else
@@ -294,8 +302,8 @@ var/world_topic_spam_protect_time = world.timeofday
if(!SSticker.delay_end)
world << round_end_sound
sleep(delay)
- if(blackbox)
- blackbox.save_all_data_to_sql()
+ if(GLOB.blackbox)
+ GLOB.blackbox.save_all_data_to_sql()
if(SSticker.delay_end)
to_chat(world, "Reboot was cancelled by an admin.")
return
@@ -304,7 +312,7 @@ var/world_topic_spam_protect_time = world.timeofday
//kick_clients_in_lobby("The round came to an end with you in the lobby.", 1)
Master.Shutdown() //run SS shutdowns
- dbcon.Disconnect() // DCs cleanly from the database
+ GLOB.dbcon.Disconnect() // DCs cleanly from the database
shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss.
for(var/client/C in GLOB.clients)
@@ -313,8 +321,8 @@ var/world_topic_spam_protect_time = world.timeofday
if(config && config.shutdown_on_reboot)
sleep(0)
- if(shutdown_shell_command)
- shell(shutdown_shell_command)
+ if(GLOB.shutdown_shell_command)
+ shell(GLOB.shutdown_shell_command)
del(world)
return
else
@@ -329,8 +337,8 @@ var/world_topic_spam_protect_time = world.timeofday
var/list/Lines = file2list("data/mode.txt")
if(Lines.len)
if(Lines[1])
- master_mode = Lines[1]
- log_game("Saved mode is '[master_mode]'")
+ GLOB.master_mode = Lines[1]
+ log_game("Saved mode is '[GLOB.master_mode]'")
/world/proc/save_mode(var/the_mode)
var/F = file("data/mode.txt")
@@ -342,7 +350,7 @@ var/world_topic_spam_protect_time = world.timeofday
return 1
/world/proc/load_motd()
- join_motd = file2text("config/motd.txt")
+ GLOB.join_motd = file2text("config/motd.txt")
GLOB.join_tos = file2text("config/tos.txt")
/proc/load_configuration()
@@ -366,7 +374,7 @@ var/world_topic_spam_protect_time = world.timeofday
s += "[config.server_name] — "
s += "[station_name()] "
if(config && config.githuburl)
- s+= "([game_version])"
+ s+= "([GLOB.game_version])"
if(config && config.server_tag_line)
s += "
[config.server_tag_line]"
@@ -379,7 +387,7 @@ var/world_topic_spam_protect_time = world.timeofday
s += "
"
var/list/features = list()
- if(!enter_allowed)
+ if(!GLOB.enter_allowed)
features += "closed"
if(config && config.server_extra_features)
@@ -391,7 +399,7 @@ var/world_topic_spam_protect_time = world.timeofday
if(config && config.wikiurl)
features += "Wiki"
- if(abandon_allowed)
+ if(GLOB.abandon_allowed)
features += "respawn"
if(features)
@@ -400,8 +408,8 @@ var/world_topic_spam_protect_time = world.timeofday
return s
#define FAILED_DB_CONNECTION_CUTOFF 5
-var/failed_db_connections = 0
-var/failed_old_db_connections = 0
+GLOBAL_VAR_INIT(failed_db_connections, 0)
+GLOBAL_VAR_INIT(failed_old_db_connections, 0)
/world/proc/SetupLogs()
GLOB.log_directory = "data/logs/[time2text(world.realtime, "YYYY/MM-Month/DD-Day")]"
@@ -436,11 +444,11 @@ var/failed_old_db_connections = 0
/proc/setup_database_connection()
- if(failed_db_connections > FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to conenct anymore.
+ if(GLOB.failed_db_connections > FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to conenct anymore.
return 0
- if(!dbcon)
- dbcon = new()
+ if(!GLOB.dbcon)
+ GLOB.dbcon = new()
var/user = sqlfdbklogin
var/pass = sqlfdbkpass
@@ -448,22 +456,22 @@ var/failed_old_db_connections = 0
var/address = sqladdress
var/port = sqlport
- dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
- . = dbcon.IsConnected()
+ GLOB.dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+ . = GLOB.dbcon.IsConnected()
if( . )
- failed_db_connections = 0 //If this connection succeeded, reset the failed connections counter.
+ GLOB.failed_db_connections = 0 //If this connection succeeded, reset the failed connections counter.
else
- failed_db_connections++ //If it failed, increase the failed connections counter.
- log_world(dbcon.ErrorMsg())
+ GLOB.failed_db_connections++ //If it failed, increase the failed connections counter.
+ log_world(GLOB.dbcon.ErrorMsg())
return .
//This proc ensures that the connection to the feedback database (global variable dbcon) is established
proc/establish_db_connection()
- if(failed_db_connections > FAILED_DB_CONNECTION_CUTOFF)
+ if(GLOB.failed_db_connections > FAILED_DB_CONNECTION_CUTOFF)
return 0
- if(!dbcon || !dbcon.IsConnected())
+ if(!GLOB.dbcon || !GLOB.dbcon.IsConnected())
return setup_database_connection()
else
return 1
diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm
index 8168583e6fa..21b59586bfd 100644
--- a/code/modules/admin/DB ban/functions.dm
+++ b/code/modules/admin/DB ban/functions.dm
@@ -5,7 +5,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
if(!check_rights(R_BAN)) return
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
return
var/serverip = "[world.internet_address]:[world.port]"
@@ -86,7 +86,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
message_admins("[key_name_admin(usr)] attempted to add a ban based on a non-existent mob, with no ckey provided. Report this bug.",1)
return
- var/DBQuery/query = dbcon.NewQuery("SELECT id FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT id FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
query.Execute()
var/validckey = 0
if(query.NextRow())
@@ -127,7 +127,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
reason = sanitizeSQL(reason)
if(maxadminbancheck)
- var/DBQuery/adm_query = dbcon.NewQuery("SELECT count(id) AS num FROM [format_table_name("ban")] WHERE (a_ckey = '[a_ckey]') AND (bantype = 'ADMIN_PERMABAN' OR (bantype = 'ADMIN_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned)")
+ var/DBQuery/adm_query = GLOB.dbcon.NewQuery("SELECT count(id) AS num FROM [format_table_name("ban")] WHERE (a_ckey = '[a_ckey]') AND (bantype = 'ADMIN_PERMABAN' OR (bantype = 'ADMIN_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned)")
adm_query.Execute()
if(adm_query.NextRow())
var/adm_bans = text2num(adm_query.item[1])
@@ -136,7 +136,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
return
var/sql = "INSERT INTO [format_table_name("ban")] (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)"
- var/DBQuery/query_insert = dbcon.NewQuery(sql)
+ var/DBQuery/query_insert = GLOB.dbcon.NewQuery(sql)
query_insert.Execute()
to_chat(usr, "Ban saved to database.")
message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1)
@@ -201,13 +201,13 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
sql += " AND job = '[job]'"
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
return
var/ban_id
var/ban_number = 0 //failsafe
- var/DBQuery/query = dbcon.NewQuery(sql)
+ var/DBQuery/query = GLOB.dbcon.NewQuery(sql)
query.Execute()
while(query.NextRow())
ban_id = query.item[1]
@@ -241,7 +241,7 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
to_chat(usr, "Cancelled")
return
- var/DBQuery/query = dbcon.NewQuery("SELECT ckey, duration, reason, job FROM [format_table_name("ban")] WHERE id = [banid]")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT ckey, duration, reason, job FROM [format_table_name("ban")] WHERE id = [banid]")
query.Execute()
var/eckey = usr.ckey //Editing admin ckey
@@ -271,7 +271,7 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
to_chat(usr, "Cancelled")
return
- var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("ban")] SET reason = '[value]', edits = CONCAT(edits,'- [eckey] changed ban reason from \\\"[reason]\\\" to \\\"[value]\\\"
') WHERE id = [banid]")
+ var/DBQuery/update_query = GLOB.dbcon.NewQuery("UPDATE [format_table_name("ban")] SET reason = '[value]', edits = CONCAT(edits,'- [eckey] changed ban reason from \\\"[reason]\\\" to \\\"[value]\\\"
') WHERE id = [banid]")
update_query.Execute()
message_admins("[key_name_admin(usr)] has edited a ban for [pckey]'s reason from [reason] to [value]",1)
if("duration")
@@ -281,7 +281,7 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
to_chat(usr, "Cancelled")
return
- var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("ban")] SET duration = [value], edits = CONCAT(edits,'- [eckey] changed ban duration from [duration] to [value]
'), expiration_time = DATE_ADD(bantime, INTERVAL [value] MINUTE) WHERE id = [banid]")
+ var/DBQuery/update_query = GLOB.dbcon.NewQuery("UPDATE [format_table_name("ban")] SET duration = [value], edits = CONCAT(edits,'- [eckey] changed ban duration from [duration] to [value]
'), expiration_time = DATE_ADD(bantime, INTERVAL [value] MINUTE) WHERE id = [banid]")
message_admins("[key_name_admin(usr)] has edited a ban for [pckey]'s duration from [duration] to [value]",1)
update_query.Execute()
if("unban")
@@ -304,13 +304,13 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
var/sql = "SELECT ckey FROM [format_table_name("ban")] WHERE id = [id]"
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
return
var/ban_number = 0 //failsafe
var/pckey
- var/DBQuery/query = dbcon.NewQuery(sql)
+ var/DBQuery/query = GLOB.dbcon.NewQuery(sql)
query.Execute()
while(query.NextRow())
pckey = query.item[1]
@@ -334,7 +334,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
var/sql_update = "UPDATE [format_table_name("ban")] SET unbanned = 1, unbanned_datetime = Now(), unbanned_ckey = '[unban_ckey]', unbanned_computerid = '[unban_computerid]', unbanned_ip = '[unban_ip]' WHERE id = [id]"
message_admins("[key_name_admin(usr)] has lifted [pckey]'s ban.",1)
- var/DBQuery/query_update = dbcon.NewQuery(sql_update)
+ var/DBQuery/query_update = GLOB.dbcon.NewQuery(sql_update)
query_update.Execute()
flag_account_for_forum_sync(pckey)
@@ -359,7 +359,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
if(!check_rights(R_BAN)) return
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
to_chat(usr, "Failed to establish database connection")
return
@@ -392,13 +392,13 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
output += ""
for(var/j in get_all_jobs())
output += ""
- for(var/j in nonhuman_positions)
+ for(var/j in GLOB.nonhuman_positions)
output += ""
- for(var/j in other_roles)
+ for(var/j in GLOB.other_roles)
output += ""
for(var/j in list("commanddept","securitydept","engineeringdept","medicaldept","sciencedept","supportdept","nonhumandept"))
output += ""
- for(var/j in list("Syndicate") + antag_roles)
+ for(var/j in list("Syndicate") + GLOB.antag_roles)
output += ""
output += ""
output += "Reason:
"
@@ -498,7 +498,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
bantypesearch += "'PERMABAN' "
- var/DBQuery/select_query = dbcon.NewQuery("SELECT id, bantime, bantype, reason, job, duration, expiration_time, ckey, a_ckey, unbanned, unbanned_ckey, unbanned_datetime, edits, ip, computerid FROM [format_table_name("ban")] WHERE 1 [playersearch] [adminsearch] [ipsearch] [cidsearch] [bantypesearch] ORDER BY bantime DESC LIMIT 100")
+ var/DBQuery/select_query = GLOB.dbcon.NewQuery("SELECT id, bantime, bantype, reason, job, duration, expiration_time, ckey, a_ckey, unbanned, unbanned_ckey, unbanned_datetime, edits, ip, computerid FROM [format_table_name("ban")] WHERE 1 [playersearch] [adminsearch] [ipsearch] [cidsearch] [bantypesearch] ORDER BY bantime DESC LIMIT 100")
select_query.Execute()
while(select_query.NextRow())
@@ -575,9 +575,9 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
usr << browse(output,"window=lookupbans;size=900x700")
/proc/flag_account_for_forum_sync(ckey)
- if(!dbcon)
+ if(!GLOB.dbcon)
return
var/skey = sanitizeSQL(ckey)
var/sql = "UPDATE [format_table_name("player")] SET fupdate = 1 WHERE ckey = '[skey]'"
- var/DBQuery/adm_query = dbcon.NewQuery(sql)
+ var/DBQuery/adm_query = GLOB.dbcon.NewQuery(sql)
adm_query.Execute()
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index d776b4a2095..c7f2baac4ef 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -25,13 +25,13 @@ world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE)
if (C && ckey == C.ckey && computer_id == C.computer_id && address == C.address)
return //don't recheck connected clients.
- if((ckey in admin_datums) || (ckey in GLOB.deadmins))
- var/datum/admins/A = admin_datums[ckey]
+ if((ckey in GLOB.admin_datums) || (ckey in GLOB.deadmins))
+ var/datum/admins/A = GLOB.admin_datums[ckey]
if(A && (A.rights & R_ADMIN))
admin = 1
//Guest Checking
- if(!guests_allowed && IsGuestKey(key))
+ if(!GLOB.guests_allowed && IsGuestKey(key))
log_adminwarn("Failed Login: [key] [computer_id] [address] - Guests not allowed")
// message_admins("Failed Login: [key] - Guests not allowed")
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a BYOND account.")
@@ -82,7 +82,7 @@ world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE)
if(computer_id)
cidquery = " OR computerid = '[computer_id]' "
- var/DBQuery/query = dbcon.NewQuery("SELECT ckey, ip, computerid, a_ckey, reason, expiration_time, duration, bantime, bantype FROM [format_table_name("ban")] WHERE (ckey = '[ckeytext]' [ipquery] [cidquery]) AND (bantype = 'PERMABAN' OR bantype = 'ADMIN_PERMABAN' OR ((bantype = 'TEMPBAN' OR bantype = 'ADMIN_TEMPBAN') AND expiration_time > Now())) AND isnull(unbanned)")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT ckey, ip, computerid, a_ckey, reason, expiration_time, duration, bantime, bantype FROM [format_table_name("ban")] WHERE (ckey = '[ckeytext]' [ipquery] [cidquery]) AND (bantype = 'PERMABAN' OR bantype = 'ADMIN_PERMABAN' OR ((bantype = 'TEMPBAN' OR bantype = 'ADMIN_TEMPBAN') AND expiration_time > Now())) AND isnull(unbanned)")
query.Execute()
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 222fc036db2..7b9a9330704 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -1,61 +1,61 @@
-var/CMinutes = null
-var/savefile/Banlist
-
+GLOBAL_VAR(CMinutes)
+GLOBAL_DATUM(banlist_savefile, /savefile)
+GLOBAL_PROTECT(banlist_savefile) // Obvious reasons
/proc/CheckBan(var/ckey, var/id, var/address)
- if(!Banlist) // if Banlist cannot be located for some reason
+ if(!GLOB.banlist_savefile) // if banlist_savefile cannot be located for some reason
LoadBans() // try to load the bans
- if(!Banlist) // uh oh, can't find bans!
+ if(!GLOB.banlist_savefile) // uh oh, can't find bans!
return 0 // ABORT ABORT ABORT
. = list()
var/appeal
if(config && config.banappeals)
appeal = "\nFor more information on your ban, or to appeal, head to [config.banappeals]"
- Banlist.cd = "/base"
- if( "[ckey][id]" in Banlist.dir )
- Banlist.cd = "[ckey][id]"
- if(Banlist["temp"])
- if(!GetExp(Banlist["minutes"]))
+ GLOB.banlist_savefile.cd = "/base"
+ if( "[ckey][id]" in GLOB.banlist_savefile.dir )
+ GLOB.banlist_savefile.cd = "[ckey][id]"
+ if(GLOB.banlist_savefile["temp"])
+ if(!GetExp(GLOB.banlist_savefile["minutes"]))
ClearTempbans()
return 0
else
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [GLOB.banlist_savefile["reason"]]\nExpires: [GetExp(GLOB.banlist_savefile["minutes"])]\nBy: [GLOB.banlist_savefile["bannedby"]][appeal]"
else
- Banlist.cd = "/base/[ckey][id]"
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]"
+ GLOB.banlist_savefile.cd = "/base/[ckey][id]"
+ .["desc"] = "\nReason: [GLOB.banlist_savefile["reason"]]\nExpires: PERMENANT\nBy: [GLOB.banlist_savefile["bannedby"]][appeal]"
.["reason"] = "ckey/id"
return .
else
- for(var/A in Banlist.dir)
- Banlist.cd = "/base/[A]"
+ for(var/A in GLOB.banlist_savefile.dir)
+ GLOB.banlist_savefile.cd = "/base/[A]"
var/matches
- if( ckey == Banlist["key"] )
+ if( ckey == GLOB.banlist_savefile["key"] )
matches += "ckey"
- if( id == Banlist["id"] )
+ if( id == GLOB.banlist_savefile["id"] )
if(matches)
matches += "/"
matches += "id"
- if( address == Banlist["ip"] )
+ if( address == GLOB.banlist_savefile["ip"] )
if(matches)
matches += "/"
matches += "ip"
if(matches)
- if(Banlist["temp"])
- if(!GetExp(Banlist["minutes"]))
+ if(GLOB.banlist_savefile["temp"])
+ if(!GetExp(GLOB.banlist_savefile["minutes"]))
ClearTempbans()
return 0
else
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [GLOB.banlist_savefile["reason"]]\nExpires: [GetExp(GLOB.banlist_savefile["minutes"])]\nBy: [GLOB.banlist_savefile["bannedby"]][appeal]"
else
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [GLOB.banlist_savefile["reason"]]\nExpires: PERMENANT\nBy: [GLOB.banlist_savefile["bannedby"]][appeal]"
.["reason"] = matches
return .
return 0
/proc/UpdateTime() //No idea why i made this a proc.
- CMinutes = (world.realtime / 10) / 60
+ GLOB.CMinutes = (world.realtime / 10) / 60
return 1
/hook/startup/proc/loadBans()
@@ -63,17 +63,17 @@ var/savefile/Banlist
/proc/LoadBans()
- Banlist = new("data/banlist.bdb")
+ GLOB.banlist_savefile = new("data/banlist.bdb")
log_admin("Loading Banlist")
- if(!length(Banlist.dir)) log_admin("Banlist is empty.")
+ if(!length(GLOB.banlist_savefile.dir)) log_admin("Banlist is empty.")
- if(!Banlist.dir.Find("base"))
+ if(!GLOB.banlist_savefile.dir.Find("base"))
log_admin("Banlist missing base dir.")
- Banlist.dir.Add("base")
- Banlist.cd = "/base"
- else if(Banlist.dir.Find("base"))
- Banlist.cd = "/base"
+ GLOB.banlist_savefile.dir.Add("base")
+ GLOB.banlist_savefile.cd = "/base"
+ else if(GLOB.banlist_savefile.dir.Find("base"))
+ GLOB.banlist_savefile.cd = "/base"
ClearTempbans()
return 1
@@ -81,17 +81,17 @@ var/savefile/Banlist
/proc/ClearTempbans()
UpdateTime()
- Banlist.cd = "/base"
- for(var/A in Banlist.dir)
- Banlist.cd = "/base/[A]"
- if(!Banlist["key"] || !Banlist["id"])
+ GLOB.banlist_savefile.cd = "/base"
+ for(var/A in GLOB.banlist_savefile.dir)
+ GLOB.banlist_savefile.cd = "/base/[A]"
+ if(!GLOB.banlist_savefile["key"] || !GLOB.banlist_savefile["id"])
RemoveBan(A)
log_admin("Invalid Ban.")
message_admins("Invalid Ban.")
continue
- if(!Banlist["temp"]) continue
- if(CMinutes >= Banlist["minutes"]) RemoveBan(A)
+ if(!GLOB.banlist_savefile["temp"]) continue
+ if(GLOB.CMinutes >= GLOB.banlist_savefile["minutes"]) RemoveBan(A)
return 1
@@ -102,23 +102,23 @@ var/savefile/Banlist
if(temp)
UpdateTime()
- bantimestamp = CMinutes + minutes
+ bantimestamp = GLOB.CMinutes + minutes
- Banlist.cd = "/base"
- if( Banlist.dir.Find("[ckey][computerid]") )
+ GLOB.banlist_savefile.cd = "/base"
+ if( GLOB.banlist_savefile.dir.Find("[ckey][computerid]") )
to_chat(usr, "Ban already exists.")
return 0
else
- Banlist.dir.Add("[ckey][computerid]")
- Banlist.cd = "/base/[ckey][computerid]"
- Banlist["key"] << ckey
- Banlist["id"] << computerid
- Banlist["ip"] << address
- Banlist["reason"] << reason
- Banlist["bannedby"] << bannedby
- Banlist["temp"] << temp
+ GLOB.banlist_savefile.dir.Add("[ckey][computerid]")
+ GLOB.banlist_savefile.cd = "/base/[ckey][computerid]"
+ GLOB.banlist_savefile["key"] << ckey
+ GLOB.banlist_savefile["id"] << computerid
+ GLOB.banlist_savefile["ip"] << address
+ GLOB.banlist_savefile["reason"] << reason
+ GLOB.banlist_savefile["bannedby"] << bannedby
+ GLOB.banlist_savefile["temp"] << temp
if(temp)
- Banlist["minutes"] << bantimestamp
+ GLOB.banlist_savefile["minutes"] << bantimestamp
if(!temp)
add_note(ckey, "Permanently banned - [reason]", null, bannedby, 0)
else
@@ -129,12 +129,12 @@ var/savefile/Banlist
var/key
var/id
- Banlist.cd = "/base/[foldername]"
- Banlist["key"] >> key
- Banlist["id"] >> id
- Banlist.cd = "/base"
+ GLOB.banlist_savefile.cd = "/base/[foldername]"
+ GLOB.banlist_savefile["key"] >> key
+ GLOB.banlist_savefile["id"] >> id
+ GLOB.banlist_savefile.cd = "/base"
- if(!Banlist.dir.Remove(foldername)) return 0
+ if(!GLOB.banlist_savefile.dir.Remove(foldername)) return 0
if(!usr)
log_admin("Ban Expired: [key]")
@@ -145,18 +145,18 @@ var/savefile/Banlist
message_admins("[key_name_admin(usr)] unbanned: [key]")
feedback_inc("ban_unban",1)
usr.client.holder.DB_ban_unban( ckey(key), BANTYPE_ANY_FULLBAN)
- for(var/A in Banlist.dir)
- Banlist.cd = "/base/[A]"
- if(key == Banlist["key"] /*|| id == Banlist["id"]*/)
- Banlist.cd = "/base"
- Banlist.dir.Remove(A)
+ for(var/A in GLOB.banlist_savefile.dir)
+ GLOB.banlist_savefile.cd = "/base/[A]"
+ if(key == GLOB.banlist_savefile["key"] /*|| id == GLOB.banlist_savefile["id"]*/)
+ GLOB.banlist_savefile.cd = "/base"
+ GLOB.banlist_savefile.dir.Remove(A)
continue
return 1
/proc/GetExp(minutes as num)
UpdateTime()
- var/exp = minutes - CMinutes
+ var/exp = minutes - GLOB.CMinutes
if(exp <= 0)
return 0
else
@@ -172,19 +172,19 @@ var/savefile/Banlist
/datum/admins/proc/unbanpanel()
var/count = 0
var/dat
- Banlist.cd = "/base"
- for(var/A in Banlist.dir)
+ GLOB.banlist_savefile.cd = "/base"
+ for(var/A in GLOB.banlist_savefile.dir)
count++
- Banlist.cd = "/base/[A]"
+ GLOB.banlist_savefile.cd = "/base/[A]"
var/ref = UID()
- var/key = Banlist["key"]
- var/id = Banlist["id"]
- var/ip = Banlist["ip"]
- var/reason = Banlist["reason"]
- var/by = Banlist["bannedby"]
+ var/key = GLOB.banlist_savefile["key"]
+ var/id = GLOB.banlist_savefile["id"]
+ var/ip = GLOB.banlist_savefile["ip"]
+ var/reason = GLOB.banlist_savefile["reason"]
+ var/by = GLOB.banlist_savefile["bannedby"]
var/expiry
- if(Banlist["temp"])
- expiry = GetExp(Banlist["minutes"])
+ if(GLOB.banlist_savefile["temp"])
+ expiry = GetExp(GLOB.banlist_savefile["minutes"])
if(!expiry) expiry = "Removal Pending"
else expiry = "Permaban"
@@ -207,26 +207,26 @@ var/savefile/Banlist
var/a = pick(1,0)
var/b = pick(1,0)
if(b)
- Banlist.cd = "/base"
- Banlist.dir.Add("trash[i]trashid[i]")
- Banlist.cd = "/base/trash[i]trashid[i]"
- Banlist["key"] << "trash[i]"
+ GLOB.banlist_savefile.cd = "/base"
+ GLOB.banlist_savefile.dir.Add("trash[i]trashid[i]")
+ GLOB.banlist_savefile.cd = "/base/trash[i]trashid[i]"
+ GLOB.banlist_savefile["key"] << "trash[i]"
else
- Banlist.cd = "/base"
- Banlist.dir.Add("[last]trashid[i]")
- Banlist.cd = "/base/[last]trashid[i]"
- Banlist["key"] << last
- Banlist["id"] << "trashid[i]"
- Banlist["reason"] << "Trashban[i]."
- Banlist["temp"] << a
- Banlist["minutes"] << CMinutes + rand(1,2000)
- Banlist["bannedby"] << "trashmin"
+ GLOB.banlist_savefile.cd = "/base"
+ GLOB.banlist_savefile.dir.Add("[last]trashid[i]")
+ GLOB.banlist_savefile.cd = "/base/[last]trashid[i]"
+ GLOB.banlist_savefile["key"] << last
+ GLOB.banlist_savefile["id"] << "trashid[i]"
+ GLOB.banlist_savefile["reason"] << "Trashban[i]."
+ GLOB.banlist_savefile["temp"] << a
+ GLOB.banlist_savefile["minutes"] << GLOB.CMinutes + rand(1,2000)
+ GLOB.banlist_savefile["bannedby"] << "trashmin"
last = "trash[i]"
- Banlist.cd = "/base"
+ GLOB.banlist_savefile.cd = "/base"
/proc/ClearAllBans()
- Banlist.cd = "/base"
- for(var/A in Banlist.dir)
+ GLOB.banlist_savefile.cd = "/base"
+ for(var/A in GLOB.banlist_savefile.dir)
RemoveBan(A)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 31aa6d5bc4c..df156c5b0df 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1,5 +1,5 @@
-var/global/BSACooldown = 0
-var/global/nologevent = 0
+GLOBAL_VAR_INIT(BSACooldown, 0)
+GLOBAL_VAR_INIT(nologevent, 0)
////////////////////////////////
/proc/message_admins(var/msg)
@@ -10,7 +10,7 @@ var/global/nologevent = 0
to_chat(C, msg)
/proc/msg_admin_attack(var/text, var/loglevel)
- if(!nologevent)
+ if(!GLOB.nologevent)
var/rendered = "ATTACK: "
for(var/client/C in GLOB.admins)
if(R_ADMIN & C.holder.rights)
@@ -197,7 +197,7 @@ var/global/nologevent = 0
for(var/block=1;block<=DNA_SE_LENGTH;block++)
if(((block-1)%5)==0)
body += "[block-1] "
- bname = assigned_blocks[block]
+ bname = GLOB.assigned_blocks[block]
body += ""
if(bname)
var/bstate=M.dna.GetSEState(block)
@@ -306,7 +306,7 @@ var/global/nologevent = 0
Feed channels and stories entered through here will be uneditable and handled as official news by the rest of the units.
Note that this panel allows full freedom over the news network, there are no constrictions except the few basic ones. Don't break things!
"}
- if(news_network.wanted_issue)
+ if(GLOB.news_network.wanted_issue)
dat+= "
Read Wanted Issue"
dat+= {"
Create Feed Channel
@@ -316,7 +316,7 @@ var/global/nologevent = 0
"}
var/wanted_already = 0
- if(news_network.wanted_issue)
+ if(GLOB.news_network.wanted_issue)
wanted_already = 1
dat+={"
Feed Security functions:
@@ -327,10 +327,10 @@ var/global/nologevent = 0
"}
if(1)
dat+= "Station Feed Channels
"
- if( isemptylist(news_network.network_channels) )
+ if( isemptylist(GLOB.news_network.network_channels) )
dat+="No active channels found..."
else
- for(var/datum/feed_channel/CHANNEL in news_network.network_channels)
+ for(var/datum/feed_channel/CHANNEL in GLOB.news_network.network_channels)
if(CHANNEL.is_admin_channel)
dat+="[CHANNEL.channel_name]
"
else
@@ -377,7 +377,7 @@ var/global/nologevent = 0
if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]")
dat+="•Invalid channel name.
"
var/check = 0
- for(var/datum/feed_channel/FC in news_network.network_channels)
+ for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
if(FC.channel_name == src.admincaster_feed_channel.channel_name)
check = 1
break
@@ -414,10 +414,10 @@ var/global/nologevent = 0
Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it.
Select Feed channel to get Stories from:
"}
- if(isemptylist(news_network.network_channels))
+ if(isemptylist(GLOB.news_network.network_channels))
dat+="No feed channels found active...
"
else
- for(var/datum/feed_channel/CHANNEL in news_network.network_channels)
+ for(var/datum/feed_channel/CHANNEL in GLOB.news_network.network_channels)
dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ""]
"
dat+="
Cancel"
if(11)
@@ -427,10 +427,10 @@ var/global/nologevent = 0
morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed
stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
"}
- if(isemptylist(news_network.network_channels))
+ if(isemptylist(GLOB.news_network.network_channels))
dat+="No feed channels found active...
"
else
- for(var/datum/feed_channel/CHANNEL in news_network.network_channels)
+ for(var/datum/feed_channel/CHANNEL in GLOB.news_network.network_channels)
dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ""]
"
dat+="
Back"
@@ -470,7 +470,7 @@ var/global/nologevent = 0
dat+="Wanted Issue Handler:"
var/wanted_already = 0
var/end_param = 1
- if(news_network.wanted_issue)
+ if(GLOB.news_network.wanted_issue)
wanted_already = 1
end_param = 2
if(wanted_already)
@@ -481,7 +481,7 @@ var/global/nologevent = 0
Description: [src.admincaster_feed_message.body]
"}
if(wanted_already)
- dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
"
+ dat+="Wanted Issue created by: [GLOB.news_network.wanted_issue.backup_author]
"
else
dat+="Wanted Issue will be created under prosecutor: [src.admincaster_signature]
"
dat+="
[(wanted_already) ? ("Edit Issue") : ("Submit")]"
@@ -507,13 +507,13 @@ var/global/nologevent = 0
"}
if(18)
dat+={"
- -- STATIONWIDE WANTED ISSUE --
\[Submitted by: [news_network.wanted_issue.backup_author]\]
- Criminal: [news_network.wanted_issue.author]
- Description: [news_network.wanted_issue.body]
+ -- STATIONWIDE WANTED ISSUE --
\[Submitted by: [GLOB.news_network.wanted_issue.backup_author]\]
+ Criminal: [GLOB.news_network.wanted_issue.author]
+ Description: [GLOB.news_network.wanted_issue.body]
Photo::
"}
- if(news_network.wanted_issue.img)
- usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png")
+ if(GLOB.news_network.wanted_issue.img)
+ usr << browse_rsc(GLOB.news_network.wanted_issue.img, "tmp_photow.png")
dat+="
"
else
dat+="None"
@@ -536,7 +536,7 @@ var/global/nologevent = 0
return
var/dat = "Job Bans!"
- for(var/t in jobban_keylist)
+ for(var/t in GLOB.jobban_keylist)
var/r = t
if( findtext(r,"##") )
r = copytext( r, 1, findtext(r,"##") )//removes the description
@@ -552,7 +552,7 @@ var/global/nologevent = 0
\n
Change Game Mode
"}
- if(master_mode == "secret")
+ if(GLOB.master_mode == "secret")
dat += "(Force Secret Mode)
"
dat += {"
@@ -714,8 +714,8 @@ var/global/nologevent = 0
if(!check_rights(R_SERVER))
return
- enter_allowed = !( enter_allowed )
- if(!( enter_allowed ))
+ GLOB.enter_allowed = !( GLOB.enter_allowed )
+ if(!( GLOB.enter_allowed ))
to_chat(world, "New players may no longer enter the game.")
else
to_chat(world, "New players may now enter the game.")
@@ -750,13 +750,13 @@ var/global/nologevent = 0
if(!check_rights(R_SERVER))
return
- abandon_allowed = !( abandon_allowed )
- if(abandon_allowed)
+ GLOB.abandon_allowed = !( GLOB.abandon_allowed )
+ if(GLOB.abandon_allowed)
to_chat(world, "You may now respawn.")
else
to_chat(world, "You may no longer respawn :(")
- message_admins("[key_name_admin(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].", 1)
- log_admin("[key_name(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].")
+ message_admins("[key_name_admin(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].", 1)
+ log_admin("[key_name(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].")
world.update_status()
feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -768,9 +768,9 @@ var/global/nologevent = 0
if(!check_rights(R_EVENT))
return
- aliens_allowed = !aliens_allowed
- log_admin("[key_name(usr)] toggled aliens to [aliens_allowed].")
- message_admins("[key_name_admin(usr)] toggled aliens [aliens_allowed ? "on" : "off"].")
+ GLOB.aliens_allowed = !GLOB.aliens_allowed
+ log_admin("[key_name(usr)] toggled aliens to [GLOB.aliens_allowed].")
+ message_admins("[key_name_admin(usr)] toggled aliens [GLOB.aliens_allowed ? "on" : "off"].")
feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/delay()
@@ -786,13 +786,13 @@ var/global/nologevent = 0
log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
message_admins("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
return //alert("Round end delayed", null, null, null, null, null)
- if(going)
- going = FALSE
+ if(SSticker.ticker_going)
+ SSticker.ticker_going = FALSE
SSticker.delay_end = TRUE
to_chat(world, "The game start has been delayed.")
log_admin("[key_name(usr)] delayed the game.")
else
- going = TRUE
+ SSticker.ticker_going = TRUE
to_chat(world, "The game will start soon.")
log_admin("[key_name(usr)] removed the delay.")
feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -899,13 +899,13 @@ var/global/nologevent = 0
if(!check_rights(R_SERVER))
return
- guests_allowed = !( guests_allowed )
- if(!( guests_allowed ))
+ GLOB.guests_allowed = !( GLOB.guests_allowed )
+ if(!( GLOB.guests_allowed ))
to_chat(world, "Guests may no longer enter the game.")
else
to_chat(world, "Guests may now enter the game.")
- log_admin("[key_name(usr)] toggled guests game entering [guests_allowed ? "" : "dis"]allowed.")
- message_admins("[key_name_admin(usr)] toggled guests game entering [guests_allowed ? "" : "dis"]allowed.", 1)
+ log_admin("[key_name(usr)] toggled guests game entering [GLOB.guests_allowed ? "" : "dis"]allowed.")
+ message_admins("[key_name_admin(usr)] toggled guests game entering [GLOB.guests_allowed ? "" : "dis"]allowed.", 1)
feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/output_ai_laws()
@@ -954,12 +954,12 @@ var/global/nologevent = 0
//ALL DONE
//*********************************************************************************************************
-var/gamma_ship_location = 1 // 0 = station , 1 = space
+GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space
/proc/move_gamma_ship()
var/area/fromArea
var/area/toArea
- if(gamma_ship_location == 1)
+ if(GLOB.gamma_ship_location == 1)
fromArea = locate(/area/shuttle/gamma/space)
toArea = locate(/area/shuttle/gamma/station)
else
@@ -970,10 +970,10 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
for(var/obj/machinery/mech_bay_recharge_port/P in toArea)
P.update_recharge_turf()
- if(gamma_ship_location)
- gamma_ship_location = 0
+ if(GLOB.gamma_ship_location)
+ GLOB.gamma_ship_location = 0
else
- gamma_ship_location = 1
+ GLOB.gamma_ship_location = 1
return
/proc/formatJumpTo(var/location,var/where="")
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index 49b2f06d003..13b786c5174 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -23,18 +23,18 @@
if(!message) return
var/F = investigate_subject2file(subject)
if(!F) return
- investigate_log_subjects |= subject
+ GLOB.investigate_log_subjects |= subject
F << "[time_stamp()] \ref[src] ([x],[y],[z]) || [src] [message]
"
/proc/log_investigate(message, subject)
if(!message) return
var/F = investigate_subject2file(subject)
if(!F) return
- investigate_log_subjects |= subject
+ GLOB.investigate_log_subjects |= subject
F << "[time_stamp()] || [message]
"
//ADMINVERBS
-/client/proc/investigate_show( subject in investigate_log_subjects )
+/client/proc/investigate_show( subject in GLOB.investigate_log_subjects )
set name = "Investigate"
set category = "Admin"
if(!holder) return
diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm
index 530b9e7958e..455b38e1e0f 100644
--- a/code/modules/admin/admin_memo.dm
+++ b/code/modules/admin/admin_memo.dm
@@ -3,7 +3,7 @@
set category = "Server"
if(!check_rights(R_SERVER))
return
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
to_chat(src, "Failed to establish database connection.")
return
var/memotask = input(usr,"Choose task.","Memo") in list("Show","Write","Edit","Remove")
@@ -16,13 +16,13 @@
return
if(!task)
return
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
to_chat(src, "Failed to establish database connection.")
return
var/sql_ckey = sanitizeSQL(src.ckey)
switch(task)
if("Write")
- var/DBQuery/query_memocheck = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")] WHERE ckey = '[sql_ckey]'")
+ var/DBQuery/query_memocheck = GLOB.dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")] WHERE ckey = '[sql_ckey]'")
if(!query_memocheck.Execute())
var/err = query_memocheck.ErrorMsg()
log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
@@ -35,7 +35,7 @@
return
memotext = sanitizeSQL(memotext)
var/timestamp = SQLtime()
- var/DBQuery/query_memoadd = dbcon.NewQuery("INSERT INTO [format_table_name("memo")] (ckey, memotext, timestamp) VALUES ('[sql_ckey]', '[memotext]', '[timestamp]')")
+ var/DBQuery/query_memoadd = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("memo")] (ckey, memotext, timestamp) VALUES ('[sql_ckey]', '[memotext]', '[timestamp]')")
if(!query_memoadd.Execute())
var/err = query_memoadd.ErrorMsg()
log_game("SQL ERROR adding new memo. Error : \[[err]\]\n")
@@ -43,7 +43,7 @@
log_admin("[key_name(src)] has set a memo: [memotext]")
message_admins("[key_name_admin(src)] has set a memo:
[memotext]")
if("Edit")
- var/DBQuery/query_memolist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]")
+ var/DBQuery/query_memolist = GLOB.dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]")
if(!query_memolist.Execute())
var/err = query_memolist.ErrorMsg()
log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
@@ -59,7 +59,7 @@
if(!target_ckey)
return
var/target_sql_ckey = sanitizeSQL(target_ckey)
- var/DBQuery/query_memofind = dbcon.NewQuery("SELECT memotext FROM [format_table_name("memo")] WHERE ckey = '[target_sql_ckey]'")
+ var/DBQuery/query_memofind = GLOB.dbcon.NewQuery("SELECT memotext FROM [format_table_name("memo")] WHERE ckey = '[target_sql_ckey]'")
if(!query_memofind.Execute())
var/err = query_memofind.ErrorMsg()
log_game("SQL ERROR obtaining memotext from memo table. Error : \[[err]\]\n")
@@ -72,7 +72,7 @@
new_memo = sanitizeSQL(new_memo)
var/edit_text = "Edited by [sql_ckey] on [SQLtime()] from
[old_memo]
to
[new_memo]
"
edit_text = sanitizeSQL(edit_text)
- var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("memo")] SET memotext = '[new_memo]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE ckey = '[target_sql_ckey]'")
+ var/DBQuery/update_query = GLOB.dbcon.NewQuery("UPDATE [format_table_name("memo")] SET memotext = '[new_memo]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE ckey = '[target_sql_ckey]'")
if(!update_query.Execute())
var/err = update_query.ErrorMsg()
log_game("SQL ERROR editing memo. Error : \[[err]\]\n")
@@ -84,7 +84,7 @@
log_admin("[key_name(src)] has edited [target_sql_ckey]'s memo from \"[old_memo]\" to \"[new_memo]\"")
message_admins("[key_name_admin(src)] has edited [target_sql_ckey]'s memo from \"[old_memo]\" to \"[new_memo]\"")
if("Show")
- var/DBQuery/query_memoshow = dbcon.NewQuery("SELECT ckey, memotext, timestamp, last_editor FROM [format_table_name("memo")]")
+ var/DBQuery/query_memoshow = GLOB.dbcon.NewQuery("SELECT ckey, memotext, timestamp, last_editor FROM [format_table_name("memo")]")
if(!query_memoshow.Execute())
var/err = query_memoshow.ErrorMsg()
log_game("SQL ERROR obtaining ckey, memotext, timestamp, last_editor from memo table. Error : \[[err]\]\n")
@@ -104,7 +104,7 @@
else if(!silent)
to_chat(src, "No memos found in database.")
if("Remove")
- var/DBQuery/query_memodellist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]")
+ var/DBQuery/query_memodellist = GLOB.dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]")
if(!query_memodellist.Execute())
var/err = query_memodellist.ErrorMsg()
log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
@@ -120,7 +120,7 @@
if(!target_ckey)
return
var/target_sql_ckey = sanitizeSQL(target_ckey)
- var/DBQuery/query_memodel = dbcon.NewQuery("DELETE FROM [format_table_name("memo")] WHERE ckey = '[target_sql_ckey]'")
+ var/DBQuery/query_memodel = GLOB.dbcon.NewQuery("DELETE FROM [format_table_name("memo")] WHERE ckey = '[target_sql_ckey]'")
if(!query_memodel.Execute())
var/err = query_memodel.ErrorMsg()
log_game("SQL ERROR removing memo. Error : \[[err]\]\n")
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index 82f82d3dabe..5956819d3d4 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -1,8 +1,9 @@
-var/list/admin_ranks = list() //list of all ranks with associated rights
+GLOBAL_LIST_EMPTY(admin_ranks) //list of all ranks with associated rights
+GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons
//load our rank - > rights associations
/proc/load_admin_ranks()
- admin_ranks.Cut()
+ GLOB.admin_ranks.Cut()
var/previous_rights = 0
@@ -43,14 +44,15 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
if("mod") rights |= R_MOD
if("mentor") rights |= R_MENTOR
if("proccall") rights |= R_PROCCALL
+ if("viewruntimes") rights |= R_VIEWRUNTIMES
- admin_ranks[rank] = rights
+ GLOB.admin_ranks[rank] = rights
previous_rights = rights
#ifdef TESTING
var/msg = "Permission Sets Built:\n"
- for(var/rank in admin_ranks)
- msg += "\t[rank] - [admin_ranks[rank]]\n"
+ for(var/rank in GLOB.admin_ranks)
+ msg += "\t[rank] - [GLOB.admin_ranks[rank]]\n"
testing(msg)
#endif
@@ -60,12 +62,16 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
/proc/load_admins()
//clear the datums references
- admin_datums.Cut()
+ GLOB.admin_datums.Cut()
for(var/client/C in GLOB.admins)
C.remove_admin_verbs()
C.holder = null
GLOB.admins.Cut()
+ // Remove all profiler access
+ for(var/A in world.GetConfig("admin"))
+ world.SetConfig("APP/admin", A, null)
+
if(config.admin_legacy_system)
load_admin_ranks()
@@ -91,11 +97,14 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
rank = ckeyEx(List[2])
//load permissions associated with this rank
- var/rights = admin_ranks[rank]
+ var/rights = GLOB.admin_ranks[rank]
//create the admin datum and store it for later use
var/datum/admins/D = new /datum/admins(rank, rights, ckey)
+ if(D.rights & R_DEBUG || D.rights & R_VIEWRUNTIMES) // Grants profiler access to anyone with R_DEBUG or R_VIEWRUNTIMES
+ world.SetConfig("APP/admin", ckey, "role=admin")
+
//find the client for a ckey if they are connected and associate them with the new admin datum
D.associate(GLOB.directory[ckey])
@@ -103,13 +112,13 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
//The current admin system uses SQL
establish_db_connection()
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
log_world("Failed to connect to database in load_admins(). Reverting to legacy system.")
config.admin_legacy_system = 1
load_admins()
return
- var/DBQuery/query = dbcon.NewQuery("SELECT ckey, rank, level, flags FROM [format_table_name("admin")]")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT ckey, rank, level, flags FROM [format_table_name("admin")]")
query.Execute()
while(query.NextRow())
var/ckey = query.item[1]
@@ -120,9 +129,12 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
if(istext(rights)) rights = text2num(rights)
var/datum/admins/D = new /datum/admins(rank, rights, ckey)
+ if(D.rights & R_DEBUG || D.rights & R_VIEWRUNTIMES) // Grants profiler access to anyone with R_DEBUG or R_VIEWRUNTIMES
+ world.SetConfig("APP/admin", ckey, "role=admin")
+
//find the client for a ckey if they are connected and associate them with the new admin datum
D.associate(GLOB.directory[ckey])
- if(!admin_datums)
+ if(!GLOB.admin_datums)
log_world("The database query in load_admins() resulted in no admins being added to the list. Reverting to legacy system.")
config.admin_legacy_system = 1
load_admins()
@@ -130,9 +142,9 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
#ifdef TESTING
var/msg = "Admins Built:\n"
- for(var/ckey in admin_datums)
+ for(var/ckey in GLOB.admin_datums)
var/rank
- var/datum/admins/D = admin_datums[ckey]
+ var/datum/admins/D = GLOB.admin_datums[ckey]
if(D) rank = D.rank
msg += "\t[ckey] - [rank]\n"
testing(msg)
@@ -140,12 +152,12 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
#ifdef TESTING
-/client/verb/changerank(newrank in admin_ranks)
+/client/verb/changerank(newrank in GLOB.admin_ranks)
if(holder)
holder.rank = newrank
- holder.rights = admin_ranks[newrank]
+ holder.rights = GLOB.admin_ranks[newrank]
else
- holder = new /datum/admins(newrank,admin_ranks[newrank],ckey)
+ holder = new /datum/admins(newrank,GLOB.admin_ranks[newrank],ckey)
remove_admin_verbs()
holder.associate(src)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 9a60d41aa66..4e3d2d65f30 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -1,13 +1,13 @@
//admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
-var/list/admin_verbs_default = list(
+GLOBAL_LIST_INIT(admin_verbs_default, list(
/client/proc/deadmin_self, /*destroys our own admin datum so we can play as a regular player*/
/client/proc/hide_verbs, /*hides all our adminverbs*/
/client/proc/toggleadminhelpsound,
/client/proc/togglementorhelpsound,
/client/proc/cmd_mentor_check_new_players,
/client/proc/cmd_mentor_check_player_exp /* shows players by playtime */
- )
-var/list/admin_verbs_admin = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_admin, list(
/client/proc/check_antagonists, /*shows all antags*/
/datum/admins/proc/show_player_panel,
/client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/
@@ -26,6 +26,7 @@ var/list/admin_verbs_admin = list(
/client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/
/client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/
/client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/
+ /client/proc/cmd_admin_open_logging_view,
/client/proc/getserverlogs, /*allows us to fetch server logs (diary) for other days*/
/client/proc/jumptocoord, /*we ghost and jump to a coordinate*/
/client/proc/Getmob, /*teleports a mob to our location*/
@@ -67,7 +68,6 @@ var/list/admin_verbs_admin = list(
/client/proc/empty_ai_core_toggle_latejoin,
/client/proc/aooc,
/client/proc/freeze,
- /client/proc/freezemecha,
/client/proc/alt_check,
/client/proc/secrets,
/client/proc/change_human_appearance_admin, /* Allows an admin to change the basic appearance of human-based mobs */
@@ -79,20 +79,20 @@ var/list/admin_verbs_admin = list(
/client/proc/list_ssds_afks,
/client/proc/cmd_admin_headset_message,
/client/proc/spawn_floor_cluwne
-)
-var/list/admin_verbs_ban = list(
+))
+GLOBAL_LIST_INIT(admin_verbs_ban, list(
/client/proc/unban_panel,
/client/proc/jobbans,
/client/proc/stickybanpanel
- )
-var/list/admin_verbs_sounds = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_sounds, list(
/client/proc/play_local_sound,
/client/proc/play_sound,
/client/proc/play_server_sound,
/client/proc/play_intercomm_sound,
/client/proc/stop_global_admin_sounds
- )
-var/list/admin_verbs_event = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_event, list(
/client/proc/object_talk,
/client/proc/cmd_admin_dress,
/client/proc/cmd_admin_gib_self,
@@ -117,14 +117,14 @@ var/list/admin_verbs_event = list(
/client/proc/event_manager_panel,
/client/proc/modify_goals,
/client/proc/outfit_manager
- )
+ ))
-var/list/admin_verbs_spawn = list(
+GLOBAL_LIST_INIT(admin_verbs_spawn, list(
/datum/admins/proc/spawn_atom, /*allows us to spawn instances*/
/client/proc/respawn_character,
/client/proc/admin_deserialize
- )
-var/list/admin_verbs_server = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_server, list(
/client/proc/ToRban,
/client/proc/Set_Holiday,
/datum/admins/proc/startnow,
@@ -144,8 +144,8 @@ var/list/admin_verbs_server = list(
/client/proc/toggle_antagHUD_restrictions,
/client/proc/set_ooc,
/client/proc/reset_ooc
- )
-var/list/admin_verbs_debug = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_debug, list(
/client/proc/cmd_admin_list_open_jobs,
/client/proc/Debug2,
/client/proc/cmd_debug_make_powernets,
@@ -172,21 +172,21 @@ var/list/admin_verbs_debug = list(
/client/proc/admin_serialize,
/client/proc/jump_to_ruin,
/client/proc/toggle_medal_disable,
- )
-var/list/admin_verbs_possess = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_possess, list(
/proc/possess,
/proc/release
- )
-var/list/admin_verbs_permissions = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_permissions, list(
/client/proc/edit_admin_permissions,
/client/proc/create_poll,
/client/proc/big_brother
- )
-var/list/admin_verbs_rejuv = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_rejuv, list(
/client/proc/respawn_character,
/client/proc/cmd_admin_rejuvenate
- )
-var/list/admin_verbs_mod = list(
+ ))
+GLOBAL_LIST_INIT(admin_verbs_mod, list(
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/
/client/proc/cmd_admin_pm_by_key_panel, /*admin-pm list by key*/
@@ -199,8 +199,8 @@ var/list/admin_verbs_mod = list(
/datum/admins/proc/show_player_panel,
/client/proc/jobbans,
/client/proc/debug_variables /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/
-)
-var/list/admin_verbs_mentor = list(
+))
+GLOBAL_LIST_INIT(admin_verbs_mentor, list(
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/
/client/proc/cmd_admin_pm_by_key_panel, /*admin-pm list by key*/
@@ -208,20 +208,20 @@ var/list/admin_verbs_mentor = list(
/client/proc/toggleMentorTicketLogs,
/client/proc/cmd_mentor_say /* mentor say*/
// cmd_mentor_say is added/removed by the toggle_mentor_chat verb
-)
-var/list/admin_verbs_proccall = list(
+))
+GLOBAL_LIST_INIT(admin_verbs_proccall, list(
/client/proc/callproc,
/client/proc/callproc_datum,
/client/proc/SDQL2_query
-)
-var/list/admin_verbs_ticket = list(
+))
+GLOBAL_LIST_INIT(admin_verbs_ticket, list(
/client/proc/openAdminTicketUI,
/client/proc/toggleticketlogs,
/client/proc/openMentorTicketUI,
/client/proc/toggleMentorTicketLogs,
/client/proc/resolveAllAdminTickets,
/client/proc/resolveAllMentorTickets
-)
+))
/client/proc/on_holder_add()
if(chatOutput && chatOutput.loaded)
@@ -229,62 +229,71 @@ var/list/admin_verbs_ticket = list(
/client/proc/add_admin_verbs()
if(holder)
- verbs += admin_verbs_default
+ // If they have ANYTHING OTHER THAN ONLY VIEW RUNTIMES (65536), then give them the default admin verbs
+ if(holder.rights != R_VIEWRUNTIMES)
+ verbs += GLOB.admin_verbs_default
if(holder.rights & R_BUILDMODE)
verbs += /client/proc/togglebuildmodeself
if(holder.rights & R_ADMIN)
- verbs += admin_verbs_admin
- verbs += admin_verbs_ticket
+ verbs += GLOB.admin_verbs_admin
+ verbs += GLOB.admin_verbs_ticket
spawn(1)
control_freak = 0
if(holder.rights & R_BAN)
- verbs += admin_verbs_ban
+ verbs += GLOB.admin_verbs_ban
if(holder.rights & R_EVENT)
- verbs += admin_verbs_event
+ verbs += GLOB.admin_verbs_event
if(holder.rights & R_SERVER)
- verbs += admin_verbs_server
+ verbs += GLOB.admin_verbs_server
if(holder.rights & R_DEBUG)
- verbs += admin_verbs_debug
+ verbs += GLOB.admin_verbs_debug
+ spawn(1)
+ control_freak = 0 // Setting control_freak to 0 allows you to use the Profiler and other client-side tools
if(holder.rights & R_POSSESS)
- verbs += admin_verbs_possess
+ verbs += GLOB.admin_verbs_possess
if(holder.rights & R_PERMISSIONS)
- verbs += admin_verbs_permissions
+ verbs += GLOB.admin_verbs_permissions
if(holder.rights & R_STEALTH)
verbs += /client/proc/stealth
if(holder.rights & R_REJUVINATE)
- verbs += admin_verbs_rejuv
+ verbs += GLOB.admin_verbs_rejuv
if(holder.rights & R_SOUNDS)
- verbs += admin_verbs_sounds
+ verbs += GLOB.admin_verbs_sounds
if(holder.rights & R_SPAWN)
- verbs += admin_verbs_spawn
+ verbs += GLOB.admin_verbs_spawn
if(holder.rights & R_MOD)
- verbs += admin_verbs_mod
+ verbs += GLOB.admin_verbs_mod
if(holder.rights & R_MENTOR)
- verbs += admin_verbs_mentor
+ verbs += GLOB.admin_verbs_mentor
if(holder.rights & R_PROCCALL)
- verbs += admin_verbs_proccall
+ verbs += GLOB.admin_verbs_proccall
+ if(holder.rights & R_VIEWRUNTIMES)
+ verbs += /client/proc/view_runtimes
+ spawn(1) // This setting exposes the profiler for people with R_VIEWRUNTIMES. They must still have it set in cfg/admin.txt
+ control_freak = 0
+
/client/proc/remove_admin_verbs()
verbs.Remove(
- admin_verbs_default,
+ GLOB.admin_verbs_default,
/client/proc/togglebuildmodeself,
- admin_verbs_admin,
- admin_verbs_ban,
- admin_verbs_event,
- admin_verbs_server,
- admin_verbs_debug,
- admin_verbs_possess,
- admin_verbs_permissions,
+ GLOB.admin_verbs_admin,
+ GLOB.admin_verbs_ban,
+ GLOB.admin_verbs_event,
+ GLOB.admin_verbs_server,
+ GLOB.admin_verbs_debug,
+ GLOB.admin_verbs_possess,
+ GLOB.admin_verbs_permissions,
/client/proc/stealth,
- admin_verbs_rejuv,
- admin_verbs_sounds,
- admin_verbs_spawn,
- admin_verbs_mod,
- admin_verbs_mentor,
- admin_verbs_proccall,
- admin_verbs_show_debug_verbs,
+ GLOB.admin_verbs_rejuv,
+ GLOB.admin_verbs_sounds,
+ GLOB.admin_verbs_spawn,
+ GLOB.admin_verbs_mod,
+ GLOB.admin_verbs_mentor,
+ GLOB.admin_verbs_proccall,
+ GLOB.admin_verbs_show_debug_verbs,
/client/proc/readmin,
- admin_verbs_ticket
+ GLOB.admin_verbs_ticket
)
/client/proc/hide_verbs()
@@ -514,14 +523,14 @@ var/list/admin_verbs_ticket = list(
return
if(!warned_ckey || !istext(warned_ckey)) return
- if(warned_ckey in admin_datums)
+ if(warned_ckey in GLOB.admin_datums)
to_chat(usr, "Error: warn(): You can't warn admins.")
return
var/datum/preferences/D
var/client/C = GLOB.directory[warned_ckey]
if(C) D = C.prefs
- else D = preferences_datums[warned_ckey]
+ else D = GLOB.preferences_datums[warned_ckey]
if(!D)
to_chat(src, "Error: warn(): No such ckey found.")
@@ -601,7 +610,7 @@ var/list/admin_verbs_ticket = list(
var/list/spell_list = list()
var/type_length = length("/obj/effect/proc_holder/spell") + 2
- for(var/A in spells)
+ for(var/A in GLOB.spells)
spell_list[copytext("[A]", type_length)] = A
var/obj/effect/proc_holder/spell/S = input("Choose the spell to give to that guy", "ABRAKADABRA") as null|anything in spell_list
if(!S)
@@ -620,7 +629,7 @@ var/list/admin_verbs_ticket = list(
set category = "Event"
set name = "Give Disease"
set desc = "Gives a Disease to a mob."
- var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in diseases
+ var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in GLOB.diseases
if(!D) return
T.ForceContractDisease(new D)
feedback_add_details("admin_verb","GD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -694,7 +703,7 @@ var/list/admin_verbs_ticket = list(
set category = "Admin"
set desc = "Regain your admin powers."
- var/datum/admins/D = admin_datums[ckey]
+ var/datum/admins/D = GLOB.admin_datums[ckey]
var/rank = null
if(config.admin_legacy_system)
//load text from file
@@ -707,26 +716,26 @@ var/list/admin_verbs_ticket = list(
break
continue
else
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
message_admins("Warning, MySQL database is not connected.")
to_chat(src, "Warning, MYSQL database is not connected.")
return
var/sql_ckey = sanitizeSQL(ckey)
- var/DBQuery/query = dbcon.NewQuery("SELECT rank FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT rank FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'")
query.Execute()
while(query.NextRow())
rank = ckeyEx(query.item[1])
if(!D)
if(config.admin_legacy_system)
- if(admin_ranks[rank] == null)
+ if(GLOB.admin_ranks[rank] == null)
error("Error while re-adminning [src], admin rank ([rank]) does not exist.")
to_chat(src, "Error while re-adminning, admin rank ([rank]) does not exist.")
return
- D = new(rank, admin_ranks[rank], ckey)
+ D = new(rank, GLOB.admin_ranks[rank], ckey)
else
var/sql_ckey = sanitizeSQL(ckey)
- var/DBQuery/query = dbcon.NewQuery("SELECT ckey, rank, flags FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT ckey, rank, flags FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'")
query.Execute()
while(query.NextRow())
var/admin_ckey = query.item[1]
@@ -791,7 +800,7 @@ var/list/admin_verbs_ticket = list(
if(!S) return
var/datum/nano_module/law_manager/L = new(S)
- L.ui_interact(usr, state = admin_state)
+ L.ui_interact(usr, state = GLOB.admin_state)
log_and_message_admins("has opened [S]'s law manager.")
feedback_add_details("admin_verb","MSL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm
index ff461c0f333..b561e0169ff 100644
--- a/code/modules/admin/banappearance.dm
+++ b/code/modules/admin/banappearance.dm
@@ -1,22 +1,22 @@
//ban people from using custom names and appearances. that'll show 'em.
-var/appearanceban_runonce //Updates legacy bans with new info
-var/appearance_keylist[0] //to store the keys
+GLOBAL_VAR(appearanceban_runonce) //Updates legacy bans with new info
+GLOBAL_LIST_EMPTY(appearance_keylist) //to store the keys
/proc/appearance_fullban(mob/M, reason)
if(!M || !M.key) return
- appearance_keylist.Add(text("[M.ckey] ## [reason]"))
+ GLOB.appearance_keylist.Add(text("[M.ckey] ## [reason]"))
appearance_savebanfile()
/proc/appearance_client_fullban(ckey)
if(!ckey) return
- appearance_keylist.Add(text("[ckey]"))
+ GLOB.appearance_keylist.Add(text("[ckey]"))
appearance_savebanfile()
//returns a reason if M is banned, returns 0 otherwise
/proc/appearance_isbanned(mob/M)
if(M)
- for(var/s in appearance_keylist)
+ for(var/s in GLOB.appearance_keylist)
if(findtext(s, "[M.ckey]") == 1)
var/startpos = findtext(s, "## ") + 3
if(startpos && startpos < length(s))
@@ -43,12 +43,12 @@ DEBUG
/proc/appearance_loadbanfile()
if(config.ban_legacy_system)
var/savefile/S=new("data/appearance_full.ban")
- S["keys[0]"] >> appearance_keylist
+ S["keys[0]"] >> GLOB.appearance_keylist
log_admin("Loading appearance_rank")
- S["runonce"] >> appearanceban_runonce
+ S["runonce"] >> GLOB.appearanceban_runonce
- if(!length(appearance_keylist))
- appearance_keylist=list()
+ if(!length(GLOB.appearance_keylist))
+ GLOB.appearance_keylist=list()
log_admin("appearance_keylist was empty")
else
if(!establish_db_connection())
@@ -58,17 +58,17 @@ DEBUG
return
//appearance bans
- var/DBQuery/query = dbcon.NewQuery("SELECT ckey FROM [format_table_name("ban")] WHERE bantype = 'APPEARANCE_BAN' AND NOT unbanned = 1")
+ var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT ckey FROM [format_table_name("ban")] WHERE bantype = 'APPEARANCE_BAN' AND NOT unbanned = 1")
query.Execute()
while(query.NextRow())
var/ckey = query.item[1]
- appearance_keylist.Add("[ckey]")
+ GLOB.appearance_keylist.Add("[ckey]")
/proc/appearance_savebanfile()
var/savefile/S=new("data/appearance_full.ban")
- to_chat(S["keys[0]"], appearance_keylist)
+ to_chat(S["keys[0]"], GLOB.appearance_keylist)
/proc/appearance_unban(mob/M)
appearance_remove("[M.ckey]")
@@ -76,18 +76,18 @@ DEBUG
/proc/appearance_updatelegacybans()
- if(!appearanceban_runonce)
+ if(!GLOB.appearanceban_runonce)
log_admin("Updating appearancefile!")
// Updates bans.. Or fixes them. Either way.
- for(var/T in appearance_keylist)
+ for(var/T in GLOB.appearance_keylist)
if(!T) continue
- appearanceban_runonce++ //don't run this update again
+ GLOB.appearanceban_runonce++ //don't run this update again
/proc/appearance_remove(X)
- for(var/i = 1; i <= length(appearance_keylist); i++)
- if( findtext(appearance_keylist[i], "[X]") )
- appearance_keylist.Remove(appearance_keylist[i])
+ for(var/i = 1; i <= length(GLOB.appearance_keylist); i++)
+ if( findtext(GLOB.appearance_keylist[i], "[X]") )
+ GLOB.appearance_keylist.Remove(GLOB.appearance_keylist[i])
appearance_savebanfile()
return 1
return 0
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index 81060503f06..9efc4c9ce88 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -1,21 +1,21 @@
-var/jobban_runonce // Updates legacy bans with new info
-var/jobban_keylist[0] // Linear list of jobban strings, kept around for the legacy system
-var/jobban_assoclist[0] // Associative list, for efficiency
+GLOBAL_VAR(jobban_runonce) // Updates legacy bans with new info
+GLOBAL_LIST_INIT(jobban_keylist, new()) // Linear list of jobban strings, kept around for the legacy system
+GLOBAL_LIST_INIT(jobban_assoclist, new()) // Associative list, for efficiency
// Matches string-based jobbans into ckey, rank, and reason groups
-var/regex/jobban_regex = regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## (.+))?")
+GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## (.+))?"))
/proc/jobban_assoc_insert(ckey, rank, reason)
if(!ckey || !rank)
return
- if(!jobban_assoclist[ckey])
- jobban_assoclist[ckey] = list()
- jobban_assoclist[ckey][rank] = reason || "Reason Unspecified"
+ if(!GLOB.jobban_assoclist[ckey])
+ GLOB.jobban_assoclist[ckey] = list()
+ GLOB.jobban_assoclist[ckey][rank] = reason || "Reason Unspecified"
/proc/jobban_fullban(mob/M, rank, reason)
if(!M || !M.key)
return
- jobban_keylist.Add(text("[M.ckey] - [rank] ## [reason]"))
+ GLOB.jobban_keylist.Add(text("[M.ckey] - [rank] ## [reason]"))
jobban_assoc_insert(M.ckey, rank, reason)
if(config.ban_legacy_system)
jobban_savebanfile()
@@ -23,7 +23,7 @@ var/regex/jobban_regex = regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## (.+))?")
/proc/jobban_client_fullban(ckey, rank)
if(!ckey || !rank)
return
- jobban_keylist.Add(text("[ckey] - [rank]"))
+ GLOB.jobban_keylist.Add(text("[ckey] - [rank]"))
jobban_assoc_insert(ckey, rank)
if(config.ban_legacy_system)
jobban_savebanfile()
@@ -37,8 +37,8 @@ var/regex/jobban_regex = regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## (.+))?")
if(IsGuestKey(M.key))
return "Guest Job-ban"
- if(jobban_assoclist[M.ckey])
- return jobban_assoclist[M.ckey][rank]
+ if(GLOB.jobban_assoclist[M.ckey])
+ return GLOB.jobban_assoclist[M.ckey][rank]
else
return 0
@@ -63,17 +63,17 @@ DEBUG
/proc/jobban_loadbanfile()
if(config.ban_legacy_system)
var/savefile/S=new("data/job_full.ban")
- S["keys[0]"] >> jobban_keylist
+ S["keys[0]"] >> GLOB.jobban_keylist
log_admin("Loading jobban_rank")
- S["runonce"] >> jobban_runonce
+ S["runonce"] >> GLOB.jobban_runonce
- if(!length(jobban_keylist))
- jobban_keylist=list()
+ if(!length(GLOB.jobban_keylist))
+ GLOB.jobban_keylist=list()
log_admin("jobban_keylist was empty")
- for(var/s in jobban_keylist)
- if(jobban_regex.Find(s))
- jobban_assoc_insert(jobban_regex.group[1], jobban_regex.group[2], jobban_regex.group[3])
+ for(var/s in GLOB.jobban_keylist)
+ if(GLOB.jobban_regex.Find(s))
+ jobban_assoc_insert(GLOB.jobban_regex.group[1], GLOB.jobban_regex.group[2], GLOB.jobban_regex.group[3])
else
log_runtime(EXCEPTION("Skipping malformed job ban: [s]"))
else
@@ -84,10 +84,10 @@ DEBUG
return
//Job permabans
- var/DBQuery/permabans = dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_PERMABAN' AND isnull(unbanned)")
+ var/DBQuery/permabans = GLOB.dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_PERMABAN' AND isnull(unbanned)")
permabans.Execute()
// Job tempbans
- var/DBQuery/tempbans = dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_TEMPBAN' AND isnull(unbanned) AND expiration_time > Now()")
+ var/DBQuery/tempbans = GLOB.dbcon.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_TEMPBAN' AND isnull(unbanned) AND expiration_time > Now()")
tempbans.Execute()
while(TRUE)
@@ -102,12 +102,12 @@ DEBUG
else
break
- jobban_keylist.Add("[ckey] - [job]")
+ GLOB.jobban_keylist.Add("[ckey] - [job]")
jobban_assoc_insert(ckey, job)
/proc/jobban_savebanfile()
var/savefile/S=new("data/job_full.ban")
- S["keys[0]"] << jobban_keylist
+ S["keys[0]"] << GLOB.jobban_keylist
/proc/jobban_unban(mob/M, rank)
jobban_remove("[M.ckey] - [rank]")
@@ -120,19 +120,19 @@ DEBUG
/proc/jobban_remove(X)
- for(var/i = 1; i <= length(jobban_keylist); i++)
- if( findtext(jobban_keylist[i], "[X]") )
+ for(var/i = 1; i <= length(GLOB.jobban_keylist); i++)
+ if( findtext(GLOB.jobban_keylist[i], "[X]") )
// This need to be here, instead of jobban_unban, due to direct calls to jobban_remove
- if(jobban_regex.Find(X))
- var/ckey = jobban_regex.group[1]
- var/rank = jobban_regex.group[2]
- if(jobban_assoclist[ckey] && jobban_assoclist[ckey][rank])
- jobban_assoclist[ckey] -= rank
+ if(GLOB.jobban_regex.Find(X))
+ var/ckey = GLOB.jobban_regex.group[1]
+ var/rank = GLOB.jobban_regex.group[2]
+ if(GLOB.jobban_assoclist[ckey] && GLOB.jobban_assoclist[ckey][rank])
+ GLOB.jobban_assoclist[ckey] -= rank
else
log_runtime(EXCEPTION("Attempted to remove non-existent job ban: [X]"))
else
log_runtime(EXCEPTION("Failed to remove malformed job ban from associative list: [X]"))
- jobban_keylist.Remove(jobban_keylist[i])
+ GLOB.jobban_keylist.Remove(GLOB.jobban_keylist[i])
if(config.ban_legacy_system)
jobban_savebanfile()
return 1
@@ -152,7 +152,7 @@ DEBUG
else
//using the SQL ban system
var/is_actually_banned = FALSE
- var/DBQuery/select_query = dbcon.NewQuery("SELECT bantime, bantype, reason, job, duration, expiration_time, a_ckey FROM [format_table_name("ban")] WHERE ckey like '[ckey]' AND ((bantype like 'JOB_TEMPBAN' AND expiration_time > Now()) OR (bantype like 'JOB_PERMABAN')) AND isnull(unbanned) ORDER BY bantime DESC LIMIT 100")
+ var/DBQuery/select_query = GLOB.dbcon.NewQuery("SELECT bantime, bantype, reason, job, duration, expiration_time, a_ckey FROM [format_table_name("ban")] WHERE ckey like '[ckey]' AND ((bantype like 'JOB_TEMPBAN' AND expiration_time > Now()) OR (bantype like 'JOB_PERMABAN')) AND isnull(unbanned) ORDER BY bantime DESC LIMIT 100")
select_query.Execute()
while(select_query.NextRow())
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index e6148c7f554..616d5aa9ee8 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -1,9 +1,9 @@
-/var/create_mob_html = null
+GLOBAL_VAR(create_mob_html)
/datum/admins/proc/create_mob(var/mob/user)
- if(!create_mob_html)
+ if(!GLOB.create_mob_html)
var/mobjs = null
mobjs = jointext(typesof(/mob), ";")
- create_mob_html = file2text('html/create_object.html')
- create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
+ GLOB.create_mob_html = file2text('html/create_object.html')
+ GLOB.create_mob_html = replacetext(GLOB.create_mob_html, "null /* object types */", "\"[mobjs]\"")
- user << browse(replacetext(create_mob_html, "/* ref src */", UID()), "window=create_mob;size=425x475")
+ user << browse(replacetext(GLOB.create_mob_html, "/* ref src */", UID()), "window=create_mob;size=425x475")
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index e3a930058bd..c311be0d017 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -1,23 +1,23 @@
-var/create_object_html = null
-var/list/create_object_forms = list(/obj, /obj/structure, /obj/machinery, /obj/effect, /obj/item, /obj/mecha, /obj/item/clothing, /obj/item/stack, /obj/item/reagent_containers, /obj/item/gun)
+GLOBAL_VAR(create_object_html)
+GLOBAL_LIST_INIT(create_object_forms, list(/obj, /obj/structure, /obj/machinery, /obj/effect, /obj/item, /obj/mecha, /obj/item/clothing, /obj/item/stack, /obj/item/reagent_containers, /obj/item/gun))
/datum/admins/proc/create_object(var/mob/user)
- if(!create_object_html)
+ if(!GLOB.create_object_html)
var/objectjs = null
objectjs = jointext(typesof(/obj), ";")
- create_object_html = file2text('html/create_object.html')
- create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
+ GLOB.create_object_html = file2text('html/create_object.html')
+ GLOB.create_object_html = replacetext(GLOB.create_object_html, "null /* object types */", "\"[objectjs]\"")
- user << browse(replacetext(create_object_html, "/* ref src */", UID()), "window=create_object;size=425x475")
+ user << browse(replacetext(GLOB.create_object_html, "/* ref src */", UID()), "window=create_object;size=425x475")
/datum/admins/proc/quick_create_object(var/mob/user)
- var/path = input("Select the path of the object you wish to create.", "Path", /obj) in create_object_forms
- var/html_form = create_object_forms[path]
+ var/path = input("Select the path of the object you wish to create.", "Path", /obj) in GLOB.create_object_forms
+ var/html_form = GLOB.create_object_forms[path]
if(!html_form)
var/objectjs = jointext(typesof(path), ";")
html_form = file2text('html/create_object.html')
html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"")
- create_object_forms[path] = html_form
+ GLOB.create_object_forms[path] = html_form
user << browse(replacetext(html_form, "/* ref src */", UID()), "window=qco[path];size=425x475")
diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm
index a1c6de98d93..63592663469 100644
--- a/code/modules/admin/create_poll.dm
+++ b/code/modules/admin/create_poll.dm
@@ -1,15 +1,15 @@
/client/proc/create_poll()
set name = "Create Server Poll"
set category = "Server"
- if(!check_rights(R_SERVER))
+ if(!check_rights(R_SERVER))
return
- if(!dbcon.IsConnected())
+ if(!GLOB.dbcon.IsConnected())
to_chat(src, "Failed to establish database connection.")
return
create_poll_window()
/client/proc/create_poll_window(var/errormessage = "")
- if(!check_rights(R_SERVER))
+ if(!check_rights(R_SERVER))
return
var/output={"
@@ -75,7 +75,7 @@ function onload() {