From c8aff28c5b5b3fd4f3bbb80e92a71868508518b2 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 14 Mar 2025 11:37:13 +0100 Subject: [PATCH] space cleanup (#17300) * space cleanup * this * this too --------- Co-authored-by: Cameron Lennox --- archive/maps/cynosure/cynosure_jobs.dm | 20 +- archive/maps/cynosure/cynosure_shuttles.dm | 56 +- archive/maps/submaps/depreciated_vr/talon.dm | 2 +- code/ATMOSPHERICS/pipes/tank.dm | 2 +- code/ZAS/ConnectionGroup.dm | 2 +- code/__defines/MC.dm | 12 +- code/__defines/_protect.dm | 6 +- code/__defines/borg_overlays.dm | 4 +- code/__defines/machinery.dm | 2 +- code/__defines/rust_g.dm | 114 ++--- code/_global_vars/lists/mapping.dm | 8 +- code/_helpers/icons_procs.dm | 116 ++--- code/_helpers/type2type.dm | 30 +- code/_helpers/unsorted.dm | 22 +- code/_onclick/hud/ai.dm | 16 +- code/_onclick/hud/minihud_mapper.dm | 14 +- code/_onclick/hud/soulcatcher_guest.dm | 6 +- code/controllers/communications.dm | 102 ++-- code/datums/diseases/advance/advance.dm | 10 +- .../advance/symptoms/synthetic_infection.dm | 14 +- code/datums/supplypacks/musical.dm | 34 +- code/game/antagonist/_antagonist_setup.dm | 22 +- code/game/area/areas.dm | 6 +- code/game/atoms.dm | 16 +- .../tree_interdiction.dm | 8 +- code/game/jobs/job/engineering.dm | 12 +- code/game/jobs/job/job.dm | 2 +- code/game/jobs/job/science.dm | 12 +- code/game/machinery/machinery.dm | 118 ++--- code/game/machinery/nuclear_bomb.dm | 2 +- code/game/mecha/combat/fighter.dm | 6 +- .../equipment/tools/storage_compartment.dm | 36 +- code/game/mecha/mecha.dm | 6 +- code/game/mecha/medical/odysseus.dm | 4 +- .../effects/decals/Cleanable/humans.dm | 4 +- code/game/objects/items/devices/paicard.dm | 96 ++-- .../objects/items/devices/radio/intercom.dm | 2 +- code/game/objects/items/stacks/medical.dm | 28 +- code/game/objects/items/weapons/canes.dm | 10 +- .../objects/items/weapons/cigs_lighters.dm | 28 +- code/game/objects/items/weapons/manuals_vr.dm | 482 +++++++++--------- .../items/weapons/material/twohanded_vr.dm | 26 +- code/game/objects/structures/droppod.dm | 14 +- .../game/objects/structures/flora/flora_vr.dm | 14 +- code/game/objects/structures/loot_piles.dm | 86 ++-- code/game/objects/structures/trash_pile_vr.dm | 4 +- code/game/response_team.dm | 2 +- code/game/turfs/snow/snow.dm | 42 +- code/js/menus.dm | 66 +-- code/modules/admin/admin_attack_log.dm | 8 +- code/modules/admin/topic.dm | 6 +- code/modules/admin/verbs/mapping.dm | 58 +-- code/modules/admin/verbs/resize.dm | 36 +- code/modules/awaymissions/gateway_vr.dm | 30 +- code/modules/awaymissions/zlevel.dm | 4 +- code/modules/blob2/overmind/types.dm | 2 +- .../loadout/loadout_fluffitems.dm | 60 +-- .../preference_setup/loadout/loadout_shoes.dm | 24 +- .../preference_setup/loadout/loadout_suit.dm | 28 +- .../loadout/loadout_uniform.dm | 24 +- code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/clothing/glasses/hud_vr.dm | 46 +- code/modules/clothing/head/hood.dm | 26 +- code/modules/clothing/masks/miscellaneous.dm | 14 +- code/modules/clothing/shoes/boots.dm | 12 +- code/modules/clothing/suits/hooded.dm | 35 +- code/modules/clothing/suits/miscellaneous.dm | 26 +- code/modules/clothing/under/miscellaneous.dm | 126 ++--- code/modules/economy/cash_register.dm | 8 +- code/modules/economy/vending_machines_vr.dm | 2 +- code/modules/emotes/definitions/helpers_vr.dm | 32 +- code/modules/emotes/definitions/visible_vr.dm | 8 +- code/modules/emotes/emote_define.dm | 4 +- code/modules/food/food/lunch.dm | 278 +++++----- code/modules/food/recipe.dm | 2 +- code/modules/food/recipe_dump.dm | 4 +- code/modules/hydroponics/trays/tray_tools.dm | 10 +- code/modules/icon generation/Uristrunes.dm | 74 +-- .../integrated_electronics/core/pins.dm | 4 +- .../core/special_pins/ref_pin.dm | 16 +- .../hardcode_library/reference/PortedBooks.dm | 2 +- code/modules/lighting/__lighting_docs.dm | 82 +-- code/modules/lighting/lighting_source.dm | 72 +-- code/modules/lore_codex/news_data/main.dm | 12 +- code/modules/mining/kinetic_crusher.dm | 4 +- code/modules/mob/_modifiers/crusher_mark.dm | 48 +- code/modules/mob/freelook/eye.dm | 6 +- code/modules/mob/hear_say.dm | 12 +- code/modules/mob/language/station_vr.dm | 4 +- code/modules/mob/living/carbon/lick_wounds.dm | 12 +- code/modules/mob/living/living_defense.dm | 2 +- .../living/simple_mob/subtypes/vore/pakkun.dm | 18 +- .../living/simple_mob/subtypes/vore/raptor.dm | 14 +- .../mob/new_player/sprite_accessories_ear.dm | 16 +- .../mob/new_player/sprite_accessories_tail.dm | 60 +-- .../mob/new_player/sprite_accessories_wing.dm | 10 +- code/modules/organs/robolimbs_vr.dm | 20 +- code/modules/persistence/paintings.dm | 2 +- code/modules/persistence/storage/storage.dm | 10 +- code/modules/power/lighting_vr.dm | 24 +- code/modules/power/singularity/singularity.dm | 14 +- code/modules/power/supermatter/supermatter.dm | 2 +- .../projectiles/guns/energy/special_vr.dm | 2 +- .../projectiles/guns/launcher/pneumatic.dm | 16 +- code/modules/projectiles/projectile/beams.dm | 22 +- .../reagents/reactions/fusion/fusion.dm | 2 +- .../reagents/reactions/instant/drinks.dm | 12 +- .../reagents/reactions/instant/instant_vr.dm | 26 +- code/modules/shuttles/shuttle.dm | 26 +- code/modules/surgery/external_repair.dm | 6 +- code/modules/surgery/robotics.dm | 2 +- code/modules/tables/interactions.dm | 2 +- code/modules/tables/tables.dm | 26 +- .../tgui/modules/trait_tutorial_tgui.dm | 2 +- code/modules/turbolift/turbolift_door_vr.dm | 4 +- code/modules/turbolift/turbolift_map.dm | 10 +- .../vore/eating/bellymodes_datum_vr.dm | 2 +- code/modules/vore/eating/living_vr.dm | 50 +- code/modules/vore/eating/vore_vr.dm | 2 +- .../vore/fluffstuff/custom_clothes_vr.dm | 14 +- .../vore/fluffstuff/custom_items_vr.dm | 59 ++- code/modules/vote/vote_datum.dm | 108 ++-- maps/common/common_things.dm | 2 +- maps/gateway_vr/variable/honlethhighlands.dm | 16 +- maps/offmap_vr/om_ships/vespa.dm | 30 +- maps/tether/tether_areas.dm | 14 +- maps/~map_system/maps.dm | 36 +- tools/Redirector/textprocs.dm | 28 +- 128 files changed, 1859 insertions(+), 1861 deletions(-) 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 e379d5c3ee..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 = "maps/cynosure/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/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/_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 2721e2ebdf..f8f506ef28 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 06acddfe44..953251c6e1 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) @@ -566,13 +566,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 76c209d595..ff65c032fb 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 e8d76099c7..6950f2c34a 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/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/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 c92c9692ad..ad53f1f0e0 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 0fbe1e841e..179457a1af 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -831,14 +831,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/engineering.dm b/code/game/jobs/job/engineering.dm index ed05478e97..ccdb6fc0e1 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 = 7 diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 70ef6a26cd..d6e8d75a8b 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -195,7 +195,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 cae936a446..c457ddd58a 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -16,13 +16,13 @@ req_admin_notify = 1 economic_modifier = 15 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_xenoarch, access_eva, access_network, access_xenobotany) + 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_xenoarch, access_eva, access_network, access_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_xenobotany) + 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_xenobotany) minimum_character_age = 25 minimal_player_age = 14 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 44b887d782..f8914af288 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 248ac34be4..3bb4fbd15b 100644 --- a/code/game/mecha/combat/fighter.dm +++ b/code/game/mecha/combat/fighter.dm @@ -186,9 +186,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 39b6c162f7..ad90045170 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -2169,9 +2169,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 b50cc512f9..6e58faf206 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 f4bde62703..411685d4cf 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -149,90 +149,90 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) @@ -327,7 +327,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 3b61a09c35..dd9ca79815 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -211,7 +211,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/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 94c9a464b9..c4baeff254 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.visible_message(span_infoplain(span_bold("\The [user]") + " starts bandaging [M]'s [affecting.name]."), \ - span_notice("You start bandaging [M]'s [affecting.name].")) + span_notice("You start bandaging [M]'s [affecting.name].")) 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.visible_message(span_infoplain(span_bold("\The [user]") + " bandages \a [W.desc] on [M]'s [affecting.name]."), \ - span_notice("You bandage \a [W.desc] on [M]'s [affecting.name].")) + span_notice("You bandage \a [W.desc] on [M]'s [affecting.name].")) else user.visible_message(span_infoplain(span_bold("\The [user]") + " places a bandage over \a [W.desc] on [M]'s [affecting.name]."), \ - span_notice("You place a bandage over \a [W.desc] on [M]'s [affecting.name].")) + span_notice("You place a bandage over \a [W.desc] on [M]'s [affecting.name].")) W.bandage() playsound(src, pick(apply_sounds), 25) used++ @@ -177,7 +177,7 @@ else var/available = get_amount() user.visible_message(span_infoplain(span_bold("\The [user]") + " starts treating [M]'s [affecting.name]."), \ - span_notice("You start treating [M]'s [affecting.name].")) + span_notice("You start treating [M]'s [affecting.name].")) 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.visible_message(span_infoplain(span_bold("\The [user]") + " bandages \a [W.desc] on [M]'s [affecting.name]."), \ - span_notice("You bandage \a [W.desc] on [M]'s [affecting.name].")) + span_notice("You bandage \a [W.desc] on [M]'s [affecting.name].")) //H.add_side_effect("Itch") else if (W.damage_type == BRUISE) user.visible_message(span_infoplain(span_bold("\The [user]") + " places a bruise patch over \a [W.desc] on [M]'s [affecting.name]."), \ - span_notice("You place a bruise patch over \a [W.desc] on [M]'s [affecting.name].")) + span_notice("You place a bruise patch over \a [W.desc] on [M]'s [affecting.name].")) else user.visible_message(span_infoplain(span_bold("\The [user]") + " places a bandaid over \a [W.desc] on [M]'s [affecting.name]."), \ - span_notice("You place a bandaid over \a [W.desc] on [M]'s [affecting.name].")) + span_notice("You place a bandaid over \a [W.desc] on [M]'s [affecting.name].")) W.bandage() // W.disinfect() // VOREStation - Tech1 should not disinfect playsound(src, pick(apply_sounds), 25) @@ -250,7 +250,7 @@ return 1 else user.visible_message(span_infoplain(span_bold("\The [user]") + " starts salving wounds on [M]'s [affecting.name]."), \ - span_notice("You start salving the wounds on [M]'s [affecting.name].") ) + span_notice("You start salving the wounds on [M]'s [affecting.name].") ) if(!do_mob(user, M, 10, exclusive = TRUE)) to_chat(user, span_notice("You must stand still to salve wounds.")) return 1 @@ -258,7 +258,7 @@ to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been salved.")) return 1 user.visible_message(span_notice("[user] salved wounds on [M]'s [affecting.name]."), \ - span_notice("You salved wounds on [M]'s [affecting.name].") ) + span_notice("You salved wounds on [M]'s [affecting.name].") ) use(1) affecting.salve() playsound(src, pick(apply_sounds), 25) @@ -296,7 +296,7 @@ else var/available = get_amount() user.visible_message(span_infoplain(span_bold("\The [user]") + " starts treating [M]'s [affecting.name]."), \ - span_notice("You start treating [M]'s [affecting.name].") ) + span_notice("You start treating [M]'s [affecting.name].") ) 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.visible_message(span_infoplain(span_bold("\The [user]") + " cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue."), \ - span_notice("You clean and seal \a [W.desc] on [M]'s [affecting.name].") ) + span_notice("You clean and seal \a [W.desc] on [M]'s [affecting.name].") ) else if (W.damage_type == BRUISE) user.visible_message(span_infoplain(span_bold("\The [user]") + " places a medical patch over \a [W.desc] on [M]'s [affecting.name]."), \ - span_notice("You place a medical patch over \a [W.desc] on [M]'s [affecting.name].") ) + span_notice("You place a medical patch over \a [W.desc] on [M]'s [affecting.name].") ) else user.visible_message(span_infoplain(span_bold("\The [user]") + " smears some bioglue over \a [W.desc] on [M]'s [affecting.name]."), \ - span_notice("You smear some bioglue over \a [W.desc] on [M]'s [affecting.name].") ) + span_notice("You smear some bioglue over \a [W.desc] on [M]'s [affecting.name].") ) W.bandage() W.disinfect() W.heal_damage(heal_brute) @@ -364,7 +364,7 @@ return 1 else user.visible_message(span_infoplain(span_bold("\The [user]") + " starts salving wounds on [M]'s [affecting.name]."), \ - span_notice("You start salving the wounds on [M]'s [affecting.name].") ) + span_notice("You start salving the wounds on [M]'s [affecting.name].") ) if(!do_mob(user, M, 10, exclusive = TRUE)) to_chat(user, span_notice("You must stand still to salve wounds.")) return 1 diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm index 1e4d4e4a11..a5143939c8 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 1f772776b9..4184dec4d6 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -768,22 +768,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_vr.dm b/code/game/objects/items/weapons/manuals_vr.dm index b5665b6cb7..61ee8ba2d9 100644 --- a/code/game/objects/items/weapons/manuals_vr.dm +++ b/code/game/objects/items/weapons/manuals_vr.dm @@ -57,30 +57,30 @@ . = ..() dat = {" - - - - - -

Food for Dummies 2

+ li {margin: 2px 0px 2px 15px;} + ul {margin: 5px; padding: 0px;} + ol {margin: 5px; padding: 0px 15px;} + body {font-size: 13px; font-family: Garamond;} + + + +

Food for Dummies 2

Penned 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 Together

Now 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!))

- - + + "} //accurate as of 2/23/21 @@ -141,207 +141,207 @@ . = ..() dat = {" - - - - -

How to Alcohol (And other Drinks)

-
Penned by Ali Big
-

Hello, and congratulations on taking on the admirable, and often thankless task of making Drinks for your fellow crewmates (or perhaps yourself if you hopped the bar, how rude!).

-

This guide will walk through the essentials of drink making... don't worry, it's not too complex! Recipes have been placed at the top for ease of use, but further down there is an actual guide as to how to make drinks, so give it a read if you don't know how, or just want some tips!

-

Part 0: Recipes Quick Reference (Ordered by strength, non-exhaustive list)

-

Low Alcohol:

-

Grog :

- 1 part Rum, 1 part Water -

Sui Dream:

- 1 part Space-Up, 1 part Miss Blue Curacao, 1 part Emeraldine Melon Liquor -

Baloon:

- 1 part Cream, 1 part Miss Blue Curacao -

Gin and Tonic:

- 1 part Gin, 1 part Tonic -

Appletini:

- 2 parts Apple Juice, 1 part Vodka -

Medium Alcohol

-

Giant Beer:

Chrysanthemum: - 1 part Sake, 1 part Emeraldine Melon Liquor -

Barefoot:

- 1 part Berry Juice, 1 part Cream, 1 part Vermouth. -

Clover Club:

- 1 part Berry Juice, 1 Part Lemon Juice, 3 parts Gin -

Cold Front:

- 1 part Iced Coffee, 1 part Whiskey, 1 part Mint (Allergy Warning: do not give to any species with less cold tolerance than Teshari, they will die if you do, if unsure do not serve) -

Cuba Libre (Often called Rum and Coke):

- 1 part Space Cola, 2 parts Rum. -

Negroni Sbagliato:

- 1 part Wine, 1 part Bermouth, 1 part Soda Water -

Slow Comfortable Screw Against the Wall (Stop giggling!):

- 3 parts Screwdriver, 1 part Rum, 1 part Whiskey, 1 part Gin -

Space Bulldog:

- 4 parts White Russian, 1 part Cola -

Sweet Rush:

- 1 part Sugar, 1 part Soda Water, 1 part Vodka. -

Allies Cocktail:

- 1 part Classic Martini, 1 part Vodka -

Bahama Mama:

- 1 part Ice, 2 parts Orange Juice, 1 part Lime Juice, 2 parts Rum -

Classic Martini:

- 2 parts Gin, 1 part Vermouth -

Daiquiri:

- 3 Rum, 2 Lime Juice, 1 Sugar -

Ginza Mary:

- 2 part Sake, 2 part Vodka, 1 part Tomato Juice -

Irish Cream:

- 2 parts Whiskey, 1 part Cream -

Lotus:

- 1 part Negroni Sbagliato, 1 part Sweet Rush -

Tequila Sunrise:

- 2 parts Tequila, 1 part Orange Juice -

The Manly Dorf:

- 1 part Beer, 2 parts Ale -

Whiskey Cola:

- 2 parts Whiskey, 1 part Space Cola -

Binman Bliss:

- 1 part Sake, 1 part Tequila + + + + +

How to Alcohol (And other Drinks)

+
Penned by Ali Big
+

Hello, and congratulations on taking on the admirable, and often thankless task of making Drinks for your fellow crewmates (or perhaps yourself if you hopped the bar, how rude!).

+

This guide will walk through the essentials of drink making... don't worry, it's not too complex! Recipes have been placed at the top for ease of use, but further down there is an actual guide as to how to make drinks, so give it a read if you don't know how, or just want some tips!

+

Part 0: Recipes Quick Reference (Ordered by strength, non-exhaustive list)

+

Low Alcohol:

+

Grog :

+ 1 part Rum, 1 part Water +

Sui Dream:

+ 1 part Space-Up, 1 part Miss Blue Curacao, 1 part Emeraldine Melon Liquor +

Baloon:

+ 1 part Cream, 1 part Miss Blue Curacao +

Gin and Tonic:

+ 1 part Gin, 1 part Tonic +

Appletini:

+ 2 parts Apple Juice, 1 part Vodka +

Medium Alcohol

+

Giant Beer:

Chrysanthemum: + 1 part Sake, 1 part Emeraldine Melon Liquor +

Barefoot:

+ 1 part Berry Juice, 1 part Cream, 1 part Vermouth. +

Clover Club:

+ 1 part Berry Juice, 1 Part Lemon Juice, 3 parts Gin +

Cold Front:

+ 1 part Iced Coffee, 1 part Whiskey, 1 part Mint (Allergy Warning: do not give to any species with less cold tolerance than Teshari, they will die if you do, if unsure do not serve) +

Cuba Libre (Often called Rum and Coke):

+ 1 part Space Cola, 2 parts Rum. +

Negroni Sbagliato:

+ 1 part Wine, 1 part Bermouth, 1 part Soda Water +

Slow Comfortable Screw Against the Wall (Stop giggling!):

+ 3 parts Screwdriver, 1 part Rum, 1 part Whiskey, 1 part Gin +

Space Bulldog:

+ 4 parts White Russian, 1 part Cola +

Sweet Rush:

+ 1 part Sugar, 1 part Soda Water, 1 part Vodka. +

Allies Cocktail:

+ 1 part Classic Martini, 1 part Vodka +

Bahama Mama:

+ 1 part Ice, 2 parts Orange Juice, 1 part Lime Juice, 2 parts Rum +

Classic Martini:

+ 2 parts Gin, 1 part Vermouth +

Daiquiri:

+ 3 Rum, 2 Lime Juice, 1 Sugar +

Ginza Mary:

+ 2 part Sake, 2 part Vodka, 1 part Tomato Juice +

Irish Cream:

+ 2 parts Whiskey, 1 part Cream +

Lotus:

+ 1 part Negroni Sbagliato, 1 part Sweet Rush +

Tequila Sunrise:

+ 2 parts Tequila, 1 part Orange Juice +

The Manly Dorf:

+ 1 part Beer, 2 parts Ale +

Whiskey Cola:

+ 2 parts Whiskey, 1 part Space Cola +

Binman Bliss:

+ 1 part Sake, 1 part Tequila -

High Alcohol

-

Elysium Facepunch:

- 1 part Kahlua, 1 part Lemon Juice -

Italian Crisis:

- 1 part Space Bulldog, 1 part Negroni Sbagliato -

Whiskey Sour:

- 2 Whiskey, 1 Lemon Juice, 1 Sugar -

Aloe:

- 1 part Cream, 1 part Watermelon Juice, 1 part Whiskey (in that order) -

Andalusia:

- 1 part Lemon Juice, 1 part Rum, 1 part Whiskey -

Black Russian:

- 2 part Vodka, 1 part Kahlua -

Bloody Mary:

- 3 parts Tomato Juice, 2 part Vodka, 1 part Lime Juice -

Brave Bull:

- 2 parts Tequila, 1 part Kahlua -

Irish Car Bomb:

- 1 part Ale, 1 part Irish Cream -

Irish Coffee:

- 1 parts Irish Cream, 1 parts Coffee -

Manhattan:

- 2 parts Whiskey, 1 part Vermouth -

Margarita:

- 2 parts Tequila, 1 part Lime Juice -

Screwdriver:

- 2 parts Vodka, 1 part Orange Juice -

Sex On The Beach:

- 3 part Orange Juice, 2 part Grenadine Syrup, 1 part Vodka -

Vodka and Tonic:

- 2 parts Vodka, 1 part Tonic -

Whiskey Soda:

- 2 parts Whiskey, 1 part Soda Water -

White Russian:

- 2 Black Russian, 1 part Cream -

WND-Garita:

- 3 Margarita, 2 Mountain Wind, 1 Emeraldine Melon Liquor -

Mudslide:

- 1 Black Russian, 1 Irish Cream +

High Alcohol

+

Elysium Facepunch:

+ 1 part Kahlua, 1 part Lemon Juice +

Italian Crisis:

+ 1 part Space Bulldog, 1 part Negroni Sbagliato +

Whiskey Sour:

+ 2 Whiskey, 1 Lemon Juice, 1 Sugar +

Aloe:

+ 1 part Cream, 1 part Watermelon Juice, 1 part Whiskey (in that order) +

Andalusia:

+ 1 part Lemon Juice, 1 part Rum, 1 part Whiskey +

Black Russian:

