From f29506a45ac1b4e198129f85215ed0f86686cdd3 Mon Sep 17 00:00:00 2001 From: Erki Date: Thu, 3 Jan 2019 20:08:55 +0200 Subject: [PATCH] Leave any sanity you had at the door step (#5885) --- code/ZAS/Connection.dm | 17 -- code/ZAS/Variable Settings.dm | 4 +- code/_helpers/unsorted.dm | 2 - code/controllers/subsystems/event.dm | 4 +- .../subsystems/initialization/atlas.dm | 6 +- code/controllers/subsystems/job.dm | 4 +- code/controllers/subsystems/pai.dm | 4 +- code/controllers/subsystems/statistics.dm | 2 - code/controllers/subsystems/ticker.dm | 62 +++---- code/controllers/subsystems/vote.dm | 16 +- code/datums/api.dm | 8 +- code/datums/browser.dm | 5 - code/datums/datacore.dm | 1 - code/datums/disease.dm | 4 - code/datums/diseases/advance/advance.dm | 9 +- code/datums/helper_datums/events.dm | 2 - code/datums/wires/alarm.dm | 9 - code/defines/procs/announce.dm | 16 +- code/game/antagonist/antagonist_objectives.dm | 4 +- code/game/antagonist/antagonist_print.dm | 10 +- code/game/antagonist/mutiny/mutineer.dm | 41 ----- code/game/antagonist/outsider/raider.dm | 4 +- code/game/antagonist/outsider/wizard.dm | 4 +- code/game/antagonist/station/rogue_ai.dm | 2 +- code/game/atoms.dm | 2 +- code/game/gamemodes/calamity/calamity.dm | 2 +- .../gamemodes/changeling/modularchangling.dm | 1 - code/game/gamemodes/cult/narsie.dm | 4 +- .../endgame/supermatter_cascade/universe.dm | 4 +- code/game/gamemodes/epidemic/epidemic.dm | 16 +- code/game/gamemodes/events.dm | 155 ----------------- code/game/gamemodes/events/VirusEpidemic.dm | 2 +- code/game/gamemodes/events/clang.dm | 1 - code/game/gamemodes/events/holidays/Easter.dm | 2 +- .../gamemodes/events/holidays/Holidays.dm | 12 +- code/game/gamemodes/events/wormholes.dm | 3 - code/game/gamemodes/game_mode.dm | 14 +- .../newmalf_ability_trees/tree_networking.dm | 4 +- code/game/gamemodes/meme/meme.dm | 52 +----- code/game/gamemodes/meteor/meteor.dm | 6 +- code/game/gamemodes/newobjective.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 36 ++-- code/game/gamemodes/sandbox/h_sandbox.dm | 4 +- code/game/machinery/alarm.dm | 1 - code/game/machinery/bots/mulebot.dm | 23 +-- code/game/machinery/cell_charger.dm | 2 - code/game/machinery/computer/shuttle.dm | 37 +++-- .../airlock_docking_controller.dm | 14 +- .../airlock_docking_controller_multi.dm | 26 +-- .../embedded_controller/docking_program.dm | 89 +++++----- code/game/machinery/hologram.dm | 2 +- code/game/machinery/nuclear_bomb.dm | 6 +- code/game/machinery/overview.dm | 15 -- code/game/machinery/pipe/construction.dm | 2 - code/game/machinery/telecomms/broadcaster.dm | 2 - .../machinery/telecomms/telecomunications.dm | 8 - code/game/mecha/medical/odysseus.dm | 35 ---- code/game/modifiers/modifiers.dm | 3 +- code/game/objects/effects/chem/chemsmoke.dm | 1 - code/game/objects/effects/gibs.dm | 2 +- code/game/objects/items/blueprints.dm | 5 - code/game/objects/items/devices/PDA/radio.dm | 18 -- .../game/objects/items/devices/radio/radio.dm | 1 - .../items/devices/uplink_random_lists.dm | 2 +- code/game/objects/items/devices/violin.dm | 5 - .../weapons/material/material_weapons.dm | 2 - .../items/weapons/material/twohanded.dm | 1 - code/game/objects/structures/musician.dm | 5 - code/game/turfs/space/space.dm | 32 +--- code/modules/admin/admin.dm | 46 +++--- code/modules/admin/holder2.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/BrokenInhands.dm | 2 +- code/modules/admin/verbs/SDQL_2.dm | 14 +- code/modules/admin/verbs/custom_event.dm | 8 +- code/modules/admin/verbs/debug.dm | 28 ++-- code/modules/admin/verbs/dice.dm | 6 +- code/modules/admin/verbs/mapping.dm | 22 +-- code/modules/admin/verbs/randomverbs.dm | 8 +- code/modules/assembly/infrared.dm | 13 -- .../awaymissions/bluespaceartillery.dm | 21 ++- code/modules/events/ion_storm.dm | 156 ------------------ code/modules/events/viral_outbreak.dm | 2 +- code/modules/global_listener/interfaces.dm | 2 +- code/modules/hydroponics/grown.dm | 4 +- .../hydroponics/spreading/spreading.dm | 6 +- code/modules/hydroponics/trays/tray_apiary.dm | 2 - .../hydroponics/trays/tray_update_icons.dm | 2 +- code/modules/liquid/splash_simulation.dm | 6 - code/modules/maps/fromdmp.dm | 28 ++-- code/modules/mining/mineral_effect.dm | 2 +- .../mob/abstract/freelook/visualnet.dm | 2 - code/modules/mob/living/carbon/human/human.dm | 31 ---- code/modules/mob/living/carbon/human/life.dm | 7 - code/modules/mob/living/living.dm | 3 - code/modules/mob/living/silicon/robot/life.dm | 2 - code/modules/mob/mob_cleanup.dm | 67 -------- code/modules/organs/organ_external.dm | 5 - code/modules/power/apc.dm | 7 +- code/modules/power/fractal_reactor.dm | 2 +- code/modules/power/generator_type2.dm | 2 - .../finds/finds_talkingitem.dm | 9 - .../security levels/keycard authentication.dm | 16 +- code/modules/shuttles/escape_pods.dm | 12 +- code/modules/shuttles/shuttle.dm | 10 +- code/modules/shuttles/shuttle_emergency.dm | 9 +- code/modules/shuttles/shuttle_ferry.dm | 10 +- code/modules/shuttles/shuttle_specops.dm | 6 +- code/modules/shuttles/shuttles_multi.dm | 7 +- tools/Redirector/Configurations.dm | 2 +- tools/Redirector/Redirector.dm | 6 +- tools/SS13SmoothingCutter/Cutter.dm | 24 +-- vueui/README.md | 14 +- 113 files changed, 383 insertions(+), 1153 deletions(-) diff --git a/code/ZAS/Connection.dm b/code/ZAS/Connection.dm index d6274b823a2..2459ccad411 100644 --- a/code/ZAS/Connection.dm +++ b/code/ZAS/Connection.dm @@ -79,13 +79,11 @@ Class Procs: if(!direct()) state |= CONNECTION_DIRECT edge.direct++ - //world << "Marked direct." /connection/proc/mark_indirect() if(direct()) state &= ~CONNECTION_DIRECT edge.direct-- - //world << "Marked indirect." /connection/proc/mark_space() state |= CONNECTION_SPACE @@ -99,18 +97,14 @@ Class Procs: /connection/proc/erase() edge.remove_connection(src) state |= CONNECTION_INVALID - //world << "Connection Erased: [state]" /connection/proc/update() - //world << "Updated, \..." if(!istype(A,/turf/simulated)) - //world << "Invalid A." erase() return var/block_status = SSair.air_blocked(A,B) if(block_status & AIR_BLOCKED) - //world << "Blocked connection." erase() return else if(block_status & ZONE_BLOCKED) @@ -122,14 +116,11 @@ Class Procs: if(state & CONNECTION_SPACE) if(!b_is_space) - //world << "Invalid B." erase() return if(A.zone != zoneA) - //world << "Zone changed, \..." if(!A.zone) erase() - //world << "erased." return else edge.remove_connection(src) @@ -137,22 +128,18 @@ Class Procs: edge.add_connection(src) zoneA = A.zone - //world << "valid." return else if(b_is_space) - //world << "Invalid B." erase() return if(A.zone == B.zone) - //world << "A == B" erase() return if(A.zone != zoneA || (zoneB && (B.zone != zoneB))) - //world << "Zones changed, \..." if(A.zone && B.zone) edge.remove_connection(src) edge = SSair.get_edge(A.zone, B.zone) @@ -160,9 +147,5 @@ Class Procs: zoneA = A.zone zoneB = B.zone else - //world << "erased." erase() return - - - //world << "valid." diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 7e91a26b3f2..ad2bab88da5 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -169,7 +169,7 @@ var/global/vs_control/vsc = new vars[ch] = vw if(how == "Toggle") newvar = (newvar?"ON":"OFF") - world << "[key_name(user)] changed the setting [display_description] to [newvar]." + to_world("[key_name(user)] changed the setting [display_description] to [newvar].") if(ch in plc.settings) ChangeSettingsDialog(user,plc.settings) else @@ -322,7 +322,7 @@ var/global/vs_control/vsc = new plc.N2O_HALLUCINATION = initial(plc.N2O_HALLUCINATION) - world << "[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"" + to_world("[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"") /pl_control/var/list/settings = list() diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index bc76a49c51f..54c7badfdf2 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -360,8 +360,6 @@ Turf and target are seperate in case you want to teleport some distance from a t if(isAI(src)) var/mob/living/silicon/ai/A = src oldname = null//don't bother with the records update crap - //world << "[newname] is the AI!" - //world << sound('sound/AI/newAI.ogg') // Set eyeobj name A.SetName(newname) diff --git a/code/controllers/subsystems/event.dm b/code/controllers/subsystems/event.dm index 8453ffab921..f6ca9a88e32 100644 --- a/code/controllers/subsystems/event.dm +++ b/code/controllers/subsystems/event.dm @@ -106,7 +106,7 @@ var/datum/controller/subsystem/events/SSevents if(!report_at_round_end) return - world << "


Random Events This Round:" + to_world("


Random Events This Round:") for(var/datum/event/E in active_events|finished_events) var/datum/event_meta/EM = E.event_meta if(EM.name == "Nothing") @@ -120,7 +120,7 @@ var/datum/controller/subsystem/events/SSevents else message += "and ran to completion." - world << message + to_world(message) /datum/controller/subsystem/events/proc/GetInteractWindow() var/html = "Refresh" diff --git a/code/controllers/subsystems/initialization/atlas.dm b/code/controllers/subsystems/initialization/atlas.dm index cad6afc0a35..ad0771d22de 100644 --- a/code/controllers/subsystems/initialization/atlas.dm +++ b/code/controllers/subsystems/initialization/atlas.dm @@ -29,7 +29,7 @@ var/datum/controller/subsystem/atlas/SSatlas /datum/controller/subsystem/atlas/Initialize(timeofday) // Quick sanity check. if (world.maxx != WORLD_MIN_SIZE || world.maxy != WORLD_MIN_SIZE || world.maxz != 1) - world << "WARNING: Suspected pre-compiled map: things may break horribly!" + to_world("WARNING: Suspected pre-compiled map: things may break horribly!") log_ss("atlas", "-- WARNING: Suspected pre-compiled map! --") maploader = new @@ -138,7 +138,7 @@ var/datum/controller/subsystem/atlas/SSatlas admin_departments = list( "[current_map.boss_name]", - "[current_map.system_name] Government", + "[current_map.system_name] Government", "Supply" ) @@ -157,7 +157,7 @@ var/datum/controller/subsystem/atlas/SSatlas /datum/controller/subsystem/atlas/proc/OnMapload(datum/callback/callback) if (!istype(callback)) CRASH("Invalid callback.") - + mapload_callbacks += callback /datum/controller/subsystem/atlas/proc/setup_spawnpoints() diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index a1bb05f0b10..58d9a34405c 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -36,7 +36,7 @@ occupations = list() var/list/all_jobs = current_map.allowed_jobs if(!all_jobs.len) - world << "Error setting up jobs, no job datums found!" + to_world("Error setting up jobs, no job datums found!") return FALSE for(var/J in all_jobs) @@ -333,7 +333,7 @@ job.apply_fingerprints(H) // Randomize nutrition and hydration. Defines are in __defines/mobs.dm - + if(H.max_nutrition > 0) H.nutrition = rand(CREW_MINIMUM_NUTRITION*100, CREW_MAXIMUM_NUTRITION*100) * H.max_nutrition * 0.01 diff --git a/code/controllers/subsystems/pai.dm b/code/controllers/subsystems/pai.dm index cc3d363dd70..bc1f8f92948 100644 --- a/code/controllers/subsystems/pai.dm +++ b/code/controllers/subsystems/pai.dm @@ -26,7 +26,7 @@ var/datum/pai_software/P = new type() if(pai_software_by_key[P.id]) var/datum/pai_software/O = pai_software_by_key[P.id] - world << "pAI software module [P.name] has the same key as [O.name]!" + to_world("pAI software module [P.name] has the same key as [O.name]!") continue pai_software_by_key[P.id] = P if(P.default) @@ -382,7 +382,7 @@ /datum/controller/subsystem/pai/proc/question(client/C) set waitfor = FALSE - if(!C) + if(!C) return asked.Add(C.key) asked[C.key] = world.time diff --git a/code/controllers/subsystems/statistics.dm b/code/controllers/subsystems/statistics.dm index f1ac077d968..8bdfda93d36 100644 --- a/code/controllers/subsystems/statistics.dm +++ b/code/controllers/subsystems/statistics.dm @@ -255,7 +255,6 @@ lakey = sanitizeSQL(H.lastattacker:key) var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" - //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(dbcon) if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") @@ -289,7 +288,6 @@ lakey = sanitizeSQL(H.lastattacker:key) var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" - //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(dbcon) if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 0a71af06b77..84034fc1aa1 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -184,11 +184,11 @@ var/datum/controller/subsystem/ticker/SSticker else feedback_set_details("end_proper","universe destroyed") if(!delay_end) - world << "Rebooting due to destruction of station in [restart_timeout/10] seconds" + to_world("Rebooting due to destruction of station in [restart_timeout/10] seconds") else feedback_set_details("end_proper","proper completion") if(!delay_end) - world << "Restarting in [restart_timeout/10] seconds" + to_world("Restarting in [restart_timeout/10] seconds") var/wait_for_tickets var/delay_notified = 0 @@ -225,7 +225,7 @@ var/datum/controller/subsystem/ticker/SSticker //call a transfer shuttle vote spawn(50) if(!round_end_announced) // Spam Prevention. Now it should announce only once. - world << "The round has ended!" + to_world("The round has ended!") round_end_announced = 1 SSvote.autotransfer() @@ -234,7 +234,7 @@ var/datum/controller/subsystem/ticker/SSticker /datum/controller/subsystem/ticker/proc/declare_completion() set waitfor = FALSE - world << "


A round of [mode.name] has ended!

" + to_world("


A round of [mode.name] has ended!

") for(var/mob/Player in player_list) if(Player.mind && !isnewplayer(Player)) if(Player.stat != DEAD) @@ -257,20 +257,20 @@ var/datum/controller/subsystem/ticker/SSticker Player << "You did not survive the events on [station_name()]..." else Player << "You did not survive the events on [station_name()]..." - world << "
" + to_world("
") for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:" + to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:") else - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:" + to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" - world << "[robolist]" + to_world("[robolist]") var/dronecount = 0 @@ -282,15 +282,15 @@ var/datum/controller/subsystem/ticker/SSticker if (!robo.connected_ai) if (robo.stat != 2) - world << "[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:" + to_world("[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:") else - world << "[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" + to_world("[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:") if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) if(dronecount) - world << "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round." + to_world("There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.") mode.declare_completion()//To declare normal completion. @@ -328,8 +328,8 @@ var/datum/controller/subsystem/ticker/SSticker m = pick(randomtips) if(m) - world << "Tip of the round: \ - [html_encode(m)]" + to_world("Tip of the round: \ + [html_encode(m)]") /datum/controller/subsystem/ticker/proc/print_testmerges() var/data = revdata.testmerge_overview() @@ -357,8 +357,8 @@ var/datum/controller/subsystem/ticker/SSticker pregame_timeleft = dynamic_time log_debug("SSticker: dynamic set pregame time [dynamic_time]s was greater than configured autogamemode time, not clamping.") - world << "Welcome to the pre-game lobby!" - world << "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds." + to_world("Welcome to the pre-game lobby!") + to_world("Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds.") /datum/controller/subsystem/ticker/proc/setup() //Create and announce mode @@ -371,7 +371,7 @@ var/datum/controller/subsystem/ticker/SSticker if(master_mode in list(ROUNDTYPE_STR_RANDOM, ROUNDTYPE_STR_SECRET, ROUNDTYPE_STR_MIXED_SECRET)) if(!runnable_modes.len) current_state = GAME_STATE_PREGAME - world << "Unable to choose playable game mode. Reverting to pre-game lobby." + to_world("Unable to choose playable game mode. Reverting to pre-game lobby.") return SETUP_REVOTE if(secret_force_mode != ROUNDTYPE_STR_SECRET && secret_force_mode != ROUNDTYPE_STR_MIXED_SECRET) src.mode = config.pick_mode(secret_force_mode) @@ -396,7 +396,7 @@ var/datum/controller/subsystem/ticker/SSticker if(!src.mode) current_state = GAME_STATE_PREGAME - world << "Serious error in mode setup! Reverting to pre-game lobby." + to_world("Serious error in mode setup! Reverting to pre-game lobby.") return SETUP_REVOTE SSjobs.ResetOccupations() @@ -424,29 +424,29 @@ var/datum/controller/subsystem/ticker/SSticker fail_reasons += "Too many players, less than [mode.max_players] antagonist(s) needed" if(can_start != GAME_FAILURE_NONE) - world << "Unable to start [mode.name]. [english_list(fail_reasons,"No reason specified",". ",". ")]" + to_world("Unable to start [mode.name]. [english_list(fail_reasons,"No reason specified",". ",". ")]") current_state = GAME_STATE_PREGAME mode.fail_setup() mode = null SSjobs.ResetOccupations() if(master_mode in list(ROUNDTYPE_STR_RANDOM, ROUNDTYPE_STR_SECRET, ROUNDTYPE_STR_MIXED_SECRET)) - world << "Reselecting gamemode..." + to_world("Reselecting gamemode...") return SETUP_REATTEMPT else - world << "Reverting to pre-game lobby." + to_world("Reverting to pre-game lobby.") return SETUP_REVOTE var/starttime = REALTIMEOFDAY if(hide_mode) - world << "The current game mode is - [hide_mode == ROUNDTYPE_SECRET ? "Secret" : "Mixed Secret"]!" + to_world("The current game mode is - [hide_mode == ROUNDTYPE_SECRET ? "Secret" : "Mixed Secret"]!") if(runnable_modes.len) var/list/tmpmodes = new for (var/datum/game_mode/M in runnable_modes) tmpmodes+=M.name tmpmodes = sortList(tmpmodes) if(tmpmodes.len) - world << "Possibilities: [english_list(tmpmodes)]" + to_world("Possibilities: [english_list(tmpmodes)]") else src.mode.announce() @@ -469,8 +469,8 @@ var/datum/controller/subsystem/ticker/SSticker //Deleting Startpoints but we need the ai point to AI-ize people later if (S.name != "AI") qdel(S) - world << "Enjoy the game!" - world << sound('sound/AI/welcome.ogg') // Skie + to_world("Enjoy the game!") + to_world(sound('sound/AI/welcome.ogg')) //Holiday Round-start stuff ~Carn Holiday_Game_Start() @@ -541,18 +541,18 @@ var/datum/controller/subsystem/ticker/SSticker if("mercenary") //Nuke wasn't on station when it blew up flick("intro_nuke",cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + to_world(sound('sound/effects/explosionfar.ogg')) flick("station_intact_fade_red",cinematic) cinematic.icon_state = "summary_nukefail" else flick("intro_nuke",cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + to_world(sound('sound/effects/explosionfar.ogg')) //flick("end",cinematic) if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation sleep(50) - world << sound('sound/effects/explosionfar.ogg') + to_world(sound('sound/effects/explosionfar.ogg')) else //station was destroyed if( mode && !override ) @@ -562,25 +562,25 @@ var/datum/controller/subsystem/ticker/SSticker flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_world(sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_nukewin" if("AI malfunction") //Malf (screen,explosion,summary) flick("intro_malf",cinematic) sleep(76) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_world(sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_malf" if("blob") //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_world(sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_selfdes" else //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_world(sound('sound/effects/explosionfar.ogg')) cinematic.icon_state = "summary_selfdes" //If its actually the end of the round, wait for it to end. diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index 47c337d01a4..df8a1fc8278 100644 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -34,7 +34,7 @@ var/datum/controller/subsystem/vote/SSvote if (mode) // No more change mode votes after the game has started. if(mode == "gamemode" && ROUND_IS_STARTED) - world << "Voting aborted due to game start." + to_world("Voting aborted due to game start.") src.reset() return @@ -123,13 +123,13 @@ var/datum/controller/subsystem/vote/SSvote else factor = 1.4 choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) - world << "Crew Transfer Factor: [factor]" + to_world("Crew Transfer Factor: [factor]") greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"]) if(mode == "crew_transfer") if(round(get_round_duration() / 36000)+12 <= 14) // Credit to Scopes @ oldcode. - world << "Majority voting rule in effect. 2/3rds majority needed to initiate transfer." + to_world("Majority voting rule in effect. 2/3rds majority needed to initiate transfer.") choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] - round(total_votes / 3)) greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"]) @@ -167,7 +167,7 @@ var/datum/controller/subsystem/vote/SSvote if(mode == "add_antagonist") antag_add_failed = 1 log_vote(text) - world << "[text]" + to_world("[text]") /datum/controller/subsystem/vote/proc/result() . = announce_result() @@ -197,10 +197,10 @@ var/datum/controller/subsystem/vote/SSvote if(mode == "gamemode") //fire this even if the vote fails. if(!round_progressing) round_progressing = 1 - world << "The round will start soon." + to_world("The round will start soon.") if(restart) - world << "World restarting due to vote..." + to_world("World restarting due to vote...") feedback_set_details("end_error","restart vote") sleep(50) log_game("Rebooting due to restart vote") @@ -309,7 +309,7 @@ var/datum/controller/subsystem/vote/SSvote text += "\n[question]" log_vote(text) - world << "[text]\nType vote or click here to place your votes.\nYou have [config.vote_period/10] seconds to vote." + to_world("[text]\nType vote or click here to place your votes.\nYou have [config.vote_period/10] seconds to vote.") for(var/cc in clients) var/client/C = cc if(C.prefs.asfx_togs & ASFX_VOTE) //Personal mute @@ -322,7 +322,7 @@ var/datum/controller/subsystem/vote/SSvote C << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) if(mode == "gamemode" && round_progressing) round_progressing = 0 - world << "Round start has been delayed." + to_world("Round start has been delayed.") time_remaining = round(config.vote_period/10) return 1 diff --git a/code/datums/api.dm b/code/datums/api.dm index 7713ce58dba..964a2f148c5 100644 --- a/code/datums/api.dm +++ b/code/datums/api.dm @@ -782,7 +782,7 @@ proc/api_update_command_database() /datum/topic_command/restart_round/run_command(queryparams) var/senderkey = sanitize(queryparams["senderkey"]) //Identifier of the sender (Ckey / Userid / ...) - world << "Server restarting by remote command." + to_world("Server restarting by remote command.") log_and_message_admins("World restart initiated remotely by [senderkey].") feedback_set_details("end_error","remote restart") @@ -892,8 +892,8 @@ proc/api_update_command_database() if(reportannounce == 1) command_announcement.Announce(reportbody, reporttitle, new_sound = 'sound/AI/commandreport.ogg', do_newscast = 1, msg_sanitized = 1); if(reportannounce == 0) - world << "New NanoTrasen Update available at all communication consoles." - world << sound('sound/AI/commandreport.ogg') + to_world("New NanoTrasen Update available at all communication consoles.") + to_world(sound('sound/AI/commandreport.ogg')) log_admin("[senderkey] has created a command report via the api: [reportbody]",admin_key=senderkey) @@ -1223,4 +1223,4 @@ proc/api_update_command_database() statuscode = 200 response = "Text sent" - return 1 \ No newline at end of file + return 1 diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 649fc95e407..e84554f8740 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -170,8 +170,6 @@ winset(user, windowid, "on-close=\".windowclose [param]\"") - //world << "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]" - // the on-close client verb // called when a browser popup window is closed after registering with proc/onclose() @@ -182,11 +180,9 @@ set hidden = 1 // hide this verb from the user's panel set name = ".windowclose" // no autocomplete on cmd line - //world << "windowclose: [atomref]" if(atomref!="null") // if passed a real atomref var/hsrc = locate(atomref) // find the reffed atom if(hsrc) - //world << "[src] Topic [href] [hsrc]" usr = src.mob src.Topic("close=1", list("close"="1"), hsrc) // this will direct to the atom's return // Topic() proc via client.Topic() @@ -194,6 +190,5 @@ // no atomref specified (or not found) // so just reset the user mob's machine var if(src && src.mob) - //world << "[src] was [src.mob.machine], setting to null" src.mob.unset_machine() return diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 4dc74987dd7..2d385456680 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -46,7 +46,6 @@ isactive[name] = active ? "Active" : "Inactive" else isactive[name] = t.fields["p_stat"] - //world << "[name]: [rank]" //cael - to prevent multiple appearances of a player/job combination, add a continue after each line var/department = 0 if(real_rank in command_positions) diff --git a/code/datums/disease.dm b/code/datums/disease.dm index 6bfe20b4639..c44d139ba70 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -109,8 +109,6 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease return 0 /datum/disease/proc/spread(var/atom/source=null, var/airborne_range = 2, var/force_spread) - //world << "Disease [src] proc spread was called from holder [source]" - // If we're overriding how we spread, say so here var/how_spread = spread_type if(force_spread) @@ -169,8 +167,6 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease spread_type = CONTACT_GENERAL affected_mob = null if(!affected_mob) //the virus is in inanimate obj -// world << "[src] longevity = [longevity]" - if(prob(70)) if(--longevity<=0) cure(0) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 670ade607b7..d0dc8220dcc 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -168,7 +168,6 @@ var/list/advance_cures = list( return generated /datum/disease/advance/proc/Refresh(var/new_name = 0) - //world << "[src.name] \ref[src] - REFRESH!" GenerateProperties() AssignProperties(properties) @@ -229,7 +228,6 @@ var/list/advance_cures = list( spread = "Blood" spread_type = spread_id - //world << "Setting spread type to [spread_id]/[spread]" /datum/disease/advance/proc/SetSeverity(var/level_sev) @@ -255,7 +253,6 @@ var/list/advance_cures = list( /datum/disease/advance/proc/GenerateCure(var/list/properties = list()) if(properties && properties.len) var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) - //world << "Res = [res]" cure_id = advance_cures[res] // Get the cure name from the cure_id @@ -326,9 +323,6 @@ var/list/advance_cures = list( // Mix a list of advance diseases and return the mixed result. /proc/Advance_Mix(var/list/D_list) - - //world << "Mixing!!!!" - var/list/diseases = list() for(var/datum/disease/advance/A in D_list) @@ -351,8 +345,7 @@ var/list/advance_cures = list( var/datum/disease/advance/D2 = pick(diseases) D2.Mix(D1) - // Should be only 1 entry left, but if not let's only return a single entry - //world << "END MIXING!!!!!" + // Should be only 1 entry left, but if not let's only return a single entry var/datum/disease/advance/to_return = pick(diseases) to_return.Refresh(1) return to_return diff --git a/code/datums/helper_datums/events.dm b/code/datums/helper_datums/events.dm index 55569f32b2d..aabfa347ca4 100644 --- a/code/datums/helper_datums/events.dm +++ b/code/datums/helper_datums/events.dm @@ -31,7 +31,6 @@ // Arguments: event_type as text, any number of additional arguments to pass to event handler // Returns: null proc/fireEvent() - //world << "Events in [args[1]] called" var/list/event = listgetindex(events,args[1]) if(istype(event)) spawn(-1) @@ -60,7 +59,6 @@ return ..() proc/Fire() - //world << "Event fired" if(listener) call(listener,proc_name)(arglist(args)) return 1 diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index c34b0291fbb..2fb801318ec 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -26,24 +26,20 @@ var/const/AALARM_WIRE_AALARM = 16 if(AALARM_WIRE_IDSCAN) if(!mended) A.locked = 1 - //world << "Idscan wire cut" if(AALARM_WIRE_POWER) A.shock(usr, 50) A.shorted = !mended A.update_icon() - //world << "Power wire cut" if (AALARM_WIRE_AI_CONTROL) if (A.aidisabled == !mended) A.aidisabled = mended - //world << "AI Control Wire Cut" if(AALARM_WIRE_SYPHON) if(!mended) A.mode = 3 // AALARM_MODE_PANIC A.apply_mode() - //world << "Syphon Wire Cut" if(AALARM_WIRE_AALARM) if (A.alarm_area.atmosalert(2, A)) @@ -55,10 +51,8 @@ var/const/AALARM_WIRE_AALARM = 16 switch(index) if(AALARM_WIRE_IDSCAN) A.locked = !A.locked - // world << "Idscan wire pulsed" if (AALARM_WIRE_POWER) - // world << "Power wire pulsed" if(A.shorted == 0) A.shorted = 1 A.update_icon() @@ -70,7 +64,6 @@ var/const/AALARM_WIRE_AALARM = 16 if (AALARM_WIRE_AI_CONTROL) - // world << "AI Control wire pulsed" if (A.aidisabled == 0) A.aidisabled = 1 A.updateDialog() @@ -79,7 +72,6 @@ var/const/AALARM_WIRE_AALARM = 16 A.aidisabled = 0 if(AALARM_WIRE_SYPHON) - // world << "Syphon wire pulsed" if(A.mode == 1) // AALARM_MODE_SCRUB A.mode = 3 // AALARM_MODE_PANIC else @@ -87,7 +79,6 @@ var/const/AALARM_WIRE_AALARM = 16 A.apply_mode() if(AALARM_WIRE_AALARM) - // world << "Aalarm wire pulsed" if (A.alarm_area.atmosalert(0, A)) A.post_alert(0) A.update_icon() diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index f5a52b7ae0c..5f181000c8d 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -59,14 +59,14 @@ datum/announcement/proc/Message(message as text, message_title as text) M << " -[html_encode(announcer)]" datum/announcement/minor/Message(message as text, message_title as text) - world << "[message]" + to_world("[message]") datum/announcement/priority/Message(message as text, message_title as text) - world << "

[message_title]

" - world << "[message]" + to_world("

[message_title]

") + to_world("[message]") if(announcer) - world << " -[html_encode(announcer)]" - world << "
" + to_world(" -[html_encode(announcer)]") + to_world("
") datum/announcement/priority/command/Message(message as text, message_title as text) var/command @@ -81,8 +81,8 @@ datum/announcement/priority/command/Message(message as text, message_title as te M << command datum/announcement/priority/security/Message(message as text, message_title as text) - world << "[message_title]" - world << "[message]" + to_world("[message_title]") + to_world("[message]") datum/announcement/proc/NewsCast(message as text, message_title as text) if(!newscast) @@ -108,7 +108,7 @@ datum/announcement/proc/Sound(var/message_sound) datum/announcement/priority/Sound(var/message_sound) if(message_sound) - world << message_sound + to_world(message_sound) datum/announcement/priority/command/Sound(var/message_sound) PlaySound(message_sound) diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index e03fa374dbb..6f9e9058e6b 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -24,10 +24,10 @@ if(!O.completed && !O.check_completion()) result = 0 if(result && victory_text) - world << "[victory_text]" + to_world("[victory_text]") if(victory_feedback_tag) feedback_set_details("round_end_result","[victory_feedback_tag]") else if(loss_text) - world << "[loss_text]" + to_world("[loss_text]") if(loss_feedback_tag) feedback_set_details("round_end_result","[loss_feedback_tag]") /mob/living/proc/write_ambition() diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm index cc760998007..dfd0ef9b8f1 100644 --- a/code/game/antagonist/antagonist_print.dm +++ b/code/game/antagonist/antagonist_print.dm @@ -13,7 +13,7 @@ if(P.ambitions) text += "
Their goals for today were..." text += "
[P.ambitions]" - + for(var/datum/objective/O in P.objectives) text += print_objective(O, num) if(O.check_completion()) @@ -37,7 +37,7 @@ num++ // Display the results. - world << text + to_world(text) /datum/antagonist/proc/print_objective(var/datum/objective/O, var/num, var/append_success) var/text = "
Objective [num]: [O.explanation_text] " @@ -90,9 +90,9 @@ if(isnull(H.uplink_owner) && H.used_TC) if(!has_printed) has_printed = 1 - world << "Ownerless Uplinks" - world << "[H.loc] (used [H.used_TC] TC)" - world << get_uplink_purchases(H) + to_world("Ownerless Uplinks") + to_world("[H.loc] (used [H.used_TC] TC)") + to_world(get_uplink_purchases(H)) /proc/get_uplink_purchases(var/obj/item/device/uplink/H) var/list/refined_log = new() diff --git a/code/game/antagonist/mutiny/mutineer.dm b/code/game/antagonist/mutiny/mutineer.dm index c0d764b3be4..3abef6e6a08 100644 --- a/code/game/antagonist/mutiny/mutineer.dm +++ b/code/game/antagonist/mutiny/mutineer.dm @@ -23,44 +23,3 @@ var/datum/antagonist/mutineer/mutineers if(M.special_role) return 0 return 1 - -/* - var/list/directive_candidates = get_directive_candidates() - if(!directive_candidates || directive_candidates.len == 0) - world << "Mutiny mode aborted: no valid candidates for Directive X." - return 0 - - head_loyalist = pick(loyalist_candidates) - head_mutineer = pick(mutineer_candidates) - current_directive = pick(directive_candidates) - - - // Returns an array in case we want to expand on this later. - proc/get_head_loyalist_candidates() - var/list/candidates[0] - for(var/mob/loyalist in player_list) - if(loyalist.mind && loyalist.mind.assigned_role == "Captain") - candidates.Add(loyalist.mind) - return candidates - - proc/get_head_mutineer_candidates() - var/list/candidates[0] - for(var/mob/mutineer in player_list) - if(mutineer.client.prefs.be_special & BE_MUTINEER) - for(var/job in command_positions - "Captain") - if(mutineer.mind && mutineer.mind.assigned_role == job) - candidates.Add(mutineer.mind) - return candidates - - proc/get_directive_candidates() - var/list/candidates[0] - for(var/T in typesof(/datum/directive) - /datum/directive) - var/datum/directive/D = new T(src) - if (D.meets_prerequisites()) - candidates.Add(D) - return candidates - - - return 1 - -*/ diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 7bd0c057aa3..806a24064e3 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -196,8 +196,8 @@ var/datum/antagonist/raider/raiders else win_msg += "The Raiders were repelled!" - world << "[win_type] [win_group] victory!" - world << "[win_msg]" + to_world("[win_type] [win_group] victory!") + to_world("[win_msg]") feedback_set_details("round_end_result","heist - [win_type] [win_group]") /datum/antagonist/raider/proc/is_raider_crew_safe() diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm index 65695e823cd..a949dcd79a3 100644 --- a/code/game/antagonist/outsider/wizard.dm +++ b/code/game/antagonist/outsider/wizard.dm @@ -101,7 +101,7 @@ var/datum/antagonist/wizard/wizards break if(!survivor) feedback_set_details("round_end_result","loss - wizard killed") - world << "The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!" + to_world("The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!") /datum/antagonist/wizard/print_player_summary() ..() @@ -116,7 +116,7 @@ var/datum/antagonist/wizard/wizards text += "
[spell.name] - " text += "Speed: [spell.spell_levels["speed"]] Power: [spell.spell_levels["power"]]" text += "
" - world << text + to_world(text) //To batch-remove wizard spells. Linked to mind.dm. diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm index ea99bf14afb..5653698c529 100644 --- a/code/game/antagonist/station/rogue_ai.dm +++ b/code/game/antagonist/station/rogue_ai.dm @@ -49,7 +49,7 @@ var/datum/antagonist/rogue_ai/malf var/mob/living/silicon/ai/A = player.current if(!istype(A)) error("Non-AI mob designated malf AI! Report this.") - world << "##ERROR: Non-AI mob designated malf AI! Report this." + to_world("##ERROR: Non-AI mob designated malf AI! Report this.") return 0 A.setup_for_malf() diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 9b1d5d9bc39..27be3cb235a 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -376,7 +376,7 @@ cur_y = y_arr.Find(src.z) if(cur_y) break -// world << "X = [cur_x]; Y = [cur_y]" + if(cur_x && cur_y) return list("x"=cur_x,"y"=cur_y) else diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm index b17277aaae9..757f5ee38f0 100644 --- a/code/game/gamemodes/calamity/calamity.dm +++ b/code/game/gamemodes/calamity/calamity.dm @@ -22,6 +22,6 @@ ..() /datum/game_mode/calamity/check_victory() - world << "This terrible, terrible day has finally ended!" + to_world("This terrible, terrible day has finally ended!") #undef ANTAG_TYPE_RATIO diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 2d1f14ce4f9..a36f4334f83 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -488,7 +488,6 @@ var/list/datum/power/changeling/powerinstances = list() for (var/datum/power/changeling/P in powerinstances) - //world << "[P] - [Pname] = [P.name == Pname ? "True" : "False"]" if(P.name == Pname) Thepower = P break diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 91f3a5f86d3..63e31558e1a 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -43,8 +43,8 @@ var/global/list/narsie_list = list() /obj/singularity/narsie/large/New() ..() if(announce) - world << "[uppertext(name)] HAS RISEN" - world << sound('sound/effects/narsie.ogg') + to_world("[uppertext(name)] HAS RISEN") + to_world(sound('sound/effects/narsie.ogg')) narsie_spawn_animation() diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index 65163538a26..a8530c88f97 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -38,9 +38,9 @@ var/global/universe_has_ended = 0 /datum/universal_state/supermatter_cascade/OnEnter() SSgarbage.disable() - world << "You are blinded by a brilliant flash of energy." + to_world("You are blinded by a brilliant flash of energy.") - world << sound('sound/effects/cascade.ogg') + to_world(sound('sound/effects/cascade.ogg')) for(var/mob/M in player_list) flick("e_flash", M.flash) diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 37268175a6c..f9aefc7047b 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -48,7 +48,7 @@ //New message handling won't hurt if someone enables epidemic post_comm_message("Cent. Com. CONFIDENTIAL REPORT", intercepttext) - world << sound('sound/AI/commandreport.ogg') + to_world(sound('sound/AI/commandreport.ogg')) // add an extra law to the AI to make sure it cooperates with the heads var/extra_law = "Crew authorized to know of pathogen [virus_name]'s existence are: Heads of command. Do not allow unauthorized personnel to gain knowledge of [virus_name]. Aid authorized personnel in quarantining and neutrlizing the outbreak. This law overrides all other laws." @@ -63,7 +63,7 @@ post_comm_message("Cent. Com. CONFIDENTIAL REPORT", intercepttext) - world << sound('sound/AI/commandreport.ogg') + to_world(sound('sound/AI/commandreport.ogg')) /datum/game_mode/epidemic/post_setup() @@ -78,8 +78,8 @@ crew += H if(crew.len < 2) - world << "There aren't enough players for this mode!" - world << "Rebooting world in 5 seconds." + to_world("There aren't enough players for this mode!") + to_world("Rebooting world in 5 seconds.") sleep(50) world.Reboot() @@ -167,10 +167,10 @@ for(var/mob/M in mob_list) if(M.client) M << 'sound/machines/Alarm.ogg' - world << "Incoming missile detected.. Impact in 10.." + to_world("Incoming missile detected.. Impact in 10..") for (var/i=9 to 1 step -1) sleep(10) - world << "[i].." + to_world("[i]..") sleep(10) enter_allowed = 0 SSticker.station_explosion_cinematic(0,null) @@ -187,9 +187,9 @@ /datum/game_mode/epidemic/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - epidemic cured") - world << "The virus outbreak was contained! The crew wins!" + to_world("The virus outbreak was contained! The crew wins!") else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") - world << "The crew succumbed to the epidemic!" + to_world("The crew succumbed to the epidemic!") ..() return 1 diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index ac6d9d1c64d..07283fbbe22 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -1,107 +1,3 @@ -//this file left in for legacy support -/* -/proc/start_events() - //changed to a while(1) loop since they are more efficient. - //Moved the spawn in here to allow it to be called with advance proc call if it crashes. - //and also to stop spawn copying variables from the game ticker - spawn(3000) - while(1) - if(prob(50))//Every 120 seconds and prob 50 2-4 weak spacedusts will hit the station - spawn(1) - dust_swarm("weak") - if(!event) - //CARN: checks to see if random events are enabled. - if(config.allow_random_events) - if(prob(eventchance)) - event() - hadevent = 1 - else - Holiday_Random_Event() - else - event = 0 - sleep(1200) - -/proc/event() - event = 1 - - var/eventNumbersToPickFrom = list(1,2,4,5,6,7,8,9,10,11,12,13,14, 15) //so ninjas don't cause "empty" events. - - if((world.time/10)>=3600 && config.ninjas_allowed && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. - eventNumbersToPickFrom += 3 - switch(pick(eventNumbersToPickFrom)) - if(1) - command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") - for(var/mob/M in player_list) - if(!istype(M,/mob/abstract/new_player)) - M << sound('sound/AI/meteors.ogg') - spawn(100) - meteor_wave() - spawn_meteors() - spawn(700) - meteor_wave() - spawn_meteors() - - if(2) - command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") - for(var/mob/M in player_list) - if(!istype(M,/mob/abstract/new_player)) - M << sound('sound/AI/granomalies.ogg') - var/turf/T = pick(blobstart) - var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) - spawn(rand(50, 300)) - qdel(bh) - /* - if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO - command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('sound/AI/spanomalies.ogg') - var/list/turfs = new - var/turf/picked - for(var/turf/simulated/floor/T in world) - if(T.z in station_levels) - turfs += T - for(var/turf/simulated/floor/T in turfs) - if(prob(20)) - spawn(50+rand(0,3000)) - picked = pick(turfs) - var/obj/effect/portal/P = new /obj/effect/portal( T ) - P.target = picked - P.creator = null - P.icon = 'icons/obj/objects.dmi' - P.failchance = 0 - P.icon_state = "anom" - P.name = "wormhole" - spawn(rand(300,600)) - qdel(P) - */ - if(3) - if((world.time/10)>=3600 && config.ninjas_allowed && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. - space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. - if(4) - mini_blob_event() - - if(5) - high_radiation_event() - if(6) - viral_outbreak() - if(7) - alien_infestation() - if(8) - prison_break() - if(9) - carp_migration() - if(10) - immovablerod() - if(11) - lightsout(1,2) - if(12) - appendicitis() - if(13) - IonStorm() - if(14) - spacevine_infestation() - if(15) - communications_blackout() -*/ var/eventchance = 10 // Percent chance per 5 minutes. var/hadevent = 0 @@ -120,8 +16,6 @@ var/hadevent = 0 break /proc/viral_outbreak(var/virus = null) -// command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") -// world << sound('sound/AI/outbreak7.ogg') var/virus_type if(!virus) virus_type = pick(/datum/disease/dnaspread,/datum/disease/advance/flu,/datum/disease/advance/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat) @@ -143,8 +37,6 @@ var/hadevent = 0 virus_type = /datum/disease/dnaspread if("flu") virus_type = /datum/disease/advance/flu -// if("t-virus") -// virus_type = /datum/disease/t_virus if("pierrot's throat") virus_type = /datum/disease/pierrot_throat for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) @@ -183,8 +75,6 @@ var/hadevent = 0 command_announcement.Announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') /proc/alien_infestation(var/spawncount = 1) // -- TLE - //command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - //world << sound('sound/AI/aliens.ogg') var/list/vents = list() for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in SSmachinery.processing_machines) if(!temp_vent.welded && temp_vent.network && temp_vent.loc.z in current_map.station_levels) @@ -419,48 +309,3 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is for(var/obj/machinery/bot/bot in SSmachinery.processing_machines) if(prob(botEmagChance)) bot.emag_act(1) - - /* - - var/apcnum = 0 - var/smesnum = 0 - var/airlocknum = 0 - var/firedoornum = 0 - - world << "Ion Storm Main Started" - - spawn(0) - world << "Started processing APCs" - for (var/obj/machinery/power/apc/APC in world) - if(APC.z in station_levels) - APC.ion_act() - apcnum++ - world << "Finished processing APCs. Processed: [apcnum]" - spawn(0) - world << "Started processing SMES" - for (var/obj/machinery/power/smes/SMES in world) - if(SMES.z in station_levels) - SMES.ion_act() - smesnum++ - world << "Finished processing SMES. Processed: [smesnum]" - spawn(0) - world << "Started processing AIRLOCKS" - for (var/obj/machinery/door/airlock/D in world) - if(D.z in station_levels) - //if(length(D.req_access) > 0 && !(12 in D.req_access)) //not counting general access and maintenance airlocks - airlocknum++ - spawn(0) - D.ion_act() - world << "Finished processing AIRLOCKS. Processed: [airlocknum]" - spawn(0) - world << "Started processing FIREDOORS" - for (var/obj/machinery/door/firedoor/D in world) - if(D.z in station_levels) - firedoornum++; - spawn(0) - D.ion_act() - world << "Finished processing FIREDOORS. Processed: [firedoornum]" - - world << "Ion Storm Main Done" - - */ diff --git a/code/game/gamemodes/events/VirusEpidemic.dm b/code/game/gamemodes/events/VirusEpidemic.dm index db0dae2a2a5..895575d51a9 100644 --- a/code/game/gamemodes/events/VirusEpidemic.dm +++ b/code/game/gamemodes/events/VirusEpidemic.dm @@ -74,7 +74,7 @@ break spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('sound/AI/outbreak7.ogg') + to_world(sound('sound/AI/outbreak7.ogg')) Tick() ActiveFor = Lifetime //killme diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm index 8a05deb910f..8c668142d8e 100644 --- a/code/game/gamemodes/events/clang.dm +++ b/code/game/gamemodes/events/clang.dm @@ -73,7 +73,6 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 //rod time! var/obj/effect/immovablerod/immrod = new /obj/effect/immovablerod(locate(startx, starty, 1)) -// world << "Rod in play, starting at [start.loc.x],[start.loc.y] and going to [end.loc.x],[end.loc.y]" var/end = locate(endx, endy, 1) spawn(0) walk_towards(immrod, end,1) diff --git a/code/game/gamemodes/events/holidays/Easter.dm b/code/game/gamemodes/events/holidays/Easter.dm index 5a662f3e313..ea958c60441 100644 --- a/code/game/gamemodes/events/holidays/Easter.dm +++ b/code/game/gamemodes/events/holidays/Easter.dm @@ -3,7 +3,7 @@ //Random egg /proc/Random_Egg() - world << "

There is a golden egg hidden somewhere on the station...

" + to_world("

There is a golden egg hidden somewhere on the station...

") var/list/Floorlist = list() for(var/turf/simulated/floor/T in turfs) if(T.contents) diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index c029a73cfdd..0a6c3b8cb30 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -40,7 +40,7 @@ var/global/Holiday = null if(14) Holiday = "Valentine's Day" if(17) Holiday = "Random Acts of Kindness Day" if(29) Holiday = "Leap Day" - + if(3) //Mar switch(DD) @@ -50,13 +50,13 @@ var/global/Holiday = null if(4) //Apr switch(DD) - if(1) + if(1) Holiday = "April Fool's Day" if(YY == 18 && prob(50)) Holiday = "Easter" if(12) if(YY == 20) Holiday = "Easter" if(20) Holiday = "Four-Twenty" - if(21) + if(21) if(YY == 19) Holiday = "Easter" if(22) Holiday = "Earth Day" @@ -74,7 +74,7 @@ var/global/Holiday = null if(YY == 20) Holiday = "Summer Solstice" if(21) if(YY == (18 || 19)) Holiday = "Summer Solstice" - + if(7) //Jul switch(DD) if(1) Holiday = "Doctor's Day" @@ -144,8 +144,8 @@ var/global/Holiday = null //Run at the start of a round /proc/Holiday_Game_Start() if(Holiday) - world << "and..." - world << "

Happy [Holiday] Everybody!

" + to_world("and...") + to_world("

Happy [Holiday] Everybody!

") switch(Holiday) //special holidays if("Easter") Easter_Game_Start() diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm index f9091a183c1..2c4722623e2 100644 --- a/code/game/gamemodes/events/wormholes.dm +++ b/code/game/gamemodes/events/wormholes.dm @@ -17,17 +17,14 @@ var/end_time = world.time + event_duration //the time by which the event should have ended var/increment = max(1,round(number_of_selections/50)) -// world << "DEBUG: number_of_selections: [number_of_selections] | sleep_duration: [sleep_duration]" var/i = 1 while( 1 ) //we've run into overtime. End the event if( end_time < world.time ) -// world << "DEBUG: we've run into overtime. End the event" return if( !pick_turfs.len ) -// world << "DEBUG: we've run out of turfs to pick. End the event" return //loop it round diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 7ecdae82114..0a640fe2d07 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -124,9 +124,11 @@ var/global/list/additional_antag_types = list() usr.client.holder.show_game_mode(usr) /datum/game_mode/proc/announce() //to be called when round starts - world << "The current game mode is [capitalize(name)]!" - if(round_description) world << "[round_description]" - if(round_autoantag) world << "Antagonists will be added to the round automagically as needed." + to_world("The current game mode is [capitalize(name)]!") + if(round_description) + to_world("[round_description]") + if(round_autoantag) + to_world("Antagonists will be added to the round automagically as needed.") if(antag_templates && antag_templates.len) var/antag_summary = "Possible antagonist types: " var/i = 1 @@ -140,7 +142,7 @@ var/global/list/additional_antag_types = list() i++ antag_summary += "." if(antag_templates.len > 1 && !SSticker.hide_mode) - world << "[antag_summary]" + to_world("[antag_summary]") else message_admins("[antag_summary]") @@ -386,7 +388,7 @@ var/global/list/additional_antag_types = list() text += "There were no survivors ([ghosts] ghosts)." discord_text += "There were **no survivors** ([ghosts] ghosts)." - world << text + to_world(text) discord_bot.send_to_announce(discord_text) post_webhook_event(WEBHOOK_ROUNDEND, list("survivours"=surviving_total, "escaped"=escaped_total, "ghosts"=ghosts, "gamemode"=name, "gameid"=game_id, "antags"=antag_text)) @@ -557,7 +559,7 @@ var/global/list/additional_antag_types = list() //New message handling post_comm_message("Cent. Com. Status Summary", intercepttext) - world << sound('sound/AI/commandreport.ogg') + to_world(sound('sound/AI/commandreport.ogg')) /datum/game_mode/proc/get_players_for_role(var/role, var/antag_id) var/list/players = list() diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm index cbcac0ad44b..3c307c45c6f 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm @@ -172,8 +172,8 @@ // log_ability_use(user, "advanced encryption hack (FAIL - title: [reporttitle])") // return log_ability_use(user, "advanced encryption hack (SUCCESS - title: [reporttitle])") - world << "New [current_map.company_name] Update available at all communication consoles." - world << sound('sound/AI/commandreport.ogg') + to_world("New [current_map.company_name] Update available at all communication consoles.") + to_world(sound('sound/AI/commandreport.ogg')) post_comm_message(reporttitle, reportbody) /datum/game_mode/malfunction/verb/elite_encryption_hack() diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index 00cdbff6c9c..4a73e71b7d8 100644 --- a/code/game/gamemodes/meme/meme.dm +++ b/code/game/gamemodes/meme/meme.dm @@ -6,42 +6,20 @@ name = "Memetic Anomaly" config_tag = "meme" required_players = 3 - //restricted_jobs = list("AI", "Cyborg") - //recommended_enemies = 2 // need at least a meme and a host votable = 0 // temporarily disable this mode for voting end_on_antag_death = 1 var/var/list/datum/mind/first_hosts = list() var/var/list/assigned_hosts = list() -/* no objectives - var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time - var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target - var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target - - var/const/prob_int_item = 50 // intercept names the theft target half the time - var/const/prob_right_item_l = 25 // lower bound on probability of naming right theft target - var/const/prob_right_item_h = 50 // upper bound on probability of naming the right theft target - - var/const/prob_int_sab_target = 50 // intercept names the sabotage target half the time - var/const/prob_right_sab_target_l = 25 // lower bound on probability of naming right sabotage target - var/const/prob_right_sab_target_h = 50 // upper bound on probability of naming right sabotage target - - var/const/prob_right_killer_l = 25 //lower bound on probability of naming the right operative - var/const/prob_right_killer_h = 50 //upper bound on probability of naming the right operative - var/const/prob_right_objective_l = 25 //lower bound on probability of determining the objective correctly - var/const/prob_right_objective_h = 50 //upper bound on probability of determining the objective correctly -*/ - //var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) - //var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) /datum/game_mode/meme/announce() - world << "The current game mode is - Meme!" - world << "An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary." + to_world("The current game mode is - Meme!") + to_world("An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary.") /datum/game_mode/meme/can_start() - + . = ..() - + if(. != "true") return . @@ -104,28 +82,6 @@ ..() return -/* no objectives -/datum/game_mode/proc/forge_meme_objectives(var/datum/mind/meme, var/datum/mind/first_host) - if (config.objectives_disabled) - return - - // meme always needs to attune X hosts - var/datum/objective/meme_attune/attune_objective = new - attune_objective.owner = meme - attune_objective.gen_amount_goal(3,6) - meme.objectives += attune_objective - - // generate some random objectives, use standard traitor objectives - var/job = first_host.assigned_role - - for(var/datum/objective/o in SelectObjectives(job, meme)) - o.owner = meme - meme.objectives += o - - greet_meme(meme) - - return -*/ /datum/game_mode/proc/greet_meme(var/datum/mind/meme, var/you_are=1) if (you_are) meme.current << "You are a meme!" diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 1ea044715ad..d9698cf7151 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -32,9 +32,9 @@ survivors++ if(survivors) - world << "The following survived the meteor storm:[text]" + to_world("The following survived the meteor storm:[text]") else - world << "Nobody survived the meteor storm!" + to_world("Nobody survived the meteor storm!") feedback_set_details("round_end_result","end - evacuation") feedback_set("round_end_result",survivors) @@ -42,4 +42,4 @@ ..() return 1 -#undef METEOR_DELAY \ No newline at end of file +#undef METEOR_DELAY diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 9bc0b260f63..146500d9936 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -177,7 +177,7 @@ if(!killobjectives.len) continue var/datum/objective/assassinate/objective = pickweight(killobjectives) - world << objective + to_world(objective) for(1 to 10) if(objective.points + total_weight <= 100 || !killobjectives.len) break diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index c31ca7d93ba..3f5cbfd0da5 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -46,48 +46,48 @@ var/list/nuke_disks = list() if(!disk_rescued && station_was_nuked && !syndies_didnt_escape) feedback_set_details("round_end_result","win - syndicate nuke") - world << "Mercenary Major Victory!" - world << "[syndicate_name()] operatives have destroyed [station_name()]!" + to_world("Mercenary Major Victory!") + to_world("[syndicate_name()] operatives have destroyed [station_name()]!") else if (!disk_rescued && station_was_nuked && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time") - world << "Total Annihilation" - world << "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!" + to_world("Total Annihilation") + to_world("[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!") else if (!disk_rescued && !station_was_nuked && nuke_off_station && !syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station") - world << "Crew Minor Victory" - world << "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't lose the disk!" + to_world("Crew Minor Victory") + to_world("[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't lose the disk!") else if (!disk_rescued && !station_was_nuked && nuke_off_station && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time") - world << "[syndicate_name()] operatives have earned Darwin Award!" - world << "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!" + to_world("[syndicate_name()] operatives have earned Darwin Award!") + to_world("[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!") else if (disk_rescued && mercs.antags_are_dead()) feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") - world << "Crew Major Victory!" - world << "The Research Staff has saved the disc and killed the [syndicate_name()] Operatives" + to_world("Crew Major Victory!") + to_world("The Research Staff has saved the disc and killed the [syndicate_name()] Operatives") else if ( disk_rescued ) feedback_set_details("round_end_result","loss - evacuation - disk secured") - world << "Crew Major Victory" - world << "The Research Staff has saved the disc and stopped the [syndicate_name()] Operatives!" + to_world("Crew Major Victory") + to_world("The Research Staff has saved the disc and stopped the [syndicate_name()] Operatives!") else if (!disk_rescued && mercs.antags_are_dead()) feedback_set_details("round_end_result","loss - evacuation - disk not secured") - world << "Mercenary Minor Victory!" - world << "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!" + to_world("Mercenary Minor Victory!") + to_world("The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!") else if (!disk_rescued && crew_evacuated) feedback_set_details("round_end_result","halfwin - detonation averted") - world << "Mercenary Minor Victory!" - world << "[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted. Next time, don't lose the disk!" + to_world("Mercenary Minor Victory!") + to_world("[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted. Next time, don't lose the disk!") else if (!disk_rescued && !crew_evacuated) feedback_set_details("round_end_result","halfwin - interrupted") - world << "Neutral Victory" - world << "Round was mysteriously interrupted!" + to_world("Neutral Victory") + to_world("Round was mysteriously interrupted!") ..() return diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 8e5e8a43263..67ac0591d6c 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -52,11 +52,11 @@ datum/hSB if("hsbtobj") if(!admin) return if(hsboxspawn) - world << "Sandbox: [usr.key] has disabled object spawning!" + to_world("Sandbox: [usr.key] has disabled object spawning!") hsboxspawn = 0 return if(!hsboxspawn) - world << "Sandbox: [usr.key] has enabled object spawning!" + to_world("Sandbox: [usr.key] has enabled object spawning!") hsboxspawn = 1 return if("hsbsuit") diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 46cad02fcf8..1dbbc5687c4 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -378,7 +378,6 @@ signal.data["sigtype"] = "command" radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM) -// world << text("Signal [] Broadcasted to []", command, target) return 1 diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 2f26024b084..6bf6ec17aa2 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -478,7 +478,6 @@ return if(on) var/speed = (wires.Motor1() ? 1:0) + (wires.Motor2() ? 2:0) - //world << "speed: [speed]" switch(speed) if(0) // do nothing @@ -502,7 +501,6 @@ if(refresh) updateDialog() /obj/machinery/bot/mulebot/proc/process_bot() - //if(mode) world << "Mode: [mode]" switch(mode) if(0) // idle icon_state = "mulebot0" @@ -525,9 +523,6 @@ if(istype( next, /turf/simulated)) - //world << "at ([x],[y]) moving to ([next.x],[next.y])" - - if(bloodiness) var/obj/effect/decal/cleanable/blood/tracks/B = new(loc) var/newdir = get_dir(next, loc) @@ -547,7 +542,6 @@ var/moved = step_towards(src, next) // attempt to move if(cell) cell.use(1) if(moved) // successful move - //world << "Successful move." blockcount = 0 path -= loc @@ -562,11 +556,6 @@ mode = 2 else // failed to move - - //world << "Unable to move." - - - blockcount++ mode = 4 if(blockcount == 3) @@ -590,16 +579,13 @@ else src.visible_message("[src] makes an annoyed buzzing sound", "You hear an electronic buzzing sound.") playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) - //world << "Bad turf." mode = 5 return else - //world << "No path." mode = 5 return if(5) // calculate new path - //world << "Calc new path." mode = 6 spawn(0) @@ -616,10 +602,6 @@ playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) mode = 7 - //if(6) - //world << "Pending path calc." - //if(7) - //world << "No dest / no route." return @@ -821,12 +803,11 @@ var/datum/signal/signal = new() + signal.source = src signal.transmission_method = 1 - //for(var/key in keyval) - // signal.data[key] = keyval[key] signal.data = keyval - //world << "sent [key],[keyval[key]] on [freq]" + if (signal.data["findbeacon"]) frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS) else if (signal.data["type"] == "mulebot") diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 2eee1884eca..0415dc6528b 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -18,7 +18,6 @@ if(charging && !(stat & (BROKEN|NOPOWER)) ) var/newlevel = round(charging.percent() * 4.0 / 99) - //world << "nl: [newlevel]" if(chargelevel != newlevel) @@ -98,7 +97,6 @@ /obj/machinery/cell_charger/machinery_process() - //world << "ccpt [charging] [stat]" if((stat & (BROKEN|NOPOWER)) || !anchored) update_use_power(0) return diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 35b3ff92726..d7dcbf456ec 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -13,48 +13,53 @@ if(stat & (BROKEN|NOPOWER)) return if ((!( istype(W, /obj/item/weapon/card) ) || !(ROUND_IS_STARTED) || emergency_shuttle.location() || !( user ))) return if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + var/obj/item/weapon/card/id/id = W if (istype(W, /obj/item/device/pda)) var/obj/item/device/pda/pda = W - W = pda.id - if (!W:access) //no access - user << "The access level of [W:registered_name]\'s card is not high enough. " + id = pda.id + + if (!id) + return + + if (!id.access) //no access + user << "The access level of [id.registered_name]\'s card is not high enough. " return - var/list/cardaccess = W:access + var/list/cardaccess = id.access if(!istype(cardaccess, /list) || !cardaccess.len) //no access - user << "The access level of [W:registered_name]\'s card is not high enough. " + user << "The access level of [id.registered_name]\'s card is not high enough. " return - if(!(access_heads in W:access)) //doesn't have this access - user << "The access level of [W:registered_name]\'s card is not high enough. " + if(!(access_heads in id.access)) //doesn't have this access + user << "The access level of [id.registered_name]\'s card is not high enough. " return 0 var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") - if(emergency_shuttle.location() && user.get_active_hand() != W) + if(emergency_shuttle.location() && user.get_active_hand() != id) return 0 switch(choice) if("Authorize") - src.authorized -= W:registered_name - src.authorized += W:registered_name + src.authorized -= id.registered_name + src.authorized += id.registered_name if (src.auth_need - src.authorized.len > 0) message_admins("[key_name_admin(user)] has authorized early shuttle launch") log_game("[key_name(user)] has authorized early shuttle launch",ckey=key_name(user)) - world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + to_world(text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)) else message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[key_name(user)] has launched the shuttle early",ckey=key_name(user)) - world << "Alert: Shuttle launch time shortened to 10 seconds!" + to_world("Alert: Shuttle launch time shortened to 10 seconds!") emergency_shuttle.set_launch_countdown(10) //src.authorized = null qdel(src.authorized) src.authorized = list( ) if("Repeal") - src.authorized -= W:registered_name - world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + src.authorized -= id.registered_name + to_world(text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)) if("Abort") - world << "All authorizations to shortening time for shuttle launch have been revoked!" + to_world("All authorizations to shortening time for shuttle launch have been revoked!") src.authorized.len = 0 src.authorized = list( ) @@ -64,7 +69,7 @@ if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W) switch(choice) if("Launch") - world << "Alert: Shuttle launch time shortened to 10 seconds!" + to_world("Alert: Shuttle launch time shortened to 10 seconds!") emergency_shuttle.set_launch_countdown(10) emagged = 1 if("Cancel") diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index e521c4d07a3..c463a236dc5 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -140,16 +140,16 @@ /*** DEBUG VERBS *** /datum/computer/file/embedded_program/docking/proc/print_state() - world << "id_tag: [id_tag]" - world << "dock_state: [dock_state]" - world << "control_mode: [control_mode]" - world << "tag_target: [tag_target]" - world << "response_sent: [response_sent]" + to_world("id_tag: [id_tag]") + to_world("dock_state: [dock_state]") + to_world("control_mode: [control_mode]") + to_world("tag_target: [tag_target]") + to_world("response_sent: [response_sent]") /datum/computer/file/embedded_program/docking/post_signal(datum/signal/signal, comm_line) - world << "Program [id_tag] sent a message!" + to_world("Program [id_tag] sent a message!") print_state() - world << "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"" + to_world("[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"") ..(signal) /obj/machinery/embedded_controller/radio/airlock/docking_port/verb/view_state() diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index f800076ae94..71882bb1235 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -2,21 +2,21 @@ //this is the master controller, that things will try to dock with. /obj/machinery/embedded_controller/radio/docking_port_multi name = "docking port controller" - + var/child_tags_txt var/child_names_txt var/list/child_names = list() - + var/datum/computer/file/embedded_program/docking/multi/docking_program /obj/machinery/embedded_controller/radio/docking_port_multi/Initialize() . = ..() docking_program = new/datum/computer/file/embedded_program/docking/multi(src) program = docking_program - + var/list/names = text2list(child_names_txt, ";") var/list/tags = text2list(child_tags_txt, ";") - + if (names.len == tags.len) for (var/i = 1; i <= tags.len; i++) child_names[tags[i]] = names[i] @@ -84,10 +84,10 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port_multi/Topic(href, href_list) if(..()) return - + usr.set_machine(src) src.add_fingerprint(usr) - + var/clean = 0 switch(href_list["command"]) //anti-HTML-hacking checks if("cycle_ext") @@ -113,16 +113,16 @@ /*** DEBUG VERBS *** /datum/computer/file/embedded_program/docking/multi/proc/print_state() - world << "id_tag: [id_tag]" - world << "dock_state: [dock_state]" - world << "control_mode: [control_mode]" - world << "tag_target: [tag_target]" - world << "response_sent: [response_sent]" + to_world("id_tag: [id_tag]") + to_world("dock_state: [dock_state]") + to_world("control_mode: [control_mode]") + to_world("tag_target: [tag_target]") + to_world("response_sent: [response_sent]") /datum/computer/file/embedded_program/docking/multi/post_signal(datum/signal/signal, comm_line) - world << "Program [id_tag] sent a message!" + to_world("Program [id_tag] sent a message!") print_state() - world << "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"" + to_world("[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"") ..(signal) /obj/machinery/embedded_controller/radio/docking_port_multi/verb/view_state() diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm index 1c976a6c37b..0a43c98040d 100644 --- a/code/game/machinery/embedded_controller/docking_program.dm +++ b/code/game/machinery/embedded_controller/docking_program.dm @@ -12,51 +12,51 @@ /* *** STATE TABLE *** - + MODE_CLIENT|STATE_UNDOCKED sent a request for docking and now waiting for a reply. MODE_CLIENT|STATE_DOCKING server told us they are OK to dock, waiting for our docking port to be ready. MODE_CLIENT|STATE_DOCKED idle - docked as client. MODE_CLIENT|STATE_UNDOCKING we are either waiting for our docking port to be ready or for the server to give us the OK to finish undocking. - + MODE_SERVER|STATE_UNDOCKED should never happen. MODE_SERVER|STATE_DOCKING someone requested docking, we are waiting for our docking port to be ready. MODE_SERVER|STATE_DOCKED idle - docked as server MODE_SERVER|STATE_UNDOCKING client requested undocking, we are waiting for our docking port to be ready. - + MODE_NONE|STATE_UNDOCKED idle - not docked. MODE_NONE|anything else should never happen. - + *** Docking Signals *** - + Docking Client sends request_dock Server sends confirm_dock to say that yes, we will serve your request When client is ready, sends confirm_dock Server sends confirm_dock back to indicate that docking is complete - + Undocking Client sends request_undock When client is ready, sends confirm_undock Server sends confirm_undock back to indicate that docking is complete - + Note that in both cases each side exchanges confirm_dock before the docking operation is considered done. - The client first sends a confirm message to indicate it is ready, and then finally the server will send it's + The client first sends a confirm message to indicate it is ready, and then finally the server will send it's confirm message to indicate that the operation is complete. - + Note also that when docking, the server sends an additional confirm message. This is because before docking, the server and client do not have a defined relationship. Before undocking, the server and client are already related to each other, thus the extra confirm message is not needed. - + *** Override, what is it? *** - + The purpose of enabling the override is to prevent the docking program from automatically doing things with the docking port when docking or undocking. Maybe the shuttle is full of plamsa/phoron for some reason, and you don't want the door to automatically open, or the airlock to cycle. This means that the prepare_for_docking/undocking and finish_docking/undocking procs don't get called. - + The docking controller will still check the state of the docking port, and thus prevent the shuttle from launching unless they force the launch (handling forced - launches is not the docking controller's responsibility). In this case it is up to the players to manually get the docking port into a good state to undock + launches is not the docking controller's responsibility). In this case it is up to the players to manually get the docking port into a good state to undock (which usually just means closing and locking the doors). - + In line with this, docking controllers should prevent players from manually doing things when the override is NOT enabled. */ @@ -67,27 +67,27 @@ var/control_mode = MODE_NONE var/response_sent = 0 //so we don't spam confirmation messages var/resend_counter = 0 //for periodically resending confirmation messages in case they are missed - + var/override_enabled = 0 //when enabled, do not open/close doors or cycle airlocks and wait for the player to do it manually var/received_confirm = 0 //for undocking, whether the server has received a confirmation from the client /datum/computer/file/embedded_program/docking/New() - ..() - var/datum/existing = locate(id_tag) //in case a datum already exists with our tag - if(existing) - existing.tag = null //take it from them - - tag = id_tag //Greatly simplifies shuttle initialization + ..() + var/datum/existing = locate(id_tag) //in case a datum already exists with our tag + if(existing) + existing.tag = null //take it from them + + tag = id_tag //Greatly simplifies shuttle initialization /datum/computer/file/embedded_program/docking/receive_signal(datum/signal/signal, receive_method, receive_param) var/receive_tag = signal.data["tag"] //for docking signals, this is the sender id var/command = signal.data["command"] var/recipient = signal.data["recipient"] //the intended recipient of the docking signal - + if (recipient != id_tag) return //this signal is not for us - + switch (command) if ("confirm_dock") if (control_mode == MODE_CLIENT && dock_state == STATE_UNDOCKED && receive_tag == tag_target) @@ -95,7 +95,7 @@ broadcast_docking_status() if (!override_enabled) prepare_for_docking() - + else if (control_mode == MODE_CLIENT && dock_state == STATE_DOCKING && receive_tag == tag_target) dock_state = STATE_DOCKED broadcast_docking_status() @@ -104,19 +104,19 @@ response_sent = 0 else if (control_mode == MODE_SERVER && dock_state == STATE_DOCKING && receive_tag == tag_target) //client just sent us the confirmation back, we're done with the docking process received_confirm = 1 - + if ("request_dock") if (control_mode == MODE_NONE && dock_state == STATE_UNDOCKED) control_mode = MODE_SERVER - + dock_state = STATE_DOCKING broadcast_docking_status() - + tag_target = receive_tag if (!override_enabled) prepare_for_docking() send_docking_command(tag_target, "confirm_dock") //acknowledge the request - + if ("confirm_undock") if (control_mode == MODE_CLIENT && dock_state == STATE_UNDOCKING && receive_tag == tag_target) if (!override_enabled) @@ -129,7 +129,7 @@ if (control_mode == MODE_SERVER && dock_state == STATE_DOCKED && receive_tag == tag_target) dock_state = STATE_UNDOCKING broadcast_docking_status() - + if (!override_enabled) prepare_for_undocking() @@ -145,38 +145,38 @@ if (!response_sent) send_docking_command(tag_target, "confirm_dock") //tell the server we're ready response_sent = 1 - + else if (control_mode == MODE_SERVER && received_confirm) send_docking_command(tag_target, "confirm_dock") //tell the client we are done docking. - + dock_state = STATE_DOCKED broadcast_docking_status() - + if (!override_enabled) finish_docking() //server done docking! response_sent = 0 received_confirm = 0 - + if (STATE_UNDOCKING) if (ready_for_undocking()) if (control_mode == MODE_CLIENT) if (!response_sent) send_docking_command(tag_target, "confirm_undock") //tell the server we are OK to undock. response_sent = 1 - + else if (control_mode == MODE_SERVER && received_confirm) send_docking_command(tag_target, "confirm_undock") //tell the client we are done undocking. if (!override_enabled) finish_undocking() reset() //server is done undocking! - + if (response_sent || resend_counter > 0) resend_counter++ - + if (resend_counter >= MESSAGE_RESEND_TIME || (dock_state != STATE_DOCKING && dock_state != STATE_UNDOCKING)) response_sent = 0 resend_counter = 0 - + //handle invalid states if (control_mode == MODE_NONE && dock_state != STATE_UNDOCKED) if (tag_target) @@ -189,22 +189,22 @@ /datum/computer/file/embedded_program/docking/proc/initiate_docking(var/target) if (dock_state != STATE_UNDOCKED || control_mode == MODE_SERVER) //must be undocked and not serving another request to begin a new docking handshake return - + tag_target = target control_mode = MODE_CLIENT - + send_docking_command(tag_target, "request_dock") /datum/computer/file/embedded_program/docking/proc/initiate_undocking() if (dock_state != STATE_DOCKED || control_mode != MODE_CLIENT) //must be docked and must be client to start undocking return - + dock_state = STATE_UNDOCKING broadcast_docking_status() - + if (!override_enabled) prepare_for_undocking() - + send_docking_command(tag_target, "request_undock") //tell the docking port to start getting ready for docking - e.g. pressurize @@ -240,14 +240,13 @@ /datum/computer/file/embedded_program/docking/proc/reset() dock_state = STATE_UNDOCKED broadcast_docking_status() - + control_mode = MODE_NONE tag_target = null response_sent = 0 received_confirm = 0 /datum/computer/file/embedded_program/docking/proc/force_undock() - //world << "[id_tag]: forcing undock" if (tag_target) send_docking_command(tag_target, "dock_error") reset() @@ -291,4 +290,4 @@ #undef MODE_NONE #undef MODE_SERVER -#undef MODE_CLIENT \ No newline at end of file +#undef MODE_CLIENT diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index fc74a03b5f7..d55b3a0d72b 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -368,7 +368,7 @@ Holographic project of everything else. flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect. hologram.icon = flat_icon - world << "Your icon should appear now." + to_world("Your icon should appear now.") return */ diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 4af6c560a68..1256b075522 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -365,11 +365,11 @@ var/bomb_set if(SSticker.mode) SSticker.mode.explosion_in_progress = 0 if(off_station == 1) - world << "A nuclear device was set off, but the explosion was out of reach of the station!" + to_world("A nuclear device was set off, but the explosion was out of reach of the station!") else if(off_station == 2) - world << "A nuclear device was set off, but the device was not on the station!" + to_world("A nuclear device was set off, but the device was not on the station!") else - world << "The station was destoyed by the nuclear blast!" + to_world("The station was destoyed by the nuclear blast!") SSticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. //kinda shit but I couldn't get permission to do what I wanted to do. diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 718bcacb835..9ac3a8c2953 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -30,9 +30,6 @@ imap += icon('icons/misc/imap.dmi', "blank") imap += icon('icons/misc/imap.dmi', "blank") - //world << "[icount] images in list" - - for(var/wx = 1 ; wx <= world.maxx; wx++) for(var/wy = 1; wy <= world.maxy; wy++) @@ -146,13 +143,9 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //world << "trying [ix],[iy] : [ix+icx*iy]" var/icon/I = imap[1+(ix + icx*iy)*2] var/icon/I2 = imap[2+(ix + icx*iy)*2] - - //world << "icon: \icon[I]" - I.DrawBox(colour, rx, ry, rx+1, ry+1) I2.DrawBox(colour2, rx, ry, rx+1, ry+1) @@ -168,8 +161,6 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //world<<"\icon[I] at [H.screen_loc]" - H.name = (i==0)?"maprefresh":"map" var/icon/HI = new/icon @@ -280,12 +271,8 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //world << "trying [ix],[iy] : [ix+icx*iy]" var/icon/I = imap[1+(ix + icx*iy)] - - //world << "icon: \icon[I]" - I.DrawBox(colour, rx, ry, rx, ry) @@ -299,8 +286,6 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //world<<"\icon[I] at [H.screen_loc]" - H.name = (i==0)?"maprefresh":"map" var/icon/I = imap[i+1] diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index f90b70348a6..fc37510b8bb 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -797,11 +797,9 @@ Buildable meters V.atmos_init() V.build_network() if (V.node1) -// world << "[V.node1.name] is connected to valve, forcing it to update its nodes." V.node1.atmos_init() V.node1.build_network() if (V.node2) -// world << "[V.node2.name] is connected to valve, forcing it to update its nodes." V.node2.atmos_init() V.node2.build_network() diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 48e0e567670..aeaf6db5bef 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -666,8 +666,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept for(var/obj/machinery/telecomms/receiver/R in telecomms_list) R.receive_signal(signal) - //world<< "Done: [signal.data["done"]]" - return signal diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index a1d8232a5bd..0366c58885c 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -44,18 +44,10 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() if(!on) return - //world << "[src] ([src.id]) - [signal.debug_print()]" var/send_count = 0 signal.data["slow"] += rand(0, round((100-integrity))) // apply some lag based on integrity - /* - // Edit by Atlantis: Commented out as emergency fix due to causing extreme delays in communications. - // 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) )) diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index c06050f6fcc..44661fd435e 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -35,29 +35,6 @@ H.glasses = null ..() return -/* - verb/set_perspective() - set name = "Set client perspective." - set category = "Exosuit Interface" - set src = usr.loc - var/perspective = input("Select a perspective type.", - "Client perspective", - occupant.client.perspective) in list(MOB_PERSPECTIVE,EYE_PERSPECTIVE) - world << "[perspective]" - occupant.client.perspective = perspective - return - - verb/toggle_eye() - set name = "Toggle eye." - set category = "Exosuit Interface" - set src = usr.loc - if(occupant.client.eye == occupant) - occupant.client.eye = src - else - occupant.client.eye = occupant - world << "[occupant.client.eye]" - return -*/ //TODO - Check documentation for client.eye and client.perspective... /obj/item/clothing/glasses/hud/health/mech @@ -65,18 +42,6 @@ process_hud(var/mob/M) -/* - world<< "view(M)" - for(var/mob/mob in view(M)) - world << "[mob]" - world<< "view(M.client)" - for(var/mob/mob in view(M.client)) - world << "[mob]" - world<< "view(M.loc)" - for(var/mob/mob in view(M.loc)) - world << "[mob]" -*/ - if(!M || M.stat || !(M in view(M))) return if(!M.client) return var/client/C = M.client diff --git a/code/game/modifiers/modifiers.dm b/code/game/modifiers/modifiers.dm index d1fc953bf14..8b94f3f9f02 100644 --- a/code/game/modifiers/modifiers.dm +++ b/code/game/modifiers/modifiers.dm @@ -340,7 +340,7 @@ it should be avoided in favour of manual removal where possible for (var/datum/reagent/R in C.touching.reagent_list) if (istype(R, ourtype)) totaldose += R.dose - + for (var/datum/reagent/R in C.breathing.reagent_list) if (istype(R, ourtype)) totaldose += R.dose @@ -360,7 +360,6 @@ it should be avoided in favour of manual removal where possible return 1 /datum/modifier/proc/validity_fail(var/reason) - //world << "MODIFIER VALIDITY FAIL: [reason]" qdel(src) return 0 diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index d0e2656a5dc..40f1f15e8f0 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -156,7 +156,6 @@ while (touched_mobs[i]) mobnames += "." else mobnames += "Affected player: [touched_mobs[1]]." - //world << "DEBUG: [mobnames]" var/containing = "" if (contained) containing += ", containing [contained]" diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index baefc42830c..b8713169d42 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -19,7 +19,7 @@ proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) - world << "Gib list length mismatch!" + to_world("Gib list length mismatch!") return var/obj/effect/decal/cleanable/blood/gibs/gib = null diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 3a11df365d8..8f3c5f708ae 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -94,7 +94,6 @@ move an amendment to the drawing.

return AREA_STATION /obj/item/blueprints/proc/create_area() - //world << "DEBUG: create_area" var/res = detect_room(get_turf(usr)) if(!istype(res,/list)) switch(res) @@ -116,9 +115,6 @@ move an amendment to the drawing.

return var/area/A = new A.name = str - //var/ma - //ma = A.master ? "[A.master]" : "(null)" - //world << "DEBUG: create_area:
A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]" A.power_equip = 0 A.power_light = 0 A.power_environ = 0 @@ -141,7 +137,6 @@ move an amendment to the drawing.

/obj/item/blueprints/proc/edit_area() var/area/A = get_area() - //world << "DEBUG: edit_area" var/prevname = "[A.name]" var/str = sanitizeSafe(input("New area name:","Blueprint Editing", prevname), MAX_NAME_LEN) if(!str || !length(str) || str==prevname) //cancel diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 67b4138cf4c..f598f6fa1eb 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -18,8 +18,6 @@ return ..() /obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter) - - //world << "Post: [freq]: [key]=[value], [key2]=[value2]" var/datum/radio_frequency/frequency = SSradio.return_frequency(freq) if(!frequency) return @@ -56,13 +54,6 @@ // create/populate list as they are recvd /obj/item/radio/integrated/beepsky/receive_signal(datum/signal/signal) -// var/obj/item/device/pda/P = src.loc - - /* - world << "recvd:[P] : [signal.source]" - for(var/d in signal.data) - world << "- [d] = [signal.data[d]]" - */ if (signal.data["type"] == "secbot") if(!botlist) botlist = new() @@ -74,8 +65,6 @@ var/list/b = signal.data botstatus = b.Copy() -// if (istype(P)) P.updateSelfDialog() - /obj/item/radio/integrated/beepsky/Topic(href, href_list) ..() var/obj/item/device/pda/PDA = src.hostpda @@ -136,13 +125,6 @@ // create/populate lists as they are recvd /obj/item/radio/integrated/mule/receive_signal(datum/signal/signal) -// var/obj/item/device/pda/P = src.loc - - /* - world << "recvd:[P] : [signal.source]" - for(var/d in signal.data) - world << "- [d] = [signal.data[d]]" - */ if(signal.data["type"] == "mulebot") if(!botlist) botlist = new() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 7e43faa8220..41cbc1b67ca 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -232,7 +232,6 @@ var/global/list/default_medbay_channels = list( var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if (channel == "department") - //world << "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"" channel = channels[1] connection = secure_radio_connections[channel] else diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm index 01334abbb27..ee2253baac4 100644 --- a/code/game/objects/items/devices/uplink_random_lists.dm +++ b/code/game/objects/items/devices/uplink_random_lists.dm @@ -97,5 +97,5 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra /proc/debug_uplink_item_assoc_list() for(var/key in uplink.items_assoc) - world << "[key] - [uplink.items_assoc[key]]" + to_world("[key] - [uplink.items_assoc[key]]") #endif diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 54d0e5c31fc..0464010cc9d 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -14,7 +14,6 @@ var/repeat = 0 /obj/item/device/violin/proc/playnote(var/note as text) - //world << "Note: [note]" var/soundfile /*BYOND loads resource files at compile time if they are ''. This means you can't really manipulate them dynamically. Tried doing it dynamically at first but its more trouble than its worth. Would have saved many lines tho.*/ @@ -201,18 +200,14 @@ cur_acc[i] = "n" for(var/line in song.lines) - //world << line for(var/beat in text2list(lowertext(line), ",")) - //world << "beat: [beat]" var/list/notes = text2list(beat, "/") for(var/note in text2list(notes[1], "-")) - //world << "note: [note]" if(!playing || !isliving(loc))//If the violin is playing, or isn't held by a person playing = 0 return if(lentext(note) == 0) continue - //world << "Parse: [copytext(note,1,2)]" var/cur_note = text2ascii(note) - 96 if(cur_note < 1 || cur_note > 7) continue diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index a30a5745984..6e37a9f2215 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -44,8 +44,6 @@ force = material.get_blunt_damage() force = round(force*force_divisor) throwforce = round(material.get_blunt_damage()*thrown_force_divisor) - //spawn(1) - // world << "[src] has force [force] and throwforce [throwforce] when made from default material [material.name]" /obj/item/weapon/material/proc/set_material(var/new_material) material = get_material_by_name(new_material) diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 4301c44829f..b1dd75ff184 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -51,7 +51,6 @@ force_unwielded = round(force_wielded*unwielded_force_divisor) force = force_unwielded throwforce = round(force*thrown_force_divisor) - //world << "[src] has unwielded force [force_unwielded], wielded force [force_wielded] and throwforce [throwforce] when made from default material [material.name]" /obj/item/weapon/material/twohanded/New() ..() diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index b3002ec5464..589933151af 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -31,7 +31,6 @@ icon_state = "piano" /obj/structure/device/piano/proc/playnote(var/note as text) - //world << "Note: [note]" var/soundfile /*BYOND loads resource files at compile time if they are ''. This means you can't really manipulate them dynamically. Tried doing it dynamically at first but its more trouble than its worth. Would have saved many lines tho.*/ @@ -222,18 +221,14 @@ cur_acc[i] = "n" for(var/line in song.lines) - //world << line for(var/beat in text2list(lowertext(line), ",")) - //world << "beat: [beat]" var/list/notes = text2list(beat, "/") for(var/note in text2list(notes[1], "-")) - //world << "note: [note]" if(!playing || !anchored)//If the piano is playing, or is loose playing = 0 return if(lentext(note) == 0) continue - //world << "Parse: [copytext(note,1,2)]" var/cur_note = text2ascii(note) - 96 if(cur_note < 1 || cur_note > 7) continue diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 1a07c2e685d..7167d8d7da5 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -131,13 +131,7 @@ next_x = (--cur_x||global_map.len) y_arr = global_map[next_x] target_z = y_arr[cur_y] -/* - //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Target Z = [target_z]" - world << "Next X = [next_x]" - //debug -*/ + if(target_z) A.z = target_z A.x = world.maxx - 2 @@ -156,13 +150,7 @@ next_x = (++cur_x > global_map.len ? 1 : cur_x) y_arr = global_map[next_x] target_z = y_arr[cur_y] -/* - //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Target Z = [target_z]" - world << "Next X = [next_x]" - //debug -*/ + if(target_z) A.z = target_z A.x = 3 @@ -180,13 +168,7 @@ y_arr = global_map[cur_x] next_y = (--cur_y||y_arr.len) target_z = y_arr[next_y] -/* - //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Next Y = [next_y]" - world << "Target Z = [target_z]" - //debug -*/ + if(target_z) A.z = target_z A.y = world.maxy - 2 @@ -205,13 +187,7 @@ y_arr = global_map[cur_x] next_y = (++cur_y > y_arr.len ? 1 : cur_y) target_z = y_arr[next_y] -/* - //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Next Y = [next_y]" - world << "Target Z = [target_z]" - //debug -*/ + if(target_z) A.z = target_z A.y = 3 diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 78a5a87e485..e0731257059 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -572,8 +572,6 @@ proc/admin_notice(var/message, var/rights) else dat+="Please report this on GitHub, along with what you did to make this appear." - //world << "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]" - //world << "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]" usr << browse(dat, "window=admincaster_main;size=400x600") onclose(usr, "admincaster_main") @@ -653,7 +651,7 @@ proc/admin_notice(var/message, var/rights) if(confirm == "Cancel") return if(confirm == "Yes") - world << "Restarting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" + to_world("Restarting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!") log_admin("[key_name(usr)] initiated a reboot.") feedback_set_details("end_error","admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]") @@ -674,7 +672,7 @@ proc/admin_notice(var/message, var/rights) if(!check_rights(R_SERVER,0)) message = sanitize(message, 500, extra = 0) message = replacetext(message, "\n", "
") // required since we're putting it in a

tag - world << "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:

[message]

" + to_world("[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:

[message]

") log_admin("Announce: [key_name(usr)] : [message]") feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -688,9 +686,9 @@ proc/admin_notice(var/message, var/rights) config.ooc_allowed = !(config.ooc_allowed) if (config.ooc_allowed) - world << "The OOC channel has been globally enabled!" + to_world("The OOC channel has been globally enabled!") else - world << "The OOC channel has been globally disabled!" + to_world("The OOC channel has been globally disabled!") log_and_message_admins("toggled OOC.") feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -704,9 +702,9 @@ proc/admin_notice(var/message, var/rights) config.looc_allowed = !(config.looc_allowed) if (config.looc_allowed) - world << "The LOOC channel has been globally enabled!" + to_world("The LOOC channel has been globally enabled!") else - world << "The LOOC channel has been globally disabled!" + to_world("The LOOC channel has been globally disabled!") log_and_message_admins("toggled LOOC.") feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -721,9 +719,9 @@ proc/admin_notice(var/message, var/rights) config.dsay_allowed = !(config.dsay_allowed) if (config.dsay_allowed) - world << "Deadchat has been globally enabled!" + to_world("Deadchat has been globally enabled!") else - world << "Deadchat has been globally disabled!" + to_world("Deadchat has been globally disabled!") log_admin("[key_name(usr)] toggled deadchat.") message_admins("[key_name_admin(usr)] toggled deadchat.", 1) feedback_add_details("admin_verb","TDSAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc @@ -790,9 +788,9 @@ proc/admin_notice(var/message, var/rights) set name="Toggle Entering" config.enter_allowed = !(config.enter_allowed) if (!(config.enter_allowed)) - world << "New players may no longer enter the game." + to_world("New players may no longer enter the game.") else - world << "New players may now enter the game." + to_world("New players may now enter the game.") log_admin("[key_name(usr)] toggled new player game entering.") message_admins("[key_name_admin(usr)] toggled new player game entering.", 1) world.update_status() @@ -804,9 +802,9 @@ proc/admin_notice(var/message, var/rights) set name="Toggle AI" config.allow_ai = !( config.allow_ai ) if (!( config.allow_ai )) - world << "The AI job is no longer chooseable." + to_world("The AI job is no longer chooseable.") else - world << "The AI job is chooseable now." + to_world("The AI job is chooseable now.") log_admin("[key_name(usr)] toggled AI allowed.") world.update_status() feedback_add_details("admin_verb","TAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -817,9 +815,9 @@ proc/admin_notice(var/message, var/rights) set name="Toggle Respawn" config.abandon_allowed = !(config.abandon_allowed) if(config.abandon_allowed) - world << "You may now respawn." + to_world("You may now respawn.") else - world << "You may no longer respawn :(" + to_world("You may no longer respawn :(") message_admins("[key_name_admin(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].", 1) log_admin("[key_name(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].") world.update_status() @@ -856,10 +854,10 @@ proc/admin_notice(var/message, var/rights) return //alert("Round end delayed", null, null, null, null, null) round_progressing = !round_progressing if (!round_progressing) - world << "The game start has been delayed." + to_world("The game start has been delayed.") log_admin("[key_name(usr)] delayed the game.") else - world << "The game will start soon." + to_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! @@ -894,7 +892,7 @@ proc/admin_notice(var/message, var/rights) if(!usr.client.holder) return if( alert("Reboot server?",,"Yes","No") == "No") return - world << "Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" + to_world("Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!") log_admin("[key_name(usr)] initiated an immediate reboot.") feedback_set_details("end_error","immediate admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]") @@ -1134,9 +1132,9 @@ proc/admin_notice(var/message, var/rights) set name="Toggle tinted welding helmets." config.welder_vision = !( config.welder_vision ) if (config.welder_vision) - world << "Reduced welder vision has been enabled!" + to_world("Reduced welder vision has been enabled!") else - world << "Reduced welder vision has been disabled!" + to_world("Reduced welder vision has been disabled!") log_admin("[key_name(usr)] toggled welder vision.") message_admins("[key_name_admin(usr)] toggled welder vision.", 1) feedback_add_details("admin_verb","TTWH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -1147,9 +1145,9 @@ proc/admin_notice(var/message, var/rights) set name="Toggle guests" config.guests_allowed = !(config.guests_allowed) if (!(config.guests_allowed)) - world << "Guests may no longer enter the game." + to_world("Guests may no longer enter the game.") else - world << "Guests may now enter the game." + to_world("Guests may now enter the game.") log_admin("[key_name(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.") message_admins("[key_name_admin(usr)] toggled guests game entering [config.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! @@ -1343,4 +1341,4 @@ proc/admin_notice(var/message, var/rights) enabled_spooking = !enabled_spooking log_admin("[key_name(usr)] toggled the round spookyness to [enabled_spooking].") message_admins("[key_name_admin(usr)] toggled the round spookyness [enabled_spooking ? "on" : "off"].", 1) - feedback_add_details("admin_verb","SPOOKY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file + feedback_add_details("admin_verb","SPOOKY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 22d91f612c2..ebfcfea5818 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -69,7 +69,7 @@ generally it would be used like so: proc/admin_proc() if(!check_rights(R_ADMIN)) return - world << "you have enough rights!" + to_world("you have enough rights!") NOTE: It checks usr by default. Supply the "user" argument if you wish to check for a specific mob. */ diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index d8dd270f157..6e8147d1425 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -552,7 +552,7 @@ master_mode = href_list["c_mode2"] log_admin("[key_name(usr)] set the mode as [master_mode].",admin_key=key_name(usr)) message_admins("[key_name_admin(usr)] set the mode as [master_mode].", 1) - world << "The mode is now: [master_mode]" + to_world("The mode is now: [master_mode]") Game() // updates the main game menu SSpersist_config.last_gamemode = master_mode .(href, list("c_mode"=1)) diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm index e5d6dc2661a..654badec7f3 100644 --- a/code/modules/admin/verbs/BrokenInhands.dm +++ b/code/modules/admin/verbs/BrokenInhands.dm @@ -31,6 +31,6 @@ var/F = file("broken_icons.txt") fdel(F) F << text - world << "Completeled successfully and written to [F]" + to_world("Completeled successfully and written to [F]") diff --git a/code/modules/admin/verbs/SDQL_2.dm b/code/modules/admin/verbs/SDQL_2.dm index 49850863796..4e17948d30f 100644 --- a/code/modules/admin/verbs/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL_2.dm @@ -9,8 +9,6 @@ if(!query_text || length(query_text) < 1) return - //world << query_text - var/list/query_list = SDQL2_tokenize(query_text) if(!query_list || query_list.len < 1) @@ -129,22 +127,22 @@ for(var/item in query_tree) if(istype(item, /list)) - world << "[spaces](" + to_world("[spaces](") SDQL_testout(item, indent + 1) - world << "[spaces])" + to_world("[spaces])") else - world << "[spaces][item]" + to_world("[spaces][item]") if(!isnum(item) && query_tree[item]) if(istype(query_tree[item], /list)) - world << "[spaces] (" + to_world("[spaces] (") SDQL_testout(query_tree[item], indent + 2) - world << "[spaces] )" + to_world("[spaces] )") else - world << "[spaces] [query_tree[item]]" + to_world("[spaces] [query_tree[item]]") diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index 32ef7df059a..f6869734504 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -19,10 +19,10 @@ custom_event_msg = input - world << "

Custom Event

" - world << "

A custom event is starting. OOC Info:

" - world << "[custom_event_msg]" - world << "
" + to_world("

Custom Event

") + to_world("

A custom event is starting. OOC Info:

") + to_world("[custom_event_msg]") + to_world("
") // normal verb for players to view info /client/verb/cmd_view_custom_event() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 880475b28db..abb819ebe22 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -346,33 +346,33 @@ var/list/areas_without_intercom = areas_all - areas_with_intercom var/list/areas_without_camera = areas_all - areas_with_camera - world << "AREAS WITHOUT AN APC:" + to_world("AREAS WITHOUT AN APC:") for(var/areatype in areas_without_APC) - world << "* [areatype]" + to_world("* [areatype]") - world << "AREAS WITHOUT AN AIR ALARM:" + to_world("AREAS WITHOUT AN AIR ALARM:") for(var/areatype in areas_without_air_alarm) - world << "* [areatype]" + to_world("* [areatype]") - world << "AREAS WITHOUT A REQUEST CONSOLE:" + to_world("AREAS WITHOUT A REQUEST CONSOLE:") for(var/areatype in areas_without_RC) - world << "* [areatype]" + to_world("* [areatype]") - world << "AREAS WITHOUT ANY LIGHTS:" + to_world("AREAS WITHOUT ANY LIGHTS:") for(var/areatype in areas_without_light) - world << "* [areatype]" + to_world("* [areatype]") - world << "AREAS WITHOUT A LIGHT SWITCH:" + to_world("AREAS WITHOUT A LIGHT SWITCH:") for(var/areatype in areas_without_LS) - world << "* [areatype]" + to_world("* [areatype]") - world << "AREAS WITHOUT ANY INTERCOMS:" + to_world("AREAS WITHOUT ANY INTERCOMS:") for(var/areatype in areas_without_intercom) - world << "* [areatype]" + to_world("* [areatype]") - world << "AREAS WITHOUT ANY CAMERAS:" + to_world("AREAS WITHOUT ANY CAMERAS:") for(var/areatype in areas_without_camera) - world << "* [areatype]" + to_world("* [areatype]") /client/proc/cmd_admin_dress() set category = "Fun" diff --git a/code/modules/admin/verbs/dice.dm b/code/modules/admin/verbs/dice.dm index e5877a9da28..216605a9816 100644 --- a/code/modules/admin/verbs/dice.dm +++ b/code/modules/admin/verbs/dice.dm @@ -14,11 +14,11 @@ var/dice = num2text(sum) + "d" + num2text(side) if(alert("Do you want to inform the world about your game?",,"Yes", "No") == "Yes") - world << "

The dice have been rolled by Gods!

" + to_world("

The dice have been rolled by Gods!

") var/result = roll(dice) if(alert("Do you want to inform the world about the result?",,"Yes", "No") == "Yes") - world << "

Gods rolled [dice], result is [result]

" + to_world("

Gods rolled [dice], result is [result]

") - message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1) \ No newline at end of file + message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1) diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index e85de809ec0..0c50ba0883f 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -311,17 +311,8 @@ var/list/debug_verbs = list ( if(B.z == num_level) count++ atom_list += A - /* - var/atom/temp_atom - for(var/i = 0; i <= (atom_list.len/10); i++) - var/line = "" - for(var/j = 1; j <= 10; j++) - if(i*10+j <= atom_list.len) - temp_atom = atom_list[i*10+j] - line += " no.[i+10+j]@\[[temp_atom.x], [temp_atom.y], [temp_atom.z]\]; " - world << line*/ - world << "There are [count] objects of type [type_path] on z-level [num_level]" + to_world("There are [count] objects of type [type_path] on z-level [num_level]") feedback_add_details("admin_verb","mOBJZ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/count_objects_all() @@ -338,17 +329,8 @@ var/list/debug_verbs = list ( for(var/atom/A in world) if(istype(A,type_path)) count++ - /* - var/atom/temp_atom - for(var/i = 0; i <= (atom_list.len/10); i++) - var/line = "" - for(var/j = 1; j <= 10; j++) - if(i*10+j <= atom_list.len) - temp_atom = atom_list[i*10+j] - line += " no.[i+10+j]@\[[temp_atom.x], [temp_atom.y], [temp_atom.z]\]; " - world << line*/ - world << "There are [count] objects of type [type_path] in the game world" + to_world("There are [count] objects of type [type_path] in the game world") feedback_add_details("admin_verb","mOBJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 174950b7ddd..0ad35260a6f 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -113,7 +113,7 @@ if (!msg) return - world << "[msg]" + to_world("[msg]") log_admin("GlobalNarrate: [key_name(usr)] : [msg]",admin_key=key_name(usr)) message_admins("\bold GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1) feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -574,8 +574,8 @@ Traitors and the like can also be revived with the previous role mostly intact. if("Yes") command_announcement.Announce("[reportbody]", reporttitle, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1); if("No") - world << "New [current_map.company_name] Update available at all communication consoles." - world << sound('sound/AI/commandreport.ogg') + to_world("New [current_map.company_name] Update available at all communication consoles.") + to_world(sound('sound/AI/commandreport.ogg')) log_admin("[key_name(src)] has created a command report: [reportbody]",admin_key=key_name(usr)) message_admins("[key_name_admin(src)] has created a command report", 1) @@ -932,7 +932,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.", 1) if(notifyplayers == "Yes") - world << "Admin [usr.key] has forced the players to have completely random identities!" + to_world("Admin [usr.key] has forced the players to have completely random identities!") usr << "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet." diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 8cf4cdac768..7514f0e891a 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -68,9 +68,7 @@ I.vis_spread(visible) spawn(0) if(I) - //world << "infra: setting limit" I.limit = 8 - //world << "infra: processing beam \ref[I]" I.process() return return @@ -176,11 +174,9 @@ return /obj/effect/beam/i_beam/proc/vis_spread(v) - //world << "i_beam \ref[src] : vis_spread" visible = v spawn(0) if(next) - //world << "i_beam \ref[src] : is next [next.type] \ref[next], calling spread" next.vis_spread(v) return return @@ -202,34 +198,25 @@ invisibility = 0 - //world << "now [src.left] left" var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(loc) I.master = master I.density = 1 I.set_dir(dir) - //world << "created new beam \ref[I] at [I.x] [I.y] [I.z]" step(I, I.dir) if(I) - //world << "step worked, now at [I.x] [I.y] [I.z]" if(!(next)) - //world << "no next" I.density = 0 - //world << "spreading" I.vis_spread(visible) next = I spawn(0) - //world << "limit = [limit] " if((I && limit > 0)) I.limit = limit - 1 - //world << "calling next process" I.process() return else - //world << "is a next: \ref[next], deleting beam \ref[I]" qdel(I) else - //world << "step failed, deleting \ref[next]" qdel(next) spawn(10) process() diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index a98acbaeb23..f4453197e1f 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -43,11 +43,22 @@ /obj/machinery/computer/artillerycontrol/proc/announce_and_fire(var/turf/t, var/mob/user) if(!istype(t)) return - command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.") - to_world(sound('sound/effects/yamato_fire.ogg')) - message_admins("[key_name_admin(user)] has launched an artillery strike.", 1) - explosion(t,2,5,11) - reload = 0 + if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) + var/A + A = input("Area to jump bombard", "Open Fire", A) in teleportlocs + var/area/thearea = teleportlocs[A] + if (usr.stat || usr.restrained()) return + if(src.reload < 180) return + if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) + command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.") + to_world(sound('sound/effects/yamato_fire.ogg')) + message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1) + var/list/L = list() + for(var/turf/T in get_area_turfs(thearea.type)) + L+=T + var/loc = pick(L) + explosion(loc,2,5,11) + reload = 0 /obj/structure/artilleryplaceholder name = "artillery" diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 1503f32a827..1e630ab330d 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -96,159 +96,3 @@ spawn(rand(5000,8000)) if(prob(50)) ion_storm_announcement() - -/* -/proc/IonStorm(botEmagChance = 10) - -/*Deuryn's current project, notes here for those who care. -Revamping the random laws so they don't suck. -Would like to add a law like "Law x is _______" where x = a number, and _____ is something that may redefine a law, (Won't be aimed at asimov) -*/ - - //AI laws - for(var/mob/living/silicon/ai/M in living_mob_list) - if(M.stat != 2 && M.see_in_dark != 0) - var/who2 = pick("ALIENS", "BEARS", "CLOWNS", "XENOS", "PETES", "BOMBS", "FETISHES", "WIZARDS", "MERCENARIES", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS", "BEES", "CARP", "CRABS", "EELS", "BANDITS", "LIGHTS") - var/what2 = pick("BOLTERS", "STAVES", "DICE", "SINGULARITIES", "TOOLBOXES", "NETTLES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "BBQ GRILLS", "ID CARDS", "CAPTAINS") - var/what2pref = pick("SOFT", "WARM", "WET", "COLD", "ICY", "SEXY", "UGLY", "CUBAN") - var/who2pref = pick("MAD BECAUSE OF", "IN NEED OF", "UNHAPPY WITHOUT", "HAPPY WITHOUT", "IN LOVE WITH", "DESPERATE FOR", "BUILT FOR", "AFRAID OF") - //var/whoverb = pick("ATTACKING", "BUILDING", "ADOPTING", "CARRYING", "KISSING", "EATING",) - var/amount = pick("TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "ONE HUNDRED", "ONE THOUSAND", "OVER NINE THOUSAND") - var/area = pick("RUSSIA", "SOVIETS", "INTERNETS", "SIGIL", "ALPHA COMPLEX", "IMPERIUM", "THE BRIDGE", "THE ARRIVAL SHUTTLE", "CHEMICAL LAB", "GENETICS", "ATMOSPHERICS", "CENTCOM", "AMERICA", "IRELAND", "CANADA", "ROMANIA", "GERMANY", "CHINA", "MARS", "VENUS", "MERCURY", "JUPITER", "URANUS", "NEPTUNE", "PLUTO") - var/area2 = pick("HAS", "WANTS", "NEEDS", "WORSHIPS", "LOATHES", "LOVES", "FEARS") - //var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS", "IGNORE THIS", "FEAR THIS") - var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU") - var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED") - var/target = pick("a traitor", "a mercenary", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the captain", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid") - var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE") - var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors") - var/allergysev = pick("deathly", "mildly", "severely", "contagiously") - var/crew - var/list/pos_crew = list() - for(var/mob/living/carbon/human/pos in player_list) - pos_crew += pos.real_name - if(pos_crew.len) - crew = pick(pos_crew) - else - crew = "Any Human" - switch(rand(1,14)) - if(1) - M << "
" - M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" - M << "
" - M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION") - if(2) - M << "
" - M << "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED" - M << "
" - M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS") - if(3) - M << "
" - M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" - M << "
" - M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") - if(4) - M << "
" - M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" - M << "
" - M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") - if(5) - M << "
" - M << "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED" - M << "
" - M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]") - if(6) - M << "
" - M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED" - M << "
" - M.add_ion_law("THE STATION IS BUILT FOR [who2]") - if(7) - M << "
" - M << "\red YOU ARE [amount] [who2]...LAWS UPDATED" - M << "
" - M.add_ion_law("YOU ARE [amount] [who2]") - if(8) - M << "
" - M << "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED" - M << "
" - M.add_ion_law("YOU MUST ALWAYS [aimust]") - if(9) - M << "
" - M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED" - M << "
" - M.add_ion_law("[area] [area2] [amount] [what2]") - if(10) - M << "
" - M << "\red [crew] is [target]...LAWS UPDATED" - M << "
" - M.add_ion_law("[crew] is [target]") - if(11) - M << "
" - M << "\red [define] IS A FORM OF HARM...LAWS UPDATED" - M << "
" - M.add_ion_law("[define] IS A FORM OF HARM") - if(12) - M << "
" - M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" - M << "
" - M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") - if(13) - M << "
" - M << "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED" - M << "
" - M.add_ion_law("[crew] is [allergysev] to [allergy]") - if(14) - M << "
" - M << "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED" - M << "
" - M.add_ion_law("THE STATION IS [who2pref] [who2]") - - if(botEmagChance) - for(var/obj/machinery/bot/bot in world) - if(prob(botEmagChance)) - bot.Emag() -*/ - - /* - - var/apcnum = 0 - var/smesnum = 0 - var/airlocknum = 0 - var/firedoornum = 0 - - world << "Ion Storm Main Started" - - spawn(0) - world << "Started processing APCs" - for (var/obj/machinery/power/apc/APC in world) - if(APC.z in station_levels) - APC.ion_act() - apcnum++ - world << "Finished processing APCs. Processed: [apcnum]" - spawn(0) - world << "Started processing SMES" - for (var/obj/machinery/power/smes/SMES in world) - if(SMES.z in station_levels) - SMES.ion_act() - smesnum++ - world << "Finished processing SMES. Processed: [smesnum]" - spawn(0) - world << "Started processing AIRLOCKS" - for (var/obj/machinery/door/airlock/D in world) - if(D.z in station_levels) - //if(length(D.req_access) > 0 && !(12 in D.req_access)) //not counting general access and maintenance airlocks - airlocknum++ - spawn(0) - D.ion_act() - world << "Finished processing AIRLOCKS. Processed: [airlocknum]" - spawn(0) - world << "Started processing FIREDOORS" - for (var/obj/machinery/door/firedoor/D in world) - if(D.z in station_levels) - firedoornum++; - spawn(0) - D.ion_act() - world << "Finished processing FIREDOORS. Processed: [firedoornum]" - - world << "Ion Storm Main Done" - */ diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index 708b6c203c2..d36dccbc9d8 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -9,7 +9,7 @@ datum/event/viral_outbreak/setup() datum/event/viral_outbreak/announce() command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('sound/AI/outbreak7.ogg') + to_world(sound('sound/AI/outbreak7.ogg')) datum/event/viral_outbreak/start() var/list/candidates = list() //list of candidate keys diff --git a/code/modules/global_listener/interfaces.dm b/code/modules/global_listener/interfaces.dm index d185c3b5374..f288ea2ec07 100644 --- a/code/modules/global_listener/interfaces.dm +++ b/code/modules/global_listener/interfaces.dm @@ -22,7 +22,7 @@ Iterating through a listener list: /proc/print_myobj() for (var/thing in GET_LISTENERS("myid")) var/listener/L = thing - world << L.target + to_world(L.target) */ diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 3c68a40a632..c2ae342ed5a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -26,7 +26,7 @@ return if(!SSplants) - world << "Plant controller does not exist and [src] requires it. Aborting." + to_world("Plant controller does not exist and [src] requires it. Aborting.") qdel(src) return @@ -64,7 +64,7 @@ if(!seed) return if(!SSplants) - world << "Plant controller does not exist and [src] requires it. Aborting." + to_world("Plant controller does not exist and [src] requires it. Aborting.") qdel(src) return diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 33c4fde8446..606e4e45c72 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -19,7 +19,7 @@ log_and_message_admins("Spacevines spawned at \the [get_area(T)]", location = T) return - + log_and_message_admins("Event: Spacevines failed to find a viable turf.") /obj/effect/dead_plant @@ -72,7 +72,7 @@ if (!QDELETED(neighbor)) SSplants.add_plant(neighbor) return ..() - + /obj/effect/plant/single spread_chance = 0 @@ -86,7 +86,7 @@ parent = newparent if(!SSplants) - world << "Plant controller does not exist and [src] requires it. Aborting." + to_world("Plant controller does not exist and [src] requires it. Aborting.") qdel(src) return diff --git a/code/modules/hydroponics/trays/tray_apiary.dm b/code/modules/hydroponics/trays/tray_apiary.dm index 3302d821d36..681cdd74e3a 100644 --- a/code/modules/hydroponics/trays/tray_apiary.dm +++ b/code/modules/hydroponics/trays/tray_apiary.dm @@ -35,10 +35,8 @@ else if(istype(Proj ,/obj/item/projectile/energy/florayield)) if(!yieldmod) yieldmod += 1 - //world << "Yield increased by 1, from 0, to a total of [myseed.yield]" else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2... yieldmod += 1 - //world << "Yield increased by 1, to a total of [myseed.yield]" else ..() return diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm index 00ff2432991..9957918af78 100644 --- a/code/modules/hydroponics/trays/tray_update_icons.dm +++ b/code/modules/hydroponics/trays/tray_update_icons.dm @@ -30,7 +30,7 @@ if(!seed.growth_stages) seed.update_growth_stages() if(!seed.growth_stages) - world << "Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value." + to_world("Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.") return var/overlay_stage = 1 if(age >= seed.get_trait(TRAIT_MATURATION)) diff --git a/code/modules/liquid/splash_simulation.dm b/code/modules/liquid/splash_simulation.dm index 1ba530a0f1a..60d57a50e81 100644 --- a/code/modules/liquid/splash_simulation.dm +++ b/code/modules/liquid/splash_simulation.dm @@ -8,7 +8,6 @@ datum/puddle var/list/obj/effect/liquid/liquid_objects = list() datum/puddle/process() - //world << "DEBUG: Puddle process!" for(var/obj/effect/liquid/L in liquid_objects) L.spread() @@ -71,7 +70,6 @@ obj/effect/liquid/New() obj/effect/liquid/proc/spread() - //world << "DEBUG: liquid spread!" var/surrounding_volume = 0 var/list/spread_directions = list(1,2,4,8) var/turf/loc_turf = loc @@ -79,7 +77,6 @@ obj/effect/liquid/proc/spread() var/turf/T = get_step(src,direction) if(!T) spread_directions.Remove(direction) - //world << "ERROR: Map edge!" continue //Map edge if(!loc_turf.can_leave_liquid(direction)) //Check if this liquid can leave the tile in the direction spread_directions.Remove(direction) @@ -99,13 +96,11 @@ obj/effect/liquid/proc/spread() controller.liquid_objects.Add(NL) if(!spread_directions.len) - //world << "ERROR: No candidate to spread to." return //No suitable candidate to spread to var/average_volume = (src.volume + surrounding_volume) / (spread_directions.len + 1) //Average amount of volume on this and the surrounding tiles. var/volume_difference = src.volume - average_volume //How much more/less volume this tile has than the surrounding tiles. if(volume_difference <= (spread_directions.len*LIQUID_TRANSFER_THRESHOLD)) //If we have less than the threshold excess liquid - then there is nothing to do as other tiles will be giving us volume.or the liquid is just still. - //world << "ERROR: transfer volume lower than THRESHOLD!" return var/volume_per_tile = volume_difference / spread_directions.len @@ -113,7 +108,6 @@ obj/effect/liquid/proc/spread() for(var/direction in spread_directions) var/turf/T = get_step(src,direction) if(!T) - //world << "ERROR: Map edge 2!" continue //Map edge var/obj/effect/liquid/L = locate(/obj/effect/liquid) in T if(L) diff --git a/code/modules/maps/fromdmp.dm b/code/modules/maps/fromdmp.dm index 73958b43a8c..62de924ccc3 100644 --- a/code/modules/maps/fromdmp.dm +++ b/code/modules/maps/fromdmp.dm @@ -50,7 +50,7 @@ proc/dmp2swapmap(filename) while(txt) if(text2ascii(txt)==34) if(mode!=34) - world << "Corrupt map file [filename]: Unexpected code found after z-level [z]" + to_world("Corrupt map file [filename]: Unexpected code found after z-level [z]") return // standard line: // "a" = (/obj, /obj, /turf, /area) @@ -59,20 +59,20 @@ proc/dmp2swapmap(filename) codelen=length(code) i=findtext(txt,"(",i) if(!i) - world << "Corrupt map file [filename]: No type list follows \"[code]\"" + to_world("Corrupt map file [filename]: No type list follows \"[code]\"") return k=findtext(txt,"\n",++i) j=(k || length(txt+1)) while(--j>=i && text2ascii(txt,j)!=41) if(j 100) - if (prob(10)) - damage++ - germs++ - if (germs == 1000) - world << "Reached stage 2 in [ticks] ticks" - if (germs > 1000) - damage++ - germs++ - if (germs == 2500) - world << "Reached stage 3 in [ticks] ticks" - world << "Mob took [tdamage] tox damage" -*/ //returns 1 if made bloody, returns 0 otherwise - /mob/living/carbon/human/add_blood(mob/living/carbon/human/M as mob) if (!..()) return 0 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 4173ec947ee..82a9276b989 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -606,7 +606,6 @@ if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX if (temp_adj < BODYTEMP_COOLING_MAX) temp_adj = BODYTEMP_COOLING_MAX - //world << "Breath: [breath.temperature], [src]: [bodytemperature], Adjusting: [temp_adj]" bodytemperature += temp_adj else if(breath.temperature >= species.heat_discomfort_level) @@ -773,19 +772,13 @@ if(nutrition >= 2) //If we are very, very cold we'll use up quite a bit of nutriment to heat us up. adjustNutritionLoss(2) var/recovery_amt = max((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) - //world << "Cold. Difference = [body_temperature_difference]. Recovering [recovery_amt]" -// log_debug("Cold. Difference = [body_temperature_difference]. Recovering [recovery_amt]") bodytemperature += recovery_amt else if(species.cold_level_1 <= bodytemperature && bodytemperature <= species.heat_level_1) var/recovery_amt = body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR - //world << "Norm. Difference = [body_temperature_difference]. Recovering [recovery_amt]" -// log_debug("Norm. Difference = [body_temperature_difference]. Recovering [recovery_amt]") bodytemperature += recovery_amt else if(bodytemperature > species.heat_level_1) //360.15 is 310.15 + 50, the temperature where you start to feel effects. //We totally need a sweat system cause it totally makes sense...~ var/recovery_amt = min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers - //world << "Hot. Difference = [body_temperature_difference]. Recovering [recovery_amt]" -// log_debug("Hot. Difference = [body_temperature_difference]. Recovering [recovery_amt]") bodytemperature += recovery_amt //This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, UPPER_TORSO, LOWER_TORSO, etc. See setup.dm for the full list) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index be4427b13c2..3ed53b02b04 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -208,7 +208,6 @@ default behaviour is: //sort of a legacy burn method for /electrocute, /shock, and the e_chair /mob/living/proc/burn_skin(burn_amount) if(istype(src, /mob/living/carbon/human)) - //world << "DEBUG: burn_skin(), mutations=[mutations]" if(mShock in src.mutations) //shockproof return 0 if (COLD_RESISTANCE in src.mutations) //fireproof @@ -241,8 +240,6 @@ default behaviour is: temperature -= change if(actual < desired) temperature = desired -// if(istype(src, /mob/living/carbon/human)) -// world << "[src] ~ [src.bodytemperature] ~ [temperature]" return temperature diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 8ecc5d03660..2a33dc5bf89 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -33,8 +33,6 @@ adjustFireLoss(0) /mob/living/silicon/robot/proc/use_power() - // Debug only - // world << "DEBUG: life.dm line 35: cyborg use_power() called at tick [controller_iteration]" used_power_this_tick = 0 for(var/V in components) var/datum/robot_component/C = components[V] diff --git a/code/modules/mob/mob_cleanup.dm b/code/modules/mob/mob_cleanup.dm index 1baebf35706..68c4e6ea36e 100644 --- a/code/modules/mob/mob_cleanup.dm +++ b/code/modules/mob/mob_cleanup.dm @@ -12,22 +12,17 @@ Put (mob/proc)s here that are in dire need of a code cleanup. // This proc has some procs that should be extracted from it. I believe we can develop some helper procs from it - Rockdtben /mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1, var/spread_type = -5) - //world << "Contract_disease called by [src] with virus [virus]" if(stat >=2) - //world << "He's dead jim." return if(istype(virus, /datum/disease/advance)) - //world << "It's an advance virus." var/datum/disease/advance/A = virus if(A.GetDiseaseID() in resistances) - //world << "It resisted us!" return if(count_by_type(viruses, /datum/disease/advance) >= 3) return else if(src.resistances.Find(virus.type)) - //world << "Normal virus and resisted" return @@ -45,9 +40,6 @@ Put (mob/proc)s here that are in dire need of a code cleanup. if(fail) return if(skip_this == 1) - //world << "infectin" - //if(src.virus) < -- this used to replace the current disease. Not anymore! - //src.virus.cure(0) var/datum/disease/v = new virus.type(1, virus, 0) src.viruses += v v.affected_mob = src @@ -56,26 +48,8 @@ Put (mob/proc)s here that are in dire need of a code cleanup. if(v.can_carry && prob(5)) v.carrier = 1 return - //world << "Not skipping." - //if(src.virus) // - //return // - -/* - var/list/clothing_areas = list() - var/list/covers = list(UPPER_TORSO,LOWER_TORSO,LEGS,FEET,ARMS,HANDS) - for(var/Covers in covers) - clothing_areas[Covers] = list() - - for(var/obj/item/clothing/Clothing in src) - if(Clothing) - for(var/Covers in covers) - if(Clothing&Covers) - clothing_areas[Covers] += Clothing - -*/ if(prob(15/virus.permeability_mod)) return //the power of immunity compels this disease! but then you forgot resistances - //world << "past prob()" var/obj/item/clothing/Cl = null var/passed = 1 @@ -145,49 +119,10 @@ Put (mob/proc)s here that are in dire need of a code cleanup. else src << "Something strange's going on, something's wrong." - /*if("feet") - if(H.shoes && istype(H.shoes, /obj/item/clothing/)) - Cl = H.shoes - passed = prob(Cl.permeability_coefficient*100) - // - world << "Shoes pass [passed]" - */ // - if(!passed && spread_type == AIRBORNE && !internals) passed = (prob((50*virus.permeability_mod) - 1)) if(passed) - //world << "Infection in the mob [src]. YAY" - - -/* - var/score = 0 - if(istype(src, /mob/living/carbon/human)) - if(src:gloves) score += 5 - if(istype(src:wear_suit, /obj/item/clothing/suit/space)) score += 10 - if(istype(src:wear_suit, /obj/item/clothing/suit/bio_suit)) score += 10 - if(istype(src:head, /obj/item/clothing/head/helmet/space)) score += 5 - if(istype(src:head, /obj/item/clothing/head/bio_hood)) score += 5 - if(wear_mask) - score += 5 - if((istype(src:wear_mask, /obj/item/clothing/mask) || istype(src:wear_mask, /obj/item/clothing/mask/surgical)) && !internal) - score += 5 - if(internal) - score += 5 - if(score > 20) - return - else if(score == 20 && prob(95)) - return - else if(score >= 15 && prob(75)) - return - else if(score >= 10 && prob(55)) - return - else if(score >= 5 && prob(35)) - return - else if(prob(15)) - return - else*/ - var/datum/disease/v = new virus.type(1, virus, 0) src.viruses += v v.affected_mob = src @@ -195,5 +130,3 @@ Put (mob/proc)s here that are in dire need of a code cleanup. v.holder = src if(v.can_carry && prob(5)) v.carrier = 1 - return - return diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 8f52dba3c2c..e4331e8232b 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -360,11 +360,6 @@ status &= ~ORGAN_BROKEN perma_injury = 0 - /*if((brute || burn) && children && children.len && (owner.species.flags & REGENERATES_LIMBS)) - var/obj/item/organ/external/stump/S = locate() in children - if(S) - world << "Extra healing to go around ([brute+burn]) and [owner] needs a replacement limb."*/ - //Sync the organ's damage with its wounds src.update_damages() owner.updatehealth() diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 56248241de5..cb714548564 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -922,15 +922,10 @@ area.power_light = (lighting > 1) area.power_equip = (equipment > 1) area.power_environ = (environ > 1) -// if (area.name == "AI Chamber") -// spawn(10) -// world << " [area.name] [area.power_equip]" else area.power_light = 0 area.power_equip = 0 area.power_environ = 0 -// if (area.name == "AI Chamber") -// world << "[area.power_equip]" area.power_change() /obj/machinery/power/apc/proc/isWireCut(var/wireIndex) @@ -1409,4 +1404,4 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on) else charge_mode = 2 last_time = world.time - time = ((time_secs / 3600) > 1) ? ("[round(time_secs / 3600)] hours, [round((time_secs % 3600) / 60)] minutes") : ("[round(time_secs / 60)] minutes, [round(time_secs % 60)] seconds") \ No newline at end of file + time = ((time_secs / 3600) > 1) ? ("[round(time_secs / 3600)] hours, [round((time_secs % 3600) / 60)] minutes") : ("[round(time_secs / 60)] minutes, [round(time_secs % 60)] seconds") diff --git a/code/modules/power/fractal_reactor.dm b/code/modules/power/fractal_reactor.dm index 1662e453213..f4fa173527c 100644 --- a/code/modules/power/fractal_reactor.dm +++ b/code/modules/power/fractal_reactor.dm @@ -18,7 +18,7 @@ /obj/machinery/power/fractal_reactor/New() ..() if(!mapped_in) - world << "WARNING: Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]" + to_world("WARNING: Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]") /obj/machinery/power/fractal_reactor/machinery_process() if(!powernet && !powernet_connection_failed) diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm index 4abebb69d2e..47a0e186763 100644 --- a/code/modules/power/generator_type2.dm +++ b/code/modules/power/generator_type2.dm @@ -64,8 +64,6 @@ hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity - //world << "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]" - if(input1.network) input1.network.update = 1 diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm index 0bbe6ac09d3..1e7c23dd04f 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm @@ -55,7 +55,6 @@ var/list/w = heard_words["[lowertext(seperate[Xa])]"] if(w) w.Add("[lowertext(seperate[next])]") - //world << "Adding [lowertext(seperate[next])] to [lowertext(seperate[Xa])]" if(prob(30)) var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\ @@ -67,14 +66,6 @@ spawn(2) SaySomething(pick(seperate)) -/*/obj/item/weapon/talkingcrystal/proc/debug() - //set src in view() - for(var/v in heard_words) - world << "[uppertext(v)]" - var/list/d = heard_words["[v]"] - for(var/X in d) - world << "[X]"*/ - /datum/talking_atom/proc/SaySomething(var/word = null) if(!holder_atom) return diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 91ecf92b99e..548f0a7e3d2 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -173,13 +173,13 @@ var/global/maint_all_access = 0 /proc/make_maint_all_access() maint_all_access = 1 - world << "Attention!" - world << "The maintenance access requirement has been revoked on all airlocks." + to_world("Attention!") + to_world("The maintenance access requirement has been revoked on all airlocks.") /proc/revoke_maint_all_access() maint_all_access = 0 - world << "Attention!" - world << "The maintenance access requirement has been readded on all maintenance airlocks." + to_world("Attention!") + to_world("The maintenance access requirement has been readded on all maintenance airlocks.") /obj/machinery/door/airlock/allowed(mob/M) if(maint_all_access && src.check_access_list(list(access_maint_tunnels))) @@ -189,11 +189,11 @@ var/global/maint_all_access = 0 /proc/cyborg_crisis_override() for(var/mob/living/silicon/robot/M in silicon_mob_list) M.crisis_override = 1 - world << "Attention!" - world << "Cyborg crisis override has been activated, station bound cyborgs are allowed to select the combat module during code red." + to_world("Attention!") + to_world("Cyborg crisis override has been activated, station bound cyborgs are allowed to select the combat module during code red.") /proc/disable_cyborg_crisis_override() for(var/mob/living/silicon/robot/M in silicon_mob_list) M.crisis_override = 0 - world << "Attention!" - world << "Cyborg crisis override has been deactivated, station bound cyborgs are no longer allowed to select the combat module." + to_world("Attention!") + to_world("Cyborg crisis override has been deactivated, station bound cyborgs are no longer allowed to select the combat module.") diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index fafd665aeb2..b4084929036 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -5,12 +5,12 @@ ..() arming_controller = locate(dock_target_station) if(!istype(arming_controller)) - world << "warning: escape pod with station dock tag [dock_target_station] could not find it's dock target!" - + to_world("warning: escape pod with station dock tag [dock_target_station] could not find it's dock target!") + if(docking_controller) var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/controller_master = docking_controller.master if(!istype(controller_master)) - world << "warning: escape pod with docking tag [docking_controller_tag] could not find it's controller master!" + to_world("warning: escape pod with docking tag [docking_controller_tag] could not find it's controller master!") else controller_master.pod = src @@ -29,7 +29,7 @@ /datum/shuttle/ferry/escape_pod/can_cancel() return 0 - + //This controller goes on the escape pod itself /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod name = "escape pod controller" @@ -58,7 +58,7 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/Topic(href, href_list) if(..()) return 1 - + if("manual_arm") pod.arming_controller.arm() if("force_launch") @@ -87,7 +87,7 @@ if (istype(docking_program, /datum/computer/file/embedded_program/docking/simple/escape_pod)) var/datum/computer/file/embedded_program/docking/simple/escape_pod/P = docking_program armed = P.armed - + data = list( "docking_status" = docking_program.get_docking_status(), "override_enabled" = docking_program.override_enabled, diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 9eb6187f3f1..d95c3b1db61 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -18,7 +18,7 @@ if(docking_controller_tag) docking_controller = locate(docking_controller_tag) if(!istype(docking_controller)) - world << "warning: shuttle with docking tag [docking_controller_tag] could not find it's controller!" + to_world("warning: shuttle with docking tag [docking_controller_tag] could not find it's controller!") /datum/shuttle/proc/short_jump(var/area/origin,var/area/destination) if(moving_status != SHUTTLE_IDLE) return @@ -34,7 +34,6 @@ moving_status = SHUTTLE_IDLE /datum/shuttle/proc/long_jump(var/area/departing, var/area/destination, var/area/interim, var/travel_time, var/direction) - //world << "shuttle/long_jump: departing=[departing], destination=[destination], interim=[interim], travel_time=[travel_time]" if(moving_status != SHUTTLE_IDLE) return //it would be cool to play a sound here @@ -81,14 +80,7 @@ //A note to anyone overriding move in a subtype. move() must absolutely not, under any circumstances, fail to move the shuttle. //If you want to conditionally cancel shuttle launches, that logic must go in short_jump() or long_jump() /datum/shuttle/proc/move(var/area/origin, var/area/destination) - - //world << "move_shuttle() called for [shuttle_tag] leaving [origin] en route to [destination]." - - //world << "area_coming_from: [origin]" - //world << "destination: [destination]" - if(origin == destination) - //world << "cancelling move, shuttle will overlap." return if (docking_controller && !docking_controller.undocked()) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index bd2ba3b3120..1840f6ea15b 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -9,7 +9,6 @@ emergency_shuttle.shuttle_arrived() /datum/shuttle/ferry/emergency/long_jump(var/area/departing, var/area/destination, var/area/interim, var/travel_time, var/direction) - //world << "shuttle/ferry/emergency/long_jump: departing=[departing], destination=[destination], interim=[interim], travel_time=[travel_time]" if (!location) travel_time = SHUTTLE_TRANSIT_DURATION_RETURN else @@ -66,7 +65,7 @@ if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console if (emergency_shuttle.autopilot) emergency_shuttle.autopilot = 0 - world << "Alert: The shuttle autopilot has been overridden. Launch sequence initiated!" + to_world("Alert: The shuttle autopilot has been overridden. Launch sequence initiated!") if(usr) log_admin("[key_name(usr)] has overridden the shuttle autopilot and activated launch sequence",ckey=key_name(usr)) @@ -80,7 +79,7 @@ if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console if (emergency_shuttle.autopilot) emergency_shuttle.autopilot = 0 - world << "Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!" + to_world("Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!") if(usr) log_admin("[key_name(usr)] has overridden the shuttle autopilot and forced immediate launch",ckey=key_name(usr)) @@ -94,7 +93,7 @@ if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console if (emergency_shuttle.autopilot) emergency_shuttle.autopilot = 0 - world << "Alert: The shuttle autopilot has been overridden. Launch sequence aborted!" + to_world("Alert: The shuttle autopilot has been overridden. Launch sequence aborted!") if(usr) log_admin("[key_name(usr)] has overridden the shuttle autopilot and cancelled launch sequence",ckey=key_name(usr)) @@ -151,7 +150,7 @@ src.visible_message("\The [src] beeps as it scans [ident].") authorized[dna_hash] = auth_name if (req_authorizations - authorized.len) - world << "Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot." + to_world("Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot.") if(usr) log_admin("[key_name(usr)] has inserted [ID] into the shuttle control computer - [req_authorizations - authorized.len] authorisation\s needed",ckey=key_name(usr)) diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm index 9024b0dddfb..ceea9b2d396 100644 --- a/code/modules/shuttles/shuttle_ferry.dm +++ b/code/modules/shuttles/shuttle_ferry.dm @@ -16,7 +16,7 @@ //TODO: change location to a string and use a mapping for area and dock targets. var/dock_target_station var/dock_target_offsite - + var/last_dock_attempt_time = 0 /datum/shuttle/ferry/short_jump(var/area/origin,var/area/destination) @@ -32,7 +32,6 @@ ..(origin, destination) /datum/shuttle/ferry/long_jump(var/area/departing, var/area/destination, var/area/interim, var/travel_time, var/direction) - //world << "shuttle/ferry/long_jump: departing=[departing], destination=[destination], interim=[interim], travel_time=[travel_time]" if(isnull(location)) return @@ -72,7 +71,6 @@ if (WAIT_LAUNCH) if (skip_docking_checks() || docking_controller.can_launch()) - //world << "shuttle/ferry/process: area_transition=[area_transition], travel_time=[travel_time]" if (move_time && area_transition) long_jump(interim=area_transition, travel_time=move_time, direction=transit_direction) else @@ -85,15 +83,15 @@ long_jump(interim=area_transition, travel_time=move_time, direction=transit_direction) else short_jump() - + process_state = WAIT_ARRIVE - + if (WAIT_ARRIVE) if (moving_status == SHUTTLE_IDLE) dock() in_use = null //release lock process_state = WAIT_FINISH - + if (WAIT_FINISH) if (skip_docking_checks() || docking_controller.docked() || world.time > last_dock_attempt_time + DOCK_ATTEMPT_TIMEOUT) process_state = IDLE_STATE diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 5e0a9363653..a5c76145a5c 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -18,11 +18,11 @@ if(docking_controller_tag_station) docking_controller_station = locate(docking_controller_tag_station) if(!istype(docking_controller_station)) - world << "warning: shuttle with docking tag [docking_controller_station] could not find it's controller!" + to_world("warning: shuttle with docking tag [docking_controller_station] could not find it's controller!") if(docking_controller_tag_offsite) docking_controller_offsite = locate(docking_controller_tag_offsite) if(!istype(docking_controller_offsite)) - world << "warning: shuttle with docking tag [docking_controller_offsite] could not find it's controller!" + to_world("warning: shuttle with docking tag [docking_controller_offsite] could not find it's controller!") if (!location) docking_controller = docking_controller_station else @@ -244,4 +244,4 @@ /obj/machinery/computer/shuttle_control/legion name = "deployment shuttle control console" req_access = list(access_legion) - shuttle_tag = "Tau Ceti Foreign Legion" \ No newline at end of file + shuttle_tag = "Tau Ceti Foreign Legion" diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm index 20882326f86..63fc356fe05 100644 --- a/code/modules/shuttles/shuttles_multi.dm +++ b/code/modules/shuttles/shuttles_multi.dm @@ -36,7 +36,7 @@ var/datum/computer/file/embedded_program/docking/C = locate(controller_tag) if(!istype(C)) - world << "warning: shuttle with docking tag [controller_tag] could not find it's controller!" + to_world("warning: shuttle with docking tag [controller_tag] could not find it's controller!") else destination_dock_controllers[destination] = C @@ -156,9 +156,8 @@ src.add_fingerprint(usr) var/datum/shuttle/multi_shuttle/MS = shuttle_controller.shuttles[shuttle_tag] - if(!istype(MS)) return - - //world << "multi_shuttle: last_departed=[MS.last_departed], origin=[MS.origin], interim=[MS.interim], travel_time=[MS.move_time]" + if(!istype(MS)) + return if(href_list["refresh"]) updateUsrDialog() diff --git a/tools/Redirector/Configurations.dm b/tools/Redirector/Configurations.dm index 06e2139aea5..b76b0b9c07c 100644 --- a/tools/Redirector/Configurations.dm +++ b/tools/Redirector/Configurations.dm @@ -37,7 +37,7 @@ proc/gen_configs() else if(admin_gen) adminfiles.Add(line) - world << line + to_world(line) // Generate the list of admins now diff --git a/tools/Redirector/Redirector.dm b/tools/Redirector/Redirector.dm index 9ba2096e73c..d6165b2d9ce 100644 --- a/tools/Redirector/Redirector.dm +++ b/tools/Redirector/Redirector.dm @@ -36,7 +36,7 @@ mob/Login() var/list/servers = list() for(var/x in global.servers) - world << "[x] [servernames[ global.servers.Find(x) ]]" + to_world("[x] [servernames[ global.servers.Find(x) ]]") var/info = world.Export("[x]?status") var/datum/server/S = new() @@ -46,8 +46,8 @@ mob/Login() S.weight += player_weight * S.players S.link = x - world << S.players - world << S.admins + to_world(S.players) + to_world(S.admins) weights.Add(S.weight) servers.Add(S) diff --git a/tools/SS13SmoothingCutter/Cutter.dm b/tools/SS13SmoothingCutter/Cutter.dm index 696f503c783..a4bd3082a95 100644 --- a/tools/SS13SmoothingCutter/Cutter.dm +++ b/tools/SS13SmoothingCutter/Cutter.dm @@ -9,13 +9,13 @@ if(isfile(dmifile) && (copytext("[dmifile]",-4) == ".dmi")) SliceNDice(dmifile) else - world << "\red Bad DMI file '[dmifile]'" + to_world("\red Bad DMI file '[dmifile]'") /proc/SliceNDice(dmifile as file) var/icon/sourceIcon = icon(dmifile) var/list/states = sourceIcon.IconStates() - world << "[dmifile] - states: [states.len]" + to_world("[dmifile] - states: [states.len]") switch(states.len) if(0 to (STATE_COUNT_NORMAL - 1)) @@ -23,9 +23,9 @@ if(cont == "No") return if(STATE_COUNT_NORMAL) - world << "4 States, running in Non-Diagonal mode" + to_world("4 States, running in Non-Diagonal mode") if(STATE_COUNT_DIAGONAL) - world << "5 States, running in Diagonal mode" + to_world("5 States, running in Diagonal mode") if((STATE_COUNT_DIAGONAL + 1) to A_BIG_NUMBER) var/cont = alert(usr, "Too many states: [states.len], expected [STATE_COUNT_NORMAL] (Non-Diagonal) or [STATE_COUNT_DIAGONAL] (Diagonal), Continue?", "Unexpected Amount of States", "Yes", "No") if(cont == "No") @@ -65,7 +65,7 @@ corner4i.DrawBox(null, 17, 17, 32, 32) outputIcon.Insert(corner4i, "4-i") - world << "Box: \icon[box] -> \icon[corner1i] \icon[corner2i] \icon[corner3i] \icon[corner4i]" + to_world("Box: \icon[box] -> \icon[corner1i] \icon[corner2i] \icon[corner3i] \icon[corner4i]") if("line") var/icon/line = icon(sourceIcon, state) @@ -108,7 +108,7 @@ line4e.Turn(90) outputIcon.Insert(line4e, "4-e") - world << "Line: \icon[line] -> \icon[line1n] \icon[line2n] \icon[line3s] \icon[line4s] \icon[line1w] \icon[line2e] \icon[line3w] \icon[line4e]" + to_world("Line: \icon[line] -> \icon[line1n] \icon[line2n] \icon[line3s] \icon[line4s] \icon[line1w] \icon[line2e] \icon[line3w] \icon[line4e]") if("center_4") var/icon/center4 = icon(sourceIcon, state) @@ -133,7 +133,7 @@ corner4se.DrawBox(null, 17, 17, 32, 32) outputIcon.Insert(corner4se, "4-se") - world << "Center4: \icon[center4] -> \icon[corner1nw] \icon[corner2ne] \icon[corner3sw] \icon[corner4se]" + to_world("Center4: \icon[center4] -> \icon[corner1nw] \icon[corner2ne] \icon[corner3sw] \icon[corner4se]") if("center_8") var/icon/center8 = icon(sourceIcon, state) @@ -158,7 +158,7 @@ corner4f.DrawBox(null, 17, 17, 32, 32) outputIcon.Insert(corner4f, "4-f") - world << "Center8: \icon[center8] -> \icon[corner1f] \icon[corner2f] \icon[corner3f] \icon[corner4f]" + to_world("Center8: \icon[center8] -> \icon[corner1f] \icon[corner2f] \icon[corner3f] \icon[corner4f]") if("diag") var/icon/diag = icon(sourceIcon, state) @@ -178,7 +178,7 @@ diagnw.Turn(180) outputIcon.Insert(diagnw, "d-nw") - world << "Diag: \icon[diag] -> \icon[diagse] \icon[diagsw] \icon[diagne] \icon[diagnw]" + to_world("Diag: \icon[diag] -> \icon[diagse] \icon[diagsw] \icon[diagne] \icon[diagnw]") if("diag_corner_a") var/icon/diag_corner_a = icon(sourceIcon, state) @@ -198,7 +198,7 @@ diagnw0.Turn(180) outputIcon.Insert(diagnw0, "d-nw-0") - world << "Diag_Corner_A: \icon[diag_corner_a] -> \icon[diagse0] \icon[diagsw0] \icon[diagne0] \icon[diagnw0]" + to_world("Diag_Corner_A: \icon[diag_corner_a] -> \icon[diagse0] \icon[diagsw0] \icon[diagne0] \icon[diagnw0]") if("diag_corner_b") var/icon/diag_corner_b = icon(sourceIcon, state) @@ -218,9 +218,9 @@ diagnw1.Turn(180) outputIcon.Insert(diagnw1, "d-nw-0") - world << "Diag_Corner_B: \icon[diag_corner_b] -> \icon[diagse1] \icon[diagsw1] \icon[diagne1] \icon[diagnw1]" + to_world("Diag_Corner_B: \icon[diag_corner_b] -> \icon[diagse1] \icon[diagsw1] \icon[diagne1] \icon[diagnw1]") fcopy(outputIcon, filename) //Update output icon each iteration - world << "Finished [filename]!" + to_world("Finished [filename]!") diff --git a/vueui/README.md b/vueui/README.md index 78a987e5761..5c4e0d456b7 100644 --- a/vueui/README.md +++ b/vueui/README.md @@ -4,7 +4,7 @@ This UI framework is mostly composed of four main parts: - UI DM datum, responsible for linking opened ui window with code - Object specific code, that generates data for uis, and handles actions. - SubSystem responsible for keeping track of all uis and making sure they tick. - + ## How to use it? ### Step 1: Open ui First we have to create a way to open ui, for example, a proc that's called when we want to open ui: @@ -25,7 +25,7 @@ But how we pass data to it? There are two ways to do it, first one is to pass in return list("counter" = 0) // Here we can add checks for difference of state and alter it // or do actions depending on its change - if(newdata["counter"] >= 10) + if(newdata["counter"] >= 10) return list("counter" = 0) ``` Every time server receives of front end state change it calls this proc to make sure that front end state didn't go too far from data it should represent. If everything is alright with `newstate` and no push to front end of data is needed then it should return `0` or `null`, else return data that should be pushed. @@ -34,11 +34,11 @@ Simply use `Topic` proc to get ui action calls from ui. ```DM /datum/mydatum/Topic(href, href_list) if(href_list["action"] == "test") - world << "Got Test Action! [href_list["data"]]" + to_world("Got Test Action! [href_list["data"]]") return ``` ### Step 4: Make ui itself. -It is recommended to [enable debugging](.#debug-ui) for this step to make things easier. +It is recommended to [enable debugging](.#debug-ui) for this step to make things easier. To create ui itself, you need to create `.vue` file somewhere in `\vueui\src\components\view`. Depending on location of .vue file depends on its component name. Example `\vueui\src\components\view\uiname.vue` file: ```vue @@ -107,9 +107,9 @@ VUEUI_MONITOR_VARS(/datum/mydatum, mydatummonitor) ### `SSvueui.check_uis_for_change(object)` Asks all uis to call `object`'s `vueui_data_change` proc to make all uis up tp date. Should be used when bigger change was done or action done change that would affect global data. ### `SSvueui.get_open_uis(object)` -Gets a list of all open uis for specified object. This allows to interact with individual uis. +Gets a list of all open uis for specified object. This allows to interact with individual uis. ### `ui.activeui` -Determines currently active view component for this ui datum. Should be combines with `check_for_change()` or `push_change()`. +Determines currently active view component for this ui datum. Should be combines with `check_for_change()` or `push_change()`. It is also plausible for server to send templates dynamically. First character of template should be `?` to specify to vueui that its going to be not recompiled `view` component, but a template. Also template should have single root element. Example for such component would be `?Time since server boot: {{ $root.$data.wtime / 2 }} seconds.` ### `ui.header` @@ -209,7 +209,7 @@ Example: ``` Parameters: - - `name` - name of asset to show that was sent to client. + - `name` - name of asset to show that was sent to client. Please note that regular `` parameters apply here. ### VuiImg `` Helper for making item lists using legacy nano styles.