diff --git a/archive/maps/old_yw/yw/cryogaia_defines.dm b/archive/maps/old_yw/yw/cryogaia_defines.dm index cf536a4aa0..3a6ddaa033 100644 --- a/archive/maps/old_yw/yw/cryogaia_defines.dm +++ b/archive/maps/old_yw/yw/cryogaia_defines.dm @@ -205,9 +205,9 @@ belter_docked_z = list(Z_LEVEL_CRYOGAIA_UPPER) belter_transit_z = list(Z_LEVEL_CRYOGAIA_MISC) belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, - Z_LEVEL_ROGUEMINE_2, - Z_LEVEL_ROGUEMINE_3, - Z_LEVEL_ROGUEMINE_4) + Z_LEVEL_ROGUEMINE_2, + Z_LEVEL_ROGUEMINE_3, + Z_LEVEL_ROGUEMINE_4) lateload_single_pick = list( //Gateway missions list("Snow Outpost"), diff --git a/archive/maps/old_yw/yw/cryogaia_things.dm b/archive/maps/old_yw/yw/cryogaia_things.dm index cc522c502a..a2d13c65d4 100644 --- a/archive/maps/old_yw/yw/cryogaia_things.dm +++ b/archive/maps/old_yw/yw/cryogaia_things.dm @@ -270,23 +270,23 @@ var/global/list/latejoin_tram = list() "Desert" = new/datum/holodeck_program(/area/houseboat/holodeck/desert, list( 'sound/effects/weather/wind/wind_2_1.ogg', - 'sound/effects/weather/wind/wind_2_2.ogg', - 'sound/effects/weather/wind/wind_3_1.ogg', - 'sound/effects/weather/wind/wind_4_1.ogg', - 'sound/effects/weather/wind/wind_4_2.ogg', - 'sound/effects/weather/wind/wind_5_1.ogg' - ) - ), + 'sound/effects/weather/wind/wind_2_2.ogg', + 'sound/effects/weather/wind/wind_3_1.ogg', + 'sound/effects/weather/wind/wind_4_1.ogg', + 'sound/effects/weather/wind/wind_4_2.ogg', + 'sound/effects/weather/wind/wind_5_1.ogg' + ) + ), "Snowfield" = new/datum/holodeck_program(/area/houseboat/holodeck/snow, list( 'sound/effects/weather/wind/wind_2_1.ogg', - 'sound/effects/weather/wind/wind_2_2.ogg', - 'sound/effects/weather/wind/wind_3_1.ogg', - 'sound/effects/weather/wind/wind_4_1.ogg', - 'sound/effects/weather/wind/wind_4_2.ogg', - 'sound/effects/weather/wind/wind_5_1.ogg' - ) - ), + 'sound/effects/weather/wind/wind_2_2.ogg', + 'sound/effects/weather/wind/wind_3_1.ogg', + 'sound/effects/weather/wind/wind_4_1.ogg', + 'sound/effects/weather/wind/wind_4_2.ogg', + 'sound/effects/weather/wind/wind_5_1.ogg' + ) + ), "Space" = new/datum/holodeck_program(/area/houseboat/holodeck/space, list( 'sound/ambience/ambispace.ogg', diff --git a/code/ATMOSPHERICS/components/shutoff.dm b/code/ATMOSPHERICS/components/shutoff.dm index ea1f9fde70..7534b1d32a 100644 --- a/code/ATMOSPHERICS/components/shutoff.dm +++ b/code/ATMOSPHERICS/components/shutoff.dm @@ -58,8 +58,8 @@ GLOBAL_LIST_EMPTY(shutoff_valves) if(close_on_leaks) if(open && (network_node1.leaks.len || network_node2.leaks.len)) - find_leaks() // If we can see the leak, then this will find it, close the valve, and cut off that network - // If we cannot see the leak, then this will not close the valve, and any valves that can see the leak will cut it off from us + find_leaks() // If we can see the leak, then this will find it, close the valve, and cut off that network + // If we cannot see the leak, then this will not close the valve, and any valves that can see the leak will cut it off from us else if(!open && !network_node1.leaks.len && !network_node2.leaks.len) open() return diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 3a7f85ccaf..b055da6e85 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -19,12 +19,12 @@ /* Filter types: - -1: Nothing - 0: Phoron: Phoron, Oxygen Agent B - 1: Oxygen: Oxygen ONLY - 2: Nitrogen: Nitrogen ONLY - 3: Carbon Dioxide: Carbon Dioxide ONLY - 4: Nitrous Oxide (Formerly called Sleeping Agent) (N2O) + -1: Nothing + 0: Phoron: Phoron, Oxygen Agent B + 1: Oxygen: Oxygen ONLY + 2: Nitrogen: Nitrogen ONLY + 3: Carbon Dioxide: Carbon Dioxide ONLY + 4: Nitrous Oxide (Formerly called Sleeping Agent) (N2O) */ var/filter_type = -1 var/list/filtered_out = list() diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index 410f5963b7..fc422b88f6 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -119,7 +119,7 @@ "power" = use_power, "volume_rate" = volume_rate, "sigtype" = "status" - ) + ) radio_connection.post_signal(src, signal) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index e87f98457b..2e036f89bf 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -880,11 +880,11 @@ var/global/list/xenobio_rainbow_extracts = list( var/global/list/event_wildlife_aquatic = list( list( list(/mob/living/simple_mob/animal/passive/fish/koi = 1, - /mob/living/simple_mob/animal/passive/fish/pike = 2, - /mob/living/simple_mob/animal/passive/fish/perch = 2, - /mob/living/simple_mob/animal/passive/fish/salmon = 2, - /mob/living/simple_mob/animal/passive/fish/trout = 2, - /mob/living/simple_mob/animal/passive/fish/bass = 3), + /mob/living/simple_mob/animal/passive/fish/pike = 2, + /mob/living/simple_mob/animal/passive/fish/perch = 2, + /mob/living/simple_mob/animal/passive/fish/salmon = 2, + /mob/living/simple_mob/animal/passive/fish/trout = 2, + /mob/living/simple_mob/animal/passive/fish/bass = 3), list(/mob/living/simple_mob/animal/passive/fish/salmon = 1), list(/mob/living/simple_mob/animal/passive/fish/perch = 1), list(/mob/living/simple_mob/animal/passive/fish/trout = 1), @@ -896,11 +896,11 @@ var/global/list/event_wildlife_aquatic = list( list(/mob/living/simple_mob/animal/sif/duck = 1), list(/mob/living/simple_mob/animal/passive/fish/measelshark = 1), list(/mob/living/simple_mob/vore/pakkun = 5, - /mob/living/simple_mob/vore/pakkun/snapdragon = 1) + /mob/living/simple_mob/vore/pakkun/snapdragon = 1) ), list( list(/mob/living/simple_mob/animal/space/goose = 10, - /mob/living/simple_mob/animal/space/goose/white = 1), + /mob/living/simple_mob/animal/space/goose/white = 1), list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish = 1) ), list( @@ -911,38 +911,38 @@ var/global/list/event_wildlife_aquatic = list( var/global/list/event_wildlife_roaming = list( list( list(/mob/living/simple_mob/animal/passive/mouse/jerboa = 1, - /mob/living/simple_mob/animal/passive/mouse/black = 2, - /mob/living/simple_mob/animal/passive/mouse/brown = 2, - /mob/living/simple_mob/animal/passive/mouse/gray = 2, - /mob/living/simple_mob/animal/passive/mouse/white = 2, - /mob/living/simple_mob/animal/passive/mouse/rat/strong = 3), // CHOMPEdit + /mob/living/simple_mob/animal/passive/mouse/black = 2, + /mob/living/simple_mob/animal/passive/mouse/brown = 2, + /mob/living/simple_mob/animal/passive/mouse/gray = 2, + /mob/living/simple_mob/animal/passive/mouse/white = 2, + /mob/living/simple_mob/animal/passive/mouse/rat/strong = 3), // CHOMPEdit list(/mob/living/simple_mob/animal/passive/bird/black_bird = 1, - /mob/living/simple_mob/animal/passive/bird/azure_tit = 1, - /mob/living/simple_mob/animal/passive/bird/european_robin = 1, - /mob/living/simple_mob/animal/passive/bird/goldcrest = 1, - /mob/living/simple_mob/animal/passive/bird/ringneck_dove = 1), + /mob/living/simple_mob/animal/passive/bird/azure_tit = 1, + /mob/living/simple_mob/animal/passive/bird/european_robin = 1, + /mob/living/simple_mob/animal/passive/bird/goldcrest = 1, + /mob/living/simple_mob/animal/passive/bird/ringneck_dove = 1), list(/mob/living/simple_mob/animal/passive/dog/corgi = 4, - /mob/living/simple_mob/animal/passive/dog/corgi/puppy = 1), + /mob/living/simple_mob/animal/passive/dog/corgi/puppy = 1), list(/mob/living/simple_mob/vore/rabbit = 1), list(/mob/living/simple_mob/vore/redpanda = 14, - /mob/living/simple_mob/vore/redpanda/fae = 7, - /mob/living/simple_mob/vore/redpanda/blue = 1), + /mob/living/simple_mob/vore/redpanda/fae = 7, + /mob/living/simple_mob/vore/redpanda/blue = 1), list(/mob/living/simple_mob/animal/passive/cow = 1), list(/mob/living/simple_mob/animal/passive/chicken = 4, - /mob/living/simple_mob/animal/passive/chick = 1), + /mob/living/simple_mob/animal/passive/chick = 1), list(/mob/living/simple_mob/animal/passive/snake = 2, - /mob/living/simple_mob/animal/passive/snake/red = 1, - /mob/living/simple_mob/animal/passive/snake/python = 1) + /mob/living/simple_mob/animal/passive/snake/red = 1, + /mob/living/simple_mob/animal/passive/snake/python = 1) ), list( list(/mob/living/simple_mob/vore/horse/big = 7, - /mob/living/simple_mob/vore/horse = 2), + /mob/living/simple_mob/vore/horse = 2), list(/mob/living/simple_mob/vore/fennix = 1, - /mob/living/simple_mob/vore/fennec = 4), + /mob/living/simple_mob/vore/fennec = 4), list(/mob/living/simple_mob/vore/bee = 1), list(/mob/living/simple_mob/animal/passive/fox = 1), list(/mob/living/simple_mob/vore/sheep = 3, - /mob/living/simple_mob/animal/goat = 1), + /mob/living/simple_mob/animal/goat = 1), list(/mob/living/simple_mob/vore/hippo = 1), list(/mob/living/simple_mob/vore/alienanimals/dustjumper = 1), list(/mob/living/simple_mob/vore/alienanimals/teppi = 1) diff --git a/code/controllers/subsystems/sqlite.dm b/code/controllers/subsystems/sqlite.dm index a2e9b2864a..725c4acf39 100644 --- a/code/controllers/subsystems/sqlite.dm +++ b/code/controllers/subsystems/sqlite.dm @@ -33,14 +33,14 @@ SUBSYSTEM_DEF(sqlite) // Note that this is for direct feedback from players using the in-game feedback system and NOT for stat tracking. // Player ckeys are not stored in this table as a unique key due to a config option to hash the keys to encourage more honest feedback. /* - * id - Primary unique key to ID a specific piece of feedback. - NOT used to id people submitting feedback. - * author - The person who submitted it. Will be the ckey, or a hash of the ckey, - if both the config supports it, and the user wants it. - * topic - A specific category to organize feedback under. Options are defined in the config file. - * content - What the author decided to write to the staff. Limited to MAX_FEEDBACK_LENGTH. - * datetime - When the author submitted their feedback, acts as a timestamp. - */ + * id - Primary unique key to ID a specific piece of feedback. + NOT used to id people submitting feedback. + * author - The person who submitted it. Will be the ckey, or a hash of the ckey, + if both the config supports it, and the user wants it. + * topic - A specific category to organize feedback under. Options are defined in the config file. + * content - What the author decided to write to the staff. Limited to MAX_FEEDBACK_LENGTH. + * datetime - When the author submitted their feedback, acts as a timestamp. + */ var/database/query/init_schema = new( {" CREATE TABLE IF NOT EXISTS [SQLITE_TABLE_FEEDBACK] diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index c57d936e7f..84ba37b69b 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -14,10 +14,10 @@ reqs = list(list(/obj/item/handcuffs/cable = 1), list(/obj/item/stack/rods = 1), list(/obj/item/material/shard = 1, - /obj/item/material/butterflyblade = 1) + /obj/item/material/butterflyblade = 1) ) parts = list(/obj/item/material/shard = 1, - /obj/item/material/butterflyblade = 1) + /obj/item/material/butterflyblade = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON diff --git a/code/datums/mind_vr.dm b/code/datums/mind_vr.dm index b853053916..87747bd97d 100644 --- a/code/datums/mind_vr.dm +++ b/code/datums/mind_vr.dm @@ -5,10 +5,11 @@ var/directory_erptag var/directory_ad var/vore_prey_eaten = 0 - //CHOMPEdit additions + //CHOMPAdd Start var/vantag_preference = VANTAG_NONE var/directory_gendertag var/directory_sexualitytag + //CHOMPAdd End /mob/living/mind_initialize() . = ..() @@ -17,7 +18,8 @@ mind.directory_tag = client.prefs.directory_tag mind.directory_erptag = client.prefs.directory_erptag mind.directory_ad = client.prefs.directory_ad - //CHOMPEdit additions + //CHOMPAdd Start mind.vantag_preference = client.prefs.vantag_preference mind.directory_gendertag = client.prefs.directory_gendertag mind.directory_sexualitytag = client.prefs.directory_sexualitytag + //CHOMPAdd End diff --git a/code/datums/supplypacks/misc_yw.dm b/code/datums/supplypacks/misc_yw.dm index d3e54de288..c8947af138 100644 --- a/code/datums/supplypacks/misc_yw.dm +++ b/code/datums/supplypacks/misc_yw.dm @@ -28,7 +28,7 @@ /datum/supply_pack/misc/bluespaceradioyw name = "Bluespace Radio Packs" contains = list( - /obj/item/bluespaceradio/cryogaia_prelinked = 2 + /obj/item/bluespaceradio/cryogaia_prelinked = 2 ) cost = 75 containertype = /obj/structure/closet/crate diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 6723172cf1..b1b4d25466 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -182,13 +182,13 @@ /obj/item/storage/belt/explorer, /obj/item/clothing/mask/gas/explorer, /obj/item/cartridge/explorer, - /obj/item/gps/explorer, - /obj/item/clothing/under/explorer, - /obj/item/radio/headset/explorer, - /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/gps/explorer, + /obj/item/clothing/under/explorer, + /obj/item/radio/headset/explorer, + /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/material/knife/tacknife/survival, /obj/item/material/knife/machete, - /obj/item/clothing/accessory/holster/machete, + /obj/item/clothing/accessory/holster/machete, /obj/item/clothing/accessory/watch/survival ) cost=25 @@ -210,7 +210,7 @@ /obj/item/clothing/gloves/fingerless, /obj/item/cataloguer/compact, //CHOMP explo keep /obj/item/clothing/suit/storage/toggle/bomber/pilot, - /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/flashlight, /obj/item/material/knife/tacknife/survival, /obj/item/clothing/head/pilot_vr, @@ -245,13 +245,13 @@ /obj/item/storage/belt/explorer/pathfinder, /obj/item/clothing/mask/gas/explorer, /obj/item/cartridge/explorer, - /obj/item/gps/explorer, - /obj/item/clothing/under/explorer, - /obj/item/radio/headset/pathfinder, - /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/gps/explorer, + /obj/item/clothing/under/explorer, + /obj/item/radio/headset/pathfinder, + /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/material/knife/tacknife/survival, /obj/item/material/knife/machete/deluxe, - /obj/item/clothing/accessory/holster/machete, + /obj/item/clothing/accessory/holster/machete, /obj/item/storage/box/explorerkeys, /obj/item/mapping_unit, /obj/item/clothing/accessory/watch/survival diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index b0b0e738cf..ecf6c8e232 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -167,7 +167,7 @@ holder.add_hiddenprint(ui.user) switch(action) - // Toggles the cut/mend status. + // Toggles the cut/mend status. if("cut") // if(!I.has_tool_quality(TOOL_WIRECUTTER) && !user.can_admin_interact()) if(!istype(I) || !I.has_tool_quality(TOOL_WIRECUTTER)) @@ -194,7 +194,7 @@ return TRUE - // Attach a signaler to a wire. + // Attach a signaler to a wire. if("attach") if(is_attached(color)) var/obj/item/O = detach_assembly(color) diff --git a/code/game/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm index 8156a792d6..159ee014de 100644 --- a/code/game/antagonist/alien/borer.dm +++ b/code/game/antagonist/alien/borer.dm @@ -59,7 +59,7 @@ var/datum/antagonist/borer/borers borer.host_brain.name = host.name borer.host_brain.real_name = host.real_name return - // Place them at a vent if they can't get a host. + // Place them at a vent if they can't get a host. borer.forceMove(get_turf(pick(get_vents()))) /datum/antagonist/borer/attempt_random_spawn() diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 80a2b82a1e..59d43ee024 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1144,8 +1144,8 @@ datum New(var/text,var/joba) ..() var/list/items = list(REAGENT_SACID, REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\ - REAGENT_LEPORAZINE, REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\ - REAGENT_KELOTANE, REAGENT_DEXALIN, REAGENT_TRICORDRAZINE) + REAGENT_LEPORAZINE, REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\ + REAGENT_KELOTANE, REAGENT_DEXALIN, REAGENT_TRICORDRAZINE) target_name = pick(items) switch(target_name) if(REAGENT_SACID) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index a04e0764f4..651e1cbdd4 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -241,7 +241,7 @@ if(istype(loc,/obj/effect/dummy)) return TRACKING_TERMINATE - // Now, are they viewable by a camera? (This is last because it's the most intensive check) + // Now, are they viewable by a camera? (This is last because it's the most intensive check) return near_camera() ? TRACKING_POSSIBLE : TRACKING_NO_COVERAGE /mob/living/silicon/robot/tracking_status() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index ccdc300201..9b6c3952d4 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -186,7 +186,7 @@ else if(occupant.health < heal_level && occupant.getCloneLoss() > 0) occupant.Paralyse(4) - //Slowly get that clone healed and finished. + //Slowly get that clone healed and finished. occupant.adjustCloneLoss(-2 * heal_rate) //Premature clones may have brain damage. diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 140b888d0d..6c6839b03d 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -516,8 +516,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //End of research and feedback code. - /* ###### Send the message ###### */ - /* --- Process all the mobs that heard a masked voice (understood) --- */ + /* ###### Send the message ###### */ + /* --- Process all the mobs that heard a masked voice (understood) --- */ if(length(heard_masked)) for (var/mob/R in heard_masked) R.hear_radio(message_pieces, verbage, part_a, part_b, part_c, part_d, part_e, M, 0, name) @@ -702,7 +702,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //End of research and feedback code. - /* ###### Send the message ###### */ + /* ###### Send the message ###### */ /* --- Process all the mobs that heard the voice normally (understood) --- */ diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index af0535f7a8..42198a272b 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -47,7 +47,7 @@ network = "tcommsat" produces_heat = 0 autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", "hb_relay", - "centcom", "receiverCent", "broadcasterCent") //VOREStation Edit - Added "hb_relay" + "centcom", "receiverCent", "broadcasterCent") //VOREStation Edit - Added "hb_relay" //Receivers diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 973404be5e..1a85bffaff 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -9,8 +9,8 @@ circuit = /obj/item/circuitboard/teleporter dir = 4 var/id = null - var/one_time_use = 0 //Used for one-time-use teleport cards (such as clown planet coordinates.) - //Setting this to 1 will set locked to null after a player enters the portal and will not allow hand-teles to open portals to that location. + var/one_time_use = 0 //Used for one-time-use teleport cards (such as clown planet coordinates.) + //Setting this to 1 will set locked to null after a player enters the portal and will not allow hand-teles to open portals to that location. var/datum/tgui_module/teleport_control/teleport_control /obj/machinery/computer/teleporter/Initialize(mapload) diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm index cecbefc798..9bcafc2a60 100644 --- a/code/game/magic/Uristrunes.dm +++ b/code/game/magic/Uristrunes.dm @@ -51,8 +51,8 @@ var/list/word_to_uristrune_table = null animated = 0 var/bits = word_to_uristrune_bit(word1) \ - | word_to_uristrune_bit(word2) \ - | word_to_uristrune_bit(word3) + | word_to_uristrune_bit(word2) \ + | word_to_uristrune_bit(word3) return get_uristrune(bits, animated) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e1ad0684db..649ffbcf7e 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -2199,7 +2199,7 @@ - "} + "} return output @@ -2328,14 +2328,14 @@ for(var/obj/item/mecha_parts/mecha_equipment/W in micro_weapon_equipment) output += "Micro Weapon Module: [W.name] Detach
" output += {"Available hull slots: [max_hull_equip-hull_equipment.len]
- Available weapon slots: [max_weapon_equip-weapon_equipment.len]
- Available micro weapon slots: [max_micro_weapon_equip-micro_weapon_equipment.len]
- Available utility slots: [max_utility_equip-utility_equipment.len]
- Available micro utility slots: [max_micro_utility_equip-micro_utility_equipment.len]
- Available universal slots: [max_universal_equip-universal_equipment.len]
- Available special slots: [max_special_equip-special_equipment.len]
- - "} */ //CHOMPedit commented micromech stuff, because fuck this trash + Available weapon slots: [max_weapon_equip-weapon_equipment.len]
+ Available micro weapon slots: [max_micro_weapon_equip-micro_weapon_equipment.len]
+ Available utility slots: [max_utility_equip-utility_equipment.len]
+ Available micro utility slots: [max_micro_utility_equip-micro_utility_equipment.len]
+ Available universal slots: [max_universal_equip-universal_equipment.len]
+ Available special slots: [max_special_equip-special_equipment.len]
+ + "} */ //CHOMPedit commented micromech stuff, because fuck this trash return output /obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index ef63b14777..7cd5ff8a4a 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -71,10 +71,10 @@ ////////////////////// /datum/construction/mecha/ripley_chassis steps = list(list("key"=/obj/item/mecha_parts/part/ripley_torso),//1 - list("key"=/obj/item/mecha_parts/part/ripley_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/ripley_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/ripley_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/ripley_right_leg)//5 + list("key"=/obj/item/mecha_parts/part/ripley_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/ripley_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/ripley_left_leg),//4 + list("key"=/obj/item/mecha_parts/part/ripley_right_leg)//5 ) /datum/construction/mecha/ripley_chassis/custom_action(step, obj/item/I, mob/user) @@ -106,56 +106,56 @@ "backkey"=IS_WRENCH, "desc"="External armor is wrenched."), //2 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="External armor is installed."), - //3 - list("key"=/obj/item/stack/material/plasteel, - "backkey"=IS_WELDER, - "desc"="Internal armor is welded."), - //4 - list("key"=IS_WELDER, - "backkey"=IS_WRENCH, - "desc"="Internal armor is wrenched"), - //5 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="Internal armor is installed"), - //6 - list("key"=/obj/item/stack/material/steel, - "backkey"=IS_SCREWDRIVER, - "desc"="Peripherals control module is secured"), - //7 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Peripherals control module is installed"), - //8 - list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, - "backkey"=IS_SCREWDRIVER, - "desc"="Central control module is secured"), - //9 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Central control module is installed"), - //10 - list("key"=/obj/item/circuitboard/mecha/ripley/main, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is adjusted"), - //11 - list("key"=IS_WIRECUTTER, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is added"), - //12 - list("key"=/obj/item/stack/cable_coil, - "backkey"=IS_SCREWDRIVER, - "desc"="The hydraulic systems are active."), - //13 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_WRENCH, - "desc"="The hydraulic systems are connected."), - //14 - list("key"=IS_WRENCH, - "desc"="The hydraulic systems are disconnected.") + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="External armor is installed."), + //3 + list("key"=/obj/item/stack/material/plasteel, + "backkey"=IS_WELDER, + "desc"="Internal armor is welded."), + //4 + list("key"=IS_WELDER, + "backkey"=IS_WRENCH, + "desc"="Internal armor is wrenched"), + //5 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="Internal armor is installed"), + //6 + list("key"=/obj/item/stack/material/steel, + "backkey"=IS_SCREWDRIVER, + "desc"="Peripherals control module is secured"), + //7 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Peripherals control module is installed"), + //8 + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=IS_SCREWDRIVER, + "desc"="Central control module is secured"), + //9 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Central control module is installed"), + //10 + list("key"=/obj/item/circuitboard/mecha/ripley/main, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is adjusted"), + //11 + list("key"=IS_WIRECUTTER, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is added"), + //12 + list("key"=/obj/item/stack/cable_coil, + "backkey"=IS_SCREWDRIVER, + "desc"="The hydraulic systems are active."), + //13 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_WRENCH, + "desc"="The hydraulic systems are connected."), + //14 + list("key"=IS_WRENCH, + "desc"="The hydraulic systems are disconnected.") ) /datum/construction/reversible/mecha/ripley/action(obj/item/I,mob/user as mob) @@ -279,11 +279,11 @@ ////////////////////// /datum/construction/mecha/gygax_chassis steps = list(list("key"=/obj/item/mecha_parts/part/gygax_torso),//1 - list("key"=/obj/item/mecha_parts/part/gygax_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/gygax_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/gygax_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/gygax_right_leg),//5 - list("key"=/obj/item/mecha_parts/part/gygax_head) + list("key"=/obj/item/mecha_parts/part/gygax_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/gygax_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/gygax_left_leg),//4 + list("key"=/obj/item/mecha_parts/part/gygax_right_leg),//5 + list("key"=/obj/item/mecha_parts/part/gygax_head) ) /datum/construction/mecha/gygax_chassis/custom_action(step, obj/item/I, mob/user) @@ -313,81 +313,81 @@ list("key"=IS_WELDER, "backkey"=IS_WRENCH, "desc"="External armor is wrenched."), - //2 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="External armor is installed."), - //3 - list("key"=/obj/item/mecha_parts/part/gygax_armour, - "backkey"=IS_WELDER, - "desc"="Internal armor is welded."), - //4 - list("key"=IS_WELDER, - "backkey"=IS_WRENCH, - "desc"="Internal armor is wrenched"), - //5 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="Internal armor is installed"), - //6 - list("key"=/obj/item/stack/material/steel, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced capacitor is secured"), - //7 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced capacitor is installed"), - //8 - list("key"=/obj/item/stock_parts/capacitor/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced scanner module is secured"), - //9 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced scanner module is installed"), - //10 - list("key"=/obj/item/stock_parts/scanning_module/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Targeting module is secured"), - //11 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Targeting module is installed"), - //12 - list("key"=/obj/item/circuitboard/mecha/gygax/targeting, - "backkey"=IS_SCREWDRIVER, - "desc"="Peripherals control module is secured"), - //13 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Peripherals control module is installed"), - //14 - list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, - "backkey"=IS_SCREWDRIVER, - "desc"="Central control module is secured"), - //15 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Central control module is installed"), - //16 - list("key"=/obj/item/circuitboard/mecha/gygax/main, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is adjusted"), - //17 - list("key"=IS_WIRECUTTER, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is added"), - //18 - list("key"=/obj/item/stack/cable_coil, - "backkey"=IS_SCREWDRIVER, - "desc"="The hydraulic systems are active."), - //19 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_WRENCH, - "desc"="The hydraulic systems are connected."), - //20 - list("key"=IS_WRENCH, - "desc"="The hydraulic systems are disconnected.") + //2 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="External armor is installed."), + //3 + list("key"=/obj/item/mecha_parts/part/gygax_armour, + "backkey"=IS_WELDER, + "desc"="Internal armor is welded."), + //4 + list("key"=IS_WELDER, + "backkey"=IS_WRENCH, + "desc"="Internal armor is wrenched"), + //5 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="Internal armor is installed"), + //6 + list("key"=/obj/item/stack/material/steel, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced capacitor is secured"), + //7 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced capacitor is installed"), + //8 + list("key"=/obj/item/stock_parts/capacitor/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced scanner module is secured"), + //9 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced scanner module is installed"), + //10 + list("key"=/obj/item/stock_parts/scanning_module/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Targeting module is secured"), + //11 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Targeting module is installed"), + //12 + list("key"=/obj/item/circuitboard/mecha/gygax/targeting, + "backkey"=IS_SCREWDRIVER, + "desc"="Peripherals control module is secured"), + //13 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Peripherals control module is installed"), + //14 + list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, + "backkey"=IS_SCREWDRIVER, + "desc"="Central control module is secured"), + //15 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Central control module is installed"), + //16 + list("key"=/obj/item/circuitboard/mecha/gygax/main, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is adjusted"), + //17 + list("key"=IS_WIRECUTTER, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is added"), + //18 + list("key"=/obj/item/stack/cable_coil, + "backkey"=IS_SCREWDRIVER, + "desc"="The hydraulic systems are active."), + //19 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_WRENCH, + "desc"="The hydraulic systems are connected."), + //20 + list("key"=IS_WRENCH, + "desc"="The hydraulic systems are disconnected.") ) /datum/construction/reversible/mecha/gygax/action(obj/item/I,mob/user as mob) @@ -561,11 +561,11 @@ ////////////////////// /datum/construction/mecha/serenity_chassis steps = list(list("key"=/obj/item/mecha_parts/part/gygax_torso),//1 - list("key"=/obj/item/mecha_parts/part/gygax_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/gygax_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/gygax_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/gygax_right_leg),//5 - list("key"=/obj/item/mecha_parts/part/gygax_head) + list("key"=/obj/item/mecha_parts/part/gygax_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/gygax_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/gygax_left_leg),//4 + list("key"=/obj/item/mecha_parts/part/gygax_right_leg),//5 + list("key"=/obj/item/mecha_parts/part/gygax_head) ) /datum/construction/mecha/serenity_chassis/custom_action(step, obj/item/I, mob/user) @@ -595,81 +595,81 @@ list("key"=IS_WELDER, "backkey"=IS_WRENCH, "desc"="External armor is wrenched."), - //2 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="External armor is installed."), - //3 - list("key"=/obj/item/stack/material/plasteel, - "backkey"=IS_WELDER, - "desc"="Internal armor is welded."), - //4 - list("key"=IS_WELDER, - "backkey"=IS_WRENCH, - "desc"="Internal armor is wrenched"), - //5 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="Internal armor is installed"), - //6 - list("key"=/obj/item/stack/material/steel, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced capacitor is secured"), - //7 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced capacitor is installed"), - //8 - list("key"=/obj/item/stock_parts/capacitor/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced scanner module is secured"), - //9 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced scanner module is installed"), - //10 - list("key"=/obj/item/stock_parts/scanning_module/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Medical module is secured"), - //11 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Medical module is installed"), - //12 - list("key"=/obj/item/circuitboard/mecha/gygax/medical, - "backkey"=IS_SCREWDRIVER, - "desc"="Peripherals control module is secured"), - //13 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Peripherals control module is installed"), - //14 - list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, - "backkey"=IS_SCREWDRIVER, - "desc"="Central control module is secured"), - //15 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Central control module is installed"), - //16 - list("key"=/obj/item/circuitboard/mecha/gygax/main, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is adjusted"), - //17 - list("key"=IS_WIRECUTTER, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is added"), - //18 - list("key"=/obj/item/stack/cable_coil, - "backkey"=IS_SCREWDRIVER, - "desc"="The hydraulic systems are active."), - //19 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_WRENCH, - "desc"="The hydraulic systems are connected."), - //20 - list("key"=IS_WRENCH, - "desc"="The hydraulic systems are disconnected.") + //2 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="External armor is installed."), + //3 + list("key"=/obj/item/stack/material/plasteel, + "backkey"=IS_WELDER, + "desc"="Internal armor is welded."), + //4 + list("key"=IS_WELDER, + "backkey"=IS_WRENCH, + "desc"="Internal armor is wrenched"), + //5 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="Internal armor is installed"), + //6 + list("key"=/obj/item/stack/material/steel, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced capacitor is secured"), + //7 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced capacitor is installed"), + //8 + list("key"=/obj/item/stock_parts/capacitor/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced scanner module is secured"), + //9 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced scanner module is installed"), + //10 + list("key"=/obj/item/stock_parts/scanning_module/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Medical module is secured"), + //11 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Medical module is installed"), + //12 + list("key"=/obj/item/circuitboard/mecha/gygax/medical, + "backkey"=IS_SCREWDRIVER, + "desc"="Peripherals control module is secured"), + //13 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Peripherals control module is installed"), + //14 + list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, + "backkey"=IS_SCREWDRIVER, + "desc"="Central control module is secured"), + //15 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Central control module is installed"), + //16 + list("key"=/obj/item/circuitboard/mecha/gygax/main, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is adjusted"), + //17 + list("key"=IS_WIRECUTTER, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is added"), + //18 + list("key"=/obj/item/stack/cable_coil, + "backkey"=IS_SCREWDRIVER, + "desc"="The hydraulic systems are active."), + //19 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_WRENCH, + "desc"="The hydraulic systems are connected."), + //20 + list("key"=IS_WRENCH, + "desc"="The hydraulic systems are disconnected.") ) /datum/construction/reversible/mecha/serenity/action(obj/item/I,mob/user as mob) @@ -843,11 +843,11 @@ //////////////////////// /datum/construction/mecha/firefighter_chassis steps = list(list("key"=/obj/item/mecha_parts/part/ripley_torso),//1 - list("key"=/obj/item/mecha_parts/part/ripley_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/ripley_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/ripley_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/ripley_right_leg),//5 - list("key"=/obj/item/clothing/suit/fire)//6 + list("key"=/obj/item/mecha_parts/part/ripley_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/ripley_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/ripley_left_leg),//4 + list("key"=/obj/item/mecha_parts/part/ripley_right_leg),//5 + list("key"=/obj/item/clothing/suit/fire)//6 ) /datum/construction/mecha/firefighter_chassis/custom_action(step, obj/item/I, mob/user) @@ -879,60 +879,60 @@ "backkey"=IS_WRENCH, "desc"="External armor is wrenched."), //2 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="External armor is installed."), - //3 - list("key"=/obj/item/stack/material/plasteel, - "backkey"=IS_CROWBAR, - "desc"="External armor is being installed."), - //4 - list("key"=/obj/item/stack/material/plasteel, - "backkey"=IS_WELDER, - "desc"="Internal armor is welded."), - //5 - list("key"=IS_WELDER, - "backkey"=IS_WRENCH, - "desc"="Internal armor is wrenched"), - //6 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="Internal armor is installed"), - //7 - list("key"=/obj/item/stack/material/plasteel, - "backkey"=IS_SCREWDRIVER, - "desc"="Peripherals control module is secured"), - //8 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Peripherals control module is installed"), - //9 - list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, - "backkey"=IS_SCREWDRIVER, - "desc"="Central control module is secured"), - //10 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Central control module is installed"), - //11 - list("key"=/obj/item/circuitboard/mecha/ripley/main, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is adjusted"), - //12 - list("key"=IS_WIRECUTTER, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is added"), - //13 - list("key"=/obj/item/stack/cable_coil, - "backkey"=IS_SCREWDRIVER, - "desc"="The hydraulic systems are active."), - //14 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_WRENCH, - "desc"="The hydraulic systems are connected."), - //15 - list("key"=IS_WRENCH, - "desc"="The hydraulic systems are disconnected.") + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="External armor is installed."), + //3 + list("key"=/obj/item/stack/material/plasteel, + "backkey"=IS_CROWBAR, + "desc"="External armor is being installed."), + //4 + list("key"=/obj/item/stack/material/plasteel, + "backkey"=IS_WELDER, + "desc"="Internal armor is welded."), + //5 + list("key"=IS_WELDER, + "backkey"=IS_WRENCH, + "desc"="Internal armor is wrenched"), + //6 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="Internal armor is installed"), + //7 + list("key"=/obj/item/stack/material/plasteel, + "backkey"=IS_SCREWDRIVER, + "desc"="Peripherals control module is secured"), + //8 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Peripherals control module is installed"), + //9 + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=IS_SCREWDRIVER, + "desc"="Central control module is secured"), + //10 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Central control module is installed"), + //11 + list("key"=/obj/item/circuitboard/mecha/ripley/main, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is adjusted"), + //12 + list("key"=IS_WIRECUTTER, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is added"), + //13 + list("key"=/obj/item/stack/cable_coil, + "backkey"=IS_SCREWDRIVER, + "desc"="The hydraulic systems are active."), + //14 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_WRENCH, + "desc"="The hydraulic systems are connected."), + //15 + list("key"=IS_WRENCH, + "desc"="The hydraulic systems are disconnected.") ) /datum/construction/reversible/mecha/firefighter/action(obj/item/I,mob/user as mob) @@ -1064,11 +1064,11 @@ ////////////////////// /datum/construction/mecha/durand_chassis steps = list(list("key"=/obj/item/mecha_parts/part/durand_torso),//1 - list("key"=/obj/item/mecha_parts/part/durand_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/durand_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/durand_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/durand_right_leg),//5 - list("key"=/obj/item/mecha_parts/part/durand_head) + list("key"=/obj/item/mecha_parts/part/durand_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/durand_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/durand_left_leg),//4 + list("key"=/obj/item/mecha_parts/part/durand_right_leg),//5 + list("key"=/obj/item/mecha_parts/part/durand_head) ) /datum/construction/mecha/durand_chassis/custom_action(step, obj/item/I, mob/user) @@ -1098,81 +1098,81 @@ list("key"=IS_WELDER, "backkey"=IS_WRENCH, "desc"="External armor is wrenched."), - //2 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="External armor is installed."), - //3 - list("key"=/obj/item/mecha_parts/part/durand_armour, - "backkey"=IS_WELDER, - "desc"="Internal armor is welded."), - //4 - list("key"=IS_WELDER, - "backkey"=IS_WRENCH, - "desc"="Internal armor is wrenched"), - //5 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="Internal armor is installed"), - //6 - list("key"=/obj/item/stack/material/steel, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced capacitor is secured"), - //7 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced capacitor is installed"), - //8 - list("key"=/obj/item/stock_parts/capacitor/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced scanner module is secured"), - //9 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced scanner module is installed"), - //10 - list("key"=/obj/item/stock_parts/scanning_module/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Targeting module is secured"), - //11 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Targeting module is installed"), - //12 - list("key"=/obj/item/circuitboard/mecha/durand/targeting, - "backkey"=IS_SCREWDRIVER, - "desc"="Peripherals control module is secured"), - //13 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Peripherals control module is installed"), - //14 - list("key"=/obj/item/circuitboard/mecha/durand/peripherals, - "backkey"=IS_SCREWDRIVER, - "desc"="Central control module is secured"), - //15 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Central control module is installed"), - //16 - list("key"=/obj/item/circuitboard/mecha/durand/main, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is adjusted"), - //17 - list("key"=IS_WIRECUTTER, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is added"), - //18 - list("key"=/obj/item/stack/cable_coil, - "backkey"=IS_SCREWDRIVER, - "desc"="The hydraulic systems are active."), - //19 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_WRENCH, - "desc"="The hydraulic systems are connected."), - //20 - list("key"=IS_WRENCH, - "desc"="The hydraulic systems are disconnected.") + //2 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="External armor is installed."), + //3 + list("key"=/obj/item/mecha_parts/part/durand_armour, + "backkey"=IS_WELDER, + "desc"="Internal armor is welded."), + //4 + list("key"=IS_WELDER, + "backkey"=IS_WRENCH, + "desc"="Internal armor is wrenched"), + //5 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="Internal armor is installed"), + //6 + list("key"=/obj/item/stack/material/steel, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced capacitor is secured"), + //7 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced capacitor is installed"), + //8 + list("key"=/obj/item/stock_parts/capacitor/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced scanner module is secured"), + //9 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced scanner module is installed"), + //10 + list("key"=/obj/item/stock_parts/scanning_module/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Targeting module is secured"), + //11 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Targeting module is installed"), + //12 + list("key"=/obj/item/circuitboard/mecha/durand/targeting, + "backkey"=IS_SCREWDRIVER, + "desc"="Peripherals control module is secured"), + //13 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Peripherals control module is installed"), + //14 + list("key"=/obj/item/circuitboard/mecha/durand/peripherals, + "backkey"=IS_SCREWDRIVER, + "desc"="Central control module is secured"), + //15 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Central control module is installed"), + //16 + list("key"=/obj/item/circuitboard/mecha/durand/main, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is adjusted"), + //17 + list("key"=IS_WIRECUTTER, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is added"), + //18 + list("key"=/obj/item/stack/cable_coil, + "backkey"=IS_SCREWDRIVER, + "desc"="The hydraulic systems are active."), + //19 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_WRENCH, + "desc"="The hydraulic systems are connected."), + //20 + list("key"=IS_WRENCH, + "desc"="The hydraulic systems are disconnected.") ) @@ -1346,11 +1346,11 @@ //////////////////////// /datum/construction/mecha/odysseus_chassis steps = list(list("key"=/obj/item/mecha_parts/part/odysseus_torso),//1 - list("key"=/obj/item/mecha_parts/part/odysseus_head),//2 - list("key"=/obj/item/mecha_parts/part/odysseus_left_arm),//3 - list("key"=/obj/item/mecha_parts/part/odysseus_right_arm),//4 - list("key"=/obj/item/mecha_parts/part/odysseus_left_leg),//5 - list("key"=/obj/item/mecha_parts/part/odysseus_right_leg)//6 + list("key"=/obj/item/mecha_parts/part/odysseus_head),//2 + list("key"=/obj/item/mecha_parts/part/odysseus_left_arm),//3 + list("key"=/obj/item/mecha_parts/part/odysseus_right_arm),//4 + list("key"=/obj/item/mecha_parts/part/odysseus_left_leg),//5 + list("key"=/obj/item/mecha_parts/part/odysseus_right_leg)//6 ) /datum/construction/mecha/odysseus_chassis/custom_action(step, obj/item/I, mob/user) @@ -1381,56 +1381,56 @@ "backkey"=IS_WRENCH, "desc"="External armor is wrenched."), //2 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="External armor is installed."), - //3 - list("key"=/obj/item/stack/material/plasteel, - "backkey"=IS_WELDER, - "desc"="Internal armor is welded."), - //4 - list("key"=IS_WELDER, - "backkey"=IS_WRENCH, - "desc"="Internal armor is wrenched"), - //5 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="Internal armor is installed"), - //6 - list("key"=/obj/item/stack/material/steel, - "backkey"=IS_SCREWDRIVER, - "desc"="Peripherals control module is secured"), - //7 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Peripherals control module is installed"), - //8 - list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals, - "backkey"=IS_SCREWDRIVER, - "desc"="Central control module is secured"), - //9 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Central control module is installed"), - //10 - list("key"=/obj/item/circuitboard/mecha/odysseus/main, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is adjusted"), - //11 - list("key"=IS_WIRECUTTER, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is added"), - //12 - list("key"=/obj/item/stack/cable_coil, - "backkey"=IS_SCREWDRIVER, - "desc"="The hydraulic systems are active."), - //13 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_WRENCH, - "desc"="The hydraulic systems are connected."), - //14 - list("key"=IS_WRENCH, - "desc"="The hydraulic systems are disconnected.") + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="External armor is installed."), + //3 + list("key"=/obj/item/stack/material/plasteel, + "backkey"=IS_WELDER, + "desc"="Internal armor is welded."), + //4 + list("key"=IS_WELDER, + "backkey"=IS_WRENCH, + "desc"="Internal armor is wrenched"), + //5 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="Internal armor is installed"), + //6 + list("key"=/obj/item/stack/material/steel, + "backkey"=IS_SCREWDRIVER, + "desc"="Peripherals control module is secured"), + //7 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Peripherals control module is installed"), + //8 + list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals, + "backkey"=IS_SCREWDRIVER, + "desc"="Central control module is secured"), + //9 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Central control module is installed"), + //10 + list("key"=/obj/item/circuitboard/mecha/odysseus/main, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is adjusted"), + //11 + list("key"=IS_WIRECUTTER, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is added"), + //12 + list("key"=/obj/item/stack/cable_coil, + "backkey"=IS_SCREWDRIVER, + "desc"="The hydraulic systems are active."), + //13 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_WRENCH, + "desc"="The hydraulic systems are connected."), + //14 + list("key"=IS_WRENCH, + "desc"="The hydraulic systems are disconnected.") ) /datum/construction/reversible/mecha/odysseus/action(obj/item/I,mob/user as mob) @@ -1556,11 +1556,11 @@ /datum/construction/mecha/phazon_chassis result = "/obj/mecha/combat/phazon" steps = list(list("key"=/obj/item/mecha_parts/part/phazon_torso),//1 - list("key"=/obj/item/mecha_parts/part/phazon_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/phazon_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/phazon_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/phazon_right_leg),//5 - list("key"=/obj/item/mecha_parts/part/phazon_head) + list("key"=/obj/item/mecha_parts/part/phazon_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/phazon_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/phazon_left_leg),//4 + list("key"=/obj/item/mecha_parts/part/phazon_right_leg),//5 + list("key"=/obj/item/mecha_parts/part/phazon_head) ) /datum/construction/mecha/phazon_chassis/custom_action(step, obj/item/I, mob/user) @@ -1835,11 +1835,11 @@ /datum/construction/mecha/janus_chassis result = "/obj/mecha/combat/phazon/janus" steps = list(list("key"=/obj/item/mecha_parts/part/janus_torso),//1 - list("key"=/obj/item/mecha_parts/part/janus_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/janus_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/janus_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/janus_right_leg),//5 - list("key"=/obj/item/mecha_parts/part/janus_head) + list("key"=/obj/item/mecha_parts/part/janus_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/janus_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/janus_left_leg),//4 + list("key"=/obj/item/mecha_parts/part/janus_right_leg),//5 + list("key"=/obj/item/mecha_parts/part/janus_head) ) /datum/construction/mecha/janus_chassis/custom_action(step, obj/item/I, mob/user) @@ -2140,12 +2140,12 @@ /datum/construction/mecha/fighter/pinnace_chassis result = "/obj/mecha/combat/fighter/pinnace" steps = list(list("key"=/obj/item/mecha_parts/fighter/part/pinnace_core),//1 - list("key"=/obj/item/mecha_parts/fighter/part/pinnace_cockpit),//2 - list("key"=/obj/item/mecha_parts/fighter/part/pinnace_main_engine),//3 - list("key"=/obj/item/mecha_parts/fighter/part/pinnace_left_engine),//4 - list("key"=/obj/item/mecha_parts/fighter/part/pinnace_right_engine),//5 - list("key"=/obj/item/mecha_parts/fighter/part/pinnace_left_wing),//6 - list("key"=/obj/item/mecha_parts/fighter/part/pinnace_right_wing)//final + list("key"=/obj/item/mecha_parts/fighter/part/pinnace_cockpit),//2 + list("key"=/obj/item/mecha_parts/fighter/part/pinnace_main_engine),//3 + list("key"=/obj/item/mecha_parts/fighter/part/pinnace_left_engine),//4 + list("key"=/obj/item/mecha_parts/fighter/part/pinnace_right_engine),//5 + list("key"=/obj/item/mecha_parts/fighter/part/pinnace_left_wing),//6 + list("key"=/obj/item/mecha_parts/fighter/part/pinnace_right_wing)//final ) /datum/construction/mecha/fighter/pinnace_chassis/custom_action(step, obj/item/I, mob/user) @@ -2423,12 +2423,12 @@ /datum/construction/mecha/fighter/baron_chassis result = "/obj/mecha/combat/fighter/baron" steps = list(list("key"=/obj/item/mecha_parts/fighter/part/baron_core),//1 - list("key"=/obj/item/mecha_parts/fighter/part/baron_cockpit),//2 - list("key"=/obj/item/mecha_parts/fighter/part/baron_main_engine),//3 - list("key"=/obj/item/mecha_parts/fighter/part/baron_left_engine),//4 - list("key"=/obj/item/mecha_parts/fighter/part/baron_right_engine),//5 - list("key"=/obj/item/mecha_parts/fighter/part/baron_left_wing),//6 - list("key"=/obj/item/mecha_parts/fighter/part/baron_right_wing)//final + list("key"=/obj/item/mecha_parts/fighter/part/baron_cockpit),//2 + list("key"=/obj/item/mecha_parts/fighter/part/baron_main_engine),//3 + list("key"=/obj/item/mecha_parts/fighter/part/baron_left_engine),//4 + list("key"=/obj/item/mecha_parts/fighter/part/baron_right_engine),//5 + list("key"=/obj/item/mecha_parts/fighter/part/baron_left_wing),//6 + list("key"=/obj/item/mecha_parts/fighter/part/baron_right_wing)//final ) /datum/construction/mecha/fighter/baron_chassis/custom_action(step, obj/item/I, mob/user) diff --git a/code/game/mecha/mecha_construction_paths_ch.dm b/code/game/mecha/mecha_construction_paths_ch.dm index 0a0259a536..d7b9d3c805 100644 --- a/code/game/mecha/mecha_construction_paths_ch.dm +++ b/code/game/mecha/mecha_construction_paths_ch.dm @@ -1,11 +1,11 @@ /datum/construction/mecha/scarab_chassis steps = list(list("key"=/obj/item/mecha_parts/part/scarab_torso),//1 - list("key"=/obj/item/mecha_parts/part/scarab_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/scarab_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/scarab_left_legs),//4 - list("key"=/obj/item/mecha_parts/part/scarab_right_legs),//5 - list("key"=/obj/item/mecha_parts/part/scarab_head) - ) + list("key"=/obj/item/mecha_parts/part/scarab_left_arm),//2 + list("key"=/obj/item/mecha_parts/part/scarab_right_arm),//3 + list("key"=/obj/item/mecha_parts/part/scarab_left_legs),//4 + list("key"=/obj/item/mecha_parts/part/scarab_right_legs),//5 + list("key"=/obj/item/mecha_parts/part/scarab_head) + ) /datum/construction/mecha/scarab_chassis/custom_action(step, obj/item/I, mob/user) user.visible_message("[user] has connected [I] to [holder].", "You connect [I] to [holder]") @@ -34,81 +34,81 @@ list("key"=IS_WELDER, "backkey"=IS_WRENCH, "desc"="External armor is wrenched."), - //2 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="External armor is installed."), - //3 - list("key"=/obj/item/stack/material/plasteel, - "backkey"=IS_WELDER, - "desc"="Internal armor is welded."), - //4 - list("key"=IS_WELDER, - "backkey"=IS_WRENCH, - "desc"="Internal armor is wrenched"), - //5 - list("key"=IS_WRENCH, - "backkey"=IS_CROWBAR, - "desc"="Internal armor is installed"), - //6 - list("key"=/obj/item/stack/material/steel, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced capacitor is secured"), - //7 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced capacitor is installed"), - //8 - list("key"=/obj/item/stock_parts/capacitor/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Advanced scanner module is secured"), - //9 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Advanced scanner module is installed"), - //10 - list("key"=/obj/item/stock_parts/scanning_module/adv, - "backkey"=IS_SCREWDRIVER, - "desc"="Targeting module is secured"), - //11 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Targeting module is installed"), - //12 - list("key"=/obj/item/circuitboard/mecha/scarab/targeting, - "backkey"=IS_SCREWDRIVER, - "desc"="Peripherals control module is secured"), - //13 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Peripherals control module is installed"), - //14 - list("key"=/obj/item/circuitboard/mecha/scarab/peripherals, - "backkey"=IS_SCREWDRIVER, - "desc"="Central control module is secured"), - //15 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_CROWBAR, - "desc"="Central control module is installed"), - //16 - list("key"=/obj/item/circuitboard/mecha/scarab/main, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is adjusted"), - //17 - list("key"=IS_WIRECUTTER, - "backkey"=IS_SCREWDRIVER, - "desc"="The wiring is added"), - //18 - list("key"=/obj/item/stack/cable_coil, - "backkey"=IS_SCREWDRIVER, - "desc"="The hydraulic systems are active."), - //19 - list("key"=IS_SCREWDRIVER, - "backkey"=IS_WRENCH, - "desc"="The hydraulic systems are connected."), - //20 - list("key"=IS_WRENCH, - "desc"="The hydraulic systems are disconnected.") + //2 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="External armor is installed."), + //3 + list("key"=/obj/item/stack/material/plasteel, + "backkey"=IS_WELDER, + "desc"="Internal armor is welded."), + //4 + list("key"=IS_WELDER, + "backkey"=IS_WRENCH, + "desc"="Internal armor is wrenched"), + //5 + list("key"=IS_WRENCH, + "backkey"=IS_CROWBAR, + "desc"="Internal armor is installed"), + //6 + list("key"=/obj/item/stack/material/steel, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced capacitor is secured"), + //7 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced capacitor is installed"), + //8 + list("key"=/obj/item/stock_parts/capacitor/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Advanced scanner module is secured"), + //9 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Advanced scanner module is installed"), + //10 + list("key"=/obj/item/stock_parts/scanning_module/adv, + "backkey"=IS_SCREWDRIVER, + "desc"="Targeting module is secured"), + //11 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Targeting module is installed"), + //12 + list("key"=/obj/item/circuitboard/mecha/scarab/targeting, + "backkey"=IS_SCREWDRIVER, + "desc"="Peripherals control module is secured"), + //13 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Peripherals control module is installed"), + //14 + list("key"=/obj/item/circuitboard/mecha/scarab/peripherals, + "backkey"=IS_SCREWDRIVER, + "desc"="Central control module is secured"), + //15 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_CROWBAR, + "desc"="Central control module is installed"), + //16 + list("key"=/obj/item/circuitboard/mecha/scarab/main, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is adjusted"), + //17 + list("key"=IS_WIRECUTTER, + "backkey"=IS_SCREWDRIVER, + "desc"="The wiring is added"), + //18 + list("key"=/obj/item/stack/cable_coil, + "backkey"=IS_SCREWDRIVER, + "desc"="The hydraulic systems are active."), + //19 + list("key"=IS_SCREWDRIVER, + "backkey"=IS_WRENCH, + "desc"="The hydraulic systems are connected."), + //20 + list("key"=IS_WRENCH, + "desc"="The hydraulic systems are disconnected.") ) /datum/construction/reversible/mecha/scarab/action(obj/item/I,mob/user as mob) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 39ae3f9801..e17f759a2e 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -129,13 +129,13 @@ vision = H.internal_organs_by_name[H.species.vision_organ] if(!vision) user.visible_message(span_infoplain(span_bold("\The [user]") + " directs [src] at [M]'s face."), \ - span_notice("You direct [src] at [M]'s face.")) + span_notice("You direct [src] at [M]'s face.")) to_chat(user, span_warning("You can't find any [H.species.vision_organ ? H.species.vision_organ : "eyes"] on [H]!")) user.setClickCooldown(user.get_attack_speed(src)) return user.visible_message(span_infoplain(span_bold("\The [user]") + " directs [src] to [M]'s eyes."), \ - span_notice("You direct [src] to [M]'s eyes.")) + span_notice("You direct [src] to [M]'s eyes.")) if(H != user) //can't look into your own eyes buster if(M.stat == DEAD || M.blinded) //mob is dead or fully blind to_chat(user, span_warning("\The [M]'s pupils do not react to the light!")) diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index c02c283dbd..84fa9f8f70 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -133,8 +133,8 @@ for(var/datum/data/record/L in data_core.locked) if(L.fields["id"] == exploit_id) data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value. - // We trade off being able to automatically add shit for more control over what gets passed to json - // and if it's sanitized for html. + // We trade off being able to automatically add shit for more control over what gets passed to json + // and if it's sanitized for html. data["exploit"]["nanoui_exploit_record"] = html_encode(L.fields["exploit_record"]) // Change stuff into html data["exploit"]["nanoui_exploit_record"] = replacetext(data["exploit"]["nanoui_exploit_record"], "\n", "
") // change line breaks into
data["exploit"]["name"] = html_encode(L.fields["name"]) diff --git a/code/game/objects/items/leash.dm b/code/game/objects/items/leash.dm index b14d267349..913a654238 100644 --- a/code/game/objects/items/leash.dm +++ b/code/game/objects/items/leash.dm @@ -159,7 +159,7 @@ step_towards(leash_pet, leash_master) /obj/item/leash/dropped(mob/user) - //Drop the leash, and the leash effects stop + //Drop the leash, and the leash effects stop . = ..() if(!leash_pet || !leash_master) //There is no pet. Stop this silliness return diff --git a/code/game/objects/items/selectable_item_vr.dm b/code/game/objects/items/selectable_item_vr.dm index bf7ab989af..154f3b343f 100644 --- a/code/game/objects/items/selectable_item_vr.dm +++ b/code/game/objects/items/selectable_item_vr.dm @@ -8,7 +8,7 @@ var/selection_string = "Select an item:" var/selection_title = "Item Selection" var/list/item_options = list("Gift" = /obj/item/a_gift, - "Health Analyzer" = /obj/item/healthanalyzer) + "Health Analyzer" = /obj/item/healthanalyzer) /obj/item/selectable_item/attack_self(mob/user as mob) tgui_alert(user, {"[preface_string]"}, preface_title) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index b6b5da218b..b0a85cac0e 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -108,7 +108,7 @@ else var/available = get_amount() user.balloon_alert_visible("\the [user] starts bandaging [M]'s [affecting.name].", \ - "bandaging [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "bandaging [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts var/used = 0 for (var/datum/wound/W in affecting.wounds) if(W.internal) @@ -131,10 +131,10 @@ if (W.current_stage <= W.max_bleeding_stage) user.balloon_alert_visible("\the [user] bandages \a [W.desc] on [M]'s [affecting.name].", \ - "you bandage \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "you bandage \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts else user.balloon_alert_visible("\the [user] places a bandage over \a [W.desc] on [M]'s [affecting.name].", \ - "you place a bandage over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "you place a bandage over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts W.bandage() playsound(src, pick(apply_sounds), 25) used++ @@ -177,7 +177,7 @@ else var/available = get_amount() user.balloon_alert_visible("\the [user] starts treating [M]'s [affecting.name].", \ - "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts var/used = 0 for (var/datum/wound/W in affecting.wounds) if (W.internal) @@ -200,14 +200,14 @@ if (W.current_stage <= W.max_bleeding_stage) user.balloon_alert_visible("\the [user] bandages \a [W.desc] on [M]'s [affecting.name].", \ - "bandaged \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "bandaged \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts //H.add_side_effect("Itch") else if (W.damage_type == BRUISE) user.balloon_alert_visible("\the [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name].", \ - "placed bruise patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "placed bruise patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts else user.balloon_alert_visible("\the [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].", \ - "placed bandaid over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "placed bandaid over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts W.bandage() // W.disinfect() // VOREStation - Tech1 should not disinfect playsound(src, pick(apply_sounds), 25) @@ -250,7 +250,7 @@ return 1 else user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \ - "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts + "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts if(!do_mob(user, M, 10, exclusive = TRUE)) balloon_alert(user, "stand still to salve wounds.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts return 1 @@ -258,7 +258,7 @@ balloon_alert(user, "[M]'s [affecting.name] have already been salved.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts return 1 user.balloon_alert_visible("[user] salved wounds on [M]'s [affecting.name].", \ - "salved wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts + "salved wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts use(1) affecting.salve() playsound(src, pick(apply_sounds), 25) @@ -296,7 +296,7 @@ else var/available = get_amount() user.balloon_alert_visible("\the [user] starts treating [M]'s [affecting.name].", \ - "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts + "treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts var/used = 0 for (var/datum/wound/W in affecting.wounds) if (W.internal) @@ -318,13 +318,13 @@ if (W.current_stage <= W.max_bleeding_stage) user.balloon_alert_visible("\the [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.", \ - "cleaning and sealing \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "cleaning and sealing \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts else if (W.damage_type == BRUISE) user.balloon_alert_visible("\the [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name].", \ - "placed medical patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "placed medical patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts else user.balloon_alert_visible("\the [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name].", \ - "smeared bioglue over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "smeared bioglue over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts W.bandage() W.disinfect() W.heal_damage(heal_brute) @@ -364,7 +364,7 @@ return 1 else user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \ - "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts + "salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts if(!do_mob(user, M, 10, exclusive = TRUE)) balloon_alert(user, "stand still to salve wounds.") // CHOMPEdit - Balloon Alerts return 1 diff --git a/code/game/objects/items/toys/fake_coin.dm b/code/game/objects/items/toys/fake_coin.dm index df75ae5125..63ff1dc387 100644 --- a/code/game/objects/items/toys/fake_coin.dm +++ b/code/game/objects/items/toys/fake_coin.dm @@ -114,4 +114,4 @@ else if(result == 2) comment = "heads" user.visible_message(span_notice("[user] has thrown \the [src]. It lands on [comment]!"), \ - span_notice("You throw \the [src]. It lands on [comment]!")) + span_notice("You throw \the [src]. It lands on [comment]!")) diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 8de0ca3bb1..9707204f77 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -19,8 +19,8 @@ /datum/autopsy_data_scanner var/weapon = null // this is the DEFINITE weapon type that was used - var/list/organs_scanned = list() // this maps a number of scanned organs to - // the wounds to those organs with this data's weapon type + var/list/organs_scanned = list() // this maps a number of scanned organs to + // the wounds to those organs with this data's weapon type var/organ_names = "" /datum/autopsy_data diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 75c243569f..7d869217b6 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -51,15 +51,15 @@ return if(H == user) user.visible_message(span_notice("[user] does their lips with \the [src]."), \ - span_notice("You take a moment to apply \the [src]. Perfect!")) + span_notice("You take a moment to apply \the [src]. Perfect!")) H.lip_style = colour H.update_icons_body() else user.visible_message(span_warning("[user] begins to do [H]'s lips with \the [src]."), \ - span_notice("You begin to apply \the [src].")) + span_notice("You begin to apply \the [src].")) if(do_after(user, 20, H)) //user needs to keep their active hand, H does not. user.visible_message(span_notice("[user] does [H]'s lips with \the [src]."), \ - span_notice("You apply \the [src].")) + span_notice("You apply \the [src].")) H.lip_style = colour H.update_icons_body() else diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 5b633b6d0f..de9a03cbbb 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -560,6 +560,6 @@ /obj/item/storage/backpack/satchel/ranger name = "ranger satchel" desc = "A satchel designed for the Go Go ERT Rangers series to allow for slightly bigger carry capacity for the ERT-Rangers.\ - Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content." + Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content." icon = 'icons/obj/clothing/ranger.dmi' icon_state = "ranger_satchel" diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 3daf04a731..ce0fbfce09 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -312,8 +312,8 @@ for(var/obj/item/I in LB.contents) LB.remove_from_storage(I, T) user.visible_message(span_notice("[user] empties \the [LB] into \the [src]."), \ - span_notice("You empty \the [LB] into \the [src]."), \ - span_notice("You hear rustling of clothes.")) + span_notice("You empty \the [LB] into \the [src]."), \ + span_notice("You hear rustling of clothes.")) return if(isrobot(user)) return diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm index 87c6554fb0..a06b4bf651 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm @@ -1288,7 +1288,7 @@ color = COLOR_YELLOW_GRAY decals = list( "crate_bracing" - ) + ) extra_decals = list( "text" = COLOR_BLUE_LIGHT ) @@ -1297,7 +1297,7 @@ color = COLOR_DARK_BLUE_GRAY decals = list( "crate_bracing" - ) + ) extra_decals = list( "text" = COLOR_BEIGE ) @@ -1306,7 +1306,7 @@ color = COLOR_NT_RED decals = list( "crate_bracing" - ) + ) extra_decals = list( "text" = COLOR_OFF_WHITE ) @@ -1315,7 +1315,7 @@ color = COLOR_ORANGE decals = list( "crate_bracing" - ) + ) extra_decals = list( "text" = COLOR_OFF_WHITE ) @@ -1327,7 +1327,7 @@ color = COLOR_NT_RED decals = list( "crate_bracing" - ) + ) extra_decals = list( "marking" = COLOR_OFF_WHITE, "text_upper" = COLOR_OFF_WHITE @@ -1337,7 +1337,7 @@ color = COLOR_YELLOW_GRAY decals = list( "crate_bracing" - ) + ) extra_decals = list( "marking" = COLOR_OFF_WHITE, "text_upper" = COLOR_BLUE_LIGHT @@ -1347,7 +1347,7 @@ color = COLOR_DARK_BLUE_GRAY decals = list( "crate_bracing" - ) + ) extra_decals = list( "marking" = COLOR_OFF_WHITE, "text_upper" = COLOR_BEIGE @@ -1357,7 +1357,7 @@ color = COLOR_GRAY20 decals = list( "crate_bracing" - ) + ) extra_decals = list( "marking" = COLOR_NT_RED, "text_upper" = COLOR_NT_RED @@ -1367,7 +1367,7 @@ color = COLOR_ORANGE decals = list( "crate_bracing" - ) + ) extra_decals = list( "marking" = COLOR_OFF_WHITE, "text_upper" = COLOR_OFF_WHITE diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index f796d18b47..33a3a0bf03 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -70,16 +70,16 @@ if(src.opened) if(istype(W, /obj/item/shovel)) user.visible_message(span_notice("[user] piles dirt into \the [src.name]."), \ - span_notice("You start to pile dirt into \the [src.name]."), \ - span_notice("You hear dirt being moved.")) + span_notice("You start to pile dirt into \the [src.name]."), \ + span_notice("You hear dirt being moved.")) if(do_after(user, 40 * W.toolspeed)) user.visible_message(span_notice("[user] pats down the dirt on top of \the [src.name]."), \ - span_notice("You finish filling in \the [src.name].")) + span_notice("You finish filling in \the [src.name].")) close() return else user.visible_message(span_notice("[user] stops filling in \the [src.name]."), \ - span_notice("You change your mind and stop filling in \the [src.name].")) + span_notice("You change your mind and stop filling in \the [src.name].")) return if(istype(W, /obj/item/grab)) var/obj/item/grab/G = W @@ -93,8 +93,8 @@ for(var/obj/item/I in LB.contents) LB.remove_from_storage(I, T) user.visible_message(span_notice("[user] empties \the [LB] into \the [src]."), \ - span_notice("You empty \the [LB] into \the [src]."), \ - span_notice("You hear rustling of clothes.")) + span_notice("You empty \the [LB] into \the [src]."), \ + span_notice("You hear rustling of clothes.")) return if(isrobot(user)) return @@ -107,11 +107,11 @@ if(istype(W, /obj/item/shovel)) if(user.a_intent == I_HURT) // Hurt intent means you're trying to kill someone, or just get rid of the grave user.visible_message(span_notice("[user] begins to smoothe out the dirt of \the [src.name]."), \ - span_notice("You start to smoothe out the dirt of \the [src.name]."), \ - span_notice("You hear dirt being moved.")) + span_notice("You start to smoothe out the dirt of \the [src.name]."), \ + span_notice("You hear dirt being moved.")) if(do_after(user, 40 * W.toolspeed)) user.visible_message(span_notice("[user] finishes smoothing out \the [src.name]."), \ - span_notice("You finish smoothing out \the [src.name].")) + span_notice("You finish smoothing out \the [src.name].")) if(LAZYLEN(contents)) alpha = 40 // If we've got stuff inside, like maybe a person, just make it hard to see us else @@ -119,20 +119,20 @@ return else user.visible_message(span_notice("[user] stops concealing \the [src.name]."), \ - span_notice("You stop concealing \the [src.name].")) + span_notice("You stop concealing \the [src.name].")) return else user.visible_message(span_notice("[user] begins to unearth \the [src.name]."), \ - span_notice("You start to unearth \the [src.name]."), \ - span_notice("You hear dirt being moved.")) + span_notice("You start to unearth \the [src.name]."), \ + span_notice("You hear dirt being moved.")) if(do_after(user, 40 * W.toolspeed)) user.visible_message(span_notice("[user] reaches the bottom of \the [src.name]."), \ - span_notice("You finish digging out \the [src.name].")) + span_notice("You finish digging out \the [src.name].")) break_open() return else user.visible_message(span_notice("[user] stops digging out \the [src.name]."), \ - span_notice("You stop digging out \the [src.name].")) + span_notice("You stop digging out \the [src.name].")) return return diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index e27a0d10d8..b27a6bc9d2 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -40,8 +40,8 @@ active_ghost_pods |= AMBLINAL //VOREStation Add End user.visible_message(span_notice("[user] pries \the [src] open."), \ - span_notice("You pry open \the [src]."), \ - span_notice("You hear splitting wood.")) + span_notice("You pry open \the [src]."), \ + span_notice("You hear splitting wood.")) qdel(src) else return attack_hand(user) diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 0de2a0f4be..b889a9212a 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -30,8 +30,8 @@ for(var/atom/movable/AM in contents) if(AM.simulated) AM.forceMove(T) user.visible_message(span_notice("[user] pries \the [src] open."), \ - span_notice("You pry open \the [src]."), \ - span_notice("You hear splitting wood.")) + span_notice("You pry open \the [src]."), \ + span_notice("You hear splitting wood.")) qdel(src) else return attack_hand(user) diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm index cef723e0c6..33faadd36c 100644 --- a/code/game/objects/structures/crates_lockers/vehiclecage.dm +++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm @@ -73,8 +73,8 @@ /obj/structure/vehiclecage/proc/load_vehicle(var/obj/vehicle/V, mob/user as mob) if(user) user.visible_message(span_notice("[user] loads \the [V] into \the [src]."), \ - span_notice("You load \the [V] into \the [src]."), \ - span_notice("You hear creaking metal.")) + span_notice("You load \the [V] into \the [src]."), \ + span_notice("You hear creaking metal.")) V.forceMove(src) @@ -92,8 +92,8 @@ my_vehicle = null user.visible_message(span_notice("[user] release \the [src]."), \ - span_notice("You finally release \the [src]."), \ - span_notice("You hear creaking metal.")) + span_notice("You finally release \the [src]."), \ + span_notice("You hear creaking metal.")) qdel(src) /obj/structure/vehiclecage/spacebike diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 8c416136ed..1cf0acfc8c 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -104,7 +104,7 @@ playsound(src, W.usesound, 100, 1) anchored = !anchored user.visible_message(span_notice("[user] [anchored ? "fastens" : "unfastens"] the grille."), \ - span_notice("You have [anchored ? "fastened the grille to" : "unfastened the grille from"] the floor.")) + span_notice("You have [anchored ? "fastened the grille to" : "unfastened the grille from"] the floor.")) return //window placing begin //TODO CONVERT PROPERLY TO MATERIAL DATUM diff --git a/code/game/objects/structures/props/alien_props.dm b/code/game/objects/structures/props/alien_props.dm index ec99c635b8..590cd150ca 100644 --- a/code/game/objects/structures/props/alien_props.dm +++ b/code/game/objects/structures/props/alien_props.dm @@ -54,7 +54,7 @@
\