+ 2 part Vodka, 1 part Kahlua +

Bloody Mary:

+ 3 parts Tomato Juice, 2 part Vodka, 1 part Lime Juice +

Brave Bull:

+ 2 parts Tequila, 1 part Kahlua +

Irish Car Bomb:

+ 1 part Ale, 1 part Irish Cream +

Irish Coffee:

+ 1 parts Irish Cream, 1 parts Coffee +

Manhattan:

+ 2 parts Whiskey, 1 part Vermouth +

Margarita:

+ 2 parts Tequila, 1 part Lime Juice +

Screwdriver:

+ 2 parts Vodka, 1 part Orange Juice +

Sex On The Beach:

+ 3 part Orange Juice, 2 part Grenadine Syrup, 1 part Vodka +

Vodka and Tonic:

+ 2 parts Vodka, 1 part Tonic +

Whiskey Soda:

+ 2 parts Whiskey, 1 part Soda Water +

White Russian:

+ 2 Black Russian, 1 part Cream +

WND-Garita:

+ 3 Margarita, 2 Mountain Wind, 1 Emeraldine Melon Liquor +

Mudslide:

+ 1 Black Russian, 1 Irish Cream -

Very High Alcohol (Serve sparingly unless a patron proves they can handle a lot)

-

Anti-Freeze:

- 1 part Cream, 1 part Ice, 1 parts Vodka (Feels cold but actually warms. Allergy Warning: Do not serve to Teshari or Promethians, or other heat vulnerable species, they will die if you do, if unsure do not serve) -

B-52:

- 1 part Irish Cream, 1 part Cognac, 1 part Kahlua -

Long Island Iced Tea:

- 3 part Cuba Libre, 1 part Vodka, 1 part Gin, 1 part Tequila -

Vodka Martini:

- 2 parts Vodka, 1 part Vermouth -

Changeling Sting:

- 1 part Screwdriver, 1 part Lemon Juice, 1 part Lime Juice -

Deathbell:

- 1 part Anti-Freeze, 1 part Pan-Galactic Gargle Blaster, 1 part Syndicate Bomb (Allergy Warning: Poisonous to Teshari and other heat vulnerable species. Literally explodes Promethians. Metabolizes very quickly so it can kill a liver easily, be very careful with this one.) -

Erebus Moonrise:

- 1 part Whiskey, 1 part Vodka, 1 part Tequila -

Pan-Galactic Gargle Blaster:

- 1 part Gin, 2 part Vodka, 1 part Whiskey, 1 part Cognac, 1 part Lime Juice (Causes halucinations, don't slip it into other drinks you animal) -

Syndicate Bomb:

- 1 part Whiskey Cola, 1 part Beer -

Euphoria:

- 1 part Special Blend Whiskey, 2 part Cognac -

Screaming Viking:

- Vodka, Vermouth, Lime Juice, Rum, Gin, and Tonic -
Good Luck figuring out the order and ratio :)
-

Fire Punch:

