diff --git a/archive/maps/cynosure/cynosure_jobs.dm b/archive/maps/cynosure/cynosure_jobs.dm index e7ec3296ea..303d87eb42 100644 --- a/archive/maps/cynosure/cynosure_jobs.dm +++ b/archive/maps/cynosure/cynosure_jobs.dm @@ -37,16 +37,16 @@ var/const/access_explorer = 43 JOB_PILOT = /decl/hierarchy/outfit/job/pilot) /datum/job/rd - access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, - access_tox_storage, access_teleporter, access_sec_doors, - access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, - access_network, access_maint_tunnels, access_explorer, access_eva, access_external_airlocks) - minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, - access_tox_storage, access_teleporter, access_sec_doors, - access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, - access_network, access_maint_tunnels, access_explorer, access_eva, access_external_airlocks) + access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, + access_tox_storage, access_teleporter, access_sec_doors, + access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, + access_network, access_maint_tunnels, access_explorer, access_eva, access_external_airlocks) + minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, + access_tox_storage, access_teleporter, access_sec_doors, + access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, + access_network, access_maint_tunnels, access_explorer, access_eva, access_external_airlocks) /* alt_titles = list( diff --git a/archive/maps/cynosure/cynosure_shuttles.dm b/archive/maps/cynosure/cynosure_shuttles.dm index 8dcd023c40..5401ab5ce3 100644 --- a/archive/maps/cynosure/cynosure_shuttles.dm +++ b/archive/maps/cynosure/cynosure_shuttles.dm @@ -448,52 +448,52 @@ ESCAPE_POD(1) // Map template for spawning the shuttle /datum/map_template/om_ships/hybrid - name = "OM Ship - Generic Shuttle" - desc = "A small privately-owned vessel." - mappath = 'generic_shuttle.dmm' - annihilate = TRUE + name = "OM Ship - Generic Shuttle" + desc = "A small privately-owned vessel." + mappath = "maps/cynosure/generic_shuttle.dmm" + annihilate = TRUE // The shuttle's area(s) /area/shuttle/generic_shuttle/eng - name = "\improper Private Vessel - Engineering" - icon_state = "shuttle2" - requires_power = 1 + name = "\improper Private Vessel - Engineering" + icon_state = "shuttle2" + requires_power = 1 /area/shuttle/generic_shuttle/gen - name = "\improper Private Vessel - General" - icon_state = "shuttle2" - requires_power = 1 + name = "\improper Private Vessel - General" + icon_state = "shuttle2" + requires_power = 1 // The shuttle's 'shuttle' computer /obj/machinery/computer/shuttle_control/explore/generic_shuttle - name = "short jump console" - shuttle_tag = "Private Vessel" - req_one_access = list(access_pilot) + name = "short jump console" + shuttle_tag = "Private Vessel" + req_one_access = list(access_pilot) // A shuttle lateloader landmark /obj/effect/shuttle_landmark/shuttle_initializer/generic_shuttle - name = "Origin - Private Vessel" - base_area = /area/space - base_turf = /turf/space - landmark_tag = "omship_spawn_generic_shuttle" - shuttle_type = /datum/shuttle/autodock/overmap/generic_shuttle + name = "Origin - Private Vessel" + base_area = /area/space + base_turf = /turf/space + landmark_tag = "omship_spawn_generic_shuttle" + shuttle_type = /datum/shuttle/autodock/overmap/generic_shuttle // The 'shuttle' /datum/shuttle/autodock/overmap/generic_shuttle - name = "Private Vessel" - current_location = "omship_spawn_generic_shuttle" - docking_controller_tag = "generic_shuttle_docker" - shuttle_area = list(/area/shuttle/generic_shuttle/eng, /area/shuttle/generic_shuttle/gen) - defer_initialisation = TRUE //We're not loaded until an admin does it + name = "Private Vessel" + current_location = "omship_spawn_generic_shuttle" + docking_controller_tag = "generic_shuttle_docker" + shuttle_area = list(/area/shuttle/generic_shuttle/eng, /area/shuttle/generic_shuttle/gen) + defer_initialisation = TRUE //We're not loaded until an admin does it // The 'ship' /obj/effect/overmap/visitable/ship/landable/generic_shuttle - scanner_name = "Private Vessel" - scanner_desc = @{"[i]Registration[/i]: PRIVATE + scanner_name = "Private Vessel" + scanner_desc = @{"[i]Registration[/i]: PRIVATE [i]Class[/i]: Small Shuttle [i]Transponder[/i]: Transmitting (CIV), non-hostile [b]Notice[/b]: Small private vessel"} - vessel_mass = 1000 - vessel_size = SHIP_SIZE_TINY - shuttle = "Private Vessel" + vessel_mass = 1000 + vessel_size = SHIP_SIZE_TINY + shuttle = "Private Vessel" */ diff --git a/archive/maps/old_yw/tether_better/tether_things.dm b/archive/maps/old_yw/tether_better/tether_things.dm index db0e6f17d9..ee3cbe955d 100644 --- a/archive/maps/old_yw/tether_better/tether_things.dm +++ b/archive/maps/old_yw/tether_better/tether_things.dm @@ -1,6 +1,6 @@ //Special map objects /obj/effect/landmark/map_data/virgo3b_better - height = 7 + height = 7 /obj/turbolift_map_holder/tether name = "Tether Climber" diff --git a/archive/maps/old_yw/yw/cryogaia_jobs.dm b/archive/maps/old_yw/yw/cryogaia_jobs.dm index fccd5d3773..491554c867 100644 --- a/archive/maps/old_yw/yw/cryogaia_jobs.dm +++ b/archive/maps/old_yw/yw/cryogaia_jobs.dm @@ -56,7 +56,7 @@ job_description = "The Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions." /datum/alt_title/pathfinder - title = "Pathfinder" + title = "Pathfinder" /datum/job/pilot title = "Pilot" @@ -97,7 +97,7 @@ job_description = "An Explorer searches for interesting things, and returns them to the station." /datum/alt_title/explorer - title = "Explorer" + title = "Explorer" /datum/job/sar title = "Field Medic" @@ -136,4 +136,4 @@ pto_type = PTO_EXPLORATION /datum/alt_title/offduty_exp - title = "Off-duty Explorer" \ No newline at end of file + title = "Off-duty Explorer" diff --git a/archive/maps/old_yw/yw/cryogaia_things.dm b/archive/maps/old_yw/yw/cryogaia_things.dm index f0c7e253dd..cc522c502a 100644 --- a/archive/maps/old_yw/yw/cryogaia_things.dm +++ b/archive/maps/old_yw/yw/cryogaia_things.dm @@ -8,7 +8,7 @@ //Special map objects /obj/effect/landmark/map_data/borealis2 - height = 3 //Height marker. Provides the map with knowledge of how many z levels connecting below. + height = 3 //Height marker. Provides the map with knowledge of how many z levels connecting below. /datum/turbolift @@ -22,7 +22,7 @@ /obj/item/blueprints SPACE_OUTSIDE_TYPES = list( /area/borealis2/outdoors/exterior, - /area/borealis2/outdoors/grounds + /area/borealis2/outdoors/grounds ) diff --git a/archive/maps/old_yw/yw/residential/_residential.dm b/archive/maps/old_yw/yw/residential/_residential.dm index c0bf6c2c59..620b93f92c 100644 --- a/archive/maps/old_yw/yw/residential/_residential.dm +++ b/archive/maps/old_yw/yw/residential/_residential.dm @@ -48,13 +48,13 @@ shuttle_tag = "Residential Shuttle" /obj/structure/table/leadreinforcedwood - icon_state = "reinf_preview" + icon_state = "reinf_preview" /obj/structure/table/leadreinforcedwood/New() - material = get_material_by_name(MAT_LEAD) - reinforced = get_material_by_name(MAT_WOOD) - ..() + material = get_material_by_name(MAT_LEAD) + reinforced = get_material_by_name(MAT_WOOD) + ..() // Spawn points diff --git a/archive/maps/submaps/depreciated_vr/talon.dm b/archive/maps/submaps/depreciated_vr/talon.dm index 68b83c6681..a6143d0c64 100644 --- a/archive/maps/submaps/depreciated_vr/talon.dm +++ b/archive/maps/submaps/depreciated_vr/talon.dm @@ -33,7 +33,7 @@ var/global/list/latejoin_talon = list() on_store_name = "ITV Talon Robotic Storage" /obj/effect/landmark/map_data/talon - height = 2 + height = 2 /////////////////////////// //// The Talon diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm index 5a32031b0a..9abf14702b 100644 --- a/code/ATMOSPHERICS/pipes/tank.dm +++ b/code/ATMOSPHERICS/pipes/tank.dm @@ -80,7 +80,7 @@ air_temporary.temperature = T20C air_temporary.adjust_multi(GAS_O2, (start_pressure*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature), \ - GAS_N2,(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)) + GAS_N2,(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)) . = ..() diff --git a/code/ZAS/ConnectionGroup.dm b/code/ZAS/ConnectionGroup.dm index 85b2545d36..e2a5e7505b 100644 --- a/code/ZAS/ConnectionGroup.dm +++ b/code/ZAS/ConnectionGroup.dm @@ -20,7 +20,7 @@ Class Vars: B - This holds the second zone with which the first zone equalizes. direct - This counts the number of direct (i.e. with no doors) connections on this edge. - Any value of this is sufficient to make the zones mergeable. + Any value of this is sufficient to make the zones mergeable. connection_edge/unsimulated diff --git a/code/__defines/MC.dm b/code/__defines/MC.dm index 2c4360add9..542986c3e4 100644 --- a/code/__defines/MC.dm +++ b/code/__defines/MC.dm @@ -3,12 +3,12 @@ #define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count #define MC_SPLIT_TICK \ - if(split_tick_phases > 1){\ - Master.current_ticklimit = ((original_tick_limit - TICK_USAGE) / split_tick_phases) + TICK_USAGE;\ - --split_tick_phases;\ - } else {\ - Master.current_ticklimit = original_tick_limit;\ - } + if(split_tick_phases > 1){\ + Master.current_ticklimit = ((original_tick_limit - TICK_USAGE) / split_tick_phases) + TICK_USAGE;\ + --split_tick_phases;\ + } else {\ + Master.current_ticklimit = original_tick_limit;\ + } // Used to smooth out costs to try and avoid oscillation. #define MC_AVERAGE_FAST(average, current) (0.7 * (average) + 0.3 * (current)) diff --git a/code/__defines/_globals.dm b/code/__defines/_globals.dm index 7e7aa3158f..083abd4108 100644 --- a/code/__defines/_globals.dm +++ b/code/__defines/_globals.dm @@ -1,16 +1,16 @@ //See controllers/globals.dm #define GLOBAL_MANAGED(X, InitValue)\ /datum/controller/global_vars/proc/InitGlobal##X(){\ - ##X = ##InitValue;\ - gvars_datum_init_order += #X;\ + ##X = ##InitValue;\ + gvars_datum_init_order += #X;\ } #define GLOBAL_UNMANAGED(X) /datum/controller/global_vars/proc/InitGlobal##X() { return; } #ifndef TESTING #define GLOBAL_PROTECT(X)\ /datum/controller/global_vars/InitGlobal##X(){\ - ..();\ - gvars_datum_protected_varlist[#X] = TRUE;\ + ..();\ + gvars_datum_protected_varlist[#X] = TRUE;\ } #else #define GLOBAL_PROTECT(X) diff --git a/code/__defines/_protect.dm b/code/__defines/_protect.dm index 8e162a8b33..dbe25203c0 100644 --- a/code/__defines/_protect.dm +++ b/code/__defines/_protect.dm @@ -1,11 +1,11 @@ ///Protects a datum from being VV'd #define GENERAL_PROTECT_DATUM(Path)\ ##Path/can_vv_get(var_name){\ - return FALSE;\ + return FALSE;\ }\ ##Path/vv_edit_var(var_name, var_value){\ - return FALSE;\ + return FALSE;\ }\ ##Path/CanProcCall(procname){\ - return FALSE;\ + return FALSE;\ } diff --git a/code/__defines/borg_overlays.dm b/code/__defines/borg_overlays.dm index bc5365e25e..54d1ec327e 100644 --- a/code/__defines/borg_overlays.dm +++ b/code/__defines/borg_overlays.dm @@ -56,6 +56,6 @@ /* /datum/robot_sprite/combat/fluff/foopwotch/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) //Make sure the path is correct! ..() //THIS IS ESSENTIAL. IF YOU FORGET THIS LINE, YOU WILL NOT GET THE NORMAL SPRITES. - if(ourborg.has_active_type(/obj/item/weapon/combat_borgblade)) - ourborg.add_overlay("[sprite_icon_state]-dagger") + if(ourborg.has_active_type(/obj/item/weapon/combat_borgblade)) + ourborg.add_overlay("[sprite_icon_state]-dagger") */ diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index f4499027a4..4174137eea 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -1,7 +1,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called manually after an event. #define CELLRATE 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) - // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided + // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided #define SMESRATE 0.03333 // Same for SMESes. A different number for some reason. #define KILOWATTS *1000 diff --git a/code/__defines/rust_g.dm b/code/__defines/rust_g.dm index 14dc8f0c28..043c7c1336 100644 --- a/code/__defines/rust_g.dm +++ b/code/__defines/rust_g.dm @@ -19,21 +19,21 @@ /* This comment bypasses grep checks */ /var/__rust_g /proc/__detect_rust_g() - if (world.system_type == UNIX) - if (fexists("./librust_g.so")) - // No need for LD_LIBRARY_PATH badness. - return __rust_g = "./librust_g.so" - else if (fexists("./rust_g")) - // Old dumb filename. - return __rust_g = "./rust_g" - else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/rust_g")) - // Old dumb filename in `~/.byond/bin`. - return __rust_g = "rust_g" - else - // It's not in the current directory, so try others - return __rust_g = "librust_g.so" - else - return __rust_g = "rust_g" + if (world.system_type == UNIX) + if (fexists("./librust_g.so")) + // No need for LD_LIBRARY_PATH badness. + return __rust_g = "./librust_g.so" + else if (fexists("./rust_g")) + // Old dumb filename. + return __rust_g = "./rust_g" + else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/rust_g")) + // Old dumb filename in `~/.byond/bin`. + return __rust_g = "rust_g" + else + // It's not in the current directory, so try others + return __rust_g = "librust_g.so" + else + return __rust_g = "rust_g" #define RUST_G (__rust_g || __detect_rust_g()) #endif @@ -105,7 +105,7 @@ * * height: The height of the grid. */ #define rustg_cnoise_generate(percentage, smoothing_iterations, birth_limit, death_limit, width, height) \ - RUSTG_CALL(RUST_G, "cnoise_generate")(percentage, smoothing_iterations, birth_limit, death_limit, width, height) + RUSTG_CALL(RUST_G, "cnoise_generate")(percentage, smoothing_iterations, birth_limit, death_limit, width, height) /** * This proc generates a grid of perlin-like noise @@ -121,7 +121,7 @@ * * upper_range: upper bound of values selected for. (exclusive) */ #define rustg_dbp_generate(seed, accuracy, stamp_size, world_size, lower_range, upper_range) \ - RUSTG_CALL(RUST_G, "dbp_generate")(seed, accuracy, stamp_size, world_size, lower_range, upper_range) + RUSTG_CALL(RUST_G, "dbp_generate")(seed, accuracy, stamp_size, world_size, lower_range, upper_range) #define rustg_dmi_strip_metadata(fname) RUSTG_CALL(RUST_G, "dmi_strip_metadata")(fname) @@ -142,8 +142,8 @@ #define rustg_file_seek_line(fname, line) RUSTG_CALL(RUST_G, "file_seek_line")(fname, "[line]") #ifdef RUSTG_OVERRIDE_BUILTINS - #define file2text(fname) rustg_file_read("[fname]") - #define text2file(text, fname) rustg_file_append(text, "[fname]") + #define file2text(fname) rustg_file_read("[fname]") + #define text2file(text, fname) rustg_file_append(text, "[fname]") #endif /// Returns the git hash of the given revision, ex. "HEAD". @@ -154,7 +154,7 @@ * Defaults to returning %F which is YYYY-MM-DD. */ /proc/rustg_git_commit_date(rev, format = "%F") - return RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev, format) + return RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev, format) /** * Returns the formatted datetime string of HEAD using the provided format. @@ -162,7 +162,7 @@ * This is different to rustg_git_commit_date because it only needs the logs directory. */ /proc/rustg_git_commit_date_head(format = "%F") - return RUSTG_CALL(RUST_G, "rg_git_commit_date_head")(format) + return RUSTG_CALL(RUST_G, "rg_git_commit_date_head")(format) #define rustg_hash_string(algorithm, text) RUSTG_CALL(RUST_G, "hash_string")(algorithm, text) #define rustg_hash_file(algorithm, fname) RUSTG_CALL(RUST_G, "hash_file")(algorithm, fname) @@ -182,7 +182,7 @@ #define rustg_decode_base64(str) RUSTG_CALL(RUST_G, "decode_base64")(str) #ifdef RUSTG_OVERRIDE_BUILTINS - #define md5(thing) (isfile(thing) ? rustg_hash_file(RUSTG_HASH_MD5, "[thing]") : rustg_hash_string(RUSTG_HASH_MD5, thing)) + #define md5(thing) (isfile(thing) ? rustg_hash_file(RUSTG_HASH_MD5, "[thing]") : rustg_hash_string(RUSTG_HASH_MD5, thing)) #endif #define RUSTG_HTTP_METHOD_GET "get" @@ -372,33 +372,33 @@ /// Provided a static RSC file path or a raw text file path, returns the duration of the file in deciseconds as a float. /proc/rustg_sound_length(file_path) - var/static/list/sound_cache - if(isnull(sound_cache)) - sound_cache = list() + var/static/list/sound_cache + if(isnull(sound_cache)) + sound_cache = list() - . = 0 + . = 0 - if(!istext(file_path)) - if(!isfile(file_path)) - CRASH("rustg_sound_length error: Passed non-text object") + if(!istext(file_path)) + if(!isfile(file_path)) + CRASH("rustg_sound_length error: Passed non-text object") - if(length("[file_path]")) // Runtime generated RSC references stringify into 0-length strings. - file_path = "[file_path]" - else - CRASH("rustg_sound_length does not support non-static file refs.") + if(length("[file_path]")) // Runtime generated RSC references stringify into 0-length strings. + file_path = "[file_path]" + else + CRASH("rustg_sound_length does not support non-static file refs.") - var/cached_length = sound_cache[file_path] - if(!isnull(cached_length)) - return cached_length + var/cached_length = sound_cache[file_path] + if(!isnull(cached_length)) + return cached_length - var/ret = RUSTG_CALL(RUST_G, "sound_len")(file_path) - var/as_num = text2num(ret) - if(isnull(ret)) - . = 0 - CRASH("rustg_sound_length error: [ret]") + var/ret = RUSTG_CALL(RUST_G, "sound_len")(file_path) + var/as_num = text2num(ret) + if(isnull(ret)) + . = 0 + CRASH("rustg_sound_length error: [ret]") - sound_cache[file_path] = as_num - return as_num + sound_cache[file_path] = as_num + return as_num #define RUSTG_SOUNDLEN_SUCCESSES "successes" @@ -426,25 +426,25 @@ /// Returns the timestamp as a string /proc/rustg_unix_timestamp() - return RUSTG_CALL(RUST_G, "unix_timestamp")() + return RUSTG_CALL(RUST_G, "unix_timestamp")() #define rustg_raw_read_toml_file(path) json_decode(RUSTG_CALL(RUST_G, "toml_file_to_json")(path) || "null") /proc/rustg_read_toml_file(path) - var/list/output = rustg_raw_read_toml_file(path) - if (output["success"]) - return json_decode(output["content"]) - else - CRASH(output["content"]) + var/list/output = rustg_raw_read_toml_file(path) + if (output["success"]) + return json_decode(output["content"]) + else + CRASH(output["content"]) #define rustg_raw_toml_encode(value) json_decode(RUSTG_CALL(RUST_G, "toml_encode")(json_encode(value))) /proc/rustg_toml_encode(value) - var/list/output = rustg_raw_toml_encode(value) - if (output["success"]) - return output["content"] - else - CRASH(output["content"]) + var/list/output = rustg_raw_toml_encode(value) + if (output["success"]) + return output["content"] + else + CRASH(output["content"]) #define rustg_unzip_download_async(url, unzip_directory) RUSTG_CALL(RUST_G, "unzip_download_async")(url, unzip_directory) #define rustg_unzip_check(job_id) RUSTG_CALL(RUST_G, "unzip_check")("[job_id]") @@ -453,8 +453,8 @@ #define rustg_url_decode(text) RUSTG_CALL(RUST_G, "url_decode")(text) #ifdef RUSTG_OVERRIDE_BUILTINS - #define url_encode(text) rustg_url_encode(text) - #define url_decode(text) rustg_url_decode(text) + #define url_encode(text) rustg_url_encode(text) + #define url_decode(text) rustg_url_decode(text) #endif /** @@ -471,4 +471,4 @@ * * node_max: maximum amount of nodes in a region */ #define rustg_worley_generate(region_size, threshold, node_per_region_chance, size, node_min, node_max) \ - RUSTG_CALL(RUST_G, "worley_generate")(region_size, threshold, node_per_region_chance, size, node_min, node_max) + RUSTG_CALL(RUST_G, "worley_generate")(region_size, threshold, node_per_region_chance, size, node_min, node_max) diff --git a/code/_global_vars/lists/mapping.dm b/code/_global_vars/lists/mapping.dm index 42e6f1baf3..7f415df82f 100644 --- a/code/_global_vars/lists/mapping.dm +++ b/code/_global_vars/lists/mapping.dm @@ -4,28 +4,28 @@ GLOBAL_LIST_INIT(cornerdirs, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) GLOBAL_LIST_INIT(cornerdirsz, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTH|UP, EAST|UP, WEST|UP, SOUTH|UP, NORTH|DOWN, EAST|DOWN, WEST|DOWN, SOUTH|DOWN)) GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) GLOBAL_LIST_INIT(reverse_dir, list( // reverse_dir[dir] = reverse of dir - 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, + 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63 )) GLOBAL_LIST_INIT(flip_dir, list( // flip_dir[dir] = 180 degree rotation of dir. Unlike reverse_dir, UP remains UP & DOWN remains DOWN. - 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, + 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, // UP - Same as first line but +16 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, // DOWN - Same as first line but +32 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63 // UP+DOWN - Same as first line but +48 )) GLOBAL_LIST_INIT(cw_dir, list( // cw_dir[dir] = clockwise rotation of dir. Unlike reverse_dir, UP remains UP & DOWN remains DOWN. - 4, 8, 12, 2, 6, 10, 14, 1, 5, 9, 13, 3, 7, 11, 15, + 4, 8, 12, 2, 6, 10, 14, 1, 5, 9, 13, 3, 7, 11, 15, 16, 20, 24, 28, 18, 22, 26, 30, 17, 21, 25, 19, 29, 23, 27, 31, // UP - Same as first line but +16 32, 36, 40, 44, 34, 38, 42, 46, 33, 37, 41, 45, 35, 39, 43, 47, // DOWN - Same as first line but +32 48, 52, 56, 40, 50, 54, 58, 62, 49, 53, 57, 61, 51, 55, 59, 63 // UP+DOWN - Same as first line but +48 )) GLOBAL_LIST_INIT(cww_dir, list( // cww_dir[dir] = counter-clockwise rotation of dir. Unlike reverse_dir, UP remains UP & DOWN remains DOWN. - 8, 4, 12, 1, 9, 5, 13, 2, 10, 6, 14, 3, 11, 7, 15, + 8, 4, 12, 1, 9, 5, 13, 2, 10, 6, 14, 3, 11, 7, 15, 16, 24, 20, 28, 17, 25, 21, 29, 18, 26, 22, 30, 19, 27, 23, 31, // UP - Same as first line but +16 32, 40, 36, 44, 33, 41, 37, 45, 34, 42, 38, 46, 35, 43, 39, 47, // DOWN - Same as first line but +32 48, 56, 52, 60, 49, 57, 53, 61, 50, 58, 54, 62, 51, 59, 55, 63 // UP+DOWN - Same as first line but +48 diff --git a/code/_helpers/icons_procs.dm b/code/_helpers/icons_procs.dm index 879053cfc8..ec97029c09 100644 --- a/code/_helpers/icons_procs.dm +++ b/code/_helpers/icons_procs.dm @@ -18,57 +18,57 @@ remember you first need to setup an /icon var like so: GLOBAL_DATUM_INIT(my_icon, /icon, new('iconfile.dmi')) icon/ChangeOpacity(amount = 1) - A very common operation in DM is to try to make an icon more or less transparent. Making an icon more - transparent is usually much easier than making it less so, however. This proc basically is a frontend - for MapColors() which can change opacity any way you like, in much the same way that SetIntensity() - can make an icon lighter or darker. If amount is 0.5, the opacity of the icon will be cut in half. - If amount is 2, opacity is doubled and anything more than half-opaque will become fully opaque. + A very common operation in DM is to try to make an icon more or less transparent. Making an icon more + transparent is usually much easier than making it less so, however. This proc basically is a frontend + for MapColors() which can change opacity any way you like, in much the same way that SetIntensity() + can make an icon lighter or darker. If amount is 0.5, the opacity of the icon will be cut in half. + If amount is 2, opacity is doubled and anything more than half-opaque will become fully opaque. icon/GrayScale() - Converts the icon to grayscale instead of a fully colored icon. Alpha values are left intact. + Converts the icon to grayscale instead of a fully colored icon. Alpha values are left intact. icon/ColorTone(tone) - Similar to GrayScale(), this proc converts the icon to a range of black -> tone -> white, where tone is an - RGB color (its alpha is ignored). This can be used to create a sepia tone or similar effect. - See also the global ColorTone() proc. + Similar to GrayScale(), this proc converts the icon to a range of black -> tone -> white, where tone is an + RGB color (its alpha is ignored). This can be used to create a sepia tone or similar effect. + See also the global ColorTone() proc. icon/MinColors(icon) - The icon is blended with a second icon where the minimum of each RGB pixel is the result. - Transparency may increase, as if the icons were blended with ICON_ADD. You may supply a color in place of an icon. + The icon is blended with a second icon where the minimum of each RGB pixel is the result. + Transparency may increase, as if the icons were blended with ICON_ADD. You may supply a color in place of an icon. icon/MaxColors(icon) - The icon is blended with a second icon where the maximum of each RGB pixel is the result. - Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. + The icon is blended with a second icon where the maximum of each RGB pixel is the result. + Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. icon/Opaque(background = "#000000") - All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. + All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. icon/BecomeAlphaMask() - You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. - The black parts become transparent, the white parts stay white, and anything in between becomes a translucent shade of white. + You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. + The black parts become transparent, the white parts stay white, and anything in between becomes a translucent shade of white. icon/AddAlphaMask(mask) - The alpha values of the mask icon will be blended with the current icon. Anywhere the mask is opaque, - the current icon is untouched. Anywhere the mask is transparent, the current icon becomes transparent. - Where the mask is translucent, the current icon becomes more transparent. + The alpha values of the mask icon will be blended with the current icon. Anywhere the mask is opaque, + the current icon is untouched. Anywhere the mask is transparent, the current icon becomes transparent. + Where the mask is translucent, the current icon becomes more transparent. icon/UseAlphaMask(mask, mode) - Sometimes you may want to take the alpha values from one icon and use them on a different icon. - This proc will do that. Just supply the icon whose alpha mask you want to use, and src will change - so it has the same colors as before but uses the mask for opacity. + Sometimes you may want to take the alpha values from one icon and use them on a different icon. + This proc will do that. Just supply the icon whose alpha mask you want to use, and src will change + so it has the same colors as before but uses the mask for opacity. COLOR MANAGEMENT AND HSV RGB isn't the only way to represent color. Sometimes it's more useful to work with a model called HSV, which stands for hue, saturation, and value. - * The hue of a color describes where it is along the color wheel. It goes from red to yellow to green to - cyan to blue to magenta and back to red. - * The saturation of a color is how much color is in it. A color with low saturation will be more gray, - and with no saturation at all it is a shade of gray. - * The value of a color determines how bright it is. A high-value color is vivid, moderate value is dark, - and no value at all is black. + * The hue of a color describes where it is along the color wheel. It goes from red to yellow to green to + cyan to blue to magenta and back to red. + * The saturation of a color is how much color is in it. A color with low saturation will be more gray, + and with no saturation at all it is a shade of gray. + * The value of a color determines how bright it is. A high-value color is vivid, moderate value is dark, + and no value at all is black. Just as BYOND uses "#rrggbb" to represent RGB values, a similar format is used for HSV: "#hhhssvv". The hue is three hex digits because it ranges from 0 to 0x5FF. - * 0 to 0xFF - red to yellow - * 0x100 to 0x1FF - yellow to green - * 0x200 to 0x2FF - green to cyan - * 0x300 to 0x3FF - cyan to blue - * 0x400 to 0x4FF - blue to magenta - * 0x500 to 0x5FF - magenta to red + * 0 to 0xFF - red to yellow + * 0x100 to 0x1FF - yellow to green + * 0x200 to 0x2FF - green to cyan + * 0x300 to 0x3FF - cyan to blue + * 0x400 to 0x4FF - blue to magenta + * 0x500 to 0x5FF - magenta to red Knowing this, you can figure out that red is "#000ffff" in HSV format, which is hue 0 (red), saturation 255 (as colorful as possible), value 255 (as bright as possible). Green is "#200ffff" and blue is "#400ffff". @@ -78,42 +78,42 @@ More than one HSV color can match the same RGB color. Here are some procs you can use for color management: ReadRGB(rgb) - Takes an RGB string like "#ffaa55" and converts it to a list such as list(255,170,85). If an RGBA format is used - that includes alpha, the list will have a fourth item for the alpha value. + Takes an RGB string like "#ffaa55" and converts it to a list such as list(255,170,85). If an RGBA format is used + that includes alpha, the list will have a fourth item for the alpha value. hsv(hue, sat, val, apha) - Counterpart to rgb(), this takes the values you input and converts them to a string in "#hhhssvv" or "#hhhssvvaa" - format. Alpha is not included in the result if null. + Counterpart to rgb(), this takes the values you input and converts them to a string in "#hhhssvv" or "#hhhssvvaa" + format. Alpha is not included in the result if null. ReadHSV(rgb) - Takes an HSV string like "#100FF80" and converts it to a list such as list(256,255,128). If an HSVA format is used that - includes alpha, the list will have a fourth item for the alpha value. + Takes an HSV string like "#100FF80" and converts it to a list such as list(256,255,128). If an HSVA format is used that + includes alpha, the list will have a fourth item for the alpha value. RGBtoHSV(rgb) - Takes an RGB or RGBA string like "#ffaa55" and converts it into an HSV or HSVA color such as "#080aaff". + Takes an RGB or RGBA string like "#ffaa55" and converts it into an HSV or HSVA color such as "#080aaff". HSVtoRGB(hsv) - Takes an HSV or HSVA string like "#080aaff" and converts it into an RGB or RGBA color such as "#ff55aa". + Takes an HSV or HSVA string like "#080aaff" and converts it into an RGB or RGBA color such as "#ff55aa". BlendRGB(rgb1, rgb2, amount) - Blends between two RGB or RGBA colors using regular RGB blending. If amount is 0, the first color is the result; - if 1, the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. - The returned value is an RGB or RGBA color. + Blends between two RGB or RGBA colors using regular RGB blending. If amount is 0, the first color is the result; + if 1, the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. + The returned value is an RGB or RGBA color. BlendHSV(hsv1, hsv2, amount) - Blends between two HSV or HSVA colors using HSV blending, which tends to produce nicer results than regular RGB - blending because the brightness of the color is left intact. If amount is 0, the first color is the result; if 1, - the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. - The returned value is an HSV or HSVA color. + Blends between two HSV or HSVA colors using HSV blending, which tends to produce nicer results than regular RGB + blending because the brightness of the color is left intact. If amount is 0, the first color is the result; if 1, + the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. + The returned value is an HSV or HSVA color. BlendRGBasHSV(rgb1, rgb2, amount) - Like BlendHSV(), but the colors used and the return value are RGB or RGBA colors. The blending is done in HSV form. + Like BlendHSV(), but the colors used and the return value are RGB or RGBA colors. The blending is done in HSV form. HueToAngle(hue) - Converts a hue to an angle range of 0 to 360. Angle 0 is red, 120 is green, and 240 is blue. + Converts a hue to an angle range of 0 to 360. Angle 0 is red, 120 is green, and 240 is blue. AngleToHue(hue) - Converts an angle to a hue in the valid range. + Converts an angle to a hue in the valid range. RotateHue(hsv, angle) - Takes an HSV or HSVA value and rotates the hue forward through red, green, and blue by an angle from 0 to 360. - (Rotating red by 60° produces yellow.) The result is another HSV or HSVA color with the same saturation and value - as the original, but a different hue. + Takes an HSV or HSVA value and rotates the hue forward through red, green, and blue by an angle from 0 to 360. + (Rotating red by 60° produces yellow.) The result is another HSV or HSVA color with the same saturation and value + as the original, but a different hue. GrayScale(rgb) - Takes an RGB or RGBA color and converts it to grayscale. Returns an RGB or RGBA string. + Takes an RGB or RGBA color and converts it to grayscale. Returns an RGB or RGBA string. ColorTone(rgb, tone) - Similar to GrayScale(), this proc converts an RGB or RGBA color to a range of black -> tone -> white instead of - using strict shades of gray. The tone value is an RGB color; any alpha value is ignored. + Similar to GrayScale(), this proc converts an RGB or RGBA color to a range of black -> tone -> white instead of + using strict shades of gray. The tone value is an RGB color; any alpha value is ignored. */ /* diff --git a/code/_helpers/type2type.dm b/code/_helpers/type2type.dm index e7f779c508..bfdbb12320 100644 --- a/code/_helpers/type2type.dm +++ b/code/_helpers/type2type.dm @@ -504,21 +504,21 @@ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16) if (l-i & 0x20) . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16) + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16) if (l-i & 0x40) . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64) + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64) while (l > i) // Chomp through the rest of the list, 128 elements at a time. . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64) + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64) #undef S64 #undef S16 @@ -547,12 +547,12 @@ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16) if (l-i & 0x40) . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64) + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64) while (l > i) // Chomp through the rest of the list, 128 elements at a time. . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ - [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64) + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\ + [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64) #undef S64 #undef S16 diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 2c2c5263ea..55c2d230d4 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -9,10 +9,10 @@ //supposedly the fastest way to do this according to https://gist.github.com/Giacom/be635398926bb463b42a #define RANGE_TURFS(RADIUS, CENTER) \ - block( \ - locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ - locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ - ) + block( \ + locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ + locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ + ) //Inverts the colour of an HTML string /proc/invertHTML(HTMLstring) @@ -596,13 +596,13 @@ Turf and target are seperate in case you want to teleport some distance from a t //returns random gauss number /proc/GaussRand(var/sigma) - var/x,y,rsq - do - x=2*rand()-1 - y=2*rand()-1 - rsq=x*x+y*y - while(rsq>1 || !rsq) - return sigma*y*sqrt(-2*log(rsq)/rsq) + var/x,y,rsq + do + x=2*rand()-1 + y=2*rand()-1 + rsq=x*x+y*y + while(rsq>1 || !rsq) + return sigma*y*sqrt(-2*log(rsq)/rsq) //returns random gauss number, rounded to 'roundto' /proc/GaussRandRound(var/sigma,var/roundto) diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index a40ebbb82d..5f374e072c 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -1,14 +1,14 @@ /obj/screen/ai/multicam/Click() - if(..()) - return - var/mob/living/silicon/ai/AI = usr - AI.toggle_multicam() + if(..()) + return + var/mob/living/silicon/ai/AI = usr + AI.toggle_multicam() /obj/screen/ai/add_multicam/Click() - if(..()) - return - var/mob/living/silicon/ai/AI = usr - AI.drop_new_multicam() + if(..()) + return + var/mob/living/silicon/ai/AI = usr + AI.drop_new_multicam() /obj/screen/ai/up/Click() var/mob/living/silicon/ai/AI = usr diff --git a/code/_onclick/hud/minihud_mapper.dm b/code/_onclick/hud/minihud_mapper.dm index b70f655e0e..fd3271973f 100644 --- a/code/_onclick/hud/minihud_mapper.dm +++ b/code/_onclick/hud/minihud_mapper.dm @@ -1,13 +1,13 @@ // Specific types /datum/mini_hud/mapper - var/obj/item/mapping_unit/owner + var/obj/item/mapping_unit/owner /datum/mini_hud/mapper/New(var/datum/hud/other, owner) - src.owner = owner - screenobjs = list(new /obj/screen/movable/mapper_holder(null, owner)) - ..() + src.owner = owner + screenobjs = list(new /obj/screen/movable/mapper_holder(null, owner)) + ..() /datum/mini_hud/mapper/Destroy() - owner?.hud_item = null - owner?.hud_datum = null - return ..() + owner?.hud_item = null + owner?.hud_datum = null + return ..() diff --git a/code/_onclick/hud/soulcatcher_guest.dm b/code/_onclick/hud/soulcatcher_guest.dm index adc9670aa2..c29d7f8a30 100644 --- a/code/_onclick/hud/soulcatcher_guest.dm +++ b/code/_onclick/hud/soulcatcher_guest.dm @@ -27,9 +27,9 @@ icon_state = "arproj" /obj/screen/nifsc/arproj/Click() - ..() - var/mob/living/carbon/brain/caught_soul/CS = usr - CS.ar_project() + ..() + var/mob/living/carbon/brain/caught_soul/CS = usr + CS.ar_project() /obj/screen/nifsc/jumptoowner name = "Jump back to host" diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index 03d414a781..1d2d62a9ad 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -1,63 +1,63 @@ /* - HOW IT WORKS + HOW IT WORKS - The radio_controller is a global object maintaining all radio transmissions, think about it as about "ether". - Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. - procs: + The radio_controller is a global object maintaining all radio transmissions, think about it as about "ether". + Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. + procs: - add_object(obj/device as obj, var/new_frequency as num, var/radio_filter as text|null = null) - Adds listening object. - parameters: - device - device receiving signals, must have proc receive_signal (see description below). - one device may listen several frequencies, but not same frequency twice. - new_frequency - see possibly frequencies below; - radio_filter - thing for optimization. Optional, but recommended. - All filters should be consolidated in this file, see defines later. - Device without listening filter will receive all signals (on specified frequency). - Device with filter will receive any signals sent without filter. - Device with filter will not receive any signals sent with different filter. - returns: - Reference to frequency object. + add_object(obj/device as obj, var/new_frequency as num, var/radio_filter as text|null = null) + Adds listening object. + parameters: + device - device receiving signals, must have proc receive_signal (see description below). + one device may listen several frequencies, but not same frequency twice. + new_frequency - see possibly frequencies below; + radio_filter - thing for optimization. Optional, but recommended. + All filters should be consolidated in this file, see defines later. + Device without listening filter will receive all signals (on specified frequency). + Device with filter will receive any signals sent without filter. + Device with filter will not receive any signals sent with different filter. + returns: + Reference to frequency object. - remove_object (obj/device, old_frequency) - Obliviously, after calling this proc, device will not receive any signals on old_frequency. - Other frequencies will left unaffected. + remove_object (obj/device, old_frequency) + Obliviously, after calling this proc, device will not receive any signals on old_frequency. + Other frequencies will left unaffected. - return_frequency(var/frequency as num) - returns: - Reference to frequency object. Use it if you need to send and do not need to listen. + return_frequency(var/frequency as num) + returns: + Reference to frequency object. Use it if you need to send and do not need to listen. - radio_frequency is a global object maintaining list of devices that listening specific frequency. - procs: + radio_frequency is a global object maintaining list of devices that listening specific frequency. + procs: - post_signal(obj/source as obj|null, datum/signal/signal, var/radio_filter as text|null = null, var/range as num|null = null) - Sends signal to all devices that wants such signal. - parameters: - source - object, emitted signal. Usually, devices will not receive their own signals. - signal - see description below. - radio_filter - described above. - range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. + post_signal(obj/source as obj|null, datum/signal/signal, var/radio_filter as text|null = null, var/range as num|null = null) + Sends signal to all devices that wants such signal. + parameters: + source - object, emitted signal. Usually, devices will not receive their own signals. + signal - see description below. + radio_filter - described above. + range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. - obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) - Handler from received signals. By default does nothing. Define your own for your object. - Avoid of sending signals directly from this proc, use spawn(-1). DO NOT use sleep() here or call procs that sleep please. If you must, use spawn() - parameters: - signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! - receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. - TRANSMISSION_WIRE is currently unused. - receive_param - for TRANSMISSION_RADIO here comes frequency. + obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) + Handler from received signals. By default does nothing. Define your own for your object. + Avoid of sending signals directly from this proc, use spawn(-1). DO NOT use sleep() here or call procs that sleep please. If you must, use spawn() + parameters: + signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! + receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. + TRANSMISSION_WIRE is currently unused. + receive_param - for TRANSMISSION_RADIO here comes frequency. - datum/signal - vars: - source - an object that emitted signal. Used for debug and bearing. - data - list with transmitting data. Usual use pattern: - data["msg"] = "hello world" - encryption - Some number symbolizing "encryption key". - Note that game actually do not use any cryptography here. - If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. + datum/signal + vars: + source + an object that emitted signal. Used for debug and bearing. + data + list with transmitting data. Usual use pattern: + data["msg"] = "hello world" + encryption + Some number symbolizing "encryption key". + Note that game actually do not use any cryptography here. + If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. */ diff --git a/code/controllers/configuration/entries/chompstation.dm b/code/controllers/configuration/entries/chompstation.dm index 6721c9a13b..c0c19a7201 100644 --- a/code/controllers/configuration/entries/chompstation.dm +++ b/code/controllers/configuration/entries/chompstation.dm @@ -67,4 +67,4 @@ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN /datum/config_entry/number/job_camp_time_limit - default = 10 MINUTES + default = 10 MINUTES diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 307e8cf029..de54d6fcdb 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -232,11 +232,11 @@ GLOBAL_LIST_INIT(advance_cures, list( severity = "Unknown" /datum/disease/advance/proc/GenerateCure(list/properties = list()) - if(properties && length(properties)) - var/res = clamp(properties["resistance"] - (length(symptoms) / 2), 1, length(GLOB.advance_cures)) - cures = list(GLOB.advance_cures[res]) - cure_text = cures[1] - return + if(properties && length(properties)) + var/res = clamp(properties["resistance"] - (length(symptoms) / 2), 1, length(GLOB.advance_cures)) + cures = list(GLOB.advance_cures[res]) + cure_text = cures[1] + return // Randomly generate a symptom, has a chance to lose or gain a symptom. /datum/disease/advance/proc/Evolve(min_level, max_level) diff --git a/code/datums/diseases/advance/symptoms/synthetic_infection.dm b/code/datums/diseases/advance/symptoms/synthetic_infection.dm index b34ce07481..7bd565ec9e 100644 --- a/code/datums/diseases/advance/symptoms/synthetic_infection.dm +++ b/code/datums/diseases/advance/symptoms/synthetic_infection.dm @@ -16,13 +16,13 @@ Bonus */ /datum/symptom/infect_synthetics - name = "Synthetic Infection" - stealth = 1 - resistance = 2 - stage_speed = 0 - transmittable = 1 - level = 5 - severity = 3 + name = "Synthetic Infection" + stealth = 1 + resistance = 2 + stage_speed = 0 + transmittable = 1 + level = 5 + severity = 3 /datum/symptom/infect_synthetics/Start(datum/disease/advance/A) A.infect_synthetics = TRUE diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index fb5f5f3422..2457a7dff2 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -304,7 +304,7 @@ /obj/item/gun/projectile/revolver/nova, /obj/item/gun/projectile/revolver/detective, /obj/item/gun/projectile/revolver/deckard, - /obj/item/gun/projectile/revolver/mateba, + /obj/item/gun/projectile/revolver/mateba, /obj/item/gun/projectile/derringer ) cost = 150 diff --git a/code/datums/supplypacks/musical.dm b/code/datums/supplypacks/musical.dm index a7bb61403f..62ff8a8ea9 100644 --- a/code/datums/supplypacks/musical.dm +++ b/code/datums/supplypacks/musical.dm @@ -1,10 +1,10 @@ /datum/supply_pack/musical/strings contains = list( - /obj/item/instrument/violin, - /obj/item/instrument/banjo, - /obj/item/instrument/guitar, - /obj/item/instrument/eguitar, - ) + /obj/item/instrument/violin, + /obj/item/instrument/banjo, + /obj/item/instrument/guitar, + /obj/item/instrument/eguitar, + ) name = "string instruments" desc = "A set of string instruments." cost = 50 @@ -13,14 +13,14 @@ /datum/supply_pack/musical/wind contains = list( - /obj/item/instrument/accordion, - /obj/item/instrument/trumpet, - /obj/item/instrument/saxophone, - /obj/item/instrument/trombone, - /obj/item/instrument/recorder, - /obj/item/instrument/harmonica, - /obj/item/instrument/bikehorn, - ) + /obj/item/instrument/accordion, + /obj/item/instrument/trumpet, + /obj/item/instrument/saxophone, + /obj/item/instrument/trombone, + /obj/item/instrument/recorder, + /obj/item/instrument/harmonica, + /obj/item/instrument/bikehorn, + ) name = "wind instruments" desc = "A set of wind instruments." cost = 50 @@ -29,10 +29,10 @@ /datum/supply_pack/musical/keys contains = list( - /obj/item/instrument/piano_synth, - /obj/item/instrument/glockenspiel, // cough - /obj/item/instrument/musicalmoth - ) + /obj/item/instrument/piano_synth, + /obj/item/instrument/glockenspiel, // cough + /obj/item/instrument/musicalmoth + ) name = "keyed instruments" desc = "A set of keyboard-style instruments." cost = 50 diff --git a/code/game/antagonist/_antagonist_setup.dm b/code/game/antagonist/_antagonist_setup.dm index c1e5002e74..765287ea36 100644 --- a/code/game/antagonist/_antagonist_setup.dm +++ b/code/game/antagonist/_antagonist_setup.dm @@ -1,17 +1,17 @@ /* - MODULAR ANTAGONIST SYSTEM + MODULAR ANTAGONIST SYSTEM - Attempts to move all the bullshit snowflake antag tracking code into its own system, which - has the added bonus of making the display procs consistent. Still needs work/adjustment/cleanup - but should be fairly self-explanatory with a review of the procs. Will supply a few examples - of common tasks that the system will be expected to perform below. ~Z + Attempts to move all the bullshit snowflake antag tracking code into its own system, which + has the added bonus of making the display procs consistent. Still needs work/adjustment/cleanup + but should be fairly self-explanatory with a review of the procs. Will supply a few examples + of common tasks that the system will be expected to perform below. ~Z - To use: - - Get the appropriate datum via get_antag_data("antagonist id") - using the id var of the desired /datum/antagonist ie. var/datum/antagonist/A = get_antag_data("traitor") - - Call add_antagonist() on the desired target mind ie. A.add_antagonist(mob.mind) - - To ignore protected roles, supply a positive second argument. - - To skip equipping with appropriate gear, supply a positive third argument. + To use: + - Get the appropriate datum via get_antag_data("antagonist id") + using the id var of the desired /datum/antagonist ie. var/datum/antagonist/A = get_antag_data("traitor") + - Call add_antagonist() on the desired target mind ie. A.add_antagonist(mob.mind) + - To ignore protected roles, supply a positive second argument. + - To skip equipping with appropriate gear, supply a positive third argument. */ // Globals. diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 7811dc134c..219c1af7b4 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -552,9 +552,9 @@ GLOBAL_DATUM(spoiler_obfuscation_image, /image) cut_overlay(GLOB.spoiler_obfuscation_image) /area/proc/flag_check(var/flag, var/match_all = FALSE) - if(match_all) - return (flags & flag) == flag - return flags & flag + if(match_all) + return (flags & flag) == flag + return flags & flag // RS Port #658 Start /area/proc/check_phase_shift(var/mob/ourmob) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index fba5a3f85a..e31e4c211e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -805,14 +805,14 @@ GLOBAL_LIST_EMPTY(icon_dimensions) /atom/proc/get_oversized_icon_offsets() - if (pixel_x == 0 && pixel_y == 0) - return list("x" = 0, "y" = 0) - var/list/icon_dimensions = get_icon_dimensions(icon) - var/icon_width = icon_dimensions["width"] - var/icon_height = icon_dimensions["height"] - return list( - "x" = icon_width > world.icon_size && pixel_x != 0 ? (icon_width - world.icon_size) * 0.5 : 0, - "y" = icon_height > world.icon_size /*&& pixel_y != 0*/ ? (icon_height - world.icon_size) * 0.5 : 0, // we don't have pixel_y in use + if (pixel_x == 0 && pixel_y == 0) + return list("x" = 0, "y" = 0) + var/list/icon_dimensions = get_icon_dimensions(icon) + var/icon_width = icon_dimensions["width"] + var/icon_height = icon_dimensions["height"] + return list( + "x" = icon_width > world.icon_size && pixel_x != 0 ? (icon_width - world.icon_size) * 0.5 : 0, + "y" = icon_height > world.icon_size /*&& pixel_y != 0*/ ? (icon_height - world.icon_size) * 0.5 : 0, // we don't have pixel_y in use ) /// Returns a list containing the width and height of an icon file diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm index c037b92531..dbdad4b6c7 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm @@ -253,10 +253,10 @@ to_chat(target, "SYSTEM LOG: System re'3RT5°^#COMU@(#$)TED)@$") for(var/i = 0, i < 5, i++) var/temptxt = pick("1101000100101001010001001001",\ - "0101000100100100000100010010",\ - "0000010001001010100100111100",\ - "1010010011110000100101000100",\ - "0010010100010011010001001010") + "0101000100100100000100010010",\ + "0000010001001010100100111100",\ + "1010010011110000100101000100",\ + "0010010100010011010001001010") to_chat(target,temptxt) sleep(5) to_chat(target, "OPERATING KEYCODES RESET. SYSTEM FAILURE. EMERGENCY SHUTDOWN FAILED. SYSTEM FAILURE.") diff --git a/code/game/jobs/job/blueshield.dm b/code/game/jobs/job/blueshield.dm index 8632123ee8..8a9126c7cb 100644 --- a/code/game/jobs/job/blueshield.dm +++ b/code/game/jobs/job/blueshield.dm @@ -14,9 +14,9 @@ minimal_player_age = 3 economic_modifier = 8 access = list(access_security, access_sec_doors, access_brig, - access_medical, access_eva, access_heads, access_teleporter, - access_maint_tunnels, access_morgue, - access_crematorium, access_research, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_blueshield, access_blueshield_exclusive) + access_medical, access_eva, access_heads, access_teleporter, + access_maint_tunnels, access_morgue, + access_crematorium, access_research, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_blueshield, access_blueshield_exclusive) minimal_access = list(access_forensics_lockers, access_sec_doors, access_medical, access_maint_tunnels, access_RC_announce, access_keycard_auth, access_heads, access_blueshield, access_blueshield_exclusive) outfit_type = /decl/hierarchy/outfit/job/blueshield diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 6fb0e28192..ca4e01ff26 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -27,14 +27,14 @@ dept_time_required = 60 access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_construction, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway) + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway) minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_construction, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway) + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway) alt_titles = list(JOB_ALT_HEAD_ENGINEER = /datum/alt_title/head_engineer, JOB_ALT_FOREMAN = /datum/alt_title/foreman, JOB_ALT_MAINTENANCE_MANAGER = /datum/alt_title/maintenance_manager) minimal_player_age = 31 //ChompEDIT diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index f5b7ab095a..6e4b4027cc 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -199,7 +199,7 @@ ///Will first check based on brain type, then based on species. /datum/job/proc/get_min_age(species_name, brain_type) return minimum_character_age // VOREStation Edit - Minimum character age by rules is 18, return default which is standard for all species - //return (brain_type && LAZYACCESS(min_age_by_species, brain_type)) || LAZYACCESS(min_age_by_species, species_name) || minimum_character_age //VOREStation Removal + //return (brain_type && LAZYACCESS(min_age_by_species, brain_type)) || LAZYACCESS(min_age_by_species, species_name) || minimum_character_age //VOREStation Removal /datum/job/proc/get_ideal_age(species_name, brain_type) return ideal_character_age // VOREStation Edit - Minimum character age by rules is 18, return default which is standard for all species diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index b9384807a2..31d889bbb4 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -19,12 +19,12 @@ access_tox_storage, access_teleporter, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network, - access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany + access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_tox_storage, access_teleporter, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network, - access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany + access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany minimum_character_age = 25 minimal_player_age = 31 //ChompEDIT diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 0090223093..649816cab8 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -18,11 +18,11 @@ access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm. + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm. minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm. + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm. minimum_character_age = 25 min_age_by_species = list(SPECIES_HUMAN_VATBORN = 14) minimal_player_age = 31 //ChompEDIT diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 51bfb68a63..d0b95daf63 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -1,87 +1,87 @@ /* Overview: - Used to create objects that need a per step proc call. Default definition of 'New()' - stores a reference to src machine in global 'machines list'. Default definition - of 'Del' removes reference to src machine in global 'machines list'. + Used to create objects that need a per step proc call. Default definition of 'New()' + stores a reference to src machine in global 'machines list'. Default definition + of 'Del' removes reference to src machine in global 'machines list'. Class Variables: - power_init_complete (boolean) - Indicates that we have have registered our static power usage with the area. + power_init_complete (boolean) + Indicates that we have have registered our static power usage with the area. - use_power (num) - current state of auto power use. - Possible Values: - USE_POWER_OFF:0 -- no auto power use - USE_POWER_IDLE:1 -- machine is using power at its idle power level - USE_POWER_ACTIVE:2 -- machine is using power at its active power level + use_power (num) + current state of auto power use. + Possible Values: + USE_POWER_OFF:0 -- no auto power use + USE_POWER_IDLE:1 -- machine is using power at its idle power level + USE_POWER_ACTIVE:2 -- machine is using power at its active power level - active_power_usage (num) - Value for the amount of power to use when in active power mode + active_power_usage (num) + Value for the amount of power to use when in active power mode - idle_power_usage (num) - Value for the amount of power to use when in idle power mode + idle_power_usage (num) + Value for the amount of power to use when in idle power mode - power_channel (num) - What channel to draw from when drawing power for power mode - Possible Values: - EQUIP:0 -- Equipment Channel - LIGHT:2 -- Lighting Channel - ENVIRON:3 -- Environment Channel + power_channel (num) + What channel to draw from when drawing power for power mode + Possible Values: + EQUIP:0 -- Equipment Channel + LIGHT:2 -- Lighting Channel + ENVIRON:3 -- Environment Channel - component_parts (list) - A list of component parts of machine used by frame based machines. + component_parts (list) + A list of component parts of machine used by frame based machines. - panel_open (num) - Whether the panel is open + panel_open (num) + Whether the panel is open - uid (num) - Unique id of machine across all machines. + uid (num) + Unique id of machine across all machines. - gl_uid (global num) - Next uid value in sequence + gl_uid (global num) + Next uid value in sequence - stat (bitflag) - Machine status bit flags. - Possible bit flags: - BROKEN:1 -- Machine is broken - NOPOWER:2 -- No power is being supplied to machine. - POWEROFF:4 -- tbd - MAINT:8 -- machine is currently under going maintenance. - EMPED:16 -- temporary broken by EMP pulse + stat (bitflag) + Machine status bit flags. + Possible bit flags: + BROKEN:1 -- Machine is broken + NOPOWER:2 -- No power is being supplied to machine. + POWEROFF:4 -- tbd + MAINT:8 -- machine is currently under going maintenance. + EMPED:16 -- temporary broken by EMP pulse Class Procs: - New() 'game/machinery/machine.dm' + Initialize(mapload) 'game/machinery/machine.dm' - Destroy() 'game/machinery/machine.dm' + Destroy() 'game/machinery/machine.dm' - get_power_usage() 'game/machinery/machinery_power.dm' - Returns the amount of power this machine uses every SSmachines cycle. - Default definition uses 'use_power', 'active_power_usage', 'idle_power_usage' + get_power_usage() 'game/machinery/machinery_power.dm' + Returns the amount of power this machine uses every SSmachines cycle. + Default definition uses 'use_power', 'active_power_usage', 'idle_power_usage' - powered(chan = CURRENT_CHANNEL) 'game/machinery/machinery_power.dm' - Checks to see if area that contains the object has power available for power - channel given in 'chan'. + powered(chan = CURRENT_CHANNEL) 'game/machinery/machinery_power.dm' + Checks to see if area that contains the object has power available for power + channel given in 'chan'. - use_power_oneoff(amount, chan=CURRENT_CHANNEL) 'game/machinery/machinery_power.dm' - Deducts 'amount' from the power channel 'chan' of the area that contains the object. + use_power_oneoff(amount, chan=CURRENT_CHANNEL) 'game/machinery/machinery_power.dm' + Deducts 'amount' from the power channel 'chan' of the area that contains the object. - power_change() 'game/machinery/machinery_power.dm' - Called by the area that contains the object when ever that area under goes a - power state change (area runs out of power, or area channel is turned off). + power_change() 'game/machinery/machinery_power.dm' + Called by the area that contains the object when ever that area under goes a + power state change (area runs out of power, or area channel is turned off). - RefreshParts() 'game/machinery/machine.dm' - Called to refresh the variables in the machine that are contributed to by parts - contained in the component_parts list. (example: glass and material amounts for - the autolathe) + RefreshParts() 'game/machinery/machine.dm' + Called to refresh the variables in the machine that are contributed to by parts + contained in the component_parts list. (example: glass and material amounts for + the autolathe) - Default definition does nothing. + Default definition does nothing. - assign_uid() 'game/machinery/machine.dm' - Called by machine to assign a value to the uid variable. + assign_uid() 'game/machinery/machine.dm' + Called by machine to assign a value to the uid variable. - process() 'game/machinery/machine.dm' - Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + process() 'game/machinery/machine.dm' + Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. Compiled by Aygar diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 5f0e830edb..0db2961883 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -22,7 +22,7 @@ var/bomb_set var/safety_wire var/timing_wire var/removal_stage = 0 // 0 is no removal, 1 is covers removed, 2 is covers open, - // 3 is sealant open, 4 is unwrenched, 5 is removed from bolts. + // 3 is sealant open, 4 is unwrenched, 5 is removed from bolts. use_power = USE_POWER_OFF /obj/machinery/nuclearbomb/Initialize(mapload) diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm index 152e8a8352..b5c18a088f 100644 --- a/code/game/mecha/combat/fighter.dm +++ b/code/game/mecha/combat/fighter.dm @@ -187,9 +187,9 @@ playsound(src, 'sound/effects/grillehit.ogg', 50, 1) /obj/mecha/combat/fighter/get_step_delay() - . = ..() - if(get_gravity() && !landing_gear_raised) - . += 4 + . = ..() + if(get_gravity() && !landing_gear_raised) + . += 4 /obj/mecha/combat/fighter/handle_equipment_movement() . = ..() diff --git a/code/game/mecha/equipment/tools/storage_compartment.dm b/code/game/mecha/equipment/tools/storage_compartment.dm index e31ad9a429..ff5871db7a 100644 --- a/code/game/mecha/equipment/tools/storage_compartment.dm +++ b/code/game/mecha/equipment/tools/storage_compartment.dm @@ -1,25 +1,25 @@ /obj/item/mecha_parts/mecha_equipment/storage - name = "auxillary exosuit storage bay" - desc = "An auxillary storage compartment, for attaching to exosuits." - icon_state = "mecha_tiler" - icon = 'icons/mecha/mecha_equipment_vr.dmi' - origin_tech = list(TECH_MATERIAL = 3) - range = 0 - var/storage_added = 5 - equip_type = EQUIP_SPECIAL + name = "auxillary exosuit storage bay" + desc = "An auxillary storage compartment, for attaching to exosuits." + icon_state = "mecha_tiler" + icon = 'icons/mecha/mecha_equipment_vr.dmi' + origin_tech = list(TECH_MATERIAL = 3) + range = 0 + var/storage_added = 5 + equip_type = EQUIP_SPECIAL /obj/item/mecha_parts/mecha_equipment/storage/attach(obj/mecha/M) - . = ..() - M.cargo_capacity += storage_added + . = ..() + M.cargo_capacity += storage_added /obj/item/mecha_parts/mecha_equipment/storage/detach() - chassis.cargo_capacity -= storage_added - ..() + chassis.cargo_capacity -= storage_added + ..() /obj/item/mecha_parts/mecha_equipment/storage/bluespace - name = "auxillary exosuit storage wormhole" - desc = "An auxillary storage wormhole, utilizing a localized rip in bluespace for storage. Interestingly enough, teleport-stable, \ - despite its blatant disregard for the fabric of reality or reality-adjacency." - icon_state = "mecha_phase_array" - storage_added = 15 - origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_POWER = 5, TECH_BLUESPACE = 3) + name = "auxillary exosuit storage wormhole" + desc = "An auxillary storage wormhole, utilizing a localized rip in bluespace for storage. Interestingly enough, teleport-stable, \ + despite its blatant disregard for the fabric of reality or reality-adjacency." + icon_state = "mecha_phase_array" + storage_added = 15 + origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_POWER = 5, TECH_BLUESPACE = 3) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 89851235bb..e1ad0684db 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -2175,9 +2175,9 @@ [js_byjax] [js_dropdowns] function ticker() { - setInterval(function(){ - window.location='byond://?src=\ref[src]&update_content=1'; - }, 1000); + setInterval(function(){ + window.location='byond://?src=\ref[src]&update_content=1'; + }, 1000); } window.onload = function() { diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index ce2f5a79c4..502e46fb37 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -49,8 +49,8 @@ set category = "Exosuit Interface" set src = usr.loc var/perspective = input(usr, "Select a perspective type.", - "Client perspective", - occupant.client.perspective) in list(MOB_PERSPECTIVE,EYE_PERSPECTIVE) + "Client perspective", + occupant.client.perspective) in list(MOB_PERSPECTIVE,EYE_PERSPECTIVE) to_world("[perspective]") occupant.client.perspective = perspective return diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 41c26220a7..c59a172281 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -157,8 +157,8 @@ var/global/list/image/splatter_cache=list() user.ContractDisease(D) /obj/effect/decal/cleanable/blood/splatter - random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") - amount = 2 + random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") + amount = 2 /obj/effect/decal/cleanable/blood/drip name = "drips of blood" diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 189ce5ec38..27417ce5de 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -152,90 +152,90 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard)
@@ -330,7 +330,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) else dat += {" "} + span_bold("pAI Request Module") + {"No personality is installed.
+No personality is installed.
| Request personality
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index c56d0d2add..1052dbe93f 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -218,7 +218,7 @@
to_chat(user, span_notice("\The [src]'s frequency is now set to [span_pink(span_bold("AI Private"))]."))
//VOREStation Add End
/obj/item/radio/intercom/locked
- var/locked_frequency
+ var/locked_frequency
/obj/item/radio/intercom/locked/set_frequency(var/frequency)
if(frequency == locked_frequency)
diff --git a/code/game/objects/items/devices/radio/radio_ch.dm b/code/game/objects/items/devices/radio/radio_ch.dm
index 0bf08a035e..7e0b70e795 100644
--- a/code/game/objects/items/devices/radio/radio_ch.dm
+++ b/code/game/objects/items/devices/radio/radio_ch.dm
@@ -1,54 +1,54 @@
-#define CANBROADCAST_INNERBOX 0.7071067811865476 //This is sqrt(2)/2
+#define CANBROADCAST_INNERBOX 0.7071067811865476 //This is sqrt(2)/2
/obj/item/radio/proc/can_broadcast_to()
- var/list/output = list()
- var/turf/T = get_turf(src)
- var/dnumber = canhear_range*CANBROADCAST_INNERBOX
- for(var/cand_x = max(0, T.x - canhear_range), cand_x <= T.x + canhear_range, cand_x++)
- for(var/cand_y = max(0, T.y - canhear_range), cand_y <= T.y + canhear_range, cand_y++)
- var/turf/cand_turf = locate(cand_x,cand_y,T.z)
- if(!cand_turf)
- continue
- if((abs(T.x - cand_x) < dnumber) || (abs(T.y - cand_y) < dnumber))
- output += cand_turf
- continue
- if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range)
- output += cand_turf
- continue
- return output
+ var/list/output = list()
+ var/turf/T = get_turf(src)
+ var/dnumber = canhear_range*CANBROADCAST_INNERBOX
+ for(var/cand_x = max(0, T.x - canhear_range), cand_x <= T.x + canhear_range, cand_x++)
+ for(var/cand_y = max(0, T.y - canhear_range), cand_y <= T.y + canhear_range, cand_y++)
+ var/turf/cand_turf = locate(cand_x,cand_y,T.z)
+ if(!cand_turf)
+ continue
+ if((abs(T.x - cand_x) < dnumber) || (abs(T.y - cand_y) < dnumber))
+ output += cand_turf
+ continue
+ if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range)
+ output += cand_turf
+ continue
+ return output
/obj/item/radio/intercom
- var/list/broadcast_tiles
+ var/list/broadcast_tiles
/obj/item/radio/intercom/proc/update_broadcast_tiles()
- var/list/output = list()
- var/turf/T = get_turf(src)
- if(!T)
- return
- var/dnumber = canhear_range*CANBROADCAST_INNERBOX
- for(var/cand_x = max(0, T.x - canhear_range), cand_x <= T.x + canhear_range, cand_x++)
- for(var/cand_y = max(0, T.y - canhear_range), cand_y <= T.y + canhear_range, cand_y++)
- var/turf/cand_turf = locate(cand_x,cand_y,T.z)
- if(!cand_turf)
- continue
- if((abs(T.x - cand_x) < dnumber) || (abs(T.y - cand_y) < dnumber))
- output += cand_turf
- continue
- if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range)
- output += cand_turf
- continue
- broadcast_tiles = output
+ var/list/output = list()
+ var/turf/T = get_turf(src)
+ if(!T)
+ return
+ var/dnumber = canhear_range*CANBROADCAST_INNERBOX
+ for(var/cand_x = max(0, T.x - canhear_range), cand_x <= T.x + canhear_range, cand_x++)
+ for(var/cand_y = max(0, T.y - canhear_range), cand_y <= T.y + canhear_range, cand_y++)
+ var/turf/cand_turf = locate(cand_x,cand_y,T.z)
+ if(!cand_turf)
+ continue
+ if((abs(T.x - cand_x) < dnumber) || (abs(T.y - cand_y) < dnumber))
+ output += cand_turf
+ continue
+ if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range)
+ output += cand_turf
+ continue
+ broadcast_tiles = output
/obj/item/radio/intercom/forceMove(atom/destination)
- . = ..()
- update_broadcast_tiles()
+ . = ..()
+ update_broadcast_tiles()
/obj/item/radio/intercom/Initialize(mapload)
- . = ..()
- update_broadcast_tiles()
+ . = ..()
+ update_broadcast_tiles()
/obj/item/radio/intercom/can_broadcast_to()
- if(!broadcast_tiles)
- update_broadcast_tiles()
- return broadcast_tiles
+ if(!broadcast_tiles)
+ update_broadcast_tiles()
+ return broadcast_tiles
//*Subspace Radio*//
/obj/item/radio/subspace
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index e1b583448e..b6b5da218b 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -108,7 +108,7 @@
else
var/available = get_amount()
user.balloon_alert_visible("\the [user] starts bandaging [M]'s [affecting.name].", \
- "bandaging [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "bandaging [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
var/used = 0
for (var/datum/wound/W in affecting.wounds)
if(W.internal)
@@ -131,10 +131,10 @@
if (W.current_stage <= W.max_bleeding_stage)
user.balloon_alert_visible("\the [user] bandages \a [W.desc] on [M]'s [affecting.name].", \
- "you bandage \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "you bandage \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else
user.balloon_alert_visible("\the [user] places a bandage over \a [W.desc] on [M]'s [affecting.name].", \
- "you place a bandage over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "you place a bandage over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
W.bandage()
playsound(src, pick(apply_sounds), 25)
used++
@@ -177,7 +177,7 @@
else
var/available = get_amount()
user.balloon_alert_visible("\the [user] starts treating [M]'s [affecting.name].", \
- "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
var/used = 0
for (var/datum/wound/W in affecting.wounds)
if (W.internal)
@@ -200,14 +200,14 @@
if (W.current_stage <= W.max_bleeding_stage)
user.balloon_alert_visible("\the [user] bandages \a [W.desc] on [M]'s [affecting.name].", \
- "bandaged \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "bandaged \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
//H.add_side_effect("Itch")
else if (W.damage_type == BRUISE)
user.balloon_alert_visible("\the [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name].", \
- "placed bruise patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "placed bruise patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else
user.balloon_alert_visible("\the [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].", \
- "placed bandaid over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "placed bandaid over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
W.bandage()
// W.disinfect() // VOREStation - Tech1 should not disinfect
playsound(src, pick(apply_sounds), 25)
@@ -250,7 +250,7 @@
return 1
else
user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \
- "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
+ "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
if(!do_mob(user, M, 10, exclusive = TRUE))
balloon_alert(user, "stand still to salve wounds.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return 1
@@ -258,7 +258,7 @@
balloon_alert(user, "[M]'s [affecting.name] have already been salved.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return 1
user.balloon_alert_visible("[user] salved wounds on [M]'s [affecting.name].", \
- "salved wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
+ "salved wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
use(1)
affecting.salve()
playsound(src, pick(apply_sounds), 25)
@@ -296,7 +296,7 @@
else
var/available = get_amount()
user.balloon_alert_visible("\the [user] starts treating [M]'s [affecting.name].", \
- "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
+ "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
var/used = 0
for (var/datum/wound/W in affecting.wounds)
if (W.internal)
@@ -318,13 +318,13 @@
if (W.current_stage <= W.max_bleeding_stage)
user.balloon_alert_visible("\the [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.", \
- "cleaning and sealing \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "cleaning and sealing \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else if (W.damage_type == BRUISE)
user.balloon_alert_visible("\the [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name].", \
- "placed medical patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "placed medical patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else
user.balloon_alert_visible("\the [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name].", \
- "smeared bioglue over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "smeared bioglue over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
W.bandage()
W.disinfect()
W.heal_damage(heal_brute)
@@ -364,7 +364,7 @@
return 1
else
user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \
- "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
+ "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
if(!do_mob(user, M, 10, exclusive = TRUE))
balloon_alert(user, "stand still to salve wounds.") // CHOMPEdit - Balloon Alerts
return 1
diff --git a/code/game/objects/items/surplus_voucher_ch.dm b/code/game/objects/items/surplus_voucher_ch.dm
index a32bd892bc..a634a55392 100644
--- a/code/game/objects/items/surplus_voucher_ch.dm
+++ b/code/game/objects/items/surplus_voucher_ch.dm
@@ -147,7 +147,7 @@
prob(2);/obj/item/ammo_magazine/ammo_box/b12g/stunshell,
prob(2);/obj/item/ammo_magazine/m45/rubber,
prob(2);/obj/item/ammo_magazine/m9mmt/rubber,
- prob(2);/obj/item/cell/device/weapon,
+ prob(2);/obj/item/cell/device/weapon,
prob(1);/obj/item/toy/plushie/borgplushie)
playsound(T, 'sound/effects/phasein.ogg', 25, 1)
new path(T)
diff --git a/code/game/objects/items/toys/toys_ch.dm b/code/game/objects/items/toys/toys_ch.dm
index ea2767b0e2..823da4c359 100644
--- a/code/game/objects/items/toys/toys_ch.dm
+++ b/code/game/objects/items/toys/toys_ch.dm
@@ -19,10 +19,10 @@
toysay = "Attention! Alert level elevated to blue."
/obj/item/toy/plushie/green_fox
- name = "green fox plushie"
- icon = 'icons/obj/toy_ch.dmi'
- icon_state = "greenfox"
- pokephrase = "Weh!"
+ name = "green fox plushie"
+ icon = 'icons/obj/toy_ch.dmi'
+ icon_state = "greenfox"
+ pokephrase = "Weh!"
/obj/item/toy/plushie/red_dragon
name = "red dragon plushie"
diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm
index b968f0654a..2af2af0fde 100644
--- a/code/game/objects/items/weapons/canes.dm
+++ b/code/game/objects/items/weapons/canes.dm
@@ -72,11 +72,11 @@
icon_state = "whitecane"
/obj/item/cane/white/attack(mob/M as mob, mob/user as mob)
- if(user.a_intent == I_HELP)
- user.visible_message(span_notice("\The [user] has lightly tapped [M] on the ankle with their white cane!"))
- return TRUE
- else
- . = ..()
+ if(user.a_intent == I_HELP)
+ user.visible_message(span_notice("\The [user] has lightly tapped [M] on the ankle with their white cane!"))
+ return TRUE
+ else
+ . = ..()
//Code for Telescopic White Cane writen by Gozulio
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index b667bf6921..83c26eb1f5 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -774,22 +774,22 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "skullzippo"
/obj/item/flame/lighter/supermatter
- name = "Hardlight Supermatter Zippo" // Base SM Lighter
- desc = "State of the Art Supermatter Lighter."
- description_fluff = "A zippo style lighter with a tiny supermatter sliver held by a hardlight shield. When lighting a cigar, make sure to hover the tip near the sliver, not against it!"
- icon_state = "SMzippo"
- item_state = "SMzippo"
- activation_sound = 'sound/items/zippo_on_alt.ogg'
- deactivation_sound = 'sound/items/zippo_off.ogg'
+ name = "Hardlight Supermatter Zippo" // Base SM Lighter
+ desc = "State of the Art Supermatter Lighter."
+ description_fluff = "A zippo style lighter with a tiny supermatter sliver held by a hardlight shield. When lighting a cigar, make sure to hover the tip near the sliver, not against it!"
+ icon_state = "SMzippo"
+ item_state = "SMzippo"
+ activation_sound = 'sound/items/zippo_on_alt.ogg'
+ deactivation_sound = 'sound/items/zippo_off.ogg'
/obj/item/flame/lighter/supermatter/syndismzippo
- name = "Phoron Supermatter Zippo" // Syndicate SM Lighter
- desc = "State of the Art Supermatter Lighter."
- description_fluff = "A red zippo style lighter with a tiny supermatter sliver held by a phoron field."
- icon_state = "SyndiSMzippo"
- item_state = "SyndiSMzippo"
- activation_sound = 'sound/items/zippo_on_alt.ogg'
- deactivation_sound = 'sound/items/zippo_off.ogg'
+ name = "Phoron Supermatter Zippo" // Syndicate SM Lighter
+ desc = "State of the Art Supermatter Lighter."
+ description_fluff = "A red zippo style lighter with a tiny supermatter sliver held by a phoron field."
+ icon_state = "SyndiSMzippo"
+ item_state = "SyndiSMzippo"
+ activation_sound = 'sound/items/zippo_on_alt.ogg'
+ deactivation_sound = 'sound/items/zippo_off.ogg'
/obj/item/flame/lighter/supermatter/expsmzippo
name = "Experimental SM Lighter" // Dangerous WIP (admin/event only ATM)
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 52dcb2d808..69a7ff4e98 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -262,17 +262,17 @@
+ R-UST STANDARD STARTUP PROCEDURE-The Engine Control Room and what to know.--
The Engine Control Room and what to know.++ Food for Dummies 2Food for Dummies 2Penned by Ali Big-Hello Newbie, congratz on deciding to make food! This guide assumes you know absolutely nothing, so fret not, the information here will help you prepare food for your hungry crewmates! +Hello Newbie, congratz on deciding to make food! This guide assumes you know absolutely nothing, so fret not, the information here will help you prepare food for your hungry crewmates! Workspace prep:This step is simple: merely go to the Grill, Oven, and Fryer and turn everything on so you do not need to wait for them to warm up later; they won't start a fire unless food is left in them unchecked. It is also highly suggested to lay out at least a few Measuring Cups on the counters for ease of use. -Basic ingredient prep:+Basic ingredient prep:In the lockers and fridges, you have all your needed supplies for this guide, so look through them and familiarize yourself! This guide will only use ingredients you already have access to, so don't worry about missing items! -Part 1: How to Create Various Essential Ingredients with What You Have-Dough Creation:+Part 1: How to Create Various Essential Ingredients with What You Have+Dough Creation:The basis for a large quantity of meals. Simply take an Egg, crack it into a Beaker or Measuring Cup, and then add 10 units of Flour to create Dough.Dough Creation part 2:With Dough, you can make a wide variety of base ingredients. Flattening it with a Rolling Pin makes Flat Dough. Flat Dough can be cooked in a Microwave for Flatbread, or if one adds Water and Flour in with the Flat Dough in the Microwave you get a Tortilla. Water can be obtained by filling a Cup at the Sink or Soda Machine. @@ -94,7 +94,7 @@ Mix Animal protein and Flour, to create Animal Protein grind down some Meat in the grinder, then remove the beaker and add Flour.Meat Uses:Full pieces of Meat can be cut for Raw Cutlets, which can be cut once more to make Raw Bacon. Though be sure not to cut all of your meat, plenty of recipes need a full uncut piece! -Part 2: Putting It All Together+Part 2: Putting It All TogetherNow that you know the fundamentals of how to make the base ingredients, here are some fairly easy recipes to put them together into something enjoyable for the crew. Warning: recipes are upscale able, so you can add multiple of the same ingredients in the same ratio to cook lots of food at once!Warning: do not try and cook multiple recipes at once as it is very likely it will default to a different recipe or will just cook the one and just "grill, bake, etc." the rest of the ingredients.@@ -124,8 +124,8 @@((The Food Bags in the Chef's Closet are great for moving a lot of food at once!))((Stay out of the Freezer if you're Cold Blooded!))((The websites linked above are also on our stations wiki. Which is always in need of helping heads to fix it up. The recipes listed on the web link may not be fully accurate so please don't be afraid to pop into the discord wiki channel and lend a hand!))- - + + |