- 1 part Sugar, 2 part Rum (Technically the strongest thing you can make, but it metabolizes slowish so it's slightly less dangerous than some others) +

Very High Alcohol (Serve sparingly unless a patron proves they can handle a lot)

+

Anti-Freeze:

+ 1 part Cream, 1 part Ice, 1 parts Vodka (Feels cold but actually warms. Allergy Warning: Do not serve to Teshari or Promethians, or other heat vulnerable species, they will die if you do, if unsure do not serve) +

B-52:

+ 1 part Irish Cream, 1 part Cognac, 1 part Kahlua +

Long Island Iced Tea:

+ 3 part Cuba Libre, 1 part Vodka, 1 part Gin, 1 part Tequila +

Vodka Martini:

+ 2 parts Vodka, 1 part Vermouth +

Changeling Sting:

+ 1 part Screwdriver, 1 part Lemon Juice, 1 part Lime Juice +

Deathbell:

+ 1 part Anti-Freeze, 1 part Pan-Galactic Gargle Blaster, 1 part Syndicate Bomb (Allergy Warning: Poisonous to Teshari and other heat vulnerable species. Literally explodes Promethians. Metabolizes very quickly so it can kill a liver easily, be very careful with this one.) +

Erebus Moonrise:

+ 1 part Whiskey, 1 part Vodka, 1 part Tequila +

Pan-Galactic Gargle Blaster:

+ 1 part Gin, 2 part Vodka, 1 part Whiskey, 1 part Cognac, 1 part Lime Juice (Causes halucinations, don't slip it into other drinks you animal) +

Syndicate Bomb:

+ 1 part Whiskey Cola, 1 part Beer +

Euphoria:

+ 1 part Special Blend Whiskey, 2 part Cognac +

Screaming Viking:

+ Vodka, Vermouth, Lime Juice, Rum, Gin, and Tonic +
Good Luck figuring out the order and ratio :)
+

Fire Punch:

+ 1 part Sugar, 2 part Rum (Technically the strongest thing you can make, but it metabolizes slowish so it's slightly less dangerous than some others) -

Non Alcoholic Drinks

-

Appleade:

- 1 part Apple Juice, 1 part Sugar, 1 part Soda Water -

Arnold Palmer:

- 1 Iced Tea, 1 Lemonade -

Berry Cordial:

- 4 Berry Juice, 1 unit Sugar, 1 Lemon Juice -

Berry shake:

- 1 part Milkshake, 1 part Berry Juice -

Brown Star:

- 2 parts Orange Juice, 1 part Space Cola -

Cafe Latte:

- 1 part Coffee, 1 part Milk -

Coffee Milkshake:

- 1 part Milkshake, 1 part Coffee -

Driver's Punch:

- 1 part Appleade, 1 part Orange Juice, 1 part Mint, 1 part Soda Water -

Graveyard:

- All 4 Sodas in your Soft Drink Dispenser in equal parts, haha it go woosh. -

Grenadine Syrup:

- 10 parts berry juice, 5 parts Universal Enzyme (Get Enzyme from Kitchen) -

Iced Coffee:

- 1 part Ice, 2 parts Coffee -

Kira Special:

- 1 part Orange Juice, 1 part Lime Juice, 1 part Soda Water -

Lemonade:

- 1 part Lemon juice, 1 part Sugar, 1 part Water -

Melonade:

- 1 part Watermelon Juice, 1 part Sugar, 1 part Soda Water -

Milkshake:

- 1 part Cream, 2 parts Ice, 2 parts Milk -

Sweet Tea:

- 2 parts Ice Tea, 1 part Sugar -

Note: There are many more drinks you can mix, these are just ones using resources you will almost always have available, the Extranet has good websites to check found here: https://wiki.vore-station.net/Guide_to_Food_and_Drink ass well as here: https://vore-station.net/infodump/recipes_drinks.html +

Non Alcoholic Drinks

+

Appleade:

+ 1 part Apple Juice, 1 part Sugar, 1 part Soda Water +

Arnold Palmer:

+ 1 Iced Tea, 1 Lemonade +

Berry Cordial:

+ 4 Berry Juice, 1 unit Sugar, 1 Lemon Juice +

Berry shake:

+ 1 part Milkshake, 1 part Berry Juice +

Brown Star:

+ 2 parts Orange Juice, 1 part Space Cola +

Cafe Latte:

+ 1 part Coffee, 1 part Milk +

Coffee Milkshake:

+ 1 part Milkshake, 1 part Coffee +

Driver's Punch:

+ 1 part Appleade, 1 part Orange Juice, 1 part Mint, 1 part Soda Water +

Graveyard:

+ All 4 Sodas in your Soft Drink Dispenser in equal parts, haha it go woosh. +

Grenadine Syrup:

+ 10 parts berry juice, 5 parts Universal Enzyme (Get Enzyme from Kitchen) +

Iced Coffee:

+ 1 part Ice, 2 parts Coffee +

Kira Special:

+ 1 part Orange Juice, 1 part Lime Juice, 1 part Soda Water +

Lemonade:

+ 1 part Lemon juice, 1 part Sugar, 1 part Water +

Melonade:

+ 1 part Watermelon Juice, 1 part Sugar, 1 part Soda Water +

Milkshake:

+ 1 part Cream, 2 parts Ice, 2 parts Milk +

Sweet Tea:

+ 2 parts Ice Tea, 1 part Sugar +

Note: There are many more drinks you can mix, these are just ones using resources you will almost always have available, the Extranet has good websites to check found here: https://wiki.vore-station.net/Guide_to_Food_and_Drink ass well as here: https://vore-station.net/infodump/recipes_drinks.html -

Part 1: The Basics

-

First and foremost, making drinks is about understanding measurements. Drinks are measured in units a pint is 60 units, a half pint 30, and ratios of those units can create certain drinks.

-

The ratios of these drinks are denoted in "Parts". For example, Grog is 1 part rum and 1 part water mixed in a container that holds liquid. This means 1 unit of Rum and 1 unit of Water can make Grog, as can 30 units of Rum and 30 units of Water. Ratios aren't picky, if you have 5 units of Rum and 10 of Water in a glass, it will turn as much as possible into Grog, and the rest will remain as water (In this case, 10 units of Grog and 5 units of Water will be in the glass). When mixing drinks, you may accidentally have extra of an ingredient such as in the previous example, but this can easily be rectified by placing the drink in one of the Dispensers, and using the interface at the bottom to remove however many units you put extra, so don't worry about sloppiness as long as you clean up your mistakes!

-

Actually mixing drinks is simple enough, the vast majority of mixing should be done in a Dispenser, it can be done by hand outside of one, but generally you only want to be doing so for when the Dispenser lacks an ingredient to make life easier. Drinks automatically mix when placed into a container together, so you don't have to do anything special, think of it like a chemical reaction, it even bubbles when it works!

-

Part 2: General Tips/FAQ

-

"I don't have X item for the drink my patron wants." - If it's on the quick reference, you probably do, just be sure to check the Booze-O-Mat if it cannot be found in the dispenser. If it's not in either Dispenser or in the Coffee Dispenser in the Surface 1 Bar (Such as Berry Juice). If you still lack the materials, you may need to ask another department (Cargo, Science, or perhaps Med usually) for a delivery of them.

-

"I don't want to run to the Surface 1 Bar every time to make this specific drink." - You don't have to! A good practice as a bartender if you want to make your life easier is to take a screwdriver, use it on the machine, and select the cartridges you want to have in your bar. If you do this you will remove them, and are free to insert them into your own machines, but do be considerate if there are more bartenders around, don't steal their supplies if they need them! Another good practice is to move, or have someone else move the machine up to your bar instead of removing the cartridges, ultimately the choice is yours as to how best set up your bar!

-

"How do I deal with a rowdy patron?" - Ask Security for help, just because you have a shotgun doesn't mean you are the law in your bar. Respect procedure!

-

"What does the Grinder do?" - What it says on the tin, if you get Iron, Uranium, or something else needed for a drink that isn't already liquefied, you have to grind it down first to add it!

-

"Do I have to wear the hat?" - No, but you can if it looks good on you!

-

"How do I unlock the good music on the Jukebox?" - Get a Screwdriver and use it on the Jukebox to open the hatch, then use Wirecutters and cut/remend wires until you cut the one that turns the Parental Guidance light off. Beware of shocks (Insulated Gloves Suggested)! Be sure to close it again after.

-

"How do I make my drinks look pretty?" - Use the Metamorphic Glasses, though do note some drinks don't look any different even in one.

-

"Oh god my patron is convulsing, what do I do?" - Rush them to Medbay. If they're too big to move get a rolling chair from the Library, or get medical staff to come to the Bar.

-

"My patron drank too much and is definitely going to start convulsing, what do I do?" - Either rush them to Medbay, or get Medbay to give you pills that neutralize alcohol, it's ok to be the fun police to save a life.

-

"Nobody wants to stay at my bar!" - Try adopting a gimmick to spruce things up! Everyone's will be different, but doing something fun is a good way to attract customers. Creating your own unique mixes is another fun way to distinguish yourself.

-

"I don't like the way the bar looks with the lights dimmed/I don't like the way the bar looks with the lights bright!" - Enable or disable the night lighting on the APC by the bar then!

-

"A patron said they don't drink, woe is me, my job is now useless!" - Have you tried offering them a non-alcoholic drink? Or just talking to them? As long as you're providing a good time, you're still doing great!

-

"Somebody messed with a drink I left lying out on the counter, I think it's been spiked!" - Don't leave drinks lying on the counter. Not only is it a spiking hazzard, but inevitably somebody is gonna try to chug them all. If you want to do a pretty display, make it non alcoholic, or on the back bar counter out of easy reach!

-

"My patrons are all hungry because we have no Chef!" - Well, you have access to the Kitchen if you feel like trying to solve that, I have a guide for that there too!

-

"I feel like a hamster in a wheel, running hopelessly but never quite getting anywhere. No matter what I do, things just don't seem to change, I don't seem to change, and I worry, that maybe... they won't." - Try drinking some of your own booze until that feeling goes away.

-

Part 3: Closing Remarks

-

This all may seem daunting at a glance; so many recipes to learn, and a "lot" to keep in mind. But really it's not - tending the Bar is mostly about going with the flow of things and providing a good times, and drinks just provide liquid courage to make a good time easier. Take a deep breath if you ever feel overwhelmed, and handle one order at a time. You can do it! Don't feel the need to know every recipe, just learn your favorites and go from there; the rest is here or online if someone asks for it! If somebody asks you to give them anything without a specific request, don't panic: evalulate their likes and tolerance level, and try your best to give them something nice!

- - "} +

Part 1: The Basics

+

First and foremost, making drinks is about understanding measurements. Drinks are measured in units a pint is 60 units, a half pint 30, and ratios of those units can create certain drinks.

+

The ratios of these drinks are denoted in "Parts". For example, Grog is 1 part rum and 1 part water mixed in a container that holds liquid. This means 1 unit of Rum and 1 unit of Water can make Grog, as can 30 units of Rum and 30 units of Water. Ratios aren't picky, if you have 5 units of Rum and 10 of Water in a glass, it will turn as much as possible into Grog, and the rest will remain as water (In this case, 10 units of Grog and 5 units of Water will be in the glass). When mixing drinks, you may accidentally have extra of an ingredient such as in the previous example, but this can easily be rectified by placing the drink in one of the Dispensers, and using the interface at the bottom to remove however many units you put extra, so don't worry about sloppiness as long as you clean up your mistakes!

+

Actually mixing drinks is simple enough, the vast majority of mixing should be done in a Dispenser, it can be done by hand outside of one, but generally you only want to be doing so for when the Dispenser lacks an ingredient to make life easier. Drinks automatically mix when placed into a container together, so you don't have to do anything special, think of it like a chemical reaction, it even bubbles when it works!

+

Part 2: General Tips/FAQ

+

"I don't have X item for the drink my patron wants." - If it's on the quick reference, you probably do, just be sure to check the Booze-O-Mat if it cannot be found in the dispenser. If it's not in either Dispenser or in the Coffee Dispenser in the Surface 1 Bar (Such as Berry Juice). If you still lack the materials, you may need to ask another department (Cargo, Science, or perhaps Med usually) for a delivery of them.

+

"I don't want to run to the Surface 1 Bar every time to make this specific drink." - You don't have to! A good practice as a bartender if you want to make your life easier is to take a screwdriver, use it on the machine, and select the cartridges you want to have in your bar. If you do this you will remove them, and are free to insert them into your own machines, but do be considerate if there are more bartenders around, don't steal their supplies if they need them! Another good practice is to move, or have someone else move the machine up to your bar instead of removing the cartridges, ultimately the choice is yours as to how best set up your bar!

+

"How do I deal with a rowdy patron?" - Ask Security for help, just because you have a shotgun doesn't mean you are the law in your bar. Respect procedure!

+

"What does the Grinder do?" - What it says on the tin, if you get Iron, Uranium, or something else needed for a drink that isn't already liquefied, you have to grind it down first to add it!

+

"Do I have to wear the hat?" - No, but you can if it looks good on you!

+

"How do I unlock the good music on the Jukebox?" - Get a Screwdriver and use it on the Jukebox to open the hatch, then use Wirecutters and cut/remend wires until you cut the one that turns the Parental Guidance light off. Beware of shocks (Insulated Gloves Suggested)! Be sure to close it again after.

+

"How do I make my drinks look pretty?" - Use the Metamorphic Glasses, though do note some drinks don't look any different even in one.

+

"Oh god my patron is convulsing, what do I do?" - Rush them to Medbay. If they're too big to move get a rolling chair from the Library, or get medical staff to come to the Bar.

+

"My patron drank too much and is definitely going to start convulsing, what do I do?" - Either rush them to Medbay, or get Medbay to give you pills that neutralize alcohol, it's ok to be the fun police to save a life.

+

"Nobody wants to stay at my bar!" - Try adopting a gimmick to spruce things up! Everyone's will be different, but doing something fun is a good way to attract customers. Creating your own unique mixes is another fun way to distinguish yourself.

+

"I don't like the way the bar looks with the lights dimmed/I don't like the way the bar looks with the lights bright!" - Enable or disable the night lighting on the APC by the bar then!

+

"A patron said they don't drink, woe is me, my job is now useless!" - Have you tried offering them a non-alcoholic drink? Or just talking to them? As long as you're providing a good time, you're still doing great!

+

"Somebody messed with a drink I left lying out on the counter, I think it's been spiked!" - Don't leave drinks lying on the counter. Not only is it a spiking hazzard, but inevitably somebody is gonna try to chug them all. If you want to do a pretty display, make it non alcoholic, or on the back bar counter out of easy reach!

+

"My patrons are all hungry because we have no Chef!" - Well, you have access to the Kitchen if you feel like trying to solve that, I have a guide for that there too!

+

"I feel like a hamster in a wheel, running hopelessly but never quite getting anywhere. No matter what I do, things just don't seem to change, I don't seem to change, and I worry, that maybe... they won't." - Try drinking some of your own booze until that feeling goes away.

+

Part 3: Closing Remarks

+

This all may seem daunting at a glance; so many recipes to learn, and a "lot" to keep in mind. But really it's not - tending the Bar is mostly about going with the flow of things and providing a good times, and drinks just provide liquid courage to make a good time easier. Take a deep breath if you ever feel overwhelmed, and handle one order at a time. You can do it! Don't feel the need to know every recipe, just learn your favorites and go from there; the rest is here or online if someone asks for it! If somebody asks you to give them anything without a specific request, don't panic: evalulate their likes and tolerance level, and try your best to give them something nice!

+ + "} /obj/item/book/manual/rotary_electric_generator name = "Rotary Electric Generator Manual" @@ -367,41 +367,41 @@ Technical Order (TO) 1-33-34-2
-

Operator's Manual - Rotary Electric Generator, D-Type



+

Operator's Manual - Rotary Electric Generator, D-Type



- Supporting Data:
- - TO 1-33-34-4-1 Illustrated Parts Breakdown - Rotary Electric Generator, D-Type
- - TO 1-33-34-6 Inspection Work Cards - Rotary Electric Generator, D-Type

+ Supporting Data:
+ - TO 1-33-34-4-1 Illustrated Parts Breakdown - Rotary Electric Generator, D-Type
+ - TO 1-33-34-6 Inspection Work Cards - Rotary Electric Generator, D-Type

- Support Equipment:
- - Torque Wrench, 100-80,000 inch-pounds
- - Composite Tool Kit, Standard
- - Multitool with Lead Kit, Wire Kit

+ Support Equipment:
+ - Torque Wrench, 100-80,000 inch-pounds
+ - Composite Tool Kit, Standard
+ - Multitool with Lead Kit, Wire Kit

- Required Supplies:
- - stainless steel, 10,000cm3
- - lubrication, petrolatum, 6000ml
- - electrical wiring, 5m
- - component set, capacitors (any grade)
- - circuitry board, REG

+ Required Supplies:
+ - stainless steel, 10,000cm3
+ - lubrication, petrolatum, 6000ml
+ - electrical wiring, 5m
+ - component set, capacitors (any grade)
+ - circuitry board, REG

-

SETUP AND OPERATING PROCEDURES



+

SETUP AND OPERATING PROCEDURES



- Setup:

+ Setup:

- CAUTION: Do not remove too much air from the work space or personnel may be exposed to hypoxia or similar effects.

+ CAUTION: Do not remove too much air from the work space or personnel may be exposed to hypoxia or similar effects.

1. Prepare setup area. Remove machinery, debris, foreign objects, people, and extra air.

2. Lay out preliminary electrical wiring.
- 2a. Connect electrical wiring to existing facility power grid.
- 2b. Work wiring into shape as defined in TO 1-33-34-4-1 Figure 32 Index 6.
+ 2a. Connect electrical wiring to existing facility power grid.
+ 2b. Work wiring into shape as defined in TO 1-33-34-4-1 Figure 32 Index 6.
3. Prepare gathered steel supplies as defined in TO 1-33-34-4-1 Figure 2 Index 3.
4. Assemble prepared steel supplies into equipment framework by inserting rod A into slot B. Refer to TO 1-33-34-4-1 Figure 1 Index 1 for technical drawings.
- 4a. Secure assembled equipment framework to flooring by tightening lower frame bolts.

+ 4a. Secure assembled equipment framework to flooring by tightening lower frame bolts.

5. Install and secure circuitry board, REG-D into marked receptacle.

@@ -416,7 +416,7 @@ 9. Wait for assembly to finish inflating, and the unit is ready for service.

- Operating Procedures:

+ Operating Procedures:

NOTE: Operation of REG-D type generators requires significant physical effort. Ensure users are provided adequare nutrition and hydration throughout the working period.

@@ -435,8 +435,8 @@ 6. To end a session, carefully lower forward running speed until the track body comes to a complete stop, then disembark the REG-D.

- REFER TO TO 1-33-34-6 FOR MAINTENANCE AND INSPECTION PROCEDURES - + REFER TO TO 1-33-34-6 FOR MAINTENANCE AND INSPECTION PROCEDURES + "} diff --git a/code/game/objects/items/weapons/material/twohanded_vr.dm b/code/game/objects/items/weapons/material/twohanded_vr.dm index 04a3777c6e..25a074ab8e 100644 --- a/code/game/objects/items/weapons/material/twohanded_vr.dm +++ b/code/game/objects/items/weapons/material/twohanded_vr.dm @@ -9,22 +9,22 @@ desc = "An infernum made riding crop with Malady Blanche engraved in the shaft. It's a little worn from how many butts it has spanked." /obj/item/material/twohanded/longsword - w_class = ITEMSIZE_NORMAL - name = "longsword" - desc = "a more elegant weapon from a more civilised age" - icon= 'icons/obj/weapons_vr.dmi' - icon_state = "longsword" - base_icon = "longsword" - item_icons = list( + w_class = ITEMSIZE_NORMAL + name = "longsword" + desc = "a more elegant weapon from a more civilised age" + icon= 'icons/obj/weapons_vr.dmi' + icon_state = "longsword" + base_icon = "longsword" + item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', ) - item_state = "saber" - unwielded_force_divisor = 0.1 - force_divisor = 0.3 - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - edge = TRUE - sharp = TRUE + item_state = "saber" + unwielded_force_divisor = 0.1 + force_divisor = 0.3 + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + edge = TRUE + sharp = TRUE /obj/item/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if (src.wielded == 1) diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm index 5def6ca518..eb50e18563 100644 --- a/code/game/objects/structures/droppod.dm +++ b/code/game/objects/structures/droppod.dm @@ -134,12 +134,12 @@ // This is about 0.896m^3 of atmosphere, which is enough to last for quite a while. /datum/gas_mixture/pod_air - volume = 2500 - temperature = 293.150 - total_moles = 104 + volume = 2500 + temperature = 293.150 + total_moles = 104 /datum/gas_mixture/pod_air/New() - . = ..() - gas = list( - GAS_O2 = 21, - GAS_N2 = 79) + . = ..() + gas = list( + GAS_O2 = 21, + GAS_N2 = 79) diff --git a/code/game/objects/structures/flora/flora_vr.dm b/code/game/objects/structures/flora/flora_vr.dm index 2728991880..b5e6879d79 100644 --- a/code/game/objects/structures/flora/flora_vr.dm +++ b/code/game/objects/structures/flora/flora_vr.dm @@ -11,14 +11,14 @@ icon_state = "spawner-jackolantern" /obj/effect/landmark/carved_pumpkin_spawn/New() - var/new_pumpkin = pick( + var/new_pumpkin = pick( prob(70);/obj/structure/flora/pumpkin, - prob(60);/obj/structure/flora/pumpkin/carved, - prob(30);/obj/structure/flora/pumpkin/carved/scream, - prob(30);/obj/structure/flora/pumpkin/carved/girly, - prob(10);/obj/structure/flora/pumpkin/carved/owo) - new new_pumpkin(src.loc) - ..() + prob(60);/obj/structure/flora/pumpkin/carved, + prob(30);/obj/structure/flora/pumpkin/carved/scream, + prob(30);/obj/structure/flora/pumpkin/carved/girly, + prob(10);/obj/structure/flora/pumpkin/carved/owo) + new new_pumpkin(src.loc) + ..() /obj/structure/flora/pumpkin/carved name = "jack o'lantern" diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index f866ab7e72..28e6c889db 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -548,50 +548,50 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) /obj/structure/loot_pile/surface/bones - name = "bone pile" - desc = "A pile of various dusty bones. Your graverobbing instincts tell you there might be valuables here." - icon = 'icons/obj/bones.dmi' - icon_state = "bonepile" - delete_on_depletion = TRUE + name = "bone pile" + desc = "A pile of various dusty bones. Your graverobbing instincts tell you there might be valuables here." + icon = 'icons/obj/bones.dmi' + icon_state = "bonepile" + delete_on_depletion = TRUE - common_loot = list( - /obj/item/bone, - /obj/item/bone/skull, - /obj/item/bone/skull/tajaran, - /obj/item/bone/skull/unathi, - /obj/item/bone/skull/unknown, - /obj/item/bone/leg, - /obj/item/bone/arm, - /obj/item/bone/ribs, - ) - uncommon_loot = list( - /obj/item/coin/gold, - /obj/item/coin/silver, - /obj/item/deck/tarot, - /obj/item/flame/lighter/zippo/gold, - /obj/item/flame/lighter/zippo/black, - /obj/item/material/knife/tacknife/survival, - /obj/item/material/knife/tacknife/combatknife, - /obj/item/material/knife/machete/hatchet, - /obj/item/material/knife/butch, - /obj/item/storage/wallet/random, - /obj/item/clothing/accessory/bracelet/material/gold, - /obj/item/clothing/accessory/bracelet/material/silver, - /obj/item/clothing/accessory/locket, - /obj/item/clothing/accessory/poncho/blue, - /obj/item/clothing/shoes/boots/cowboy, - /obj/item/clothing/suit/storage/toggle/bomber, - /obj/item/clothing/under/frontier, - /obj/item/clothing/under/overalls, - /obj/item/clothing/under/pants/classicjeans/ripped, - /obj/item/clothing/under/sl_suit - ) - rare_loot = list( - /obj/item/storage/belt/utility/alien/full, - /obj/item/gun/projectile/revolver, - /obj/item/gun/projectile/sec, - /obj/item/gun/launcher/crossbow - ) + common_loot = list( + /obj/item/bone, + /obj/item/bone/skull, + /obj/item/bone/skull/tajaran, + /obj/item/bone/skull/unathi, + /obj/item/bone/skull/unknown, + /obj/item/bone/leg, + /obj/item/bone/arm, + /obj/item/bone/ribs, + ) + uncommon_loot = list( + /obj/item/coin/gold, + /obj/item/coin/silver, + /obj/item/deck/tarot, + /obj/item/flame/lighter/zippo/gold, + /obj/item/flame/lighter/zippo/black, + /obj/item/material/knife/tacknife/survival, + /obj/item/material/knife/tacknife/combatknife, + /obj/item/material/knife/machete/hatchet, + /obj/item/material/knife/butch, + /obj/item/storage/wallet/random, + /obj/item/clothing/accessory/bracelet/material/gold, + /obj/item/clothing/accessory/bracelet/material/silver, + /obj/item/clothing/accessory/locket, + /obj/item/clothing/accessory/poncho/blue, + /obj/item/clothing/shoes/boots/cowboy, + /obj/item/clothing/suit/storage/toggle/bomber, + /obj/item/clothing/under/frontier, + /obj/item/clothing/under/overalls, + /obj/item/clothing/under/pants/classicjeans/ripped, + /obj/item/clothing/under/sl_suit + ) + rare_loot = list( + /obj/item/storage/belt/utility/alien/full, + /obj/item/gun/projectile/revolver, + /obj/item/gun/projectile/sec, + /obj/item/gun/launcher/crossbow + ) // Subtype for mecha and mecha accessories. These might not always be on the surface. /obj/structure/loot_pile/mecha diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index a6657e433a..8b08d93ace 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -351,8 +351,8 @@ icon = 'icons/obj/trash_piles.dmi' icon_state = "randompile" spawn_types = list( - /mob/living/simple_mob/animal/passive/mouse= 100, - /mob/living/simple_mob/animal/passive/cockroach = 25) + /mob/living/simple_mob/animal/passive/mouse= 100, + /mob/living/simple_mob/animal/passive/cockroach = 25) simultaneous_spawns = 1 destructible = 1 spawn_delay = 1 HOUR diff --git a/code/game/response_team.dm b/code/game/response_team.dm index bf5b02699c..4dc118df19 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -2,7 +2,7 @@ //Thanks to Kilakk for the admin-button portion of this code. var/global/send_emergency_team = 0 // Used for automagic response teams - // 'admin_emergency_team' for admin-spawned response teams + // 'admin_emergency_team' for admin-spawned response teams var/ert_base_chance = 10 // Default base chance. Will be incremented by increment ERT chance. var/can_call_ert var/silent_ert = 0 diff --git a/code/game/turfs/snow/snow.dm b/code/game/turfs/snow/snow.dm index 465f1cb183..6b9f4e39f7 100644 --- a/code/game/turfs/snow/snow.dm +++ b/code/game/turfs/snow/snow.dm @@ -1,35 +1,35 @@ /turf/snow - name = "snow" + name = "snow" - dynamic_lighting = 0 - icon = 'icons/turf/snow_new.dmi' - icon_state = "snow" + dynamic_lighting = 0 + icon = 'icons/turf/snow_new.dmi' + icon_state = "snow" - oxygen = MOLES_O2STANDARD * 1.15 - nitrogen = MOLES_N2STANDARD * 1.15 + oxygen = MOLES_O2STANDARD * 1.15 + nitrogen = MOLES_N2STANDARD * 1.15 - temperature = TN60C - var/list/crossed_dirs = list() + temperature = TN60C + var/list/crossed_dirs = list() /turf/snow/Entered(atom/A) - if(ismob(A)) - var/mdir = "[A.dir]" - if(crossed_dirs[mdir]) - crossed_dirs[mdir] = min(crossed_dirs[mdir] + 1, FOOTSTEP_SPRITE_AMT) - else - crossed_dirs[mdir] = 1 + if(ismob(A)) + var/mdir = "[A.dir]" + if(crossed_dirs[mdir]) + crossed_dirs[mdir] = min(crossed_dirs[mdir] + 1, FOOTSTEP_SPRITE_AMT) + else + crossed_dirs[mdir] = 1 - update_icon() + update_icon() - . = ..() + . = ..() /turf/snow/update_icon() - cut_overlays() - for(var/d in crossed_dirs) - var/amt = crossed_dirs[d] + cut_overlays() + for(var/d in crossed_dirs) + var/amt = crossed_dirs[d] - for(var/i in 1 to amt) - add_overlay(image(icon, "footprint[i]", text2num(d))) + for(var/i in 1 to amt) + add_overlay(image(icon, "footprint[i]", text2num(d))) /turf/snow/snow2 name = "snow" diff --git a/code/js/menus.dm b/code/js/menus.dm index d1cd99ef3f..0064522c2f 100644 --- a/code/js/menus.dm +++ b/code/js/menus.dm @@ -1,37 +1,37 @@ var/const/js_dropdowns = {" function dropdowns() { - var divs = document.getElementsByTagName('div'); - var headers = new Array(); - var links = new Array(); - for(var i=0;i=0) { - elem.className = elem.className.replace('visible','hidden'); - this.className = this.className.replace('open','closed'); - this.innerHTML = this.innerHTML.replace('-','+'); - } - else { - elem.className = elem.className.replace('hidden','visible'); - this.className = this.className.replace('closed','open'); - this.innerHTML = this.innerHTML.replace('+','-'); - } - return false; - } - })(links\[i\]); - } - } + var divs = document.getElementsByTagName('div'); + var headers = new Array(); + var links = new Array(); + for(var i=0;i=0) { + elem.className = elem.className.replace('visible','hidden'); + this.className = this.className.replace('open','closed'); + this.innerHTML = this.innerHTML.replace('-','+'); + } + else { + elem.className = elem.className.replace('hidden','visible'); + this.className = this.className.replace('closed','open'); + this.innerHTML = this.innerHTML.replace('+','-'); + } + return false; + } + })(links\[i\]); + } + } } "} diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm index eeb8c8a24e..c85616f301 100644 --- a/code/modules/admin/admin_attack_log.dm +++ b/code/modules/admin/admin_attack_log.dm @@ -39,8 +39,8 @@ else violent = "" admin_attack_log(attacker, - victim, - "used \the [weapon] to [violent]inject - [reagents] - [amount_transferred]u transferred", - "was [violent]injected with \the [weapon] - [reagents] - [amount_transferred]u transferred", - "used \the [weapon] to [violent]inject [reagents] ([amount_transferred]u transferred) into") + victim, + "used \the [weapon] to [violent]inject - [reagents] - [amount_transferred]u transferred", + "was [violent]injected with \the [weapon] - [reagents] - [amount_transferred]u transferred", + "used \the [weapon] to [violent]inject [reagents] ([amount_transferred]u transferred) into") */ diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 18bf68bca3..5e7f86efc4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -335,9 +335,9 @@ var/jobs = "" /***********************************WARNING!************************************ - The jobban stuff looks mangled and disgusting - But it looks beautiful in-game - -Nodrak + The jobban stuff looks mangled and disgusting + But it looks beautiful in-game + -Nodrak ************************************WARNING!***********************************/ var/counter = 0 //Regular jobs diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 0c3127c577..c8753d66f8 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -125,35 +125,35 @@ GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging) feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! var/list/debug_verbs = list ( - /client/proc/do_not_use_these - ,/client/proc/camera_view - ,/client/proc/sec_camera_report - ,/client/proc/intercom_view - ,/client/proc/Cell - ,/client/proc/atmosscan - ,/client/proc/powerdebug - ,/client/proc/count_objects_on_z_level - ,/client/proc/count_objects_all - ,/client/proc/cmd_assume_direct_control - ,/client/proc/jump_to_dead_group - ,/client/proc/startSinglo - ,/client/proc/set_server_fps - ,/client/proc/cmd_admin_grantfullaccess - ,/client/proc/kaboom - ,/client/proc/cmd_admin_areatest - ,/client/proc/cmd_admin_rejuvenate - ,/datum/admins/proc/show_traitor_panel - ,/client/proc/print_jobban_old - ,/client/proc/print_jobban_old_filter - ,/client/proc/forceEvent - ,/client/proc/Zone_Info - ,/client/proc/Test_ZAS_Connection - ,/client/proc/ZoneTick - ,/client/proc/rebootAirMaster - ,/client/proc/hide_debug_verbs - ,/client/proc/testZAScolors - ,/client/proc/testZAScolors_remove - ,/datum/admins/proc/setup_supermatter + /client/proc/do_not_use_these + ,/client/proc/camera_view + ,/client/proc/sec_camera_report + ,/client/proc/intercom_view + ,/client/proc/Cell + ,/client/proc/atmosscan + ,/client/proc/powerdebug + ,/client/proc/count_objects_on_z_level + ,/client/proc/count_objects_all + ,/client/proc/cmd_assume_direct_control + ,/client/proc/jump_to_dead_group + ,/client/proc/startSinglo + ,/client/proc/set_server_fps + ,/client/proc/cmd_admin_grantfullaccess + ,/client/proc/kaboom + ,/client/proc/cmd_admin_areatest + ,/client/proc/cmd_admin_rejuvenate + ,/datum/admins/proc/show_traitor_panel + ,/client/proc/print_jobban_old + ,/client/proc/print_jobban_old_filter + ,/client/proc/forceEvent + ,/client/proc/Zone_Info + ,/client/proc/Test_ZAS_Connection + ,/client/proc/ZoneTick + ,/client/proc/rebootAirMaster + ,/client/proc/hide_debug_verbs + ,/client/proc/testZAScolors + ,/client/proc/testZAScolors_remove + ,/datum/admins/proc/setup_supermatter ,/client/proc/atmos_toggle_debug ,/client/proc/spawn_tanktransferbomb ,/client/proc/take_picture diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm index eb4267aee4..f48a328afb 100644 --- a/code/modules/admin/verbs/resize.dm +++ b/code/modules/admin/verbs/resize.dm @@ -1,24 +1,24 @@ /client/proc/resize(var/mob/living/L in mob_list) - set name = "Resize" - set desc = "Resizes any living mob without any restrictions on size." - set category = "Fun.Event Kit" - if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT)) - return + set name = "Resize" + set desc = "Resizes any living mob without any restrictions on size." + set category = "Fun.Event Kit" + if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT)) + return - var/size_multiplier = tgui_input_number(usr, "Input size multiplier.", "Resize", 1, round_value=FALSE) - if(!size_multiplier) - return //cancelled + var/size_multiplier = tgui_input_number(usr, "Input size multiplier.", "Resize", 1, round_value=FALSE) + if(!size_multiplier) + return //cancelled - size_multiplier = clamp(size_multiplier, -50, 50) //VOREStation Edit - being able to make people upside down is fun. Also 1000 is way, WAY too big. Honestly 50 is too big but at least you can see 50 and it doesn't break the rendering. - var/can_be_big = L.has_large_resize_bounds() - var/very_big = is_extreme_size(size_multiplier) + size_multiplier = clamp(size_multiplier, -50, 50) //VOREStation Edit - being able to make people upside down is fun. Also 1000 is way, WAY too big. Honestly 50 is too big but at least you can see 50 and it doesn't break the rendering. + var/can_be_big = L.has_large_resize_bounds() + var/very_big = is_extreme_size(size_multiplier) - if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse - to_chat(src,span_warning("[L] will lose this size upon moving into an area where this size is not allowed.")) - else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse - to_chat(src,span_warning("[L] will retain this normally unallowed size outside this area.")) + if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse + to_chat(src,span_warning("[L] will lose this size upon moving into an area where this size is not allowed.")) + else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse + to_chat(src,span_warning("[L] will retain this normally unallowed size outside this area.")) - L.resize(size_multiplier, animate = TRUE, uncapped = TRUE, ignore_prefs = TRUE) + L.resize(size_multiplier, animate = TRUE, uncapped = TRUE, ignore_prefs = TRUE) - log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].") - feedback_add_details("admin_verb","RESIZE") + log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].") + feedback_add_details("admin_verb","RESIZE") diff --git a/code/modules/awaymissions/gateway_vr.dm b/code/modules/awaymissions/gateway_vr.dm index 9618eb5f68..816d2c06e8 100644 --- a/code/modules/awaymissions/gateway_vr.dm +++ b/code/modules/awaymissions/gateway_vr.dm @@ -38,28 +38,28 @@ icon_state = "key" /obj/machinery/gateway/centeraway/proc/entrydetect() - return + return /obj/machinery/gateway/centeraway/mcguffin/entrydetect() - if(key) - return + if(key) + return - var/list/spawners = list() - for(var/obj/effect/landmark/mcguffin_spawner/sp in world) - spawners += sp + var/list/spawners = list() + for(var/obj/effect/landmark/mcguffin_spawner/sp in world) + spawners += sp - var/obj/effect/landmark/mcguffin_spawner/the_cool_one = pick(spawners) + var/obj/effect/landmark/mcguffin_spawner/the_cool_one = pick(spawners) - var/atom/destination = get_turf(the_cool_one) - var/obj/structure/closet/CL = locate() in destination - if(CL) - destination = CL + var/atom/destination = get_turf(the_cool_one) + var/obj/structure/closet/CL = locate() in destination + if(CL) + destination = CL - if(!destination) - warning("A gateway is trying to spawn it's mcguffin but there are no mapped in spawner landmarks") - destination = get_turf(src) + if(!destination) + warning("A gateway is trying to spawn it's mcguffin but there are no mapped in spawner landmarks") + destination = get_turf(src) - key = new mcguffin_type(destination) + key = new mcguffin_type(destination) /obj/machinery/gateway/centeraway/mcguffin/Bumped(atom/movable/M as mob|obj) if(!ready) return diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 31ee0bd112..9fa0f50459 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -24,11 +24,11 @@ // var/value = null if (pos) - // No, don't do lowertext here, that breaks paths on linux + // No, don't do lowertext here, that breaks paths on linux name = copytext(t, 1, pos) // value = copytext(t, pos + 1) else - // No, don't do lowertext here, that breaks paths on linux + // No, don't do lowertext here, that breaks paths on linux name = t if (!name) diff --git a/code/modules/blob2/overmind/types.dm b/code/modules/blob2/overmind/types.dm index 394a899d02..6b1e62144d 100644 --- a/code/modules/blob2/overmind/types.dm +++ b/code/modules/blob2/overmind/types.dm @@ -5,7 +5,7 @@ var/effect_desc = "This does nothing special." // For examine panel. var/ai_desc = "default" // Shown when examining the overmind. var/difficulty = BLOB_DIFFICULTY_EASY // A rough guess on how hard a blob is to kill. - // When a harder blob spawns by event, the crew is given more information than usual from the announcement. + // When a harder blob spawns by event, the crew is given more information than usual from the announcement. var/color = "#FFFFFF" // The actual blob's color. var/complementary_color = "#000000" //a color that's complementary to the normal blob color. Blob mobs are colored in this. diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm index 18a61c2be0..f6d13270cc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm @@ -68,16 +68,16 @@ character_name = list("Xander Bevin") /datum/gear/fluff/charlotte_medal - path = /obj/item/clothing/accessory/medal/silver/security - display_name = "Charlotte's Robust Security Medal" - ckeywhitelist = list("alfalah") - character_name = list("Charlotte Graves") + path = /obj/item/clothing/accessory/medal/silver/security + display_name = "Charlotte's Robust Security Medal" + ckeywhitelist = list("alfalah") + character_name = list("Charlotte Graves") /datum/gear/fluff/charlotte_medal_2 - path = /obj/item/clothing/accessory/medal/conduct - display_name = "Charlotte's Medal of Conduct" - ckeywhitelist = list("alfalah") - character_name = list("Charlotte Graves") + path = /obj/item/clothing/accessory/medal/conduct + display_name = "Charlotte's Medal of Conduct" + ckeywhitelist = list("alfalah") + character_name = list("Charlotte Graves") /datum/gear/fluff/charlotte_cigarettes path = /obj/item/storage/fancy/fluff/charlotte @@ -912,10 +912,10 @@ // P CKEYS /datum/gear/fluff/evelyn_medal - path = /obj/item/clothing/accessory/medal/conduct - display_name = "Evelyn's Medal of Conduct" - ckeywhitelist = list("pandora029") - character_name = list("Evelyn Tareen") + path = /obj/item/clothing/accessory/medal/conduct + display_name = "Evelyn's Medal of Conduct" + ckeywhitelist = list("pandora029") + character_name = list("Evelyn Tareen") /datum/gear/fluff/evelyn_coat path = /obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/ @@ -1205,10 +1205,10 @@ character_name = list("Lilith Vespers") /datum/gear/fluff/greek_dress - path = /obj/item/clothing/under/fluff/greek_dress - display_name = "mytilenean Dress" - ckeywhitelist = list("sudate") - character_name = list("Shea Corbett") + path = /obj/item/clothing/under/fluff/greek_dress + display_name = "mytilenean Dress" + ckeywhitelist = list("sudate") + character_name = list("Shea Corbett") /datum/gear/fluff/silent_mimemask path = /obj/item/clothing/mask/gas/sexymime @@ -1225,24 +1225,24 @@ character_name = list("Silent Stripes") /datum/gear/fluff/parrizjacket - path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/parrizjacket - display_name = "pink crop bomber" - slot = slot_wear_suit - ckeywhitelist = list("satinisle") - character_name = list("Parriz Tavakdavi") + path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/parrizjacket + display_name = "pink crop bomber" + slot = slot_wear_suit + ckeywhitelist = list("satinisle") + character_name = list("Parriz Tavakdavi") /datum/gear/fluff/dark_tarot - path = /obj/item/deck/dark_tarot - display_name = "dark rose tarot deck" - ckeywhitelist = list("satinisle") - character_name = list("Millie Orlen") + path = /obj/item/deck/dark_tarot + display_name = "dark rose tarot deck" + ckeywhitelist = list("satinisle") + character_name = list("Millie Orlen") /datum/gear/fluff/memorycrown - path = /obj/item/clothing/head/fluff/memory_crown - display_name = "memory crown" - slot = slot_head - ckeywhitelist = list("sixberry") - character_name = list("Thistle") + path = /obj/item/clothing/head/fluff/memory_crown + display_name = "memory crown" + slot = slot_head + ckeywhitelist = list("sixberry") + character_name = list("Thistle") // T CKEYS /datum/gear/fluff/ascian_medal diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 86cc834676..11cc9414da 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -78,12 +78,12 @@ path = /obj/item/clothing/shoes/laceup /datum/gear/shoes/lacey/New() - ..() - var/list/laces = list() - for(var/lace in typesof(/obj/item/clothing/shoes/laceup)) - var/obj/item/clothing/shoes/laceup/lace_type = lace - laces[initial(lace_type.name)] = lace_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(laces)) + ..() + var/list/laces = list() + for(var/lace in typesof(/obj/item/clothing/shoes/laceup)) + var/obj/item/clothing/shoes/laceup/lace_type = lace + laces[initial(lace_type.name)] = lace_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(laces)) /datum/gear/shoes/green display_name = "shoes, green" @@ -118,12 +118,12 @@ path = /obj/item/clothing/shoes/hitops/ /datum/gear/shoes/hitops/New() - ..() - var/list/hitops = list() - for(var/hitop in typesof(/obj/item/clothing/shoes/hitops)) - var/obj/item/clothing/shoes/hitops/hitop_type = hitop - hitops[initial(hitop_type.name)] = hitop_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hitops)) + ..() + var/list/hitops = list() + for(var/hitop in typesof(/obj/item/clothing/shoes/hitops)) + var/obj/item/clothing/shoes/hitops/hitop_type = hitop + hitops[initial(hitop_type.name)] = hitop_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hitops)) /datum/gear/shoes/flipflops display_name = "flip flops" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 239167820a..0baaa9d8d4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -755,20 +755,20 @@ gear_tweaks += new/datum/gear_tweak/path(croppedhoodies) /datum/gear/suit/drive - display_name = "relatable jacket" - path = /obj/item/clothing/suit/storage/drive + display_name = "relatable jacket" + path = /obj/item/clothing/suit/storage/drive /datum/gear/suit/motojacket - display_name = "motorcycle jacket" - path = /obj/item/clothing/suit/storage/toggle/moto_jacket + display_name = "motorcycle jacket" + path = /obj/item/clothing/suit/storage/toggle/moto_jacket /datum/gear/suit/punkvest - display_name = "punk vest" - path = /obj/item/clothing/suit/storage/punkvest + display_name = "punk vest" + path = /obj/item/clothing/suit/storage/punkvest /datum/gear/suit/raincoat - display_name = "raincoat" - path = /obj/item/clothing/suit/storage/hooded/raincoat + display_name = "raincoat" + path = /obj/item/clothing/suit/storage/hooded/raincoat //hooded cloaks /datum/gear/suit/roles/hoodedcloaks @@ -787,16 +787,16 @@ //oversized shirts /datum/gear/suit/nerdshirt - display_name = "nerdy shirt" - path = /obj/item/clothing/suit/nerdshirt + display_name = "nerdy shirt" + path = /obj/item/clothing/suit/nerdshirt /datum/gear/suit/ianshirt - display_name = "worn corgi shirt" - path = /obj/item/clothing/suit/ianshirt + display_name = "worn corgi shirt" + path = /obj/item/clothing/suit/ianshirt /datum/gear/suit/wornshirt - display_name = "worn shirt" - path = /obj/item/clothing/suit/wornshirt + display_name = "worn shirt" + path = /obj/item/clothing/suit/wornshirt /datum/gear/suit/bomber_pilot display_name = "bomber jacket, pilot" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 81a5c1971d..0e8910c706 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -543,16 +543,16 @@ //leotards /datum/gear/uniform/leotard - display_name = "leotard, black" - path = /obj/item/clothing/under/leotard + display_name = "leotard, black" + path = /obj/item/clothing/under/leotard /datum/gear/uniform/leotardcolor - display_name = "leotard, colorable" - path = /obj/item/clothing/under/leotardcolor + display_name = "leotard, colorable" + path = /obj/item/clothing/under/leotardcolor /datum/gear/uniform/leotardcolor/New() - ..() - gear_tweaks += gear_tweak_free_color_choice + ..() + gear_tweaks += gear_tweak_free_color_choice //skinsuits /datum/gear/uniform/skinsuits @@ -611,17 +611,17 @@ //half-moon outfit /datum/gear/uniform/halfmoon - display_name = "half moon outfit" - path = /obj/item/clothing/under/half_moon + display_name = "half moon outfit" + path = /obj/item/clothing/under/half_moon //fiend clothes /datum/gear/uniform/fiendsuit - display_name = "fiendish suit" - path = /obj/item/clothing/under/fiendsuit + display_name = "fiendish suit" + path = /obj/item/clothing/under/fiendsuit /datum/gear/uniform/fienddress - display_name = "fiendish dress" - path = /obj/item/clothing/under/fienddress + display_name = "fiendish dress" + path = /obj/item/clothing/under/fienddress //tabard dresses /datum/gear/uniform/tabarddress diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index d34492b0e5..fbe2499a64 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -6,7 +6,7 @@ SEE_MOBS // can see all mobs, no matter what SEE_OBJS // can see all objs, no matter what SEE_TURFS // can see all turfs (and areas), no matter what SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are - // in a lit area (via pixel_x,y or smooth movement), can see those pixels + // in a lit area (via pixel_x,y or smooth movement), can see those pixels BLIND // can't see anything */ /////////////////////////////////////////////////////////////////////// diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index c14a2ed45e..101ec2b3c3 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -268,13 +268,13 @@ return 1 /obj/item/clothing/glasses/hud/security/eyepatch - name = "Security Hudpatch" - desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their ID status and security records." - icon_state = "eyepatch" - item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") - body_parts_covered = 0 - enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM) - var/eye = null + name = "Security Hudpatch" + desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their ID status and security records." + icon_state = "eyepatch" + item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") + body_parts_covered = 0 + enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM) + var/eye = null /obj/item/clothing/glasses/hud/security/eyepatch/verb/switcheye() set name = "Switch Eyepatch" @@ -291,15 +291,15 @@ update_clothing_icon() /obj/item/clothing/glasses/hud/security/eyepatch2 - name = "Security Hudpatch MKII" - desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their ID status and security records. This updated model offers better ergonomics and updated sensors." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' - icon_state = "sec_eyepatch" - item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") - body_parts_covered = 0 - enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM) - var/eye = null + name = "Security Hudpatch MKII" + desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their ID status and security records. This updated model offers better ergonomics and updated sensors." + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' + icon_state = "sec_eyepatch" + item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") + body_parts_covered = 0 + enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM) + var/eye = null /obj/item/clothing/glasses/hud/security/eyepatch2/verb/switcheye() set name = "Switch Eyepatch" @@ -317,13 +317,13 @@ /obj/item/clothing/glasses/hud/health/eyepatch - name = "Medical Hudpatch" - desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their health status." - icon_state = "eyepatch" - item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") - body_parts_covered = 0 - enables_planes = list(VIS_CH_STATUS,VIS_CH_HEALTH) - var/eye = null + name = "Medical Hudpatch" + desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their health status." + icon_state = "eyepatch" + item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") + body_parts_covered = 0 + enables_planes = list(VIS_CH_STATUS,VIS_CH_HEALTH) + var/eye = null /obj/item/clothing/glasses/hud/health/eyepatch/verb/switcheye() set name = "Switch Eyepatch" diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index 99983a6a81..fdc7e2fe77 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -222,22 +222,22 @@ //hooded cloak hoods /obj/item/clothing/head/hood/cloak - name = "maroon cloak hood" - desc = "A hood attached to a maroon cloak." - icon_state = "maroon_cloakhood" - flags_inv = HIDEEARS|BLOCKHAIR + name = "maroon cloak hood" + desc = "A hood attached to a maroon cloak." + icon_state = "maroon_cloakhood" + flags_inv = HIDEEARS|BLOCKHAIR /obj/item/clothing/head/hood/cloak/winter - name = "winter cloak hood" - desc = "A hood attached to a winter cloak." - icon_state = "winter_cloakhood" + name = "winter cloak hood" + desc = "A hood attached to a winter cloak." + icon_state = "winter_cloakhood" /obj/item/clothing/head/hood/cloak/asymmetric - name = "asymmetric cloak hood" - desc = "A hood attached to an asymmetric cloak." - icon_state = "asymmetric_cloakhood" + name = "asymmetric cloak hood" + desc = "A hood attached to an asymmetric cloak." + icon_state = "asymmetric_cloakhood" /obj/item/clothing/head/hood/cloak/fancy - name = "fancy cloak hood" - desc = "A hood attached to a fancy cloak." - icon_state = "hb_cloakhood" + name = "fancy cloak hood" + desc = "A hood attached to a fancy cloak." + icon_state = "hb_cloakhood" diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 21a54809a1..0fd79e952a 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -16,9 +16,9 @@ w_class = ITEMSIZE_TINY /obj/item/clothing/mask/muzzle/New() - ..() - say_messages = list("Mmfph!", "Mmmf mrrfff!", "Mmmf mnnf!") - say_verbs = list("mumbles", "says") + ..() + say_messages = list("Mmfph!", "Mmmf mrrfff!", "Mmmf mnnf!") + say_verbs = list("mumbles", "says") // Clumsy folks can't take the mask off themselves. /obj/item/clothing/mask/muzzle/attack_hand(mob/living/user as mob) @@ -218,10 +218,10 @@ body_parts_covered = HEAD|FACE */ /obj/item/clothing/mask/horsehead/New() - ..() - // The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary - say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") - say_verbs = list("whinnies", "neighs", "says") + ..() + // The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary + say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") + say_verbs = list("whinnies", "neighs", "says") /obj/item/clothing/mask/ai name = "camera MIU" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 0c485247d2..c0a77078d4 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -253,9 +253,9 @@ siemens_coefficient = 0.6 /obj/item/clothing/shoes/boots/singer - name = "blue performer's boots" - desc = "These boots were made for dancing." - icon_state = "bsing" + name = "blue performer's boots" + desc = "These boots were made for dancing." + icon_state = "bsing" /obj/item/clothing/shoes/boots/singer/yellow name = "yellow performer's boots" @@ -263,6 +263,6 @@ icon_state = "ysing" /obj/item/clothing/shoes/boots/half_moon - name = "half moon boots" - desc = "Flexible and tight, these boots ensure the wearer will be leaving a solid impression without sacrificing mobility." - icon_state = "half_moon" + name = "half moon boots" + desc = "Flexible and tight, these boots ensure the wearer will be leaving a solid impression without sacrificing mobility." + icon_state = "half_moon" diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index b1ddd29d66..30678afe5d 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -368,27 +368,26 @@ //hooded cloaks /obj/item/clothing/suit/storage/hooded/cloak - name = "hooded maroon cloak" - desc = "A simple maroon colored cloak." - icon_state = "maroon_cloak" - body_parts_covered = CHEST|ARMS - hoodtype = /obj/item/clothing/head/hood/cloak + name = "hooded maroon cloak" + desc = "A simple maroon colored cloak." + icon_state = "maroon_cloak" + body_parts_covered = CHEST|ARMS + hoodtype = /obj/item/clothing/head/hood/cloak /obj/item/clothing/suit/storage/hooded/cloak/winter - name = "hooded winter cloak" - desc = "A simple wool cloak used during winter." - icon_state = "winter_cloak" - hoodtype = /obj/item/clothing/head/hood/cloak/winter + name = "hooded winter cloak" + desc = "A simple wool cloak used during winter." + icon_state = "winter_cloak" + hoodtype = /obj/item/clothing/head/hood/cloak/winter /obj/item/clothing/suit/storage/hooded/cloak/asymmetric - name = "hooded asymmetric cloak" - desc = "A blue hooded cloak with an asymmetric design." - icon_state = "asymmetric_cloak" - hoodtype = /obj/item/clothing/head/hood/cloak/asymmetric - + name = "hooded asymmetric cloak" + desc = "A blue hooded cloak with an asymmetric design." + icon_state = "asymmetric_cloak" + hoodtype = /obj/item/clothing/head/hood/cloak/asymmetric /obj/item/clothing/suit/storage/hooded/cloak/fancy - name = "hooded fancy cloak" - desc = "A fancy black hooded cloak." - icon_state = "hb_cloak" - hoodtype = /obj/item/clothing/head/hood/cloak/fancy + name = "hooded fancy cloak" + desc = "A fancy black hooded cloak." + icon_state = "hb_cloak" + hoodtype = /obj/item/clothing/head/hood/cloak/fancy diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 4744101c1b..9518710bf9 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1129,19 +1129,19 @@ body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/croppedhoodie/croppier - name = "high cropped hoodie" - desc = "This style of hoodie is worn by those that wish to display ample amounts of midriff, or never threw out their childhood apparel. The hood is cosmetic, and non-functional." - icon_state = "croppierhoodie" + name = "high cropped hoodie" + desc = "This style of hoodie is worn by those that wish to display ample amounts of midriff, or never threw out their childhood apparel. The hood is cosmetic, and non-functional." + icon_state = "croppierhoodie" /obj/item/clothing/suit/storage/croppedhoodie/croppierer - name = "very high cropped hoodie" - desc = "This style of hoodie is worn by those that wish to display ample amounts of underboob, and love the breeze. Comes with a free 'functionally_nude' sticker. The hood is cosmetic, and non-functional." - icon_state = "highcrophoodie" + name = "very high cropped hoodie" + desc = "This style of hoodie is worn by those that wish to display ample amounts of underboob, and love the breeze. Comes with a free 'functionally_nude' sticker. The hood is cosmetic, and non-functional." + icon_state = "highcrophoodie" /obj/item/clothing/suit/storage/croppedhoodie/croppiest - name = "super cropped hoodie" - desc = "This style of hoodie is worn by those that have little respect for the concept of a hoodie. Often seen in nightclubs and your daughter's wardrdobe. The hood is cosmetic, and non-functional." - icon_state = "supercroppedhoodie" + name = "super cropped hoodie" + desc = "This style of hoodie is worn by those that have little respect for the concept of a hoodie. Often seen in nightclubs and your daughter's wardrdobe. The hood is cosmetic, and non-functional." + icon_state = "supercroppedhoodie" //Drive jacket /obj/item/clothing/suit/storage/drive @@ -1158,7 +1158,7 @@ body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/punkvest - name = "punk vest" - desc = "For the spiritual rebels that nevertheless wish to conform to standard goth trends. You're totally showing them your anti-authority spunk." - icon_state = "punkvest" - body_parts_covered = CHEST|ARMS + name = "punk vest" + desc = "For the spiritual rebels that nevertheless wish to conform to standard goth trends. You're totally showing them your anti-authority spunk." + icon_state = "punkvest" + body_parts_covered = CHEST|ARMS diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index bd65703a32..64091d6148 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -573,9 +573,9 @@ icon_state = "countess" /obj/item/clothing/under/dress/verglasdress - name = "verglas dress" - desc = "The modern twist on a forgotten pattern, the Verglas style utilizes comfortable velvet and silver white satin to create an otherworldly effect evocative of winter, or the void." - icon_state = "verglas_dress" + name = "verglas dress" + desc = "The modern twist on a forgotten pattern, the Verglas style utilizes comfortable velvet and silver white satin to create an otherworldly effect evocative of winter, or the void." + icon_state = "verglas_dress" /obj/item/clothing/under/dress/alpine name = "alpine dress" @@ -1084,19 +1084,19 @@ icon_state = "swim_cow" /obj/item/clothing/under/swimsuit/highclass - name = "high class swimsuit" - desc = "An elegant swimsuit with a white bikini top and black bikini bottom. Thin black silk drapes down the back and goes to the upper thighs, and authentic gold rings hold the top together at the bust and back." - icon_state = "swim_highclass" + name = "high class swimsuit" + desc = "An elegant swimsuit with a white bikini top and black bikini bottom. Thin black silk drapes down the back and goes to the upper thighs, and authentic gold rings hold the top together at the bust and back." + icon_state = "swim_highclass" /obj/item/clothing/under/swimsuit/risque - name = "risque swimsuit" - desc = "This fits a bit too snug in all the right places. Comes with a collar, for inscrutable reasons." - icon_state = "swim_risque" + name = "risque swimsuit" + desc = "This fits a bit too snug in all the right places. Comes with a collar, for inscrutable reasons." + icon_state = "swim_risque" /obj/item/clothing/under/swimsuit/streamlined - name = "streamlined swimsuit" - desc = "An all white one-piece that maintains modesty without sacrificing class." - icon_state = "swim_stream" + name = "streamlined swimsuit" + desc = "An all white one-piece that maintains modesty without sacrificing class." + icon_state = "swim_stream" /* * Pyjamas @@ -1534,14 +1534,14 @@ //leotards /obj/item/clothing/under/leotard - name = "black leotard" - desc = "A black leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included." - icon_state = "leotard" + name = "black leotard" + desc = "A black leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included." + icon_state = "leotard" /obj/item/clothing/under/leotardcolor - name = "colored leotard" - desc = "A colorable leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included." - icon_state = "leotard_color" + name = "colored leotard" + desc = "A colorable leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included." + icon_state = "leotard_color" //skinsuits /obj/item/clothing/under/skinsuit @@ -1550,18 +1550,18 @@ icon_state = "skinsuit" /obj/item/clothing/under/skinsuit/gray - name = "gray skinsuit" - icon_state = "skinsuit_g" + name = "gray skinsuit" + icon_state = "skinsuit_g" /obj/item/clothing/under/skinsuit/leotard - name = "leotard skinsuit" - desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations." - icon_state = "skinsuitleo" + name = "leotard skinsuit" + desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations." + icon_state = "skinsuitleo" /obj/item/clothing/under/skinsuit/leotard/gray - name = "gray leotard skinsuit" - icon_state = "skinsuitleo_g" + name = "gray leotard skinsuit" + icon_state = "skinsuitleo_g" /obj/item/clothing/under/skinsuit/fem name = "feminine skinsuit" @@ -1569,17 +1569,17 @@ icon_state = "skinsuitfem" /obj/item/clothing/under/skinsuit/fem/gray - name = "feminine gray skinsuit" - icon_state = "skinsuitfem_g" + name = "feminine gray skinsuit" + icon_state = "skinsuitfem_g" /obj/item/clothing/under/skinsuit/fem/leotard - name = "feminine leotard skinsuit" - desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations." - icon_state = "skinsuitfemleo" + name = "feminine leotard skinsuit" + desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations." + icon_state = "skinsuitfemleo" /obj/item/clothing/under/skinsuit/fem/leotard/gray - name = "feminine gray leotard skinsuit" - icon_state = "skinsuitfemleo_g" + name = "feminine gray leotard skinsuit" + icon_state = "skinsuitfemleo_g" //baggy turtlenecks /obj/item/clothing/under/turtlebaggy @@ -1590,58 +1590,58 @@ /obj/item/clothing/under/turtlebaggy/cream_fem - name = "feminine cream baggy turtleneck" - icon_state = "bb_turtle_fem" + name = "feminine cream baggy turtleneck" + icon_state = "bb_turtle_fem" /obj/item/clothing/under/turtlebaggy/purple - name = "purple baggy turtleneck" - icon_state = "bb_turtlepur" + name = "purple baggy turtleneck" + icon_state = "bb_turtlepur" /obj/item/clothing/under/turtlebaggy/purple_fem - name = "feminine purple baggy turtleneck" - icon_state = "bb_turtlepur_fem" + name = "feminine purple baggy turtleneck" + icon_state = "bb_turtlepur_fem" /obj/item/clothing/under/turtlebaggy/red - name = "red baggy turtleneck" - icon_state = "bb_turtlered" + name = "red baggy turtleneck" + icon_state = "bb_turtlered" /obj/item/clothing/under/turtlebaggy/red_fem - name = "feminine red baggy turtleneck" - icon_state = "bb_turtlered_fem" + name = "feminine red baggy turtleneck" + icon_state = "bb_turtlered_fem" /obj/item/clothing/under/turtlebaggy/blue - name = "blue baggy turtleneck" - icon_state = "bb_turtleblu" + name = "blue baggy turtleneck" + icon_state = "bb_turtleblu" /obj/item/clothing/under/turtlebaggy/blue_fem - name = "feminine blue baggy turtleneck" - icon_state = "bb_turtleblu_fem" + name = "feminine blue baggy turtleneck" + icon_state = "bb_turtleblu_fem" /obj/item/clothing/under/turtlebaggy/green - name = "green baggy turtleneck" - icon_state = "bb_turtlegrn" + name = "green baggy turtleneck" + icon_state = "bb_turtlegrn" /obj/item/clothing/under/turtlebaggy/green_fem - name = "feminine green baggy turtleneck" - icon_state = "bb_turtlegrn_fem" + name = "feminine green baggy turtleneck" + icon_state = "bb_turtlegrn_fem" /obj/item/clothing/under/turtlebaggy/black - name = "black baggy turtleneck" - icon_state = "bb_turtleblk" + name = "black baggy turtleneck" + icon_state = "bb_turtleblk" /obj/item/clothing/under/turtlebaggy/black_fem - name = "feminine black baggy turtleneck" - icon_state = "bb_turtleblk_fem" + name = "feminine black baggy turtleneck" + icon_state = "bb_turtleblk_fem" //more big sweaters @@ -1663,21 +1663,21 @@ //half-moon outfit /obj/item/clothing/under/half_moon - name = "half moon outfit" - desc = "This eminently fashionable outfit consists of a tailored latex leotard and daringly cut white shorts. Paired with plunging off-color stockings, it's to die for." - icon_state = "half_moon" + name = "half moon outfit" + desc = "This eminently fashionable outfit consists of a tailored latex leotard and daringly cut white shorts. Paired with plunging off-color stockings, it's to die for." + icon_state = "half_moon" //fiend clothes /obj/item/clothing/under/fiendsuit - name = "fiendish suit" - desc = "A red and black suit befitting someone from the dark pits themselves… Or someone way too edgy." - icon_state = "fiendsuit" + name = "fiendish suit" + desc = "A red and black suit befitting someone from the dark pits themselves… Or someone way too edgy." + icon_state = "fiendsuit" /obj/item/clothing/under/fienddress - name = "fiendish dress" - desc = "A red and black dress befitting someone from the dark pits themselves… Or someone way too edgy." - icon_state = "fienddress" + name = "fiendish dress" + desc = "A red and black dress befitting someone from the dark pits themselves… Or someone way too edgy." + icon_state = "fienddress" //bunny suits diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index 881a176d1f..261f6fb1d6 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -486,20 +486,20 @@ manipulating = 1 if(!anchored) user.visible_message("\The [user] begins securing \the [src] to the floor.", - "You begin securing \the [src] to the floor.") + "You begin securing \the [src] to the floor.") else user.visible_message(span_warning("\The [user] begins unsecuring \the [src] from the floor."), - "You begin unsecuring \the [src] from the floor.") + "You begin unsecuring \the [src] from the floor.") playsound(src, W.usesound, 50, 1) if(!do_after(user, 20 * W.toolspeed)) manipulating = 0 return if(!anchored) user.visible_message(span_notice("\The [user] has secured \the [src] to the floor."), - span_notice("You have secured \the [src] to the floor.")) + span_notice("You have secured \the [src] to the floor.")) else user.visible_message(span_warning("\The [user] has unsecured \the [src] from the floor."), - span_notice("You have unsecured \the [src] from the floor.")) + span_notice("You have unsecured \the [src] from the floor.")) anchored = !anchored manipulating = 0 return diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 541fd2e4c0..ab5b3bbee4 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -781,7 +781,7 @@ ) premium = list(/obj/item/bedsheet/rainbow = 1) contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1, - /obj/item/clothing/accessory/collar/collarplanet_earth = 5) + /obj/item/clothing/accessory/collar/collarplanet_earth = 5) /obj/machinery/vending/loadout/clothing name = "General Jump" diff --git a/code/modules/emotes/definitions/helpers_vr.dm b/code/modules/emotes/definitions/helpers_vr.dm index c3eccf385a..4abe8d9028 100644 --- a/code/modules/emotes/definitions/helpers_vr.dm +++ b/code/modules/emotes/definitions/helpers_vr.dm @@ -1,33 +1,33 @@ // Not specifically /human type because those won't allow FBPs to use them /decl/emote/helper/vwag - key = "vwag" - emote_message_3p = "" + key = "vwag" + emote_message_3p = "" /decl/emote/helper/vwag/mob_can_use(mob/living/carbon/human/user) - if(!istype(user) || (!user.tail_style || !user.tail_style.ani_state)) - return FALSE - return ..() + if(!istype(user) || (!user.tail_style || !user.tail_style.ani_state)) + return FALSE + return ..() /decl/emote/helper/vwag/do_emote(var/mob/living/carbon/human/user, var/extra_params) - if(user.toggle_tail(message = 1)) - return ..() + if(user.toggle_tail(message = 1)) + return ..() /decl/emote/helper/vwag/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params) - return "[user.wagging ? "starts" : "stops"] wagging USER_THEIR tail." + return "[user.wagging ? "starts" : "stops"] wagging USER_THEIR tail." /decl/emote/helper/vflap - key = "vflap" - emote_message_3p = "" + key = "vflap" + emote_message_3p = "" /decl/emote/helper/vflap/mob_can_use(mob/living/carbon/human/user) - if(!istype(user) || (!user.wing_style || !user.wing_style.ani_state)) - return FALSE - return ..() + if(!istype(user) || (!user.wing_style || !user.wing_style.ani_state)) + return FALSE + return ..() /decl/emote/helper/vflap/do_emote(var/mob/living/carbon/human/user, var/extra_params) - if(user.toggle_wing(message = 1)) - return ..() + if(user.toggle_wing(message = 1)) + return ..() /decl/emote/helper/vflap/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params) - return "[user.flapping ? "starts" : "stops"] flapping USER_THEIR wings." + return "[user.flapping ? "starts" : "stops"] flapping USER_THEIR wings." diff --git a/code/modules/emotes/definitions/visible_vr.dm b/code/modules/emotes/definitions/visible_vr.dm index 69252cf43b..39b8dcbd82 100644 --- a/code/modules/emotes/definitions/visible_vr.dm +++ b/code/modules/emotes/definitions/visible_vr.dm @@ -1,7 +1,7 @@ /decl/emote/visible/mlem - key = "mlem" - emote_message_3p = "mlems USER_THEIR tongue up over USER_THEIR nose. Mlem." + key = "mlem" + emote_message_3p = "mlems USER_THEIR tongue up over USER_THEIR nose. Mlem." /decl/emote/visible/blep - key = "blep" - emote_message_3p = "bleps USER_THEIR tongue out. Blep." + key = "blep" + emote_message_3p = "bleps USER_THEIR tongue out. Blep." diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index bf3b7fa3aa..4ec63ef70f 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -30,8 +30,8 @@ var/global/list/emotes_by_key var/emote_message_muffled // A message to show if the emote is audible and the user is muzzled. var/list/emote_sound // A sound for the emote to play. - // Can either be a single sound, a list of sounds to pick from, or an - // associative array of gender to single sounds/a list of sounds. + // Can either be a single sound, a list of sounds to pick from, or an + // associative array of gender to single sounds/a list of sounds. var/list/emote_sound_synthetic // As above, but used when check_synthetic() is true. var/emote_volume = 50 // Volume of sound to play. var/emote_volume_synthetic = 50 // As above, but used when check_synthetic() is true. diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm index a2f2846c16..c764240693 100644 --- a/code/modules/food/food/lunch.dm +++ b/code/modules/food/food/lunch.dm @@ -1,154 +1,154 @@ var/list/lunchables_lunches_ = list(/obj/item/reagent_containers/food/snacks/sandwich, - /obj/item/reagent_containers/food/snacks/slice/meatbread/filled, - /obj/item/reagent_containers/food/snacks/slice/tofubread/filled, - /obj/item/reagent_containers/food/snacks/slice/creamcheesebread/filled, - /obj/item/reagent_containers/food/snacks/slice/margherita/filled, - /obj/item/reagent_containers/food/snacks/slice/meatpizza/filled, - /obj/item/reagent_containers/food/snacks/slice/mushroompizza/filled, - /obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled, - /obj/item/reagent_containers/food/snacks/pineappleslice/filled, - /obj/item/reagent_containers/food/snacks/tastybread, - /obj/item/reagent_containers/food/snacks/bagelplain, - /obj/item/reagent_containers/food/snacks/bagelsunflower, - /obj/item/reagent_containers/food/snacks/bagelcheese, - /obj/item/reagent_containers/food/snacks/bagelraisin, - /obj/item/reagent_containers/food/snacks/bagelpoppy, - /obj/item/reagent_containers/food/snacks/croissant, - /obj/item/reagent_containers/food/snacks/corn_dog, - /obj/item/reagent_containers/food/snacks/liquidfood, - /obj/item/reagent_containers/food/snacks/liquidprotein, - /obj/item/reagent_containers/food/snacks/liquidvitamin, - /obj/item/reagent_containers/food/snacks/jellysandwich/cherry, - /obj/item/reagent_containers/food/snacks/tossedsalad, - /obj/item/reagent_containers/food/snacks/rosesalad, - /obj/item/reagent_containers/food/snacks/boiledegg, - /obj/item/reagent_containers/food/snacks/locust_cooked, - /obj/item/reagent_containers/food/snacks/spicedmeatbun, - /obj/item/reagent_containers/food/snacks/quicheslice/filled, - /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, - /obj/item/reagent_containers/food/snacks/packaged/sausageroll, - /obj/item/reagent_containers/food/snacks/packaged/pasty, - /obj/item/reagent_containers/food/snacks/packaged/scotchegg, - /obj/item/reagent_containers/food/snacks/packaged/porkpie) + /obj/item/reagent_containers/food/snacks/slice/meatbread/filled, + /obj/item/reagent_containers/food/snacks/slice/tofubread/filled, + /obj/item/reagent_containers/food/snacks/slice/creamcheesebread/filled, + /obj/item/reagent_containers/food/snacks/slice/margherita/filled, + /obj/item/reagent_containers/food/snacks/slice/meatpizza/filled, + /obj/item/reagent_containers/food/snacks/slice/mushroompizza/filled, + /obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled, + /obj/item/reagent_containers/food/snacks/pineappleslice/filled, + /obj/item/reagent_containers/food/snacks/tastybread, + /obj/item/reagent_containers/food/snacks/bagelplain, + /obj/item/reagent_containers/food/snacks/bagelsunflower, + /obj/item/reagent_containers/food/snacks/bagelcheese, + /obj/item/reagent_containers/food/snacks/bagelraisin, + /obj/item/reagent_containers/food/snacks/bagelpoppy, + /obj/item/reagent_containers/food/snacks/croissant, + /obj/item/reagent_containers/food/snacks/corn_dog, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidprotein, + /obj/item/reagent_containers/food/snacks/liquidvitamin, + /obj/item/reagent_containers/food/snacks/jellysandwich/cherry, + /obj/item/reagent_containers/food/snacks/tossedsalad, + /obj/item/reagent_containers/food/snacks/rosesalad, + /obj/item/reagent_containers/food/snacks/boiledegg, + /obj/item/reagent_containers/food/snacks/locust_cooked, + /obj/item/reagent_containers/food/snacks/spicedmeatbun, + /obj/item/reagent_containers/food/snacks/quicheslice/filled, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, + /obj/item/reagent_containers/food/snacks/packaged/sausageroll, + /obj/item/reagent_containers/food/snacks/packaged/pasty, + /obj/item/reagent_containers/food/snacks/packaged/scotchegg, + /obj/item/reagent_containers/food/snacks/packaged/porkpie) var/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snacks/donut/plain/jelly, - /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, - /obj/item/reagent_containers/food/snacks/muffin, - /obj/item/reagent_containers/food/snacks/popcorn, - /obj/item/reagent_containers/food/snacks/sosjerky, - /obj/item/reagent_containers/food/snacks/unajerky, - /obj/item/reagent_containers/food/snacks/no_raisin, - /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie, - /obj/item/reagent_containers/food/snacks/cheesiehonkers, - /obj/item/reagent_containers/food/snacks/poppypretzel, - /obj/item/reagent_containers/food/snacks/carrotfries, - /obj/item/reagent_containers/food/snacks/candiedapple, - /obj/item/reagent_containers/food/snacks/applepie, - /obj/item/reagent_containers/food/snacks/cherrypie, - /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit, - /obj/item/reagent_containers/food/snacks/appletart, - /obj/item/reagent_containers/food/snacks/slice/carrotcake/filled, - /obj/item/reagent_containers/food/snacks/slice/cheesecake/filled, - /obj/item/reagent_containers/food/snacks/slice/plaincake/filled, - /obj/item/reagent_containers/food/snacks/slice/orangecake/filled, - /obj/item/reagent_containers/food/snacks/slice/limecake/filled, - /obj/item/reagent_containers/food/snacks/slice/lemoncake/filled, - /obj/item/reagent_containers/food/snacks/slice/chocolatecake/filled, - /obj/item/reagent_containers/food/snacks/slice/birthdaycake/filled, - /obj/item/reagent_containers/food/snacks/watermelonslice, - /obj/item/reagent_containers/food/snacks/slice/applecake/filled, - /obj/item/reagent_containers/food/snacks/slice/pumpkinpie/filled, - /obj/item/reagent_containers/food/snacks/keylimepieslice/filled, - /obj/item/reagent_containers/food/snacks/browniesslice/filled, - /obj/item/reagent_containers/food/snacks/skrellsnacks, - /obj/item/reagent_containers/food/snacks/mint/admints, - /obj/item/reagent_containers/food/snacks/roastedpeanuts, - /obj/item/reagent_containers/food/snacks/sugarcookie, - /obj/item/reagent_containers/food/snacks/eggroll, - /obj/item/reagent_containers/food/snacks/fruitsalad, - /obj/item/reagent_containers/food/snacks/honeybun, - /obj/item/reagent_containers/food/snacks/custardbun, - /obj/item/reagent_containers/food/snacks/honeytoast, - /obj/item/reagent_containers/food/snacks/cookie, - /obj/item/reagent_containers/food/snacks/fruitbar, - /obj/item/reagent_containers/food/snacks/semki, - /obj/item/reagent_containers/food/snacks/salo, - /obj/item/reagent_containers/food/snacks/weebonuts, - /obj/item/reagent_containers/food/snacks/ricecake, - /obj/item/reagent_containers/food/snacks/packaged/lunacake, - /obj/item/reagent_containers/food/snacks/packaged/darklunacake, - /obj/item/reagent_containers/food/snacks/packaged/mochicake, - /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie, - /obj/item/storage/box/jaffacake, - /obj/item/storage/box/winegum, - /obj/item/storage/box/custardcream, - /obj/item/storage/box/bourbon - ) + /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, + /obj/item/reagent_containers/food/snacks/muffin, + /obj/item/reagent_containers/food/snacks/popcorn, + /obj/item/reagent_containers/food/snacks/sosjerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/no_raisin, + /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie, + /obj/item/reagent_containers/food/snacks/cheesiehonkers, + /obj/item/reagent_containers/food/snacks/poppypretzel, + /obj/item/reagent_containers/food/snacks/carrotfries, + /obj/item/reagent_containers/food/snacks/candiedapple, + /obj/item/reagent_containers/food/snacks/applepie, + /obj/item/reagent_containers/food/snacks/cherrypie, + /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit, + /obj/item/reagent_containers/food/snacks/appletart, + /obj/item/reagent_containers/food/snacks/slice/carrotcake/filled, + /obj/item/reagent_containers/food/snacks/slice/cheesecake/filled, + /obj/item/reagent_containers/food/snacks/slice/plaincake/filled, + /obj/item/reagent_containers/food/snacks/slice/orangecake/filled, + /obj/item/reagent_containers/food/snacks/slice/limecake/filled, + /obj/item/reagent_containers/food/snacks/slice/lemoncake/filled, + /obj/item/reagent_containers/food/snacks/slice/chocolatecake/filled, + /obj/item/reagent_containers/food/snacks/slice/birthdaycake/filled, + /obj/item/reagent_containers/food/snacks/watermelonslice, + /obj/item/reagent_containers/food/snacks/slice/applecake/filled, + /obj/item/reagent_containers/food/snacks/slice/pumpkinpie/filled, + /obj/item/reagent_containers/food/snacks/keylimepieslice/filled, + /obj/item/reagent_containers/food/snacks/browniesslice/filled, + /obj/item/reagent_containers/food/snacks/skrellsnacks, + /obj/item/reagent_containers/food/snacks/mint/admints, + /obj/item/reagent_containers/food/snacks/roastedpeanuts, + /obj/item/reagent_containers/food/snacks/sugarcookie, + /obj/item/reagent_containers/food/snacks/eggroll, + /obj/item/reagent_containers/food/snacks/fruitsalad, + /obj/item/reagent_containers/food/snacks/honeybun, + /obj/item/reagent_containers/food/snacks/custardbun, + /obj/item/reagent_containers/food/snacks/honeytoast, + /obj/item/reagent_containers/food/snacks/cookie, + /obj/item/reagent_containers/food/snacks/fruitbar, + /obj/item/reagent_containers/food/snacks/semki, + /obj/item/reagent_containers/food/snacks/salo, + /obj/item/reagent_containers/food/snacks/weebonuts, + /obj/item/reagent_containers/food/snacks/ricecake, + /obj/item/reagent_containers/food/snacks/packaged/lunacake, + /obj/item/reagent_containers/food/snacks/packaged/darklunacake, + /obj/item/reagent_containers/food/snacks/packaged/mochicake, + /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/winegum, + /obj/item/storage/box/custardcream, + /obj/item/storage/box/bourbon + ) var/list/lunchables_drinks_ = list(/obj/item/reagent_containers/food/drinks/cans/cola, - /obj/item/reagent_containers/food/drinks/cans/waterbottle, - /obj/item/reagent_containers/food/drinks/cans/decaf_cola, - /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, - /obj/item/reagent_containers/food/drinks/cans/dr_gibb, - /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet, - /obj/item/reagent_containers/food/drinks/cans/starkist, - /obj/item/reagent_containers/food/drinks/cans/starkistdecaf, - /obj/item/reagent_containers/food/drinks/cans/space_up, - /obj/item/reagent_containers/food/drinks/cans/lemon_lime, - /obj/item/reagent_containers/food/drinks/cans/iced_tea, - /obj/item/reagent_containers/food/drinks/cans/grape_juice, - /obj/item/reagent_containers/food/drinks/cans/tonic, - /obj/item/reagent_containers/food/drinks/cans/sodawater, - /obj/item/reagent_containers/food/drinks/cans/gingerale, - /obj/item/reagent_containers/food/drinks/cans/root_beer, - /obj/item/reagent_containers/food/drinks/cans/sarsaparilla, - /obj/item/reagent_containers/food/drinks/cans/straw_cola, - /obj/item/reagent_containers/food/drinks/cans/apple_cola, - /obj/item/reagent_containers/food/drinks/cans/lemon_cola, - /obj/item/reagent_containers/food/drinks/cans/nukie_peach, - /obj/item/reagent_containers/food/drinks/cans/nukie_pear, - /obj/item/reagent_containers/food/drinks/cans/nukie_cherry, - /obj/item/reagent_containers/food/drinks/cans/nukie_melon, - /obj/item/reagent_containers/food/drinks/cans/nukie_banana, - /obj/item/reagent_containers/food/drinks/cans/nukie_rose, - /obj/item/reagent_containers/food/drinks/cans/nukie_lemon, - /obj/item/reagent_containers/food/drinks/cans/nukie_fruit - ) + /obj/item/reagent_containers/food/drinks/cans/waterbottle, + /obj/item/reagent_containers/food/drinks/cans/decaf_cola, + /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, + /obj/item/reagent_containers/food/drinks/cans/dr_gibb, + /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet, + /obj/item/reagent_containers/food/drinks/cans/starkist, + /obj/item/reagent_containers/food/drinks/cans/starkistdecaf, + /obj/item/reagent_containers/food/drinks/cans/space_up, + /obj/item/reagent_containers/food/drinks/cans/lemon_lime, + /obj/item/reagent_containers/food/drinks/cans/iced_tea, + /obj/item/reagent_containers/food/drinks/cans/grape_juice, + /obj/item/reagent_containers/food/drinks/cans/tonic, + /obj/item/reagent_containers/food/drinks/cans/sodawater, + /obj/item/reagent_containers/food/drinks/cans/gingerale, + /obj/item/reagent_containers/food/drinks/cans/root_beer, + /obj/item/reagent_containers/food/drinks/cans/sarsaparilla, + /obj/item/reagent_containers/food/drinks/cans/straw_cola, + /obj/item/reagent_containers/food/drinks/cans/apple_cola, + /obj/item/reagent_containers/food/drinks/cans/lemon_cola, + /obj/item/reagent_containers/food/drinks/cans/nukie_peach, + /obj/item/reagent_containers/food/drinks/cans/nukie_pear, + /obj/item/reagent_containers/food/drinks/cans/nukie_cherry, + /obj/item/reagent_containers/food/drinks/cans/nukie_melon, + /obj/item/reagent_containers/food/drinks/cans/nukie_banana, + /obj/item/reagent_containers/food/drinks/cans/nukie_rose, + /obj/item/reagent_containers/food/drinks/cans/nukie_lemon, + /obj/item/reagent_containers/food/drinks/cans/nukie_fruit + ) // This default list is a bit different, it contains items we don't want var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing, - /datum/reagent/drink/doctor_delight, - /datum/reagent/drink/dry_ramen, - /datum/reagent/drink/hell_ramen, - /datum/reagent/drink/hot_ramen, - /datum/reagent/drink/soda/nuka_cola, - /datum/reagent/drink/coffee/nukie/mega, - /datum/reagent/drink/coffee/nukie/mega/sight, - /datum/reagent/drink/coffee/nukie/mega/heart, - /datum/reagent/drink/coffee/nukie/mega/nega, - /datum/reagent/drink/coffee/nukie/mega/shock, - /datum/reagent/drink/coffee/nukie/mega/fast, - /datum/reagent/drink/coffee/nukie/mega/high, - /datum/reagent/drink/coffee/nukie/mega/shrink, - /datum/reagent/drink/coffee/nukie/mega/grow) + /datum/reagent/drink/doctor_delight, + /datum/reagent/drink/dry_ramen, + /datum/reagent/drink/hell_ramen, + /datum/reagent/drink/hot_ramen, + /datum/reagent/drink/soda/nuka_cola, + /datum/reagent/drink/coffee/nukie/mega, + /datum/reagent/drink/coffee/nukie/mega/sight, + /datum/reagent/drink/coffee/nukie/mega/heart, + /datum/reagent/drink/coffee/nukie/mega/nega, + /datum/reagent/drink/coffee/nukie/mega/shock, + /datum/reagent/drink/coffee/nukie/mega/fast, + /datum/reagent/drink/coffee/nukie/mega/high, + /datum/reagent/drink/coffee/nukie/mega/shrink, + /datum/reagent/drink/coffee/nukie/mega/grow) // This default list is a bit different, it contains items we don't want var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit, - /datum/reagent/ethanol/atomicbomb, - /datum/reagent/ethanol/beepsky_smash, - /datum/reagent/ethanol/coffee, - /datum/reagent/ethanol/hippies_delight, - /datum/reagent/ethanol/hooch, - /datum/reagent/ethanol/thirteenloko, - /datum/reagent/ethanol/manhattan_proj, - /datum/reagent/ethanol/neurotoxin, - /datum/reagent/ethanol/pwine, - /datum/reagent/ethanol/threemileisland, - /datum/reagent/ethanol/toxins_special, - /datum/reagent/ethanol/voxdelight, - /datum/reagent/ethanol/soemmerfire, - /datum/reagent/ethanol/slimeshot) + /datum/reagent/ethanol/atomicbomb, + /datum/reagent/ethanol/beepsky_smash, + /datum/reagent/ethanol/coffee, + /datum/reagent/ethanol/hippies_delight, + /datum/reagent/ethanol/hooch, + /datum/reagent/ethanol/thirteenloko, + /datum/reagent/ethanol/manhattan_proj, + /datum/reagent/ethanol/neurotoxin, + /datum/reagent/ethanol/pwine, + /datum/reagent/ethanol/threemileisland, + /datum/reagent/ethanol/toxins_special, + /datum/reagent/ethanol/voxdelight, + /datum/reagent/ethanol/soemmerfire, + /datum/reagent/ethanol/slimeshot) /proc/lunchables_lunches() if(!(lunchables_lunches_[lunchables_lunches_[1]])) diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm index 6c8b5b7a4a..f81a21871f 100644 --- a/code/modules/food/recipe.dm +++ b/code/modules/food/recipe.dm @@ -9,7 +9,7 @@ * * items are objects. Fruits, tools, circuit boards. * * result is type to create as new object * * time is optional parameter, you shall use in in your machine, - default /datum/recipe/ procs does not rely on this parameter. + * default /datum/recipe/ procs does not rely on this parameter. * * Functions you need: * /datum/recipe/proc/make(var/obj/container as obj) diff --git a/code/modules/food/recipe_dump.dm b/code/modules/food/recipe_dump.dm index 21733d96b6..3908e1750d 100644 --- a/code/modules/food/recipe_dump.dm +++ b/code/modules/food/recipe_dump.dm @@ -10,8 +10,8 @@ var/list/drink_recipes = list() for(var/decl/chemical_reaction/instant/drinks/CR in SSchemistry.chemical_reactions) drink_recipes[CR.type] = list("Result" = CR.name, - "ResAmt" = CR.result_amount, - "Reagents" = CR.required_reagents, + "ResAmt" = CR.result_amount, + "Reagents" = CR.required_reagents, "Catalysts" = CR.catalysts) //////////////////////// FOOD diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index fc3d7f11a8..7b7b66bced 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -8,11 +8,11 @@ random_color = FALSE /obj/item/tool/wirecutters/clippers/trimmers - name = "hedgetrimmers" - desc = "An old pair of trimmers with a pretty dull blade. You would probably have a hard time cutting anything but plants with it." - icon_state = "hedget" - item_state = "hedget" - force = 7 //One point extra than standard wire cutters. + name = "hedgetrimmers" + desc = "An old pair of trimmers with a pretty dull blade. You would probably have a hard time cutting anything but plants with it." + icon_state = "hedget" + item_state = "hedget" + force = 7 //One point extra than standard wire cutters. /obj/item/tool/wirecutters/clippers/trimmers/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(!proximity) return diff --git a/code/modules/icon generation/Uristrunes.dm b/code/modules/icon generation/Uristrunes.dm index 8dfe135a72..4deff20821 100644 --- a/code/modules/icon generation/Uristrunes.dm +++ b/code/modules/icon generation/Uristrunes.dm @@ -36,14 +36,14 @@ var/sw = I.GetPixel(x - 1, y - 1) var/sum_adj = ((n == "#00ff00"? 1 : 0) \ - + (s == "#00ff00"? 1 : 0) \ - + (e == "#00ff00"? 1 : 0) \ - + (w == "#00ff00"? 1 : 0)) + + (s == "#00ff00"? 1 : 0) \ + + (e == "#00ff00"? 1 : 0) \ + + (w == "#00ff00"? 1 : 0)) var/sum_diag = ((ne == "#00ff00"? 1 : 0) \ - + (se == "#00ff00"? 1 : 0) \ - + (nw == "#00ff00"? 1 : 0) \ - + (sw == "#00ff00"? 1 : 0)) + + (se == "#00ff00"? 1 : 0) \ + + (nw == "#00ff00"? 1 : 0) \ + + (sw == "#00ff00"? 1 : 0)) if(sum_adj) @@ -234,35 +234,35 @@ var/list/rune_animation = list( var/obj/o = new(t) o.icon = animate_rune_full(I, rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), - rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), - rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), - rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), - 0, 0, 0, rand(0, 255), - 0, 0, 0, rand(0, 255), - 0, 0, 0, 0, - 0, 0, 0, 0, - list( - list(0.000, 5), - list(0.020, 1), - list(0.050, 1), - list(0.090, 1), - list(0.140, 1), - list(0.200, 1), - list(0.270, 1), - list(0.340, 1), - list(0.420, 1), - list(0.500, 1), - list(0.590, 1), - list(0.675, 1), - list(0.750, 1), - list(0.900, 1), - list(1.000, 6), - list(0.875, 1), - list(0.750, 1), - list(0.625, 1), - list(0.500, 1), - list(0.375, 1), - list(0.250, 1), - list(0.125, 1), - )) + rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), + rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), + rand(0, 255), rand(0, 255), rand(0, 255), rand(-255, 255), + 0, 0, 0, rand(0, 255), + 0, 0, 0, rand(0, 255), + 0, 0, 0, 0, + 0, 0, 0, 0, + list( + list(0.000, 5), + list(0.020, 1), + list(0.050, 1), + list(0.090, 1), + list(0.140, 1), + list(0.200, 1), + list(0.270, 1), + list(0.340, 1), + list(0.420, 1), + list(0.500, 1), + list(0.590, 1), + list(0.675, 1), + list(0.750, 1), + list(0.900, 1), + list(1.000, 6), + list(0.875, 1), + list(0.750, 1), + list(0.625, 1), + list(0.500, 1), + list(0.375, 1), + list(0.250, 1), + list(0.125, 1), + )) */ diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index 78ddcc060c..389c9ace9c 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -12,8 +12,8 @@ A [2]\ /[8] result B [1]-\|++|/ C [4]-/|++| D [1]/ || - || - Activator + || + Activator diff --git a/code/modules/integrated_electronics/core/special_pins/ref_pin.dm b/code/modules/integrated_electronics/core/special_pins/ref_pin.dm index f078935519..96ab532647 100644 --- a/code/modules/integrated_electronics/core/special_pins/ref_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/ref_pin.dm @@ -3,14 +3,14 @@ name = "ref pin" /datum/integrated_io/ref/ask_for_pin_data(mob/user, obj/item/I) - if(istype(I, /obj/item/multitool)) - var/obj/item/multitool/tool = I - write_data_to_pin(tool.weakref_wiring) - else if(istype(I, /obj/item/integrated_electronics/debugger)) - var/obj/item/integrated_electronics/debugger/tool = I - write_data_to_pin(tool.data_to_write) - else - write_data_to_pin(null) + if(istype(I, /obj/item/multitool)) + var/obj/item/multitool/tool = I + write_data_to_pin(tool.weakref_wiring) + else if(istype(I, /obj/item/integrated_electronics/debugger)) + var/obj/item/integrated_electronics/debugger/tool = I + write_data_to_pin(tool.data_to_write) + else + write_data_to_pin(null) /datum/integrated_io/ref/write_data_to_pin(var/new_data) if(isnull(new_data) || isweakref(new_data)) diff --git a/code/modules/library/hardcode_library/reference/PortedBooks.dm b/code/modules/library/hardcode_library/reference/PortedBooks.dm index 4b8e895c93..c8a37abfe5 100644 --- a/code/modules/library/hardcode_library/reference/PortedBooks.dm +++ b/code/modules/library/hardcode_library/reference/PortedBooks.dm @@ -311,7 +311,7 @@ Category: Reference
  • "} + span_bold("Avoid opening fire locks.") + {"

    • In the event of depressurization, the station's fire locks automatically drop in an attempt to contain the breach. However, this can also impede movement. If possible, find an alternate route to your destination or find a safe place to wait until the station's engineering team repairs the station. Do not open a fire lock without an engineer's express permission unless you are in immediate mortal danger. After you have opened a fire lock, make sure to close it immediately so as to prevent the breach from spreading.

    -
      +
      • "} + span_bold("Listen to emergency personnel.") + {"

      Follow the instructions of engineering, medical, and security personnel, as well as the orders of the heads of staff. Engineering personnel are trained to fix these situations, and medical personnel will likely be conducting search and rescue operations. Do not impede them and follow their instructions; you are more likely to survive, and less likely to endanger your fellow crew members.

      diff --git a/code/modules/lighting/__lighting_docs.dm b/code/modules/lighting/__lighting_docs.dm index aef406dcb8..0ae9ce5ed6 100644 --- a/code/modules/lighting/__lighting_docs.dm +++ b/code/modules/lighting/__lighting_docs.dm @@ -4,64 +4,64 @@ BS12 object based lighting system /* Changes from tg DAL: - - Lighting is done using objects instead of subareas. - - Animated transitions. (newer tg DAL has this) - - Full colours with mixing. - - Support for lights on shuttles. + - Lighting is done using objects instead of subareas. + - Animated transitions. (newer tg DAL has this) + - Full colours with mixing. + - Support for lights on shuttles. - - Code: - - Instead of one flat luminosity var, light is represented by 3 atom vars: - - light_range; range in tiles of the light, used for calculating falloff, - - light_power; multiplier for the brightness of lights, - - light_color; hex string representing the RGB colour of the light. - - setLuminousity() is now set_light() and takes the three variables above. - - Variables can be left as null to not update them. - - set_opacity() is now set_opacity(). - - Areas have luminosity set to 1 permanently, no hard-lighting. - - Objects inside other objects can have lights and they properly affect the turf. (flashlights) - - area/master and area/list/related have been eviscerated since subareas aren't needed. + - Code: + - Instead of one flat luminosity var, light is represented by 3 atom vars: + - light_range; range in tiles of the light, used for calculating falloff, + - light_power; multiplier for the brightness of lights, + - light_color; hex string representing the RGB colour of the light. + - setLuminousity() is now set_light() and takes the three variables above. + - Variables can be left as null to not update them. + - set_opacity() is now set_opacity(). + - Areas have luminosity set to 1 permanently, no hard-lighting. + - Objects inside other objects can have lights and they properly affect the turf. (flashlights) + - area/master and area/list/related have been eviscerated since subareas aren't needed. */ /* Relevant vars/procs: atom: (lighting_atom.dm) - - var/light_range; range in tiles of the light, used for calculating falloff - - var/light_power; multiplier for the brightness of lights - - var/light_color; hex string representing the RGB colour of the light + - var/light_range; range in tiles of the light, used for calculating falloff + - var/light_power; multiplier for the brightness of lights + - var/light_color; hex string representing the RGB colour of the light - - var/datum/light_source/light; light source datum for this atom, only present if light_range && light_power - - var/list/light_sources; light sources in contents that are shining through this object, including this object + - var/datum/light_source/light; light source datum for this atom, only present if light_range && light_power + - var/list/light_sources; light sources in contents that are shining through this object, including this object - - proc/set_light(l_range, l_power, l_color): - - Sets light_range/power/color to non-null args and calls update_light() - - proc/set_opacity(new_opacity): - - Sets opacity to new_opacity. - - If opacity has changed, call turf.reconsider_lights() to fix light occlusion - - proc/update_light(): - - Updates the light var on this atom, deleting or creating as needed and calling .update() + - proc/set_light(l_range, l_power, l_color): + - Sets light_range/power/color to non-null args and calls update_light() + - proc/set_opacity(new_opacity): + - Sets opacity to new_opacity. + - If opacity has changed, call turf.reconsider_lights() to fix light occlusion + - proc/update_light(): + - Updates the light var on this atom, deleting or creating as needed and calling .update() turf: (lighting_turf.dm) - - var/list/affecting_lights; list of light sources that are shining onto this turf + - var/list/affecting_lights; list of light sources that are shining onto this turf - - proc/reconsider_lights(): - - Force all light sources shining onto this turf to update + - proc/reconsider_lights(): + - Force all light sources shining onto this turf to update - - proc/lighting_clear_overlays(): - - Delete (manual GC) all light overlays on this turf, used when changing turf to space - - proc/lighting_build_overlays(): - - Create lighting overlays for this turf + - proc/lighting_clear_overlays(): + - Delete (manual GC) all light overlays on this turf, used when changing turf to space + - proc/lighting_build_overlays(): + - Create lighting overlays for this turf /atom/movable/lighting_overlay: (lighting_overlay.dm) - - var/lum_r, var/lum_g, var/lum_b; lumcounts of each colour - - var/needs_update; set on update_lumcount, checked by lighting process + - var/lum_r, var/lum_g, var/lum_b; lumcounts of each colour + - var/needs_update; set on update_lumcount, checked by lighting process - - var/xoffset, var/yoffset; (only present when using sub-tile overlays) fractional offset of this overlay in the tile + - var/xoffset, var/yoffset; (only present when using sub-tile overlays) fractional offset of this overlay in the tile - - proc/update_lumcount(delta_r, delta_g, delta_b): - - Change the lumcount vars and queue the overlay for update - - proc/update_overlay() - - Called by the lighting process to update the color of the overlay + - proc/update_lumcount(delta_r, delta_g, delta_b): + - Change the lumcount vars and queue the overlay for update + - proc/update_overlay() + - Called by the lighting process to update the color of the overlay */ diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 11b96ba64c..4edaf2b756 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -76,11 +76,11 @@ // Yes this doesn't align correctly on anything other than 4 width tabs. // If you want it to go switch everybody to elastic tab stops. // Actually that'd be great if you could! -#define EFFECT_UPDATE(level) \ +#define EFFECT_UPDATE(level) \ if (needs_update == LIGHTING_NO_UPDATE) \ - SSlighting.sources_queue += src; \ - if (needs_update < level) \ - needs_update = level; \ + SSlighting.sources_queue += src; \ + if (needs_update < level) \ + needs_update = level; \ // This proc will cause the light source to update the top atom, and add itself to the update queue. @@ -133,40 +133,40 @@ #define LUM_FALLOFF(C) (1 - CLAMP01(sqrt((C.x - _turf_x) ** 2 + (C.y - _turf_y) ** 2 + LIGHTING_HEIGHT) / _range_divisor)) -#define APPLY_CORNER(C) \ - . = LUM_FALLOFF(C); \ - . *= _light_power; \ - var/OLD = effect_str[C]; \ - \ - C.update_lumcount \ - ( \ - (. * _lum_r) - (OLD * _applied_lum_r), \ - (. * _lum_g) - (OLD * _applied_lum_g), \ - (. * _lum_b) - (OLD * _applied_lum_b) \ - ); \ +#define APPLY_CORNER(C) \ + . = LUM_FALLOFF(C); \ + . *= _light_power; \ + var/OLD = effect_str[C]; \ + \ + C.update_lumcount \ + ( \ + (. * _lum_r) - (OLD * _applied_lum_r), \ + (. * _lum_g) - (OLD * _applied_lum_g), \ + (. * _lum_b) - (OLD * _applied_lum_b) \ + ); \ -#define APPLY_CORNER_NEW(C) \ - . = LUM_FALLOFF(C); \ - . *= _light_power; \ - var/OLD = effect_str[C]; \ - if (. != 0){ \ - LAZYADD(C.affecting, src); \ - effect_str[C] = .; \ - } \ - C.update_lumcount \ - ( \ - (. * _lum_r) - (OLD * _applied_lum_r), \ - (. * _lum_g) - (OLD * _applied_lum_g), \ - (. * _lum_b) - (OLD * _applied_lum_b) \ - ); \ +#define APPLY_CORNER_NEW(C) \ + . = LUM_FALLOFF(C); \ + . *= _light_power; \ + var/OLD = effect_str[C]; \ + if (. != 0){ \ + LAZYADD(C.affecting, src); \ + effect_str[C] = .; \ + } \ + C.update_lumcount \ + ( \ + (. * _lum_r) - (OLD * _applied_lum_r), \ + (. * _lum_g) - (OLD * _applied_lum_g), \ + (. * _lum_b) - (OLD * _applied_lum_b) \ + ); \ -#define REMOVE_CORNER(C) \ - . = -effect_str[C]; \ - C.update_lumcount \ - ( \ - . * _applied_lum_r, \ - . * _applied_lum_g, \ - . * _applied_lum_b \ +#define REMOVE_CORNER(C) \ + . = -effect_str[C]; \ + C.update_lumcount \ + ( \ + . * _applied_lum_r, \ + . * _applied_lum_g, \ + . * _applied_lum_b \ ); /datum/light_source/proc/remove_lum() diff --git a/code/modules/lore_codex/news_data/main.dm b/code/modules/lore_codex/news_data/main.dm index 088d0bba6e..9f3b8c9e25 100644 --- a/code/modules/lore_codex/news_data/main.dm +++ b/code/modules/lore_codex/news_data/main.dm @@ -754,12 +754,12 @@ name = "07/07/63 - Vir Election Results" data = "The results of the 2563 Vir Gubernatorial Elections are as follows:\
      \ - Governor of Vir: Lusia Hainirsdottir (Shadow Coalition)\ -
      \ - Vir Colonial Assembly Representative: Vani Jee (Icarus Front)\ -
      \ - Vir Colonial Assembly Representative: Selma Jorg (Shadow Coalition)\ -
      \ + Governor of Vir: Lusia Hainirsdottir (Shadow Coalition)\ +
      \ + Vir Colonial Assembly Representative: Vani Jee (Icarus Front)\ +
      \ + Vir Colonial Assembly Representative: Selma Jorg (Shadow Coalition)\ +
      \ Other candidates ranked: Sao (4), Zarshir (5), Keldow (6), Singh (7), Moravec (8), Phaedrus (9), Lye (10), Savik (11), Square (12), Wekstrom (13)\

      \ Voter turnout: 30,928,287 (63%)\ diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index 838089011d..d561e016b9 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -230,8 +230,8 @@ and kit-bashed into a high-tech cleaver on a stick - with a handguard and a goliath hide grip. While it is still of little use to any \ but the most skilled and/or suicidal miners against local fauna, it's an elegant weapon for a more civilized hunter." - look gary there i am - - hatterhat + look gary there i am + - hatterhat */ diff --git a/code/modules/mob/_modifiers/crusher_mark.dm b/code/modules/mob/_modifiers/crusher_mark.dm index e0dc2dc12d..67a6b36a7f 100644 --- a/code/modules/mob/_modifiers/crusher_mark.dm +++ b/code/modules/mob/_modifiers/crusher_mark.dm @@ -1,30 +1,30 @@ /datum/modifier/crusher_mark - name = "destabilized" - desc = "You've been struck by a destabilizing bolt. By all accounts, this is probably a bad thing." - stacks = MODIFIER_STACK_EXTEND - on_created_text = span_warning("You feel physically unstable.") - on_expired_text = span_notice("You feel physically stable again.") - var/mutable_appearance/marked_underlay - var/obj/item/kinetic_crusher/hammer_synced + name = "destabilized" + desc = "You've been struck by a destabilizing bolt. By all accounts, this is probably a bad thing." + stacks = MODIFIER_STACK_EXTEND + on_created_text = span_warning("You feel physically unstable.") + on_expired_text = span_notice("You feel physically stable again.") + var/mutable_appearance/marked_underlay + var/obj/item/kinetic_crusher/hammer_synced /datum/modifier/crusher_mark/New(var/new_holder, var/new_origin) - . = ..() - if(isliving(new_origin)) - var/mob/living/origin = new_origin - var/obj/item/kinetic_crusher/to_sync - if(istype(origin.get_active_hand(), /obj/item/kinetic_crusher)) - to_sync = origin.get_active_hand() - else if (istype(origin.get_inactive_hand(), /obj/item/kinetic_crusher)) - to_sync = origin.get_inactive_hand() - if(to_sync) // did we find it? - hammer_synced = to_sync // go ahead - if(hammer_synced? hammer_synced.can_mark(holder) : TRUE) - marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2") - marked_underlay.pixel_x = -holder.pixel_x - marked_underlay.pixel_y = -holder.pixel_y - holder.underlays += marked_underlay - else - Destroy() + . = ..() + if(isliving(new_origin)) + var/mob/living/origin = new_origin + var/obj/item/kinetic_crusher/to_sync + if(istype(origin.get_active_hand(), /obj/item/kinetic_crusher)) + to_sync = origin.get_active_hand() + else if (istype(origin.get_inactive_hand(), /obj/item/kinetic_crusher)) + to_sync = origin.get_inactive_hand() + if(to_sync) // did we find it? + hammer_synced = to_sync // go ahead + if(hammer_synced? hammer_synced.can_mark(holder) : TRUE) + marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2") + marked_underlay.pixel_x = -holder.pixel_x + marked_underlay.pixel_y = -holder.pixel_y + holder.underlays += marked_underlay + else + Destroy() /datum/modifier/crusher_mark/Destroy() hammer_synced = null diff --git a/code/modules/mob/freelook/eye.dm b/code/modules/mob/freelook/eye.dm index 23a956974a..262ffe5521 100644 --- a/code/modules/mob/freelook/eye.dm +++ b/code/modules/mob/freelook/eye.dm @@ -87,9 +87,9 @@ return eyeobj.EyeMove(n, direct) /mob/observer/eye/proc/GetViewerClient() - if(owner) - return owner.client - return null + if(owner) + return owner.client + return null /mob/observer/eye/EyeMove(n, direct) var/initial = initial(sprint) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 7b08eca8e4..3d2ff42461 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -184,13 +184,13 @@ return list("AI") // AI door! /proc/encode_html_emphasis(message) - var/tagged_message = message - for(var/delimiter in GLOB.speech_toppings) - var/regex/R = new("\\[delimiter](.+?)\\[delimiter]","g") - var/tag = GLOB.speech_toppings[delimiter] - tagged_message = R.Replace(tagged_message,"<[tag]>$1") + var/tagged_message = message + for(var/delimiter in GLOB.speech_toppings) + var/regex/R = new("\\[delimiter](.+?)\\[delimiter]","g") + var/tag = GLOB.speech_toppings[delimiter] + tagged_message = R.Replace(tagged_message,"<[tag]>$1") - return tagged_message + return tagged_message /mob/proc/hear_radio(var/list/message_pieces, var/verb = "says", var/part_a, var/part_b, var/part_c, var/part_d, var/part_e, var/mob/speaker = null, var/hard_to_hear = 0, var/vname = "") if(!client) diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 6ae132f96a..f73a30717a 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -80,8 +80,8 @@ colour = "bug" key = "X" syllables = list("vaur","uyek","uyit","avek","sc'theth","k'ztak","teth","wre'ge","lii","dra'","zo'","ra'","kax'","zz","vh","ik","ak", - "uhk","zir","sc'orth","sc'er","thc'yek","th'zirk","th'esk","k'ayek","ka'mil","sc'","ik'yir","yol","kig","k'zit","'","'","zrk","krg","isk'yet","na'k", - "sc'azz","th'sc","nil","n'ahk","sc'yeth","aur'sk","iy'it","azzg","a'","i'","o'","u'","a","i","o","u","zz","kr","ak","nrk","tzzk","bz","xic'","k'lax'","histh") + "uhk","zir","sc'orth","sc'er","thc'yek","th'zirk","th'esk","k'ayek","ka'mil","sc'","ik'yir","yol","kig","k'zit","'","'","zrk","krg","isk'yet","na'k", + "sc'azz","th'sc","nil","n'ahk","sc'yeth","aur'sk","iy'it","azzg","a'","i'","o'","u'","a","i","o","u","zz","kr","ak","nrk","tzzk","bz","xic'","k'lax'","histh") /datum/language/shadekin name = LANGUAGE_SHADEKIN diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index e703d25b93..4d4e72656a 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -59,7 +59,7 @@ else visible_message(span_infoplain(span_bold("\The [src]") + " starts licking the wounds on [M]'s [affecting.name] clean."), \ - span_notice("You start licking the wounds on [M]'s [affecting.name] clean.") ) + span_notice("You start licking the wounds on [M]'s [affecting.name] clean.") ) for (var/datum/wound/W in affecting.wounds) @@ -76,11 +76,11 @@ else visible_message(span_notice("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.", - "drags their tongue across \a [W.desc] on [M]'s [affecting.name].", - "drips saliva onto \a [W.desc] on [M]'s [affecting.name].", - "uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].", - "licks \a [W.desc] on [M]'s [affecting.name], cleaning it.")]"), \ - span_notice("You treat \a [W.desc] on [M]'s [affecting.name] with your antiseptic saliva.") ) + "drags their tongue across \a [W.desc] on [M]'s [affecting.name].", + "drips saliva onto \a [W.desc] on [M]'s [affecting.name].", + "uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].", + "licks \a [W.desc] on [M]'s [affecting.name], cleaning it.")]"), \ + span_notice("You treat \a [W.desc] on [M]'s [affecting.name] with your antiseptic saliva.") ) adjust_nutrition(-20) W.salve() W.bandage() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 8da9ccd9be..9f61fcea86 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -428,7 +428,7 @@ return /mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person - fire_stacks = CLAMP(fire_stacks + add_fire_stacks, FIRE_MIN_STACKS, FIRE_MAX_STACKS) + fire_stacks = CLAMP(fire_stacks + add_fire_stacks, FIRE_MIN_STACKS, FIRE_MAX_STACKS) /mob/living/proc/handle_fire() if(fire_stacks < 0) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm index 6f270f8020..85b19d365a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm @@ -165,15 +165,15 @@ B.digest_mode = DM_SELECT /mob/living/simple_mob/vore/pakkun/attackby(var/obj/item/O, var/mob/user) //if they're newspapered, they'll spit out any junk they've eaten for whatever reason - if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc)) - user.visible_message(span_info("[user] swats [src] with [O]!")) - release_vore_contents() - for(var/mob/living/L in living_mobs(0)) - if(!(LAZYFIND(prey_excludes, L))) - LAZYSET(prey_excludes, L, world.time) - addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), WEAKREF(L)), 5 MINUTES) - else - ..() + if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc)) + user.visible_message(span_info("[user] swats [src] with [O]!")) + release_vore_contents() + for(var/mob/living/L in living_mobs(0)) + if(!(LAZYFIND(prey_excludes, L))) + LAZYSET(prey_excludes, L, world.time) + addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), WEAKREF(L)), 5 MINUTES) + else + ..() //a palette-swapped version that's a bit bossier, in JRPG tradition diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm index 7b02c43304..55c43c31d1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm @@ -117,13 +117,13 @@ consider_wg() /mob/living/simple_mob/vore/raptor/proc/consider_wg() - var/past_state = wg_state - if(nutrition >= 900) - wg_state = 1 - else - wg_state = 0 - if(past_state != wg_state) - update_icon() + var/past_state = wg_state + if(nutrition >= 900) + wg_state = 1 + else + wg_state = 0 + if(past_state != wg_state) + update_icon() /mob/living/simple_mob/vore/raptor/update_icon() if(wg_state == 1) diff --git a/code/modules/mob/new_player/sprite_accessories_ear.dm b/code/modules/mob/new_player/sprite_accessories_ear.dm index b882196100..87eb3d76f7 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear.dm @@ -1228,13 +1228,13 @@ ckeys_allowed = list("natje") /datum/sprite_accessory/ears/frost - name = "Frost antenna" - desc = "" - icon_state = "frosted_tips" - ckeys_allowed = list("tucker0666") + name = "Frost antenna" + desc = "" + icon_state = "frosted_tips" + ckeys_allowed = list("tucker0666") /datum/sprite_accessory/ears/sylv_pip - name = "sylveon ears and ribbons (Pip Shyner)" - desc = "" - icon_state = "pipears" - ckeys_allowed = list("phoaly") + name = "sylveon ears and ribbons (Pip Shyner)" + desc = "" + icon_state = "pipears" + ckeys_allowed = list("phoaly") diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 5e92b9f1b4..ec591a3f75 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -126,22 +126,22 @@ do_colouration = 1 /datum/sprite_accessory/tail/rabbit - name = "rabbit, colourable (vwag)" - desc = "" - icon_state = "rabbit" - do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY - ani_state = "rabbit_w" + name = "rabbit, colourable (vwag)" + desc = "" + icon_state = "rabbit" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "rabbit_w" /datum/sprite_accessory/tail/rabbitalt - name = "rabbit, dual color (vwag)" - desc = "" - icon_state = "rabbitalt" - extra_overlay = "rabbitalt-tips" - do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY - ani_state = "rabbitalt_w" - extra_overlay_w = "rabbitalt-tips_w" + name = "rabbit, dual color (vwag)" + desc = "" + icon_state = "rabbitalt" + extra_overlay = "rabbitalt-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "rabbitalt_w" + extra_overlay_w = "rabbitalt-tips_w" /datum/sprite_accessory/tail/bear_brown name = "bear, brown" @@ -1169,14 +1169,14 @@ extra_overlay = "ninekitsune-tips" /datum/sprite_accessory/tail/hideableninetails - name = "Kitsune 9-in-1 tail, colourable (vwag)" - desc = "" - icon_state = "ninekitsune" - extra_overlay = "ninekitsune-tips" - do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY - ani_state = "foxtail_w" - extra_overlay_w = "foxtail-tips_w" + name = "Kitsune 9-in-1 tail, colourable (vwag)" + desc = "" + icon_state = "ninekitsune" + extra_overlay = "ninekitsune-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "foxtail_w" + extra_overlay_w = "foxtail-tips_w" /datum/sprite_accessory/tail/shadekin_short name = "Shadekin Short Tail, colorable" @@ -1702,16 +1702,16 @@ ckeys_allowed = list("arokha") /datum/sprite_accessory/tail/cabletail - name = "cabletail" - desc = "cabletail" - icon_state = "cabletail" - ckeys_allowed = list("tucker0666") + name = "cabletail" + desc = "cabletail" + icon_state = "cabletail" + ckeys_allowed = list("tucker0666") /datum/sprite_accessory/tail/featherfluff_tail - name = "featherfluff_tail" - desc = "" - icon_state = "featherfluff_tail" - ckeys_allowed = list("tucker0666") + name = "featherfluff_tail" + desc = "" + icon_state = "featherfluff_tail" + ckeys_allowed = list("tucker0666") /datum/sprite_accessory/tail/holly name = "tigress tail (Holly)" diff --git a/code/modules/mob/new_player/sprite_accessories_wing.dm b/code/modules/mob/new_player/sprite_accessories_wing.dm index 4828e77d4b..88ffb71f59 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing.dm @@ -569,11 +569,11 @@ color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/wing/mothwings_luna_colorable - name = "Moth Wings (Luna, Colorable)" - desc = "" - icon_state = "mothwings_luna_colorable" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + name = "Moth Wings (Luna, Colorable)" + desc = "" + icon_state = "mothwings_luna_colorable" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/wing/sect_drone_alt name = "Sect drone wings Alt. (To use with bodytype marking)" diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index 9f21ba8421..b7fcdddbbc 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -61,18 +61,18 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ // tucker0666 : Frost /datum/robolimb/zenghu_frost - company = "Zeng-Hu (Custom)" - desc = "This limb has realistic synthetic flesh covering with 'blue accents'." - icon = 'icons/mob/human_races/cyberlimbs/_fluff_vr/Frosty.dmi' - blood_color = "#45ccff" - lifelike = 1 - skin_tone = 1 - unavailable_to_build = 1 - whitelisted_to = list("tucker0666") + company = "Zeng-Hu (Custom)" + desc = "This limb has realistic synthetic flesh covering with 'blue accents'." + icon = 'icons/mob/human_races/cyberlimbs/_fluff_vr/Frosty.dmi' + blood_color = "#45ccff" + lifelike = 1 + skin_tone = 1 + unavailable_to_build = 1 + whitelisted_to = list("tucker0666") /obj/item/disk/limb/zenghu_frost - company = "Zeng-Hu (Modified)" - catalogue_data = list(/datum/category_item/catalogue/information/organization/zeng_hu) + company = "Zeng-Hu (Modified)" + catalogue_data = list(/datum/category_item/catalogue/information/organization/zeng_hu) //Ported from CitRP /datum/robolimb/cyber_beast diff --git a/code/modules/persistence/paintings.dm b/code/modules/persistence/paintings.dm index 63f935f7ae..b11c8ce566 100644 --- a/code/modules/persistence/paintings.dm +++ b/code/modules/persistence/paintings.dm @@ -4,7 +4,7 @@ var/max_entries = 1000 //1000 paintings is a lot, and will take a long time to cycle through. /datum/persistent/paintings/SetFilename() - filename = "data/persistent/paintings.json" + filename = "data/persistent/paintings.json" /datum/persistent/paintings/Initialize() . = ..() diff --git a/code/modules/persistence/storage/storage.dm b/code/modules/persistence/storage/storage.dm index d430ee8cda..de976cbd98 100644 --- a/code/modules/persistence/storage/storage.dm +++ b/code/modules/persistence/storage/storage.dm @@ -45,12 +45,12 @@ LAZYADDASSOC(., "items", storage_list) // Usage: returns list with structure: -// list( -// [type1] = [stored_quantity], -// [type2] = [stored_quantity] -// ) +// list( +// [type1] = [stored_quantity], +// [type2] = [stored_quantity] +// ) /datum/persistent/storage/proc/get_storage_list(var/atom/entry) - return list() // Subtypes define list structure + return list() // Subtypes define list structure /datum/persistent/storage/proc/find_specific_instance(var/turf/T) return locate(target_type) in T diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index 009d677949..a4c882c5da 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -76,24 +76,24 @@ sheets_refunded = 2 /obj/machinery/light_construct/floortube/verb/rotate_clockwise() - set name = "Rotate Fixture Clockwise" - set category = "Object" - set src in view(1) + set name = "Rotate Fixture Clockwise" + set category = "Object" + set src in view(1) - if (usr.stat || usr.restrained() || anchored) - return + if (usr.stat || usr.restrained() || anchored) + return - src.set_dir(turn(src.dir, 270)) + src.set_dir(turn(src.dir, 270)) /obj/machinery/light_construct/floortube/verb/rotate_counterclockwise() - set name = "Rotate Fixture Counter-Clockwise" - set category = "Object" - set src in view(1) + set name = "Rotate Fixture Counter-Clockwise" + set category = "Object" + set src in view(1) - if (usr.stat || usr.restrained() || anchored) - return + if (usr.stat || usr.restrained() || anchored) + return - src.set_dir(turn(src.dir, 90)) + src.set_dir(turn(src.dir, 90)) /obj/machinery/light_construct/floortube/update_icon() switch(stage) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index a65d81e57f..598e176650 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -481,10 +481,10 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) move_self = 1 /obj/singularity/singularity_act(S, size) - if(current_size <= size) - var/gain = (energy/2) - var/dist = max((current_size - 2), 1) - explosion(src.loc,(dist),(dist*2),(dist*4)) - spawn(0) - qdel(src) - return gain + if(current_size <= size) + var/gain = (energy/2) + var/dist = max((current_size - 2), 1) + explosion(src.loc,(dist),(dist*2),(dist*4)) + spawn(0) + qdel(src) + return gain diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 203ffc20af..3871c12f96 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -374,7 +374,7 @@ //Release reaction gasses var/heat_capacity = removed.heat_capacity() removed.adjust_multi(GAS_PHORON, max(device_energy / PHORON_RELEASE_MODIFIER, 0), \ - GAS_O2, max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)) + GAS_O2, max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)) var/thermal_power = THERMAL_RELEASE_MODIFIER * device_energy if (debug) diff --git a/code/modules/projectiles/guns/energy/special_vr.dm b/code/modules/projectiles/guns/energy/special_vr.dm index c7b3f3ca0d..0d1a550261 100644 --- a/code/modules/projectiles/guns/energy/special_vr.dm +++ b/code/modules/projectiles/guns/energy/special_vr.dm @@ -54,7 +54,7 @@ spinning_up = TRUE update_icon() user.visible_message(span_notice("[user] starts charging the [src]!"), \ - span_notice("You start charging the [src]!")) + span_notice("You start charging the [src]!")) if(do_after(user, 8, src)) spinning_up = FALSE ..() diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 0c694388ac..90d7a22238 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -9,17 +9,17 @@ fire_delay = 50 fire_sound = 'sound/weapons/grenade_launcher.ogg' // Formerly tablehit1.ogg but I like this better -Ace - var/fire_pressure // Used in fire checks/pressure checks. - var/max_w_class = ITEMSIZE_NORMAL // Hopper intake size. - var/max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Total internal storage size. - var/obj/item/tank/tank = null // Tank of gas for use in firing the cannon. + var/fire_pressure // Used in fire checks/pressure checks. + var/max_w_class = ITEMSIZE_NORMAL // Hopper intake size. + var/max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Total internal storage size. + var/obj/item/tank/tank = null // Tank of gas for use in firing the cannon. var/obj/item/storage/item_storage - var/pressure_setting = 10 // Percentage of the gas in the tank used to fire the projectile. + var/pressure_setting = 10 // Percentage of the gas in the tank used to fire the projectile. var/possible_pressure_amounts = list(5,10,20,25,50) // Possible pressure settings. - var/force_divisor = 400 // Force equates to speed. Speed/5 equates to a damage multiplier for whoever you hit. - // For reference, a fully pressurized oxy tank at 50% gas release firing a health - // analyzer with a force_divisor of 10 hit with a damage multiplier of 3000+. + var/force_divisor = 400 // Force equates to speed. Speed/5 equates to a damage multiplier for whoever you hit. + // For reference, a fully pressurized oxy tank at 50% gas release firing a health + // analyzer with a force_divisor of 10 hit with a damage multiplier of 3000+. /obj/item/gun/launcher/pneumatic/New() ..() item_storage = new(src) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index c4cfe59954..4a50dd022b 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -382,18 +382,18 @@ hud_state = "laser_disabler" /obj/item/projectile/beam/disable - name = "disabler beam" - icon_state = "omnilaser" - nodamage = 1 - taser_effect = 1 - agony = 100 //One shot stuns for the time being until adjustments are fully made. - damage_type = HALLOSS - light_color = "#00CECE" - hud_state = "laser_disabler" + name = "disabler beam" + icon_state = "omnilaser" + nodamage = 1 + taser_effect = 1 + agony = 100 //One shot stuns for the time being until adjustments are fully made. + damage_type = HALLOSS + light_color = "#00CECE" + hud_state = "laser_disabler" - muzzle_type = /obj/effect/projectile/muzzle/laser_omni - tracer_type = /obj/effect/projectile/tracer/laser_omni - impact_type = /obj/effect/projectile/impact/laser_omni + muzzle_type = /obj/effect/projectile/muzzle/laser_omni + tracer_type = /obj/effect/projectile/tracer/laser_omni + impact_type = /obj/effect/projectile/impact/laser_omni /obj/item/projectile/beam/shock name = "shock beam" diff --git a/code/modules/reagents/reactions/fusion/fusion.dm b/code/modules/reagents/reactions/fusion/fusion.dm index fb30548438..9daf69c703 100644 --- a/code/modules/reagents/reactions/fusion/fusion.dm +++ b/code/modules/reagents/reactions/fusion/fusion.dm @@ -3,4 +3,4 @@ // but will have distinct behaviours (mostly relating to the fusion field) that warrants a separate type /* /decl/chemical_reaction/fusion - name = "Fusion"*/ + name = "Fusion"*/ diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 0eb0ab477d..79089ec5e0 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -1042,12 +1042,12 @@ result_amount = 3 /decl/chemical_reaction/instant/drinks/winebrandy - name = "Wine brandy" - id = REAGENT_ID_WINEBRANDY - result = REAGENT_ID_WINEBRANDY - required_reagents = list(REAGENT_ID_REDWINE = 10) - catalysts = list(REAGENT_ID_ENZYME = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe - result_amount = 5 + name = "Wine brandy" + id = REAGENT_ID_WINEBRANDY + result = REAGENT_ID_WINEBRANDY + required_reagents = list(REAGENT_ID_REDWINE = 10) + catalysts = list(REAGENT_ID_ENZYME = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe + result_amount = 5 /decl/chemical_reaction/instant/drinks/love_potion name = REAGENT_LOVEPOTION diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index 874270734b..bade6e2b3f 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -106,21 +106,21 @@ required_reagents = list(REAGENT_ID_COLA = 1, REAGENT_ID_MINT = 1) /decl/chemical_reaction/instant/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them - name = REAGENT_FIREFOAM - id = "firefighting foam" - result = REAGENT_ID_FIREFOAM - required_reagents = list(REAGENT_ID_WATER = 1) - catalysts = list(REAGENT_ID_FLUORINE = 10) - result_amount = 1 + name = REAGENT_FIREFOAM + id = "firefighting foam" + result = REAGENT_ID_FIREFOAM + required_reagents = list(REAGENT_ID_WATER = 1) + catalysts = list(REAGENT_ID_FLUORINE = 10) + result_amount = 1 /decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously. - name = "Firefighting Foam EZ" - id = "firefighting foam ez" - result = REAGENT_ID_FIREFOAM - required_reagents = list(REAGENT_ID_WATER = 1) - catalysts = list(REAGENT_ID_FIREFOAM = 5) - inhibitors = list(REAGENT_ID_FLUORINE = 0.01) - result_amount = 1 + name = "Firefighting Foam EZ" + id = "firefighting foam ez" + result = REAGENT_ID_FIREFOAM + required_reagents = list(REAGENT_ID_WATER = 1) + catalysts = list(REAGENT_ID_FIREFOAM = 5) + inhibitors = list(REAGENT_ID_FLUORINE = 0.01) + result_amount = 1 /////////////////////////////////////////////////////////////////////////////////// /// Vore Drugs diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 5c3edcf20c..7234c7a30f 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -12,9 +12,9 @@ var/flags = SHUTTLE_FLAGS_NONE var/process_state = IDLE_STATE // Used with SHUTTLE_FLAGS_PROCESS, as well as to store current state. var/category = /datum/shuttle - var/multiz = 0 //how many multiz levels, starts at 0 TODO Leshana - Are we porting this? + var/multiz = 0 //how many multiz levels, starts at 0 TODO Leshana - Are we porting this? - var/ceiling_type // Type path of turf to roof over the shuttle when at multi-z landmarks. Ignored if null. + var/ceiling_type // Type path of turf to roof over the shuttle when at multi-z landmarks. Ignored if null. var/sound_takeoff = 'sound/effects/shuttles/shuttle_takeoff.ogg' var/sound_landing = 'sound/effects/shuttles/shuttle_landing.ogg' @@ -22,11 +22,11 @@ var/knockdown = 1 //whether shuttle downs non-buckled people when it moves var/defer_initialisation = FALSE //If this this shuttle should be initialised automatically. - //If set to true, you are responsible for initialzing the shuttle manually. - //Useful for shuttles that are initialized by map_template loading, or shuttles that are created in-game or not used. + //If set to true, you are responsible for initialzing the shuttle manually. + //Useful for shuttles that are initialized by map_template loading, or shuttles that are created in-game or not used. - var/mothershuttle //tag of mothershuttle - var/motherdock //tag of mothershuttle landmark, defaults to starting location + var/mothershuttle //tag of mothershuttle + var/motherdock //tag of mothershuttle landmark, defaults to starting location var/tmp/depart_time = 0 //Similar to above, set when the shuttle leaves when long jumping. Used for progress bars. @@ -104,8 +104,8 @@ /datum/shuttle/proc/on_shuttle_departure(var/obj/effect/shuttle_landmark/origin, var/obj/effect/shuttle_landmark/destination) return -// Similar to above, but when it finishes moving to the target. Short jump generally makes this occur immediately after the above proc. -// Keep in mind we might not actually have gotten to destination. Check current_location to be sure where we ended up. +// Similar to above, but when it finishes moving to the target. Short jump generally makes this occur immediately after the above proc. +// Keep in mind we might not actually have gotten to destination. Check current_location to be sure where we ended up. /datum/shuttle/proc/on_shuttle_arrival(var/obj/effect/shuttle_landmark/origin, var/obj/effect/shuttle_landmark/destination) return @@ -117,7 +117,7 @@ return var/obj/effect/shuttle_landmark/start_location = current_location - // TODO - Figure out exactly when to play sounds. Before warmup_time delay? Should there be a sleep for waiting for sounds? or no? + // TODO - Figure out exactly when to play sounds. Before warmup_time delay? Should there be a sleep for waiting for sounds? or no? moving_status = SHUTTLE_WARMUP spawn(warmup_time*10) @@ -155,7 +155,7 @@ return var/obj/effect/shuttle_landmark/start_location = current_location - // TODO - Figure out exactly when to play sounds. Before warmup_time delay? Should there be a sleep for waiting for sounds? or no? + // TODO - Figure out exactly when to play sounds. Before warmup_time delay? Should there be a sleep for waiting for sounds? or no? moving_status = SHUTTLE_WARMUP spawn(warmup_time*10) @@ -204,7 +204,7 @@ ////////////////////////////// -// Forward declarations of public procs. They do nothing because this is not auto-dock. +// Forward declarations of public procs. They do nothing because this is not auto-dock. /datum/shuttle/proc/fuel_check() return 1 //fuel check should always pass in non-overmap shuttles (they have magic engines) @@ -300,7 +300,7 @@ if(our_area.get_gravity() != new_grav) our_area.gravitychange(new_grav) - // TODO - Old code used to throw stuff out of the way instead of squashing. Should we? + // TODO - Old code used to throw stuff out of the way instead of squashing. Should we? // Move, gib, or delete everything in our way! for(var/turf/src_turf in turf_translation) @@ -345,7 +345,7 @@ if(move_direction) throw_a_mob(M,move_direction) //VOREStation Add End - // We only need to rebuild powernets for our cables. No need to check machines because they are on top of cables. + // We only need to rebuild powernets for our cables. No need to check machines because they are on top of cables. for(var/obj/structure/cable/C in A) powernets |= C.powernet diff --git a/code/modules/surgery/external_repair.dm b/code/modules/surgery/external_repair.dm index 53dbf21195..8ea9365d1f 100644 --- a/code/modules/surgery/external_repair.dm +++ b/code/modules/surgery/external_repair.dm @@ -10,9 +10,9 @@ req_open = 1 /datum/surgery_step/repairflesh/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -/* VOREStation Removal for Mlem Reasons(TM) - if (target.stat == DEAD) // Sorry defibs, your subjects need to have pumping fluids for these to work. - return 0 +/* VOREStation Removal for Mlem Reasons(TM) + if (target.stat == DEAD) // Sorry defibs, your subjects need to have pumping fluids for these to work. + return 0 */ if (isslime(target)) return 0 diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 17d5214034..69edc5a82e 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -536,7 +536,7 @@ holder = new /obj/item/organ/internal/mmi_holder/robot(target, 1, M) else holder = new /obj/item/organ/internal/mmi_holder(target, 1, M) // Fallback to old behavior if organic MMI or if no subtype exists. - //VOREstation edit end + //VOREstation edit end target.internal_organs_by_name["brain"] = holder if(M.brainmob && M.brainmob.mind) diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 2b6069fefe..2344a530f1 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -116,7 +116,7 @@ for(var/obj/item/material/shard/S in L) if(prob(50)) M.visible_message(span_danger("\The [S] slices [M]'s face messily!"), - span_danger("\The [S] slices your face messily!")) + span_danger("\The [S] slices your face messily!")) M.apply_damage(10, def_zone = BP_HEAD) if(prob(2)) M.embed(S, def_zone = BP_HEAD) diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 3507c1c1da..ad5c0e6372 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -109,7 +109,7 @@ var/list/table_icon_cache = list() if(carpeted && W.has_tool_quality(TOOL_CROWBAR)) user.visible_message(span_infoplain(span_bold("\The [user]") + " removes the carpet from \the [src]."), - span_notice("You remove the carpet from \the [src].")) + span_notice("You remove the carpet from \the [src].")) new carpeted_type(loc) carpeted = 0 update_icon() @@ -119,7 +119,7 @@ var/list/table_icon_cache = list() var/obj/item/stack/tile/carpet/C = W if(C.use(1)) user.visible_message(span_infoplain(span_bold("\The [user]") + " adds \the [C] to \the [src]."), - span_notice("You add \the [C] to \the [src].")) + span_notice("You add \the [C] to \the [src].")) carpeted = 1 carpeted_type = W.type update_icon() @@ -150,7 +150,7 @@ var/list/table_icon_cache = list() if(!do_after(user, 20 * F.toolspeed) || !F.remove_fuel(1, user)) return user.visible_message(span_infoplain(span_bold("\The [user]") + " repairs some damage to \the [src]."), - span_notice("You repair some damage to \the [src].")) + span_notice("You repair some damage to \the [src].")) health = max(health+(maxhealth/5), maxhealth) // 20% repair per application return 1 @@ -259,14 +259,14 @@ var/list/table_icon_cache = list() if(manipulating) return M manipulating = 1 user.visible_message(span_infoplain(span_bold("\The [user]") + " begins removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place."), - span_notice("You begin removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.")) + span_notice("You begin removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.")) if(sound) playsound(src, sound, 50, 1) if(!do_after(user, delay)) manipulating = 0 return M user.visible_message(span_infoplain(span_bold("\The [user]") + " removes the [M.display_name] [what] from \the [src]."), - span_notice("You remove the [M.display_name] [what] from \the [src].")) + span_notice("You remove the [M.display_name] [what] from \the [src].")) new M.stack_type(src.loc) manipulating = 0 return null @@ -281,13 +281,13 @@ var/list/table_icon_cache = list() if(manipulating) return manipulating = 1 user.visible_message(span_infoplain(span_bold("\The [user]") + " begins dismantling \the [src]."), - span_notice("You begin dismantling \the [src].")) + span_notice("You begin dismantling \the [src].")) playsound(src, W.usesound, 50, 1) if(!do_after(user, 20 * W.toolspeed)) manipulating = 0 return user.visible_message(span_infoplain(span_bold("\The [user]") + " dismantles \the [src]."), - span_notice("You dismantle \the [src].")) + span_notice("You dismantle \the [src].")) new /obj/item/stack/material/steel(src.loc) qdel(src) return @@ -296,8 +296,8 @@ var/list/table_icon_cache = list() // Used for !fun! things such as embedding shards in the faces of tableslammed people. // The repeated -// S = [x].place_shard(loc) -// if(S) shards += S +// S = [x].place_shard(loc) +// if(S) shards += S // is to avoid filling the list with nulls, as place_shard won't place shards of certain materials (holo-wood, holo-steel) /obj/structure/table/proc/break_to_parts(full_return = 0) @@ -445,10 +445,10 @@ var/list/table_icon_cache = list() #define CORNER_CLOCKWISE 4 /* - turn() is weird: - turn(icon, angle) turns icon by angle degrees clockwise - turn(matrix, angle) turns matrix by angle degrees clockwise - turn(dir, angle) turns dir by angle degrees counter-clockwise + turn() is weird: + turn(icon, angle) turns icon by angle degrees clockwise + turn(matrix, angle) turns matrix by angle degrees clockwise + turn(dir, angle) turns dir by angle degrees counter-clockwise */ /proc/dirs_to_corner_states(list/dirs) diff --git a/code/modules/tgui/modules/trait_tutorial_tgui.dm b/code/modules/tgui/modules/trait_tutorial_tgui.dm index 68c8afe350..6a7a47e0a8 100644 --- a/code/modules/tgui/modules/trait_tutorial_tgui.dm +++ b/code/modules/tgui/modules/trait_tutorial_tgui.dm @@ -45,4 +45,4 @@ Frontend path: tgui\packages\tgui\interfaces\TraitTutorial.tsx . = TRUE /datum/tgui_module/trait_tutorial_tgui/tgui_state(mob/user) - return GLOB.tgui_always_state + return GLOB.tgui_always_state diff --git a/code/modules/turbolift/turbolift_door_vr.dm b/code/modules/turbolift/turbolift_door_vr.dm index 04b4357024..d37fb05069 100644 --- a/code/modules/turbolift/turbolift_door_vr.dm +++ b/code/modules/turbolift/turbolift_door_vr.dm @@ -1,5 +1,5 @@ // Vore specific code for /obj/machinery/door/airlock/lift /obj/machinery/door/airlock/lift/emag_act(var/uses_left, var/mob/user) - to_chat(user, span_danger("This door is internally controlled.")) - return 0 // Prevents the cryptographic sequencer from using a charge fruitlessly + to_chat(user, span_danger("This door is internally controlled.")) + return 0 // Prevents the cryptographic sequencer from using a charge fruitlessly diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 73b844d37b..49f21c00b6 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -2,15 +2,15 @@ /obj/turbolift_map_holder name = "turbolift map placeholder" icon = 'icons/obj/turbolift_preview_3x3.dmi' - dir = SOUTH // Direction of the holder determines the placement of the lift control panel and doors. - var/depth = 1 // Number of floors to generate, including the initial floor. + dir = SOUTH // Direction of the holder determines the placement of the lift control panel and doors. + var/depth = 1 // Number of floors to generate, including the initial floor. var/lift_size_x = 2 // Number of turfs on each axis to generate in addition to the first var/lift_size_y = 2 // ie. a 3x3 lift would have a value of 2 in each of these variables. // Various turf and door types used when generating the turbolift floors. - var/wall_type = /turf/simulated/wall/elevator + var/wall_type = /turf/simulated/wall/elevator var/floor_type = /turf/simulated/floor/tiled/dark - var/door_type = /obj/machinery/door/airlock/lift + var/door_type = /obj/machinery/door/airlock/lift var/list/areas_to_use = list() @@ -194,7 +194,7 @@ panel_ext.set_dir(udir) cfloor.ext_panel = panel_ext - // Place lights + // Place lights var/turf/placing1 = locate(light_x1, light_y1, cz) var/turf/placing2 = locate(light_x2, light_y2, cz) var/obj/machinery/light/light1 = new(placing1, light) diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index ac91fb2958..ba26215ca3 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -15,7 +15,7 @@ GLOBAL_LIST_INIT(digest_modes, list()) return null /datum/digest_mode/proc/handle_atoms(obj/belly/B, list/touchable_atoms) - return FALSE + return FALSE /datum/digest_mode/digest id = DM_DIGEST diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index cac9e5c7bb..d0dd479578 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -787,45 +787,45 @@ // This is about 0.896m^3 of atmosphere /datum/gas_mixture/belly_air - volume = 2500 - temperature = 293.150 - total_moles = 104 + volume = 2500 + temperature = 293.150 + total_moles = 104 /datum/gas_mixture/belly_air/New() - . = ..() - gas = list( - GAS_O2 = 21, - GAS_N2 = 79) + . = ..() + gas = list( + GAS_O2 = 21, + GAS_N2 = 79) /datum/gas_mixture/belly_air/vox - volume = 2500 - temperature = 293.150 - total_moles = 104 + volume = 2500 + temperature = 293.150 + total_moles = 104 /datum/gas_mixture/belly_air/vox/New() - . = ..() - gas = list( - GAS_PHORON = 100) + . = ..() + gas = list( + GAS_PHORON = 100) /datum/gas_mixture/belly_air/zaddat - volume = 2500 - temperature = 293.150 - total_moles = 300 + volume = 2500 + temperature = 293.150 + total_moles = 300 /datum/gas_mixture/belly_air/zaddat/New() - . = ..() - gas = list( - GAS_O2 = 100) + . = ..() + gas = list( + GAS_O2 = 100) /datum/gas_mixture/belly_air/nitrogen_breather - volume = 2500 - temperature = 293.150 - total_moles = 104 + volume = 2500 + temperature = 293.150 + total_moles = 104 /datum/gas_mixture/belly_air/nitrogen_breather/New() - . = ..() - gas = list( - GAS_N2 = 100) + . = ..() + gas = list( + GAS_N2 = 100) /mob/living/proc/feed_grabbed_to_self_falling_nom(var/mob/living/user, var/mob/living/prey) diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 4d3064b987..9b6c979d3a 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -135,7 +135,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE // // Belly searching for simplifying other procs -// Mostly redundant now with belly-objects and isbelly(loc) +// Mostly redundant now with belly-objects and isbelly(loc) // /proc/check_belly(atom/movable/A) return isbelly(A.loc) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 621f29dd38..049d089f6d 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2709,10 +2709,10 @@ Departamental Swimsuits, for general use //sixberry: Thistle /obj/item/clothing/head/fluff/memory_crown - name = "Memory Crown" - desc = "A thorned crown sporting numerous amethyst inserts, all of which seem to glow faintly in the dark. Just holding it makes you feel as though you've forgotten something unpleasant." - icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "memorycrown" - icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "memorycrown_onmob" - slot_flags = SLOT_HEAD + name = "Memory Crown" + desc = "A thorned crown sporting numerous amethyst inserts, all of which seem to glow faintly in the dark. Just holding it makes you feel as though you've forgotten something unpleasant." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "memorycrown" + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "memorycrown_onmob" + slot_flags = SLOT_HEAD diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index e22b3fb4d0..0aafeb2585 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1164,22 +1164,21 @@ //RadiantAurora: Tiemli Kroto /obj/item/clothing/glasses/welding/tiemgogs - name = "custom-fitted welding goggles" - desc = "A pair of thick, custom-fitted goggles with LEDs above the lenses. Ruggedly engraved below the lenses is the name 'Tiemli Kroto'." + name = "custom-fitted welding goggles" + desc = "A pair of thick, custom-fitted goggles with LEDs above the lenses. Ruggedly engraved below the lenses is the name 'Tiemli Kroto'." - icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "tiemgogs" + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "tiemgogs" - icon_override = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "tiemgogs" + icon_override = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "tiemgogs" /obj/item/clothing/glasses/welding/tiemgogs/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) - if(..()) - if(H.ckey != "radiantaurora") - to_chat(H, span_warning("These don't look like they were made to fit you...")) - return 0 - else - return 1 + if(..()) + if(H.ckey != "radiantaurora") + to_chat(H, span_warning("These don't look like they were made to fit you...")) + return 0 + return 1 //Ryumi - Nikki Yumeno /obj/item/rig/nikki @@ -1224,11 +1223,11 @@ //Nickcrazy - Damon Bones Xrim /obj/item/clothing/suit/storage/toggle/bomber/bombersec - name = "Security Bomber Jacket" - desc = "A black bomber jacket with the security emblem sewn onto it." - icon = 'icons/vore/custom_items_vr.dmi' - icon_override = 'icons/vore/custom_items_vr.dmi' - icon_state = "bombersec" + name = "Security Bomber Jacket" + desc = "A black bomber jacket with the security emblem sewn onto it." + icon = 'icons/vore/custom_items_vr.dmi' + icon_override = 'icons/vore/custom_items_vr.dmi' + icon_state = "bombersec" //pimientopyro - Scylla Casmus @@ -1479,21 +1478,21 @@ //Bricker98:Nettie Stough /obj/item/modular_computer/tablet/preset/custom_loadout/nettie - name = "Remodeled Tablet" - desc = "A tablet computer, looks quite high-tech and has some emblems on the back." - icon = 'icons/obj/modular_tablet.dmi' - icon_state = "elite" - icon_state_unpowered = "elite" + name = "Remodeled Tablet" + desc = "A tablet computer, looks quite high-tech and has some emblems on the back." + icon = 'icons/obj/modular_tablet.dmi' + icon_state = "elite" + icon_state_unpowered = "elite" /obj/item/modular_computer/tablet/preset/custom_loadout/nettie/install_default_hardware() - ..() - processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/computer_hardware/hard_drive/(src) - network_card = new/obj/item/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/computer_hardware/nano_printer(src) - battery_module = new/obj/item/computer_hardware/battery_module(src) - battery_module.charge_to_full() + ..() + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + battery_module = new/obj/item/computer_hardware/battery_module(src) + battery_module.charge_to_full() //Stobarico - Kyu Comet diff --git a/code/modules/vote/vote_datum.dm b/code/modules/vote/vote_datum.dm index 61cf7156f4..47a749b8f4 100644 --- a/code/modules/vote/vote_datum.dm +++ b/code/modules/vote/vote_datum.dm @@ -56,78 +56,78 @@ return max(((started_time + vote_time - world.time)/10), 0) /datum/vote/proc/calculate_result() - if(!length(voted)) - to_chat(world, span_interface("No votes were cast. Do you all hate democracy?!")) - return null + if(!length(voted)) + to_chat(world, span_interface("No votes were cast. Do you all hate democracy?!")) + return null - return calculate_vote_result(voted, choices, vote_result_type) + return calculate_vote_result(voted, choices, vote_result_type) /datum/vote/proc/calculate_vote_result(var/list/voted, var/list/choices, var/vote_result_type) - var/list/results = list() + var/list/results = list() - for(var/ck in voted) - if(voted[ck] in results) - results[voted[ck]]++ - else - results[voted[ck]] = 1 + for(var/ck in voted) + if(voted[ck] in results) + results[voted[ck]]++ + else + results[voted[ck]] = 1 - var/maxvotes = 0 - for(var/res in results) - maxvotes = max(results[res], maxvotes) + var/maxvotes = 0 + for(var/res in results) + maxvotes = max(results[res], maxvotes) - var/list/winning_options = list() + var/list/winning_options = list() - for(var/res in results) - if(results[res] == maxvotes) - winning_options |= res + for(var/res in results) + if(results[res] == maxvotes) + winning_options |= res - for(var/res in results) - to_chat(world, span_interface("[res] - [results[res]] vote\s")) + for(var/res in results) + to_chat(world, span_interface("[res] - [results[res]] vote\s")) - switch(vote_result_type) - if(VOTE_RESULT_TYPE_MAJORITY) - if(length(winning_options) == 1) - var/res = winning_options[1] - if(res in choices) - to_chat(world, span_interface(span_bold("[res] won the vote!"))) - return res - else - to_chat(world, span_interface("The winner of the vote ([sanitize(res)]) isn't a valid choice? What the heck?")) - stack_trace("Vote concluded with an invalid answer. Answer was [sanitize(res)], choices were [json_encode(choices)]") - return null + switch(vote_result_type) + if(VOTE_RESULT_TYPE_MAJORITY) + if(length(winning_options) == 1) + var/res = winning_options[1] + if(res in choices) + to_chat(world, span_interface(span_bold("[res] won the vote!"))) + return res + else + to_chat(world, span_interface("The winner of the vote ([sanitize(res)]) isn't a valid choice? What the heck?")) + stack_trace("Vote concluded with an invalid answer. Answer was [sanitize(res)], choices were [json_encode(choices)]") + return null - to_chat(world, span_interface(span_bold("No clear winner. The vote did not pass."))) - return null + to_chat(world, span_interface(span_bold("No clear winner. The vote did not pass."))) + return null - if(VOTE_RESULT_TYPE_SKEWED) - var/required_votes = ceil(length(voted) * 0.7) // 70% of total votes - if(maxvotes >= required_votes && length(winning_options) == 1) - var/res = winning_options[1] - if(res in choices) - to_chat(world, span_interface(span_bold("[res] won the vote with a 70% majority!"))) - return res - else - to_chat(world, span_interface("The winner of the vote ([sanitize(res)]) isn't a valid choice? What the heck?")) - stack_trace("Vote concluded with an invalid answer. Answer was [sanitize(res)], choices were [json_encode(choices)]") - return null + if(VOTE_RESULT_TYPE_SKEWED) + var/required_votes = ceil(length(voted) * 0.7) // 70% of total votes + if(maxvotes >= required_votes && length(winning_options) == 1) + var/res = winning_options[1] + if(res in choices) + to_chat(world, span_interface(span_bold("[res] won the vote with a 70% majority!"))) + return res + else + to_chat(world, span_interface("The winner of the vote ([sanitize(res)]) isn't a valid choice? What the heck?")) + stack_trace("Vote concluded with an invalid answer. Answer was [sanitize(res)], choices were [json_encode(choices)]") + return null - to_chat(world, span_interface(span_bold("No option received 70% of the votes. The vote did not pass."))) - return null + to_chat(world, span_interface(span_bold("No option received 70% of the votes. The vote did not pass."))) + return null - return null + return null /datum/vote/proc/announce(start_text, var/time = vote_time) - to_chat(world, span_lightpurple("Type vote or click here to place your vote. \ - You have [time/10] seconds to vote.")) - world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) + to_chat(world, span_lightpurple("Type vote or click here to place your vote. \ + You have [time/10] seconds to vote.")) + world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) /datum/vote/Topic(href, list/href_list) - if(href_list["vote"] == "open") - if(src) - tgui_interact(usr) - else - to_chat(usr, "There is no active vote to participate in.") + if(href_list["vote"] == "open") + if(src) + tgui_interact(usr) + else + to_chat(usr, "There is no active vote to participate in.") /datum/vote/proc/tick() if(remaining() == 0) diff --git a/maps/common/common_things.dm b/maps/common/common_things.dm index 354ee77e1d..8ddfe13016 100644 --- a/maps/common/common_things.dm +++ b/maps/common/common_things.dm @@ -331,7 +331,7 @@ //Special map objects /obj/effect/landmark/map_data/virgo3b - height = 5 + height = 5 /obj/turbolift_map_holder/tether name = "Tether Climber" diff --git a/maps/gateway_vr/variable/honlethhighlands.dm b/maps/gateway_vr/variable/honlethhighlands.dm index 0a01167848..a30434455c 100644 --- a/maps/gateway_vr/variable/honlethhighlands.dm +++ b/maps/gateway_vr/variable/honlethhighlands.dm @@ -15,16 +15,16 @@ /datum/map_template/common_lateload/gateway/honlethhighlands_a/on_map_loaded(z) - . = ..() - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, z, 64, 64) // Create the mining ore distribution map. + . = ..() + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, z, 64, 64) // Create the mining ore distribution map. /datum/map_template/common_lateload/gateway/honlethhighlands_b/on_map_loaded(z) - . = ..() - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, z, 64, 64) // Create the mining ore distribution map. + . = ..() + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, z, 64, 64) // Create the mining ore distribution map. + - //Areas// /area/gateway/honlethhighlands @@ -76,4 +76,4 @@ /area/gateway/honlethhighlands/town/kitchen icon_state = "cyawhisqu" - name = "kitchen" \ No newline at end of file + name = "kitchen" diff --git a/maps/offmap_vr/om_ships/vespa.dm b/maps/offmap_vr/om_ships/vespa.dm index f4b936a612..f2c5e0af04 100644 --- a/maps/offmap_vr/om_ships/vespa.dm +++ b/maps/offmap_vr/om_ships/vespa.dm @@ -139,24 +139,24 @@ // The shuttle's 'shuttle' computer // /obj/machinery/computer/shuttle_control/explore/vespaboat - //name = "Vespa's Shuttle control console" - //shuttle_tag = "Vespa's Ship's Boat" - //req_one_access = list(access_pilot) + //name = "Vespa's Shuttle control console" + //shuttle_tag = "Vespa's Ship's Boat" + //req_one_access = list(access_pilot) // A shuttle lateloader landmark // /obj/effect/shuttle_landmark/shuttle_initializer/vespaboat - //name = "Vespa's Boat Bay" - //base_area = /area/ship/expe/hangar - //base_turf = /turf/simulated/floor/tiled/techfloor - //landmark_tag = "omship_spawn_vespaboat" - //docking_controller = "vespa_boatbay" - //shuttle_type = /datum/shuttle/autodock/overmap/vespaboat + //name = "Vespa's Boat Bay" + //base_area = /area/ship/expe/hangar + //base_turf = /turf/simulated/floor/tiled/techfloor + //landmark_tag = "omship_spawn_vespaboat" + //docking_controller = "vespa_boatbay" + //shuttle_type = /datum/shuttle/autodock/overmap/vespaboat // The 'shuttle' // /datum/shuttle/autodock/overmap/vespaboat - //name = "Vespa's Ship's Boat" - //current_location = "omship_spawn_vespaboat" - //docking_controller_tag = "vespaboat_docker" - //shuttle_area = /area/shuttle/vespaboat - //fuel_consumption = 0 - //defer_initialisation = TRUE + //name = "Vespa's Ship's Boat" + //current_location = "omship_spawn_vespaboat" + //docking_controller_tag = "vespaboat_docker" + //shuttle_area = /area/shuttle/vespaboat + //fuel_consumption = 0 + //defer_initialisation = TRUE diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index b94fab9a9c..98be6492b4 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -775,20 +775,20 @@ // Robotics + Associated Areas /area/rnd/robotics - name = "\improper Robotics Lab" - icon_state = "robotics" + name = "\improper Robotics Lab" + icon_state = "robotics" /area/rnd/robotics/mechbay - name = "\improper Mech Bay" - icon_state = "mechbay" + name = "\improper Mech Bay" + icon_state = "mechbay" /area/rnd/robotics/surgeryroom1 - name = "\improper Robotics Surgery Room 1" + name = "\improper Robotics Surgery Room 1" /area/rnd/robotics/surgeryroom2 - name = "\improper Robotics Surgery Room 2" + name = "\improper Robotics Surgery Room 2" /area/rnd/robotics/resleeving - name = "\improper Robotics Resleeving" + name = "\improper Robotics Resleeving" /area/rnd/research/testingrange name = "\improper Weapons Testing Range" diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 1f7b0ea164..04cc7d4887 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -59,11 +59,11 @@ var/list/all_maps = list() var/list/lateload_redgate = list() //VOREStation Add - The same thing as gateway, but safe-ish var/list/allowed_jobs = list() //Job datums to use. - //Works a lot better so if we get to a point where three-ish maps are used - //We don't have to C&P ones that are only common between two of them - //That doesn't mean we have to include them with the rest of the jobs though, especially for map specific ones. - //Also including them lets us override already created jobs, letting us keep the datums to a minimum mostly. - //This is probably a lot longer explanation than it needs to be. + //Works a lot better so if we get to a point where three-ish maps are used + //We don't have to C&P ones that are only common between two of them + //That doesn't mean we have to include them with the rest of the jobs though, especially for map specific ones. + //Also including them lets us override already created jobs, letting us keep the datums to a minimum mostly. + //This is probably a lot longer explanation than it needs to be. var/list/holomap_smoosh // List of lists of zlevels to smoosh into single icons var/list/holomap_offset_x = list() @@ -264,19 +264,19 @@ var/list/all_maps = list() // This list needs to be purged but people insist on adding more cruft to the radio. /datum/map/proc/default_internal_channels() return list( - num2text(PUB_FREQ) = list(), - num2text(AI_FREQ) = list(access_synth), - num2text(ENT_FREQ) = list(), - num2text(ERT_FREQ) = list(access_cent_specops), - num2text(COMM_FREQ) = list(access_heads), - num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics), - num2text(MED_FREQ) = list(access_medical_equip), - num2text(MED_I_FREQ) = list(access_medical_equip), - num2text(SEC_FREQ) = list(access_security), - num2text(SEC_I_FREQ) = list(access_security), - num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology), - num2text(SUP_FREQ) = list(access_cargo), - num2text(SRV_FREQ) = list(access_janitor, access_hydroponics), + num2text(PUB_FREQ) = list(), + num2text(AI_FREQ) = list(access_synth), + num2text(ENT_FREQ) = list(), + num2text(ERT_FREQ) = list(access_cent_specops), + num2text(COMM_FREQ) = list(access_heads), + num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics), + num2text(MED_FREQ) = list(access_medical_equip), + num2text(MED_I_FREQ)= list(access_medical_equip), + num2text(SEC_FREQ) = list(access_security), + num2text(SEC_I_FREQ)= list(access_security), + num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology), + num2text(SUP_FREQ) = list(access_cargo), + num2text(SRV_FREQ) = list(access_janitor, access_hydroponics), ) /datum/map/proc/get_skybox_datum(z) diff --git a/tools/Redirector/textprocs.dm b/tools/Redirector/textprocs.dm index 6d3cc6c30c..84bc2165c9 100644 --- a/tools/Redirector/textprocs.dm +++ b/tools/Redirector/textprocs.dm @@ -20,9 +20,9 @@ proc return dd_text2list(file2text(file), separator) - //////////////////// - // Replacing text // - //////////////////// + //////////////////// + // Replacing text // + //////////////////// dd_replacetext(text, search_string, replacement_string) // A nice way to do this is to split the text into an array based on the search_string, // then put it back together into text using replacement_string as the new separator. @@ -35,7 +35,7 @@ proc return dd_list2text(textList, replacement_string) - ///////////////////// + ///////////////////// // Prefix checking // ///////////////////// dd_hasprefix(text, prefix) @@ -49,7 +49,7 @@ proc return findtextEx(text, prefix, start, end) - ///////////////////// + ///////////////////// // Suffix checking // ///////////////////// dd_hassuffix(text, suffix) @@ -64,11 +64,11 @@ proc // Turning text into lists // ///////////////////////////// dd_text2list(text, separator) - var/textlength = length(text) + var/textlength = length(text) var/separatorlength = length(separator) - var/list/textList = new /list() - var/searchPosition = 1 - var/findPosition = 1 + var/list/textList = new /list() + var/searchPosition = 1 + var/findPosition = 1 var/buggyText while (1) // Loop forever. findPosition = findtext(text, separator, searchPosition, 0) @@ -84,11 +84,11 @@ proc return textList dd_text2List(text, separator) - var/textlength = length(text) + var/textlength = length(text) var/separatorlength = length(separator) - var/list/textList = new /list() - var/searchPosition = 1 - var/findPosition = 1 + var/list/textList = new /list() + var/searchPosition = 1 + var/findPosition = 1 var/buggyText while (1) // Loop forever. findPosition = findtextEx(text, separator, searchPosition, 0) @@ -147,4 +147,4 @@ proc if (size <= length) return message else - return copytext(message, 1, length + 1) \ No newline at end of file + return copytext(message, 1, length + 1)