diff --git a/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm b/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm index 673acde12f1..1057ba78f94 100644 --- a/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm +++ b/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm @@ -127,7 +127,7 @@ /obj/item/storage/backpack/messenger/cap name = "captain's messenger bag" - desc = "An exclusive messenger bag for NanoTrasen officers, made of real whaleleather." + desc = "An exclusive messenger bag for Nanotrasen officers, made of real whaleleather." icon_state = "messenger_captain" inhand_icon_state = "messenger_captain" diff --git a/modular_skyrat/master_files/code/game/objects/structures/tables_racks.dm b/modular_skyrat/master_files/code/game/objects/structures/tables_racks.dm index 2058fbd5467..cf7ab78f52d 100644 --- a/modular_skyrat/master_files/code/game/objects/structures/tables_racks.dm +++ b/modular_skyrat/master_files/code/game/objects/structures/tables_racks.dm @@ -4,6 +4,6 @@ return return attack_hand(user, modifiers) -/obj/structure/table/reinforced/Initialize() +/obj/structure/table/reinforced/Initialize(mapload) . = ..() AddElement(/datum/element/liquids_height, 20) diff --git a/modular_skyrat/master_files/code/game/objects/structures/trash_pile.dm b/modular_skyrat/master_files/code/game/objects/structures/trash_pile.dm index 2cb722fd714..92598f7cd2f 100644 --- a/modular_skyrat/master_files/code/game/objects/structures/trash_pile.dm +++ b/modular_skyrat/master_files/code/game/objects/structures/trash_pile.dm @@ -142,4 +142,4 @@ /obj/structure/trash_pile/relaymove(mob/user) container_resist_act(user) -BUBBERSTATION CHANGE END */ \ No newline at end of file +BUBBERSTATION CHANGE END */ diff --git a/modular_skyrat/master_files/code/modules/clothing/towels.dm b/modular_skyrat/master_files/code/modules/clothing/towels.dm index 16ae2c3ca30..03c22a59f16 100644 --- a/modular_skyrat/master_files/code/modules/clothing/towels.dm +++ b/modular_skyrat/master_files/code/modules/clothing/towels.dm @@ -191,7 +191,7 @@ if(!choice) return - change_towel_shape(user, lowertext(choice)) + change_towel_shape(user, LOWER_TEXT(choice)) /obj/item/towel/attackby(obj/item/attacking_item, mob/user, params) @@ -522,3 +522,16 @@ user.changeNext_move(CLICK_CD_MELEE) return TRUE +#undef TOWEL_WRING_AMOUNT +#undef TOWEL_WRING_LOSS_FACTOR +#undef TOWEL_CLOTH_AMOUNT +#undef TOWEL_RIGHTHAND_ICON +#undef TOWEL_LEFTHAND_ICON +#undef TOWEL_WORN_ICON_DIGI +#undef TOWEL_WORN_ICON +#undef TOWEL_OBJ_ICON +#undef TOWEL_USED +#undef TOWEL_HEAD +#undef TOWEL_WAIST +#undef TOWEL_FULL +#undef TOWEL_FOLDED diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm index 333ad865506..5bec029ab80 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm @@ -56,7 +56,7 @@ /datum/loadout_item/suit/rax_peacekeeper_jacket name = "Peacekeeper jacket" item_path = /obj/item/clothing/suit/armor/vest/warden/rax - //ckeywhitelist = list("raxraus") + //ckeywhitelist = list("raxraus") restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/uniform/rax_banded_uniform diff --git a/modular_skyrat/master_files/code/modules/power/circulator.dm b/modular_skyrat/master_files/code/modules/power/circulator.dm index 1150ab60c3c..84f40fa22a6 100644 --- a/modular_skyrat/master_files/code/modules/power/circulator.dm +++ b/modular_skyrat/master_files/code/modules/power/circulator.dm @@ -141,16 +141,16 @@ /obj/machinery/atmospherics/components/binary/circulator/wrench_act(mob/living/user, obj/item/I) if(!panel_open) - balloon_alert(user, span_warning("Open the panel first!")) + balloon_alert(user, "open the panel first!") return TRUE if(generator) - balloon_alert(user, span_warning("Disconnect [generator] first!")) + balloon_alert(user, "disconnect [generator] first!") return TRUE set_anchored(!anchored) I.play_tool_sound(src) - balloon_alert(user, span_notice("You [anchored?"secure":"unsecure"] [src].")) + balloon_alert(user, "you [anchored?"secure":"unsecure"] [src].") var/obj/machinery/atmospherics/node1 = nodes[1] var/obj/machinery/atmospherics/node2 = nodes[2] @@ -203,22 +203,22 @@ /obj/machinery/atmospherics/components/binary/circulator/multitool_act(mob/living/user, obj/item/I) if(generator) - balloon_alert(user, span_warning("Disconnect [generator] first!")) + balloon_alert(user, "disconnect [generator] first!") return TRUE mode = !mode - balloon_alert(user, span_notice("You set [src] to [mode?"cold":"hot"] mode.")) + balloon_alert(user, "you set [src] to [mode?"cold":"hot"] mode.") return TRUE /obj/machinery/atmospherics/components/binary/circulator/screwdriver_act(mob/user, obj/item/I) if(..()) return TRUE if(generator) - balloon_alert(user, span_warning("Disconnect the generator first!")) + balloon_alert(user, "disconnect the generator first!") return TRUE panel_open = !panel_open I.play_tool_sound(src) - balloon_alert(user, span_notice("You [panel_open?"open":"close"] the panel on [src].")) + balloon_alert(user, "you [panel_open?"open":"close"] the panel on [src].") update_icon_nopipes() return TRUE @@ -234,7 +234,7 @@ /obj/machinery/atmospherics/components/binary/circulator/crowbar_act(mob/user, obj/item/I) if(anchored) - balloon_alert(user, span_warning("[src] is anchored!")) + balloon_alert(user, "[src] is anchored!") return TRUE if(!panel_open) circulator_flip() @@ -268,7 +268,7 @@ if(!ishuman(usr)) return flipped = !flipped - balloon_alert(usr, span_notice("You flip [src].")) + balloon_alert(usr, "you flip [src].") playsound(src, 'sound/items/tools/change_drill.ogg', 50) update_icon_nopipes() diff --git a/modular_skyrat/master_files/code/modules/power/thermoelectric_generator.dm b/modular_skyrat/master_files/code/modules/power/thermoelectric_generator.dm index 75f2dc635db..3034c9f84e1 100644 --- a/modular_skyrat/master_files/code/modules/power/thermoelectric_generator.dm +++ b/modular_skyrat/master_files/code/modules/power/thermoelectric_generator.dm @@ -193,31 +193,31 @@ if(!panel_open) //connect/disconnect circulators if(!anchored) - balloon_alert(user, span_warning("Anchor [src] before trying to connect the circulators!")) + balloon_alert(user, "anchor [src] before trying to connect the circulators!") return TRUE else if(hot_circ && cold_circ) - balloon_alert(user, span_notice("You start removing the circulators...")) + balloon_alert(user, "you start removing the circulators...") if(I.use_tool(src, user, 30, volume=50)) null_circulators() update_appearance() - balloon_alert(user, span_notice("You disconnect [src]'s circulator links.")) + balloon_alert(user, "you disconnect [src]'s circulator links.") playsound(src, 'sound/misc/box_deploy.ogg', 50) return TRUE - balloon_alert(user, span_notice("You attempt to attach the circulators...")) + balloon_alert(user, "you attempt to attach the circulators...") if(I.use_tool(src, user, 30, volume=50)) switch(find_circulators()) if(0) - balloon_alert(user, span_warning("No circulators found!")) + balloon_alert(user, "no circulators found!") if(1) - balloon_alert(user, span_warning("Only one circulator found!")) + balloon_alert(user, "only one circulator found!") if(2) - balloon_alert(user, span_notice("You connect [src]'s circulator links.")) + balloon_alert(user, "you connect [src]'s circulator links.") playsound(src, 'sound/misc/box_deploy.ogg', 50) return TRUE if(3) - balloon_alert(user, span_warning("Both circulators are the same mode!")) + balloon_alert(user, "both circulators are the same mode!") return TRUE set_anchored(!anchored) @@ -225,7 +225,7 @@ if(!anchored) null_circulators() connect_to_network() - balloon_alert(user, span_notice("You [anchored?"secure":"unsecure"] [src].")) + balloon_alert(user, "you [anchored?"secure":"unsecure"] [src].") update_appearance() return TRUE @@ -234,21 +234,21 @@ return TRUE if(hot_circ && cold_circ) - balloon_alert(user, span_warning("Disconnect the circulators first!")) + balloon_alert(user, "disconnect the circulators first!") return TRUE panel_open = !panel_open I.play_tool_sound(src) - balloon_alert(user, span_notice("You [panel_open?"open":"close"] the panel on [src].")) + balloon_alert(user, "you [panel_open?"open":"close"] the panel on [src].") update_appearance() return TRUE /obj/machinery/power/thermoelectric_generator/crowbar_act(mob/user, obj/item/I) if(anchored) - balloon_alert(user, span_warning("[src] is anchored!")) + balloon_alert(user, "[src] is anchored!") return TRUE else if(!panel_open) - balloon_alert(user, span_warning("Open the panel first!")) + balloon_alert(user, "open the panel first!") return TRUE else default_deconstruction_crowbar(I) diff --git a/modular_skyrat/master_files/code/modules/vehicles/snowmobile.dm b/modular_skyrat/master_files/code/modules/vehicles/snowmobile.dm index 81ad9c4a140..7cb56e4d933 100644 --- a/modular_skyrat/master_files/code/modules/vehicles/snowmobile.dm +++ b/modular_skyrat/master_files/code/modules/vehicles/snowmobile.dm @@ -28,7 +28,7 @@ // This should eventually be fixed upstream by adding make_ridable to the base ATV definition // or, ideally, to /obj/vehicle/ridden so that it's not duplicated all over the codebase // for wheelchairs, scooters, and snowmobiles alike. -/obj/vehicle/ridden/atv/snowmobile/snowcurity/Initialize() +/obj/vehicle/ridden/atv/snowmobile/snowcurity/Initialize(mapload) . = ..() // We shouldn't have the ridable component added while still in Initialize, // so this is hopefully safe to do. diff --git a/modular_skyrat/modules/admin/code/player_ranks.dm b/modular_skyrat/modules/admin/code/player_ranks.dm index 415c1160297..b01cbf26eb3 100644 --- a/modular_skyrat/modules/admin/code/player_ranks.dm +++ b/modular_skyrat/modules/admin/code/player_ranks.dm @@ -36,7 +36,7 @@ ADMIN_VERB(manage_player_ranks, R_PERMISSIONS, "Manage Player Ranks", "Manage wh if(!(group in SKYRAT_PLAYER_RANKS)) CRASH("[key_name(usr)] attempted to add someone to an invalid \"[group]\" group.") - var/group_title = lowertext(group) + var/group_title = LOWER_TEXT(group) var/list/choices = list("Add", "Remove") switch(tgui_alert(usr, "What would you like to do?", "Manage [group]s", choices)) diff --git a/modular_skyrat/modules/aesthetics/vending/access_vending.dm b/modular_skyrat/modules/aesthetics/vending/access_vending.dm index 8022749e119..44597afe69e 100644 --- a/modular_skyrat/modules/aesthetics/vending/access_vending.dm +++ b/modular_skyrat/modules/aesthetics/vending/access_vending.dm @@ -59,7 +59,7 @@ .["product_records"] += list(data) /// Check if the list of given access is allowed to purchase the given product -/obj/machinery/vending/access/proc/allow_purchase(var/obj/item/card/id/user_id, product_path) +/obj/machinery/vending/access/proc/allow_purchase(obj/item/card/id/user_id, product_path) if(obj_flags & EMAGGED || !onstation) return TRUE . = FALSE diff --git a/modular_skyrat/modules/alcohol_processing/code/alcohol_processing.dm b/modular_skyrat/modules/alcohol_processing/code/alcohol_processing.dm index ca748ce19d6..43b644f638d 100644 --- a/modular_skyrat/modules/alcohol_processing/code/alcohol_processing.dm +++ b/modular_skyrat/modules/alcohol_processing/code/alcohol_processing.dm @@ -17,31 +17,31 @@ /// Adds a moodlet entry based on if the mob currently has alcohol processing in their system. /datum/mood/proc/get_alcohol_processing(mob/user) - if(user.reagents.reagent_list.len) - for(var/datum/reagent/consumable/ethanol/booze in user.reagents.reagent_list) - return span_notice("I'm still processing that alcohol I drank...\n") + if(user.reagents.reagent_list.len) + for(var/datum/reagent/consumable/ethanol/booze in user.reagents.reagent_list) + return span_notice("I'm still processing that alcohol I drank...\n") /// Adds a moodlet entry based on the current blood alcohol content of the mob. /datum/mood/proc/get_drunk_mood(mob/user) - var/mob/living/target = user - var/blood_alcohol_content = target.get_blood_alcohol_content() - switch(blood_alcohol_content) - if(BAC_STAGE_1_ACTIVE to BAC_STAGE_2_WARN) - return span_notice("Had a drink, time to relax!\n") - if(BAC_STAGE_2_WARN to BAC_STAGE_2_ACTIVE) - return span_nicegreen("Now I'm starting to feel that drink.\n") - if(BAC_STAGE_2_ACTIVE to BAC_STAGE_3_WARN) - return span_nicegreen("A bit tipsy, this feels good!\n") - if(BAC_STAGE_3_WARN to BAC_STAGE_3_ACTIVE) - return span_nicegreen("Those drinks are really starting to hit!\n") - if(BAC_STAGE_3_ACTIVE to BAC_STAGE_4_WARN) - return span_nicegreen("I can't remember how many I've had, but I feel great!\n") - if(BAC_STAGE_4_WARN to BAC_STAGE_4_ACTIVE) - return span_warning("I think I've had too much to drink... I should probably stop... drink some water...\n") - if(BAC_STAGE_4_ACTIVE to BAC_STAGE_5_WARN) - return span_bolddanger("I'm not feeling so hot...\n") - if(BAC_STAGE_5_WARN to INFINITY) - return span_bolddanger("Is there a doctor around? I really don't feel good...\n") + var/mob/living/target = user + var/blood_alcohol_content = target.get_blood_alcohol_content() + switch(blood_alcohol_content) + if(BAC_STAGE_1_ACTIVE to BAC_STAGE_2_WARN) + return span_notice("Had a drink, time to relax!\n") + if(BAC_STAGE_2_WARN to BAC_STAGE_2_ACTIVE) + return span_nicegreen("Now I'm starting to feel that drink.\n") + if(BAC_STAGE_2_ACTIVE to BAC_STAGE_3_WARN) + return span_nicegreen("A bit tipsy, this feels good!\n") + if(BAC_STAGE_3_WARN to BAC_STAGE_3_ACTIVE) + return span_nicegreen("Those drinks are really starting to hit!\n") + if(BAC_STAGE_3_ACTIVE to BAC_STAGE_4_WARN) + return span_nicegreen("I can't remember how many I've had, but I feel great!\n") + if(BAC_STAGE_4_WARN to BAC_STAGE_4_ACTIVE) + return span_warning("I think I've had too much to drink... I should probably stop... drink some water...\n") + if(BAC_STAGE_4_ACTIVE to BAC_STAGE_5_WARN) + return span_bolddanger("I'm not feeling so hot...\n") + if(BAC_STAGE_5_WARN to INFINITY) + return span_bolddanger("Is there a doctor around? I really don't feel good...\n") #undef BAC_STAGE_1_ACTIVE #undef BAC_STAGE_2_WARN diff --git a/modular_skyrat/modules/alt_vox/code/vox_procs.dm b/modular_skyrat/modules/alt_vox/code/vox_procs.dm index de7702db913..3bf03412585 100644 --- a/modular_skyrat/modules/alt_vox/code/vox_procs.dm +++ b/modular_skyrat/modules/alt_vox/code/vox_procs.dm @@ -93,7 +93,7 @@ switch(vox_type) if(VOX_NORMAL) for(var/word in words) - word = lowertext(trim(word)) + word = LOWER_TEXT(trim(word)) if(!word) words -= word continue @@ -101,7 +101,7 @@ incorrect_words += word if(VOX_HL) for(var/word in words) - word = lowertext(trim(word)) + word = LOWER_TEXT(trim(word)) if(!word) words -= word continue @@ -109,7 +109,7 @@ incorrect_words += word if(VOX_MIL) for(var/word in words) - word = lowertext(trim(word)) + word = LOWER_TEXT(trim(word)) if(!word) words -= word continue @@ -117,7 +117,7 @@ incorrect_words += word if(VOX_BMS) for(var/word in words) - word = lowertext(trim(word)) + word = LOWER_TEXT(trim(word)) if(!word) words -= word continue @@ -140,7 +140,7 @@ /proc/play_vox_word(word, z_level, mob/only_listener, vox_type) - word = lowertext(word) + word = LOWER_TEXT(word) var/sound_file var/volume = 100 switch(vox_type) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm index bc838bef5ec..78e63dfe400 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm @@ -140,11 +140,11 @@ else icon_state = "[planted_seed.icon_grow][planted_seed.growthstages]" - name = lowertext(planted_seed.plantname) + name = LOWER_TEXT(planted_seed.plantname) else icon_state = "[planted_seed.icon_grow]1" - name = lowertext("harvested [planted_seed.plantname]") + name = LOWER_TEXT("harvested [planted_seed.plantname]") return ..() @@ -266,7 +266,7 @@ /** * will create a harvest of the seeds product, with a chance to create a mutated version */ -/obj/structure/simple_farm/proc/create_harvest(var/obj/item/storage/bag/plants/plant_bag, var/mob/user) +/obj/structure/simple_farm/proc/create_harvest(obj/item/storage/bag/plants/plant_bag, mob/user) if(!planted_seed) return diff --git a/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm b/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm index de17a751d83..def94ccf409 100644 --- a/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm +++ b/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm @@ -141,7 +141,7 @@ name = "Bone Greaves" result = /obj/item/clothing/shoes/bone_greaves reqs = list( - /obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/sinew = 1, - ) + /obj/item/stack/sheet/bone = 2, + /obj/item/stack/sheet/sinew = 1, + ) category = CAT_CLOTHING diff --git a/modular_skyrat/modules/ashwalkers/code/items/ash_seedmesh.dm b/modular_skyrat/modules/ashwalkers/code/items/ash_seedmesh.dm index 4e25fb152a0..fffaaf002dc 100644 --- a/modular_skyrat/modules/ashwalkers/code/items/ash_seedmesh.dm +++ b/modular_skyrat/modules/ashwalkers/code/items/ash_seedmesh.dm @@ -3,7 +3,7 @@ desc = "A little mesh that, when paired with sand, has the possibility of filtering out large seeds." icon = 'modular_skyrat/modules/ashwalkers/icons/misc_tools.dmi' icon_state = "mesh" - var/list/static/seeds_blacklist = list( + var/static/list/seeds_blacklist = list( /obj/item/seeds/lavaland, ) diff --git a/modular_skyrat/modules/clock_cult/code/items/integration_cog.dm b/modular_skyrat/modules/clock_cult/code/items/integration_cog.dm index 8557ca2008a..217fe480f37 100644 --- a/modular_skyrat/modules/clock_cult/code/items/integration_cog.dm +++ b/modular_skyrat/modules/clock_cult/code/items/integration_cog.dm @@ -26,7 +26,7 @@ if(!do_after(user, 5 SECONDS, target = cogger_apc)) return - balloon_alert(user, "APC cut open") + balloon_alert(user, UNLINT("APC cut open")) cogger_apc.panel_open = TRUE cogger_apc.update_appearance() return diff --git a/modular_skyrat/modules/customization/__HELPERS/text.dm b/modular_skyrat/modules/customization/__HELPERS/text.dm index 1f431da9722..f95563090bf 100644 --- a/modular_skyrat/modules/customization/__HELPERS/text.dm +++ b/modular_skyrat/modules/customization/__HELPERS/text.dm @@ -1,5 +1,5 @@ /proc/prefix_a_or_an(text) - var/start = lowertext(text[1]) + var/start = LOWER_TEXT(text[1]) if(!start) return "a" if(start == "a" || start == "e" || start == "i" || start == "o" || start == "u") diff --git a/modular_skyrat/modules/customization/modules/client/augment/implants.dm b/modular_skyrat/modules/customization/modules/client/augment/implants.dm index e6a45ce1615..705aabff4fe 100644 --- a/modular_skyrat/modules/customization/modules/client/augment/implants.dm +++ b/modular_skyrat/modules/customization/modules/client/augment/implants.dm @@ -20,18 +20,18 @@ slot = AUGMENT_SLOT_LEFT_ARM_IMPLANT /datum/augment_item/implant/l_arm/razor_claws - name = "Left Razor Claws" - cost = 4 - path = /obj/item/organ/cyberimp/arm/razor_claws/left_arm + name = "Left Razor Claws" + cost = 4 + path = /obj/item/organ/cyberimp/arm/razor_claws/left_arm //RIGHT ARM IMPLANTS /datum/augment_item/implant/r_arm slot = AUGMENT_SLOT_RIGHT_ARM_IMPLANT /datum/augment_item/implant/r_arm/razor_claws - name = "Right Razor Claws" - cost = 4 - path = /obj/item/organ/cyberimp/arm/razor_claws/right_arm + name = "Right Razor Claws" + cost = 4 + path = /obj/item/organ/cyberimp/arm/razor_claws/right_arm //EYES IMPLANTS /datum/augment_item/implant/eyes diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm index fb826f79b88..adca6816006 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm @@ -33,7 +33,7 @@ /obj/item/hairbrush/switchblade/Initialize(mapload) . = ..() - AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_HANDS) + AddElement(/datum/element/update_icon_updates_onmob) ///This is called when you transform it /obj/item/hairbrush/switchblade/attack_self(mob/user, modifiers) diff --git a/modular_skyrat/modules/customization/modules/language/mothic.dm b/modular_skyrat/modules/customization/modules/language/mothic.dm index de863abae3b..fc30d9b54a6 100644 --- a/modular_skyrat/modules/customization/modules/language/mothic.dm +++ b/modular_skyrat/modules/customization/modules/language/mothic.dm @@ -1,9 +1,9 @@ /datum/language/moffic name = "Mothic" desc = "Spoken colloquially by the Mothfolk of Va Lumla, the early iteration of Mothic emerged when Fueljacks relied on their receptors for simple, one-worded pheromones to communicate, and navigate the often fatal maintenance tunnels sprawled throughout the fleet. \ - The moths developed gesticulation through antennas and wings to convey deeper intent, with mandibles providing emotional context through clicks and trills. \ - After First Contact, human speakers managed to achieve a similar effect from clicking their tongue to roof, and steer the tone with the width of their mouth while using their hands in place of antennas. \ - It is informally spoken, deploying many slangs and shorthands from Common. Has phonetic resemblance to Italian." + The moths developed gesticulation through antennas and wings to convey deeper intent, with mandibles providing emotional context through clicks and trills. \ + After First Contact, human speakers managed to achieve a similar effect from clicking their tongue to roof, and steer the tone with the width of their mouth while using their hands in place of antennas. \ + It is informally spoken, deploying many slangs and shorthands from Common. Has phonetic resemblance to Italian." space_chance = 40 // Syllables derived from Italian. syllables = list( diff --git a/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm b/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm index f9efcae1bba..7ca352b686b 100644 --- a/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm +++ b/modular_skyrat/modules/customization/modules/language/te_velu_akko.dm @@ -1,16 +1,16 @@ /datum/language/akulan - name = "Te Velu Akko" - desc = "The flowing, rhythmic language of the Akula, a language created in their distant times by one of their first leaders. The older form has much more flow and cadence, while the current popular form is more quick and harsh, making it easy to find most Old Nobles and hardliners just by dialect. One could compare the sound of Akko to that of the Terran Maori language." + name = "Te Velu Akko" + desc = "The flowing, rhythmic language of the Akula, a language created in their distant times by one of their first leaders. The older form has much more flow and cadence, while the current popular form is more quick and harsh, making it easy to find most Old Nobles and hardliners just by dialect. One could compare the sound of Akko to that of the Terran Maori language." - key = "Z" - flags = TONGUELESS_SPEECH - space_chance = 70 - // Syllables derived from the Maori language. - syllables = list ( - "ā", "ē", "ī", "ō", "a", "e", "i", "o", "u", "ha", "he", "hi", "ho", "hu", "ka", "ke", "ki", "ko", "ku", "ma", "me", "mi", "mo", "mu", "na", "ne", "ni", "no", "nu", - "nga", "nge", "ngi", "ngo", "ngu", "pa", "pe", "pi", "po", "pu", "ra", "re", "ri", "ro", "ru", "ta", "te", "ti", "to", "tu", "wa", "we", "wi", "wo", "wu", "wha", "whe", "whi", - ) - icon_state = "azulean" - icon = 'modular_skyrat/master_files/icons/misc/language.dmi' - default_priority = 94 + key = "Z" + flags = TONGUELESS_SPEECH + space_chance = 70 + // Syllables derived from the Maori language. + syllables = list ( + "ā", "ē", "ī", "ō", "a", "e", "i", "o", "u", "ha", "he", "hi", "ho", "hu", "ka", "ke", "ki", "ko", "ku", "ma", "me", "mi", "mo", "mu", "na", "ne", "ni", "no", "nu", + "nga", "nge", "ngi", "ngo", "ngu", "pa", "pe", "pi", "po", "pu", "ra", "re", "ri", "ro", "ru", "ta", "te", "ti", "to", "tu", "wa", "we", "wi", "wo", "wu", "wha", "whe", "whi", + ) + icon_state = "azulean" + icon = 'modular_skyrat/master_files/icons/misc/language.dmi' + default_priority = 94 diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm index a0881ddce74..582ea6fa063 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm @@ -155,7 +155,7 @@ /obj/item/organ/genital/penis/get_description_string(datum/sprite_accessory/genital/gas) var/returned_string = "" - var/pname = lowertext(genital_name) == "nondescript" ? "" : lowertext(genital_name) + " " + var/pname = LOWER_TEXT(genital_name) == "nondescript" ? "" : LOWER_TEXT(genital_name) + " " if(sheath != SHEATH_NONE && aroused != AROUSAL_FULL) //Hidden in sheath switch(sheath) if(SHEATH_NORMAL) @@ -199,7 +199,7 @@ var/poking_out = 0 if(aroused == AROUSAL_PARTIAL) poking_out = 1 - return "[lowertext(sheath)]_[poking_out]" + return "[LOWER_TEXT(sheath)]_[poking_out]" var/size_affix var/measured_size = FLOOR(genital_size,1) @@ -269,7 +269,7 @@ if(genital_name == "Internal") //Checks if Testicles are of Internal Variety visibility_preference = GENITAL_SKIP_VISIBILITY //Removes visibility if yes. else - return "You see a pair of testicles, they look [lowertext(balls_size_to_description(genital_size))]." + return "You see a pair of testicles, they look [LOWER_TEXT(balls_size_to_description(genital_size))]." /obj/item/organ/genital/testicles/build_from_dna(datum/dna/DNA, associated_key) uses_skin_color = DNA.features["testicles_uses_skincolor"] @@ -325,8 +325,8 @@ layers = EXTERNAL_FRONT /obj/item/organ/genital/vagina/get_description_string(datum/sprite_accessory/genital/gas) - var/returned_string = "You see a [lowertext(genital_name)] vagina." - if(lowertext(genital_name) == "cloaca") + var/returned_string = "You see a [LOWER_TEXT(genital_name)] vagina." + if(LOWER_TEXT(genital_name) == "cloaca") returned_string = "You see a cloaca." //i deserve a pipebomb for this switch(aroused) if(AROUSAL_NONE) @@ -397,7 +397,7 @@ layers = NONE /obj/item/organ/genital/anus/get_description_string(datum/sprite_accessory/genital/gas) - var/returned_string = "You see an [lowertext(genital_name)]." + var/returned_string = "You see an [LOWER_TEXT(genital_name)]." if(aroused == AROUSAL_PARTIAL) returned_string += " It looks tight." if(aroused == AROUSAL_FULL) @@ -428,7 +428,7 @@ layers = EXTERNAL_FRONT | EXTERNAL_BEHIND /obj/item/organ/genital/breasts/get_description_string(datum/sprite_accessory/genital/gas) - var/returned_string = "You see a [lowertext(genital_name)] of breasts." + var/returned_string = "You see a [LOWER_TEXT(genital_name)] of breasts." var/size_description var/translation = breasts_size_to_cup(genital_size) switch(translation) diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm b/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm index 2c53d32f204..ada39964418 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm @@ -40,5 +40,5 @@ overlays[index_to_color].color = null /datum/bodypart_overlay/mutant/pod_hair/randomize_appearance() - . = ..() - draw_color = list("#[random_color()]", "#[random_color()]", "#FFFFFF") // currently only two colors are used + . = ..() + draw_color = list("#[random_color()]", "#[random_color()]", "#FFFFFF") // currently only two colors are used diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm index b8540671de7..0fcc65ae1e2 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm @@ -124,10 +124,10 @@ if (left_leg_name) new_left_leg.name = left_leg_name + " (Left leg)" - new_left_leg.plaintext_zone = lowertext(new_left_leg.name) // weird otherwise + new_left_leg.plaintext_zone = LOWER_TEXT(new_left_leg.name) // weird otherwise if (right_leg_name) new_right_leg.name = right_leg_name + " (Right leg)" - new_right_leg.plaintext_zone = lowertext(new_right_leg.name) + new_right_leg.plaintext_zone = LOWER_TEXT(new_right_leg.name) new_left_leg.bodyshape |= external_bodyshapes new_left_leg.replace_limb(receiver, TRUE) diff --git a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm index 46b9fb7c86d..835d98dac7b 100644 --- a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm +++ b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm @@ -503,7 +503,7 @@ if (isnull(source)) return // sanity - var/ckey = lowertext(owner.mind?.key) + var/ckey = LOWER_TEXT(owner.mind?.key) if (isnull(ckey) || ckey != source.ckey) return // sanity diff --git a/modular_skyrat/modules/departmentization/clothing_overrides.dm b/modular_skyrat/modules/departmentization/clothing_overrides.dm index 6de4a1dd9e1..3565fe8a822 100644 --- a/modular_skyrat/modules/departmentization/clothing_overrides.dm +++ b/modular_skyrat/modules/departmentization/clothing_overrides.dm @@ -1,7 +1,7 @@ /obj/item/clothing/under/rank/cargo/tech name = "cargo technician's jumpsuit" desc = "A jumpsuit from the previous supply-department, a tag on the collar says, 'Production Line: 2557, Product of Nanotrasen.'" - + /obj/item/clothing/under/rank/cargo/tech/skirt name = "cargo technician's jumpskirt" desc = "A jumpskirt from the previous supply-department, a tag on the collar says, 'Production Line: 2557, Product of Nanotrasen.'" diff --git a/modular_skyrat/modules/emotes/code/synth_emotes.dm b/modular_skyrat/modules/emotes/code/synth_emotes.dm index f7f07e8ad87..2414d5c4c52 100644 --- a/modular_skyrat/modules/emotes/code/synth_emotes.dm +++ b/modular_skyrat/modules/emotes/code/synth_emotes.dm @@ -2,13 +2,13 @@ cooldown = 2 SECONDS /datum/emote/living/human/dwoop - key = "dwoop" - key_third_person = "dwoops" - message = "chirps happily!" - vary = TRUE - sound = 'modular_skyrat/modules/emotes/sound/emotes/dwoop.ogg' - allowed_species = list(/datum/species/synthetic) - cooldown = 2 SECONDS + key = "dwoop" + key_third_person = "dwoops" + message = "chirps happily!" + vary = TRUE + sound = 'modular_skyrat/modules/emotes/sound/emotes/dwoop.ogg' + allowed_species = list(/datum/species/synthetic) + cooldown = 2 SECONDS /datum/emote/silicon/yes key = "yes" diff --git a/modular_skyrat/modules/events/code/event_spawner.dm b/modular_skyrat/modules/events/code/event_spawner.dm index 16d9f209baf..de4696a9ca3 100644 --- a/modular_skyrat/modules/events/code/event_spawner.dm +++ b/modular_skyrat/modules/events/code/event_spawner.dm @@ -24,7 +24,7 @@ return if(used) return - if(ckey_whitelist && !(lowertext(user.ckey) in ckey_whitelist)) + if(ckey_whitelist && !(LOWER_TEXT(user.ckey) in ckey_whitelist)) alert(user, "Sorry, This spawner is not for you!", "", "Ok") return if(is_banned_from(user.ckey, BAN_GHOST_ROLE_SPAWNER)) diff --git a/modular_skyrat/modules/events/code/event_spawner_menu.dm b/modular_skyrat/modules/events/code/event_spawner_menu.dm index b9278c7df9a..4a3edd7b3b5 100644 --- a/modular_skyrat/modules/events/code/event_spawner_menu.dm +++ b/modular_skyrat/modules/events/code/event_spawner_menu.dm @@ -39,7 +39,7 @@ CES.name = "[job_name] cryogenic sleeper" if(prompt_players) for(var/mob/dead/observer/ghost in GLOB.player_list) - if(length(ckey_whitelist) && !(lowertext(ghost.ckey) in ckey_whitelist)) + if(length(ckey_whitelist) && !(LOWER_TEXT(ghost.ckey) in ckey_whitelist)) continue ghost.playsound_local(ghost, 'sound/effects/ghost2.ogg', 75, FALSE) var/turf_link = TURF_LINK(ghost, spawn_loc) @@ -267,7 +267,7 @@ if("add_ckey") var/msg = input(usr, "Add allowed CKEY to the spawner.", "Add CKEY", "") as text|null if(msg) - ESI.ckey_whitelist += lowertext(msg) + ESI.ckey_whitelist += LOWER_TEXT(msg) if("add_species") var/result = input(usr, "Select a species", "Add species") as null|anything in GLOB.roundstart_races if(result) diff --git a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm index 5e747e645ed..eaaa03fc219 100644 --- a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm +++ b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm @@ -8,7 +8,7 @@ toolspeed = 0.25 /obj/item/bonesetter/alien/get_all_tool_behaviours() - return list(TOOL_BONESET, TOOL_ALIEN_BONESET) + return list(TOOL_BONESET, TOOL_ALIEN_BONESET) /datum/wound/item_can_treat(obj/item/potential_treater, mob/user) . = ..() diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index d33f525399d..8ccdc239b91 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -646,7 +646,7 @@ "Blue Variant" = list( RESKIN_ICON_STATE = "jumpskirt_blue", RESKIN_WORN_ICON_STATE = "jumpskirt_blue" - ), + ), "Black Variant" = list( RESKIN_ICON_STATE = "jumpskirt_black", RESKIN_WORN_ICON_STATE = "jumpskirt_black" diff --git a/modular_skyrat/modules/gun_safety/code/safety_component.dm b/modular_skyrat/modules/gun_safety/code/safety_component.dm index 1d771bce307..1c0817a69e0 100644 --- a/modular_skyrat/modules/gun_safety/code/safety_component.dm +++ b/modular_skyrat/modules/gun_safety/code/safety_component.dm @@ -41,7 +41,7 @@ SIGNAL_HANDLER if(safety_currently_on) - user.balloon_alert(user, "The safety disengages!") + user.balloon_alert(user, "the safety disengages!") toggle_safeties(user) return COMPONENT_CANCEL_GUN_FIRE diff --git a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm index 40cdf3e1b6c..50117186a2b 100644 --- a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm +++ b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm @@ -40,7 +40,7 @@ glass_colour_type = /datum/client_colour/glass_colour/purple armor_type = /datum/armor/prescription_science -/obj/item/clothing/glasses/science/prescription/Initialize() +/obj/item/clothing/glasses/science/prescription/Initialize(mapload) . = ..() clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED) diff --git a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm index e3fcab56375..015ddf6c774 100644 --- a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm +++ b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm @@ -106,25 +106,25 @@ if(!istype(tool, /obj/item/hypospray/mkii) || !LAZYACCESS(modifiers, RIGHT_CLICK)) return ..() if(!isnull(attached_hypo)) - balloon_alert(user, "Mount point full! Remove [attached_hypo] first!") + balloon_alert(user, "mount point full! Remove [attached_hypo] first!") return ITEM_INTERACT_BLOCKING tool.moveToNullspace() attached_hypo = tool RegisterSignal(tool, COMSIG_QDELETING, PROC_REF(on_attached_hypo_qdel)) - balloon_alert(user, "Attached [attached_hypo].") + balloon_alert(user, "attached [attached_hypo].") update_appearance() return ITEM_INTERACT_SUCCESS /obj/item/storage/hypospraykit/click_alt_secondary(mob/user) if(attached_hypo != null) if(user.put_in_hands(attached_hypo)) - balloon_alert(user, "Removed [attached_hypo].") + balloon_alert(user, "removed [attached_hypo].") UnregisterSignal(attached_hypo, COMSIG_QDELETING) attached_hypo = null update_appearance() // Ditto here. else - balloon_alert(user, "Couldn't pull the hypo!") + balloon_alert(user, "couldn't pull the hypo!") /obj/item/storage/hypospraykit/proc/on_attached_hypo_qdel() if(attached_hypo) diff --git a/modular_skyrat/modules/implants/code/augments_arms.dm b/modular_skyrat/modules/implants/code/augments_arms.dm index 7a9a5e4dd61..83f26f68300 100644 --- a/modular_skyrat/modules/implants/code/augments_arms.dm +++ b/modular_skyrat/modules/implants/code/augments_arms.dm @@ -130,12 +130,12 @@ /// bespoke subtypes for augs menu since it's a bit wonky /obj/item/organ/cyberimp/arm/razor_claws/right_arm - zone = BODY_ZONE_R_ARM - slot = ORGAN_SLOT_RIGHT_ARM_AUG + zone = BODY_ZONE_R_ARM + slot = ORGAN_SLOT_RIGHT_ARM_AUG /obj/item/organ/cyberimp/arm/razor_claws/left_arm - zone = BODY_ZONE_L_ARM - slot = ORGAN_SLOT_LEFT_ARM_AUG + zone = BODY_ZONE_L_ARM + slot = ORGAN_SLOT_LEFT_ARM_AUG /datum/action/item_action/organ_action/toggle/razor_claws diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm index 94680daf3d3..11c395e0d1c 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm @@ -623,7 +623,7 @@ reagents_string += "and " while(reagents_remaining) - return lowertext(reagents_string) + return LOWER_TEXT(reagents_string) /obj/effect/temp_visual/liquid_splash icon = 'modular_skyrat/modules/liquids/icons/obj/effects/splash.dmi' diff --git a/modular_skyrat/modules/lorecaster/code/story_manager.dm b/modular_skyrat/modules/lorecaster/code/story_manager.dm index 90220ea676a..faf24ba726d 100644 --- a/modular_skyrat/modules/lorecaster/code/story_manager.dm +++ b/modular_skyrat/modules/lorecaster/code/story_manager.dm @@ -98,7 +98,7 @@ ADMIN_VERB(lorecaster_story_manager, R_ADMIN, "Lorecaster Stories", "Open the Lo if(!id) return - id = lowertext(id) + id = LOWER_TEXT(id) id = replacetext(id, @"\W", "_") if(id in current_stories) diff --git a/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm b/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm index 7aff5de5aca..51f02c80785 100644 --- a/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm +++ b/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm @@ -149,7 +149,7 @@ SUBSYSTEM_DEF(maturity_guard) var/datum/db_query/add_age_to_db = SSdbcore.NewQuery( "INSERT INTO [format_table_name("player_dob")] (ckey, dob_year, dob_month) VALUES(:ckey, :dob_year, :dob_month) \ - ON DUPLICATE KEY UPDATE dob_year = :dob_year, dob_month = :dob_month", + ON DUPLICATE KEY UPDATE dob_year = :dob_year, dob_month = :dob_month", list("ckey" = user.ckey, "dob_year" = year, "dob_month" = month), ) @@ -208,7 +208,7 @@ SUBSYSTEM_DEF(maturity_guard) var/player_ban_notification = span_boldannounce("You have been banned by the AGE CHECK SYSTEM from the server.\nReason: You do not meet the minimum age requirements for this community. [discord_appeal_text]") if(!SSdbcore.Connect()) - // Just a stopgap measure... this really isn't intended to be used without a db attached + // Just a stopgap measure... this really isn't intended to be used without a db attached message_admins("[user.ckey] has FAILED THE AGE CHECK but couldn't be banned due to lack of database connection.") blacklisted_cache |= user.ckey to_chat(user, player_ban_notification) diff --git a/modular_skyrat/modules/medical/code/wounds/_wounds.dm b/modular_skyrat/modules/medical/code/wounds/_wounds.dm index 47abfc8cb34..bc8ac1ecbd1 100644 --- a/modular_skyrat/modules/medical/code/wounds/_wounds.dm +++ b/modular_skyrat/modules/medical/code/wounds/_wounds.dm @@ -4,4 +4,4 @@ /// Gets the name of the wound with any interactable topic if possible /datum/wound/proc/get_topic_name(mob/user) - return show_wound_topic(user) ? "[lowertext(name)]" : lowertext(name) + return show_wound_topic(user) ? "[LOWER_TEXT(name)]" : LOWER_TEXT(name) diff --git a/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm b/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm index 3ececf6b398..03a9910b3ae 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm @@ -105,7 +105,7 @@ return FALSE if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, span_warning("You must have [victim] in an aggressive grab to manipulate [victim.p_their()] [lowertext(name)]!")) + to_chat(user, span_warning("You must have [victim] in an aggressive grab to manipulate [victim.p_their()] [LOWER_TEXT(name)]!")) return TRUE user.visible_message(span_danger("[user] begins softly pressing against [victim]'s collapsed [limb.plaintext_zone]..."), \ diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm index 1a18631c794..a508a813331 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm @@ -11,7 +11,7 @@ For adding unique abilities to microfusion cells. These cannot directly interact w_class = WEIGHT_CLASS_NORMAL /// The overlay that will be automatically added, must be in the cells icon. var/attachment_overlay_icon_state - /// Does this attachment process with the cell? + /// Does this attachment process with the cell? var/processing_attachment = FALSE diff --git a/modular_skyrat/modules/modular_implants/code/nifs.dm b/modular_skyrat/modules/modular_implants/code/nifs.dm index 8d0ac9f8e8c..77167e25158 100644 --- a/modular_skyrat/modules/modular_implants/code/nifs.dm +++ b/modular_skyrat/modules/modular_implants/code/nifs.dm @@ -266,11 +266,11 @@ if(!blood_drain) power_usage += (blood_drain_rate * blood_conversion_rate) - balloon_alert(linked_mob, "Blood draining disabled") + balloon_alert(linked_mob, "blood draining disabled") return power_usage -= (blood_drain_rate * blood_conversion_rate) - balloon_alert(linked_mob, "Blood draining enabled") + balloon_alert(linked_mob, "blood draining enabled") ///Checks if the NIF is able to draw blood as a power source? /obj/item/organ/cyberimp/brain/nif/proc/blood_check() diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm index c7b9e3dab5d..06a03ce346d 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm @@ -1,6 +1,6 @@ /datum/nifsoft/hud name = "Scrying Lens" - program_desc = "An umbrella term for all sorts of NIFsofts dealing with heads-up displays, this sort of technology dates back almost to the beginning of NIFsoft development. These 'softs are commonly used in the civilian field for integration with all sorts of activities; piloting, swordplay, scientific research, or even AI copiloting for important social interactions. While normally the nanomachines involved in the program's operation are used as a sort of artificial contact lens over the user's visual organs, NanoTrasen regulations have bid these particular forks to instead integrate with glasses the user's already wearing." + program_desc = "An umbrella term for all sorts of NIFsofts dealing with heads-up displays, this sort of technology dates back almost to the beginning of NIFsoft development. These 'softs are commonly used in the civilian field for integration with all sorts of activities; piloting, swordplay, scientific research, or even AI copiloting for important social interactions. While normally the nanomachines involved in the program's operation are used as a sort of artificial contact lens over the user's visual organs, Nanotrasen regulations have bid these particular forks to instead integrate with glasses the user's already wearing." compatible_nifs = list(/obj/item/organ/cyberimp/brain/nif/standard) active_mode = TRUE active_cost = 0.5 diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/prop_summoner.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/prop_summoner.dm index 7fbdeb04e6f..4a861a31cc0 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts/prop_summoner.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts/prop_summoner.dm @@ -51,13 +51,13 @@ if(tgui_alert(linked_mob, "Do you wish to summon a new item or dispel an already existing item?", program_name, list("Summon", "Dispel")) == "Dispel") refund_activation_cost() if(!length(summoned_items)) - linked_mob.balloon_alert(linked_mob, "You have no summoned items!") + linked_mob.balloon_alert(linked_mob, "you have no summoned items!") return FALSE - var/obj/item/choice = tgui_input_list(linked_mob, "Chose an object to desummon.", program_name, summoned_items) + var/obj/item/choice = tgui_input_list(linked_mob, "Choose an object to desummon.", program_name, summoned_items) if(!choice) - linked_mob.balloon_alert(linked_mob, "You did not chose an item!") + linked_mob.balloon_alert(linked_mob, "you did not choose an item!") return FALSE summoned_items -= choice @@ -65,7 +65,7 @@ return TRUE if(length(summoned_items) >= max_summoned_items) - linked_mob.balloon_alert(linked_mob, "You have the max ammount of items summoned!") + linked_mob.balloon_alert(linked_mob, "you have the max amount of items summoned!") refund_activation_cost() return FALSE diff --git a/modular_skyrat/modules/modular_items/code/modular_glasses.dm b/modular_skyrat/modules/modular_items/code/modular_glasses.dm index 934fcad8ee7..3764d12e6b9 100644 --- a/modular_skyrat/modules/modular_items/code/modular_glasses.dm +++ b/modular_skyrat/modules/modular_items/code/modular_glasses.dm @@ -62,18 +62,18 @@ switch(mode) if(MODE_ON) - balloon_alert(user, span_notice("[modes_msg[mode]]")) + balloon_alert(user, "[modes_msg[mode]]") reset_vars() // Resets all the vars to their initial values (THIS PRESUMES THE DEFAULT STATE IS ON) add_hud(user) if(MODE_FREEZE_ANIMATION) - balloon_alert(user, span_notice("[modes_msg[mode]]")) + balloon_alert(user, "[modes_msg[mode]]") freeze_animation() if(MODE_OFF) if(MODE_OFF_FLASH_PROTECTION in modes) flash_protect = FLASH_PROTECTION_FLASH - balloon_alert(user, span_notice("[modes_msg[MODE_OFF_FLASH_PROTECTION]]")) + balloon_alert(user, "[modes_msg[MODE_OFF_FLASH_PROTECTION]]") else - balloon_alert(user, span_notice("[modes_msg[mode]]")) + balloon_alert(user, "[modes_msg[mode]]") icon_state = off_state disable_vars(user) remove_hud(user) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm index d84dd0c3cb8..094bee37fc3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm @@ -138,7 +138,7 @@ return switch(rand(1, 2)) if(1) - to_chat(owner, span_hypnophrase("...[lowertext(hypnotic_phrase)]...")) + to_chat(owner, span_hypnophrase("...[LOWER_TEXT(hypnotic_phrase)]...")) if(2) new /datum/hallucination/chat(owner, TRUE, FALSE, span_hypnophrase("[hypnotic_phrase]")) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm index 677f7f3f944..f164ad67255 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm @@ -318,15 +318,15 @@ if(ROPE_TIGHTNESS_HIGH) tightness = ROPE_TIGHTNESS_LOW conditional_pref_sound(loc, 'modular_skyrat/modules/modular_items/lewd_items/sounds/latex.ogg', 25) - balloon_alert(user, span_notice("You slightly tightened the ropes")) + balloon_alert(user, "you slightly tightened the ropes") if(ROPE_TIGHTNESS_LOW) tightness = ROPE_TIGHTNESS_MED conditional_pref_sound(loc, 'modular_skyrat/modules/modular_items/lewd_items/sounds/latex.ogg', 50) - balloon_alert(user, span_notice("You moderately tightened the ropes")) + balloon_alert(user, "you moderately tightened the ropes") if(ROPE_TIGHTNESS_MED) tightness = ROPE_TIGHTNESS_HIGH conditional_pref_sound(loc, 'modular_skyrat/modules/modular_items/lewd_items/sounds/latex.ogg', 75) - balloon_alert(user, span_notice("You strongly tightened the ropes")) + balloon_alert(user, "you strongly tightened the ropes") #undef ROPE_TIGHTNESS_LOW #undef ROPE_TIGHTNESS_MED diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/verbs.dm b/modular_skyrat/modules/modular_items/lewd_items/code/verbs.dm index 17a59650d7e..6f9431005b9 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/verbs.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/verbs.dm @@ -13,14 +13,14 @@ to_chat(src, span_warning("You can't cum right now!")) /mob/living/verb/reflexes_verb() - set name = "Toggle Reflexes" - set category = "IC" - if(!HAS_TRAIT_FROM(src, TRAIT_QUICKREFLEXES, REF(src))) - ADD_TRAIT(src, TRAIT_QUICKREFLEXES, REF(src)) - to_chat(src, span_notice("[get_reflexes_gain_text()]")) - else - REMOVE_TRAIT(src, TRAIT_QUICKREFLEXES, REF(src)) - to_chat(src, span_notice("[get_reflexes_lose_text()]")) + set name = "Toggle Reflexes" + set category = "IC" + if(!HAS_TRAIT_FROM(src, TRAIT_QUICKREFLEXES, REF(src))) + ADD_TRAIT(src, TRAIT_QUICKREFLEXES, REF(src)) + to_chat(src, span_notice("[get_reflexes_gain_text()]")) + else + REMOVE_TRAIT(src, TRAIT_QUICKREFLEXES, REF(src)) + to_chat(src, span_notice("[get_reflexes_lose_text()]")) /mob/living/proc/get_reflexes_gain_text() return "You don't feel like being touched right now." diff --git a/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm b/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm index 49f81ee89cd..5c0782d2008 100644 --- a/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm +++ b/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(modular_persistence_ignored_vars, list( return returned_list /// Saves the held persistence data to where it needs to go. -/datum/modular_persistence/proc/save_data(var/ckey) +/datum/modular_persistence/proc/save_data(ckey) ckey = replacetext(ckey || owner.owner?.ckey || owner.brainmob?.ckey, "@", "") if(!owner.owner && !owner.brainmob) CRASH("Modular persistence save called on a brain with no owning mob or brainmob! How did this happen?! (\ref[owner], [owner])") @@ -113,7 +113,7 @@ GLOBAL_LIST_INIT(modular_persistence_ignored_vars, list( WRITE_FILE(json_file, json_encode(json)) /// Saves the persistence data for the owner. -/mob/living/carbon/human/proc/save_individual_persistence(var/ckey) +/mob/living/carbon/human/proc/save_individual_persistence(ckey) var/obj/item/organ/brain/brain = get_organ_slot(ORGAN_SLOT_BRAIN) return brain?.modular_persistence?.save_data(ckey) diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm index b111c832a16..5d3084f3e32 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm @@ -77,7 +77,7 @@ /obj/item/gun/ballistic/automatic/pistol/firefly name = "\improper MX-7C 'Firefly'" - desc = "NanoTrasen Experimental Model 7 Compact, A rare pistol chambered in a .117 electrode cartridge. It has has a small magazine capacity." + desc = "Nanotrasen Experimental Model 7 Compact, A rare pistol chambered in a .117 electrode cartridge. It has has a small magazine capacity." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi' icon_state = "firefly" w_class = WEIGHT_CLASS_NORMAL diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm index 3853dca37bb..9deb68a7bad 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm @@ -138,8 +138,8 @@ with this design being rapidly pushed out, being made from an advanced sol design \ this pistol seems rather unassuming but it has been, itself, the new symbol of peace \ Leaving NRI weapon in the past, as it now became the symbol of the oppressive era of Romulus\ - To whom it may concerns, These weapon were mostly used by the new Romulus National Army,\ - it was a symbol of struggle and freedom \ + To whom it may concerns, These weapon were mostly used by the new Romulus National Army, \ + it was a symbol of struggle and freedom \ Weapons cannot bring people back, but it can save your life." return . diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm index daab21e876f..91331a91163 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm @@ -57,8 +57,8 @@ with this design being rapidly pushed out, being made from converted rifle making it easier to acquire, \ this rifle seems rather unassuming but it has been, itself, the new symbol of peace \ Leaving NRI weapon in the past, as it now became the symbol of the oppressive era of Romulus\ - To whom it may concerns, These weapon were mostly used by the new Romulus National Army,\ - it was a symbol of struggle and freedom \ + To whom it may concerns, These weapon were mostly used by the new Romulus National Army, \ + it was a symbol of struggle and freedom \ Weapons cannot bring people back, but it can save your life." return . @@ -178,7 +178,7 @@ return toggle_stock(user) -/obj/item/gun/ballistic/automatic/rom_flech/proc/toggle_stock(mob/user, var/forced) +/obj/item/gun/ballistic/automatic/rom_flech/proc/toggle_stock(mob/user, forced) if(!user && forced) folded = !folded update_fold_stats() diff --git a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm index e6d036d52e9..08f70a707e9 100644 --- a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm +++ b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm @@ -193,12 +193,12 @@ if(!istype(weapon, ammo_box_type)) return if(ammo_box) - balloon_alert("already loaded!") + balloon_alert(user, "already loaded!") return ammo_box = weapon weapon.forceMove(src) playsound(src, 'modular_skyrat/modules/mounted_machine_gun/sound/insert_ammobox.ogg', 100) - balloon_alert("ammo box inserted!") + balloon_alert(user, "ammo box inserted!") /obj/machinery/mounted_machine_gun/proc/remove_ammo_box(mob/living/user) ammo_box.forceMove(drop_location()) diff --git a/modular_skyrat/modules/novaya_ert/code/police_outfit.dm b/modular_skyrat/modules/novaya_ert/code/police_outfit.dm index 5a9aef82263..dbac3f8765d 100644 --- a/modular_skyrat/modules/novaya_ert/code/police_outfit.dm +++ b/modular_skyrat/modules/novaya_ert/code/police_outfit.dm @@ -15,7 +15,7 @@ icon_state = "cloak_police" // Just some extra police equipment -/obj/item/clothing/neck/cloak/colonial/nri_police/Initialize() +/obj/item/clothing/neck/cloak/colonial/nri_police/Initialize(mapload) allowed += list( /obj/item/restraints/handcuffs, /obj/item/ammo_box, diff --git a/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm b/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm index d3fd4aca43a..c3662ee9b18 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm @@ -22,7 +22,7 @@ item_type = /obj/item/mod/control/pre_equipped/ninja /datum/opposing_force_equipment/modsuit/corporate - name = "CentComm's Corporate" + name = "CentCom's Corporate" description = "An even more costly version of the Magnate model, the corporate suit is a thermally insulated, anti-corrosion coated suit for high-ranking CentCom Officers, deploying pristine protective armor and advanced actuators, feeling practically weightless when turned on." item_type = /obj/item/mod/control/pre_equipped/corporate diff --git a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm index f2489ab6662..2c115a54aca 100644 --- a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm +++ b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm @@ -924,8 +924,8 @@ var/list/equipment = opfor_data["selected_equipment"][iter_num] if(\ - !equipment["equipment_parent_category"]|| !(equipment["equipment_parent_category"] in SSopposing_force.equipment_list)\ - || !equipment["equipment_parent_type"] || !ispath(text2path(equipment["equipment_parent_type"]), /datum/opposing_force_equipment)) + !equipment["equipment_parent_category"]|| !(equipment["equipment_parent_category"] in SSopposing_force.equipment_list) \ + || !equipment["equipment_parent_type"] || !ispath(text2path(equipment["equipment_parent_type"]), /datum/opposing_force_equipment)) continue // creates a new selected equipment datum using a type gotten from the given equipment type via SSopposing_force.equipment_list diff --git a/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm b/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm index b6597841d38..b5df997558b 100644 --- a/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm +++ b/modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm @@ -183,7 +183,7 @@ SUBSYSTEM_DEF(player_ranks) if(IsAdminAdvancedProcCall()) return null - rank_title = lowertext(rank_title) + rank_title = LOWER_TEXT(rank_title) // Can't make switch() statements with non-constant values. if(rank_title == donator_controller.rank_title) @@ -231,7 +231,7 @@ SUBSYSTEM_DEF(player_ranks) return FALSE - rank_title = lowertext(rank_title) + rank_title = LOWER_TEXT(rank_title) var/datum/player_rank_controller/controller = get_controller_for_group(rank_title) @@ -273,7 +273,7 @@ SUBSYSTEM_DEF(player_ranks) var/datum/db_query/query_add_player_rank = SSdbcore.NewQuery( "INSERT INTO [format_table_name(PLAYER_RANK_TABLE_NAME)] (ckey, rank, admin_ckey) VALUES(:ckey, :rank, :admin_ckey) \ - ON DUPLICATE KEY UPDATE deleted = 0, admin_ckey = :admin_ckey", + ON DUPLICATE KEY UPDATE deleted = 0, admin_ckey = :admin_ckey", list("ckey" = ckey, "rank" = controller.rank_title, "admin_ckey" = admin_ckey), ) @@ -319,7 +319,7 @@ SUBSYSTEM_DEF(player_ranks) return FALSE - rank_title = lowertext(rank_title) + rank_title = LOWER_TEXT(rank_title) var/datum/player_rank_controller/controller = get_controller_for_group(rank_title) diff --git a/modular_skyrat/modules/pod_locking/pod_locking.dm b/modular_skyrat/modules/pod_locking/pod_locking.dm index 799aef2f329..da75dbb0aec 100644 --- a/modular_skyrat/modules/pod_locking/pod_locking.dm +++ b/modular_skyrat/modules/pod_locking/pod_locking.dm @@ -5,10 +5,10 @@ RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_for_evac)) /** - * Signal handler for [COMSIG_SECURITY_LEVEL_CHANGED]. - * Pulls minimum required alert level from modular config and sets pod's [var/launch_status] as [NOLAUNCH] or [UNLAUNCHED] accordingly. - * Will not do anything if pod already launched. - */ + * Signal handler for [COMSIG_SECURITY_LEVEL_CHANGED]. + * Pulls minimum required alert level from modular config and sets pod's [var/launch_status] as [NOLAUNCH] or [UNLAUNCHED] accordingly. + * Will not do anything if pod already launched. + */ /obj/docking_port/mobile/pod/proc/check_for_evac(datum/source, new_level) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm b/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm index 8f6ac184feb..5d2202ac013 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/smelling_salts.dm @@ -31,7 +31,7 @@ user.balloon_alert_to_viewers("trying to revive [carbon_target]") if(!do_after(user, 3 SECONDS, carbon_target)) - user.balloon_alert("stopped reviving [carbon_target]") + user.balloon_alert(user, "stopped reviving [carbon_target]") return if(carbon_target.stat != DEAD) diff --git a/modular_skyrat/modules/primitive_catgirls/code/species.dm b/modular_skyrat/modules/primitive_catgirls/code/species.dm index e9322ec7d48..eb2b4b392d1 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/species.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/species.dm @@ -48,7 +48,7 @@ hearthkin.dna.add_mutation(/datum/mutation/human/olfaction, MUT_NORMAL) hearthkin.dna.activate_mutation(/datum/mutation/human/olfaction) - // >mfw I take mutadone and my nose clogs + // >mfw I take mutadone and my nose clogs var/datum/mutation/human/olfaction/mutation = locate() in hearthkin.dna.mutations mutation.mutadone_proof = TRUE mutation.instability = 0 @@ -124,7 +124,7 @@ "Physically, the Hearthkin always come in the form of demihumans; appearing similar to normal Earthlings, \ but with the tails, ears, and sometimes limbs of various arctic animals; wolves, bears, and felines to only name a few. \ They seem perfectly adapted to their lands of ice and mist, but find even the mild controlled temperatures of \ - NanoTrasen stations to be swelteringly hot. Their view of 'station' genemodders is that of 'halflings': \ + Nanotrasen stations to be swelteringly hot. Their view of 'station' genemodders is that of 'halflings': \ Ancestral bodies, but with the blood and spirit of the humans of Midgard, \ tending to look down on them even more than other aliens.", ) diff --git a/modular_skyrat/modules/salon/code/fur_dyer.dm b/modular_skyrat/modules/salon/code/fur_dyer.dm index de4e271f6a7..9eb93c7a65e 100644 --- a/modular_skyrat/modules/salon/code/fur_dyer.dm +++ b/modular_skyrat/modules/salon/code/fur_dyer.dm @@ -21,7 +21,7 @@ else mode = COLOR_MODE_SPECIFIC - balloon_alert(user, "Set to [mode]!") + balloon_alert(user, "set to [mode]!") /obj/item/fur_dyer/attack(mob/living/M, mob/living/user, params) if(!ishuman(M)) diff --git a/modular_skyrat/modules/salon/code/scissors.dm b/modular_skyrat/modules/salon/code/scissors.dm index b286a791303..b54dc41b991 100644 --- a/modular_skyrat/modules/salon/code/scissors.dm +++ b/modular_skyrat/modules/salon/code/scissors.dm @@ -22,7 +22,7 @@ return if(target_human.hairstyle == "Bald" && target_human.facial_hairstyle == "Shaved") - balloon_alert(user, "What hair? They have none!") + balloon_alert(user, "what hair? They have none!") return if(user.zone_selected != BODY_ZONE_HEAD) @@ -35,7 +35,7 @@ if(selected_part == "Hair") if(!target_human.hairstyle == "Bald" && target_human.head) - balloon_alert(user, "They have no hair to cut!") + balloon_alert(user, "they have no hair to cut!") return var/hair_id = tgui_input_list(user, "Please select what hairstyle you'd like to sculpt!", "Select masterpiece", SSaccessories.hairstyles_list) @@ -55,7 +55,7 @@ new /obj/effect/decal/cleanable/hair(get_turf(src)) else if(!target_human.facial_hairstyle == "Shaved" && target_human.wear_mask) - balloon_alert(user, "They have no facial hair to cut!") + balloon_alert(user, "they have no facial hair to cut!") return var/facial_hair_id = tgui_input_list(user, "Please select what facial hairstyle you'd like to sculpt!", "Select masterpiece", SSaccessories.facial_hairstyles_list) diff --git a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm index d37c06ecf63..3d5c4c30909 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm @@ -105,12 +105,12 @@ /datum/supply_pack/security/sidearmcrate name = "Sidearm Crate" - desc = "Contains Two Sidearm Beacon, rated for NanoTrasen usage." + desc = "Contains Two Sidearm Beacon, rated for Nanotrasen usage." access_view = ACCESS_ARMORY cost = CARGO_CRATE_VALUE * 12 contains = list(/obj/item/choice_beacon/security_pistol = 2, ) - crate_name = "NanoTrasen Sidearm Crate" + crate_name = "Nanotrasen Sidearm Crate" // RomFed Gun diff --git a/modular_skyrat/modules/sec_haul/code/misc/packs.dm b/modular_skyrat/modules/sec_haul/code/misc/packs.dm index bee448c4488..e9555e3019c 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/packs.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/packs.dm @@ -34,7 +34,7 @@ access_view = ACCESS_WEAPONS /datum/supply_pack/goody/nt_shotgun - name = "NanoTrasen Woodstock Shotgun" + name = "Nanotrasen Woodstock Shotgun" desc = "A classic Shotgun used by hunters, police and frontiersmen alike, now at an affordable price." cost = PAYCHECK_COMMAND * 20 contains = list(/obj/item/gun/ballistic/shotgun/riot, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/hunter) diff --git a/modular_skyrat/modules/station_traits/code/station_traits.dm b/modular_skyrat/modules/station_traits/code/station_traits.dm index 2dcb71bf1b3..4992e309e2f 100644 --- a/modular_skyrat/modules/station_traits/code/station_traits.dm +++ b/modular_skyrat/modules/station_traits/code/station_traits.dm @@ -3,7 +3,7 @@ /datum/station_trait/overflow_job_bureaucracy/set_overflow_job_override(datum/source) var/datum/job/picked_job = pick(SSjob.joinable_occupations) - chosen_job_name = lowertext(picked_job.title) // like Chief Engineers vs like chief engineers + chosen_job_name = LOWER_TEXT(picked_job.title) // like Chief Engineers vs like chief engineers SSjob.set_overflow_role(picked_job.type) /datum/station_trait/random_event_weight_modifier/rad_storms diff --git a/modular_skyrat/modules/supersoups/code/stove.dm b/modular_skyrat/modules/supersoups/code/stove.dm index 16888232909..22f3e5f9751 100644 --- a/modular_skyrat/modules/supersoups/code/stove.dm +++ b/modular_skyrat/modules/supersoups/code/stove.dm @@ -10,4 +10,4 @@ // alt-right click toggles whether soups will get cleaned /obj/item/reagent_containers/cup/soup_pot/click_alt_secondary(mob/user) emulsify_reagents = !emulsify_reagents - balloon_alert(user, "Soup cleaning [emulsify_reagents ? "enabled" : "disabled"]!") + balloon_alert(user, "soup cleaning [emulsify_reagents ? "enabled" : "disabled"]!") diff --git a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm index fb03572e141..3278ee98bfd 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm @@ -85,9 +85,9 @@ Various overrides necessary to get the persocom working, namely ui status, power var/obj/item/organ/brain/synth/robotbrain = targetmachine.get_organ_slot(ORGAN_SLOT_BRAIN) if(istype(robotbrain)) if(user.zone_selected == BODY_ZONE_PRECISE_EYES) - balloon_alert(user, "Establishing SSH login with persocom...") + balloon_alert(user, "establishing SSH login with persocom...") if(do_after(user, 5 SECONDS)) - balloon_alert(user, "Connection established!") + balloon_alert(user, "connection established!") to_chat(targetmachine, span_notice("[user] establishes an SSH connection between [src] and your persocom emulation.")) robotbrain.internal_computer.interact(user) return diff --git a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm index c8d8fc45ce0..657f21c8e1c 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm @@ -83,7 +83,7 @@ var/minimum_cell_charge = target_apc ? SYNTH_APC_MINIMUM_PERCENT : 0 if(!target_cell || target_cell.percent() < minimum_cell_charge) - user.balloon_alert(user, "APC charge low!") + user.balloon_alert(user, UNLINT("APC charge low!")) return var/energy_needed @@ -99,7 +99,7 @@ // Check if the charge level of the cell is below the minimum. // Prevents synths from overloading the cell. if(target_cell.percent() < minimum_cell_charge) - user.balloon_alert(user, "APC charge low!") + user.balloon_alert(user, UNLINT("APC charge low!")) break // Attempt to drain charge from the cell. @@ -114,7 +114,7 @@ // The cell could be sabotaged, which causes it to explode and qdelete. if(QDELETED(target_cell)) return - user.balloon_alert(user, "APC failure!") + user.balloon_alert(user, UNLINT("APC failure!")) break // If charging was successful, then increase user nutrition and emit sparks. diff --git a/modular_skyrat/modules/tesh_augments/code/robot_bodyparts.dm b/modular_skyrat/modules/tesh_augments/code/robot_bodyparts.dm index b1d7430627d..bb22f015e6a 100644 --- a/modular_skyrat/modules/tesh_augments/code/robot_bodyparts.dm +++ b/modular_skyrat/modules/tesh_augments/code/robot_bodyparts.dm @@ -7,10 +7,9 @@ #define ROBOTIC_HEAVY_BURN_MSG "smoldering" /* - The damage modifiers here are modified to stay in line with teshari - Although I'm not sure if it's redundant, better safe than sorry. - - Addendum: the limbs lack "limb_id = SPECIES_TESHARI". if this becomes a problem, just put those in xoxo -aKhro + * The damage modifiers here are modified to stay in line with teshari + * Although I'm not sure if it's redundant, better safe than sorry. + * Addendum: the limbs lack "limb_id = SPECIES_TESHARI". if this becomes a problem, just put those in xoxo -aKhro */ #define TESHARI_PUNCH_LOW 2 diff --git a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm index 8719998750f..fce6e3b6a1f 100644 --- a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm +++ b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm @@ -44,7 +44,7 @@ SUBSYSTEM_DEF(title) if((LAZYLEN(formatted_list) == 1 && (formatted_list[1] != "exclude" && formatted_list[1] != "blank.png" && formatted_list[1] != "startup_splash"))) local_title_screens += screen - if(LAZYLEN(formatted_list) > 1 && lowertext(formatted_list[1]) == "startup_splash") + if(LAZYLEN(formatted_list) > 1 && LOWER_TEXT(formatted_list[1]) == "startup_splash") var/file_path = "[global.config.directory]/title_screens/images/[screen]" ASSERT(fexists(file_path)) startup_splash = new(fcopy_rsc(file_path)) diff --git a/modular_zubbers/code/__DEFINES/send2relay.dm b/modular_zubbers/code/__DEFINES/send2relay.dm index 25dc01d4448..11ca9755b03 100644 --- a/modular_zubbers/code/__DEFINES/send2relay.dm +++ b/modular_zubbers/code/__DEFINES/send2relay.dm @@ -13,7 +13,7 @@ #define NO_RELAY "No Relay (Direct Connect)" /client/verb/go2relay() - var/list/static/relays = list( + var/static/list/relays = list( US_EAST_RELAY, US_WEST_RELAY, SYDNEY_RELAY, diff --git a/modular_zubbers/code/datums/armor_overrides.dm b/modular_zubbers/code/datums/armor_overrides.dm index 70154d5c8ee..f4df16b6e18 100644 --- a/modular_zubbers/code/datums/armor_overrides.dm +++ b/modular_zubbers/code/datums/armor_overrides.dm @@ -14,7 +14,7 @@ acid = 100 wound = 10 -/obj/item/mod/control/pre_equipped/security/Initialize() +/obj/item/mod/control/pre_equipped/security/Initialize(mapload, new_theme, new_skin, new_core) default_pins += /obj/item/mod/module/armor_booster/nanotrasen/security applied_modules -= /obj/item/mod/module/headprotector . = ..() @@ -34,7 +34,7 @@ acid = 95 wound = 25 -/obj/item/mod/control/pre_equipped/safeguard/Initialize() +/obj/item/mod/control/pre_equipped/safeguard/Initialize(mapload, new_theme, new_skin, new_core) default_pins += /obj/item/mod/module/armor_booster/nanotrasen/security/safeguard applied_modules -= /obj/item/mod/module/headprotector . = ..() @@ -54,7 +54,7 @@ acid = 100 wound = 20 -/obj/item/mod/control/pre_equipped/magnate/Initialize() +/obj/item/mod/control/pre_equipped/magnate/Initialize(mapload, new_theme, new_skin, new_core) default_pins += /obj/item/mod/module/armor_booster/nanotrasen/magnate applied_modules -= /obj/item/mod/module/headprotector . = ..() @@ -74,7 +74,7 @@ acid = 90 wound = 15 -/obj/item/mod/control/pre_equipped/responsory/Initialize() +/obj/item/mod/control/pre_equipped/responsory/Initialize(mapload, new_theme, new_skin, new_core) applied_modules -= list( /obj/item/mod/module/welding, /obj/item/mod/module/armor_booster/retractplates, @@ -98,7 +98,7 @@ acid = 100 wound = 15 -/obj/item/mod/control/pre_equipped/corporate/Initialize() +/obj/item/mod/control/pre_equipped/corporate/Initialize(mapload, new_theme, new_skin, new_core) default_pins += /obj/item/mod/module/armor_booster/nanotrasen/corporate . = ..() @@ -128,6 +128,6 @@ /obj/item/mod/module/quick_carry, ) -/obj/item/mod/control/pre_equipped/blueshield/Initialize() +/obj/item/mod/control/pre_equipped/blueshield/Initialize(mapload, new_theme, new_skin, new_core) default_pins += /obj/item/mod/module/armor_booster/nanotrasen/blueshield . = ..() diff --git a/modular_zubbers/code/datums/brain_damage/magic.dm b/modular_zubbers/code/datums/brain_damage/magic.dm index 0370342fbd4..d0fa1ce7afc 100644 --- a/modular_zubbers/code/datums/brain_damage/magic.dm +++ b/modular_zubbers/code/datums/brain_damage/magic.dm @@ -121,7 +121,7 @@ /// The person able to see this tear. var/mob/living/carbon/seer -/obj/effect/client_image_holder/phobetor/Initialize() +/obj/effect/client_image_holder/phobetor/Initialize(mapload) . = ..() created_on = world.time diff --git a/modular_zubbers/code/datums/components/crafting/furniture.dm b/modular_zubbers/code/datums/components/crafting/furniture.dm index 95d33bd3541..b1bb33c39d5 100644 --- a/modular_zubbers/code/datums/components/crafting/furniture.dm +++ b/modular_zubbers/code/datums/components/crafting/furniture.dm @@ -44,4 +44,4 @@ /obj/item/stack/sheet/cloth = 3, ) result = /obj/item/sign/flag/pride/trans - category = CAT_FURNITURE \ No newline at end of file + category = CAT_FURNITURE diff --git a/modular_zubbers/code/datums/components/vore/belly.dm b/modular_zubbers/code/datums/components/vore/belly.dm index 2839317bd1f..771105f795c 100644 --- a/modular_zubbers/code/datums/components/vore/belly.dm +++ b/modular_zubbers/code/datums/components/vore/belly.dm @@ -304,7 +304,7 @@ return var/mob/living/living_parent = owner.parent owner.play_vore_sound(get_insert_sound()) - to_chat(living_parent, span_notice("[arrived] slides into your [lowertext(name)].")) + to_chat(living_parent, span_notice("[arrived] slides into your [LOWER_TEXT(name)].")) owner.appearance_holder.vis_contents += arrived if(ismob(arrived)) var/mob/M = arrived @@ -312,7 +312,7 @@ RegisterSignal(M, COMSIG_MOVABLE_USING_RADIO, PROC_REF(try_deny_radio)) ADD_TRAIT(M, TRAIT_SOFTSPOKEN, TRAIT_SOURCE_VORE) deep_search_prey(M) - to_chat(M, boxed_message("You slide into [span_notice("[owner.parent]")]'s [span_green(lowertext(name))]!\n[EXAMINE_SECTION_BREAK][format_message(desc, M)]")) + to_chat(M, boxed_message("You slide into [span_notice("[owner.parent]")]'s [span_green(LOWER_TEXT(name))]!\n[EXAMINE_SECTION_BREAK][format_message(desc, M)]")) // Add the appearance_holder to prey so they can see fellow prey if(can_taste && iscarbon(M)) var/mob/living/carbon/H = M @@ -446,7 +446,7 @@ to_chat(living_parent, escape_fail_owner_message) return // don't print struggle message else - to_chat(living_parent, span_warning("Your prey appears to be unable to make any progress in escaping your [lowertext(name)].")) + to_chat(living_parent, span_warning("Your prey appears to be unable to make any progress in escaping your [LOWER_TEXT(name)].")) to_chat(user, struggle_user_message) @@ -455,7 +455,7 @@ /obj/vore_belly/proc/release(atom/movable/AM) var/mob/living/living_parent = owner.parent AM.forceMove(living_parent.loc) - AM.visible_message(span_warning("[living_parent] [lowertext(release_verb)] [AM] from their [lowertext(name)]."), pref_to_check = /datum/preference/toggle/erp/vore_enable) + AM.visible_message(span_warning("[living_parent] [LOWER_TEXT(release_verb)] [AM] from their [LOWER_TEXT(name)]."), pref_to_check = /datum/preference/toggle/erp/vore_enable) /// Plays sound just to pred and prey in this stomach /obj/vore_belly/proc/play_vore_sound_preypred(preysound, predsound, volume = VORE_SOUND_VOLUME, range = 2, vary = FALSE, pref = /datum/vore_pref/toggle/eating_noises) diff --git a/modular_zubbers/code/datums/components/vore/ui.dm b/modular_zubbers/code/datums/components/vore/ui.dm index 37ccc383781..c8e10edba85 100644 --- a/modular_zubbers/code/datums/components/vore/ui.dm +++ b/modular_zubbers/code/datums/components/vore/ui.dm @@ -469,8 +469,8 @@ to_chat(living_parent, span_warning("You cannot eject absorbed prey.")) return #ifdef VORE_EJECT_DELAY - to_chat(living_parent, span_notice("You start to work [prey] out of your [lowertext(prey_loc.name)]...")) - to_chat(prey, span_notice("[living_parent] starts to work you out of their [lowertext(prey_loc.name)]...")) + to_chat(living_parent, span_notice("You start to work [prey] out of your [LOWER_TEXT(prey_loc.name)]...")) + to_chat(prey, span_notice("[living_parent] starts to work you out of their [LOWER_TEXT(prey_loc.name)]...")) if(!do_after(living_parent, VORE_EJECT_DELAY, interaction_key = "vore_eject")) return #endif diff --git a/modular_zubbers/code/datums/components/vore/vore.dm b/modular_zubbers/code/datums/components/vore/vore.dm index c27a34aebca..fdee477e9b2 100644 --- a/modular_zubbers/code/datums/components/vore/vore.dm +++ b/modular_zubbers/code/datums/components/vore/vore.dm @@ -376,13 +376,13 @@ if(!check_vore_preferences(parent, pred, prey)) return #ifdef VORE_DELAY - pred.visible_message(span_danger("[pred] is attempting to [lowertext(selected_belly.insert_verb)] [prey] into their [lowertext(selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) + pred.visible_message(span_danger("[pred] is attempting to [LOWER_TEXT(selected_belly.insert_verb)] [prey] into their [LOWER_TEXT(selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) if(!do_after(pred, VORE_DELAY, prey)) return if(!check_vore_grab(pred) || !check_vore_preferences(parent, pred, prey, assume_active_consent = TRUE)) return #endif - pred.visible_message(span_danger("[pred] manages to [lowertext(selected_belly.insert_verb)] [prey] into their [lowertext(selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) + pred.visible_message(span_danger("[pred] manages to [LOWER_TEXT(selected_belly.insert_verb)] [prey] into their [LOWER_TEXT(selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) complete_vore(prey) /datum/component/vore/proc/feed_self_to_other() @@ -396,13 +396,13 @@ // check_vore_preferences asserts this exists var/datum/component/vore/pred_component = pred.GetComponent(/datum/component/vore) #ifdef VORE_DELAY - prey.visible_message(span_danger("[prey] is attempting to make [pred] [lowertext(pred_component.selected_belly.insert_verb)] [prey] into their [lowertext(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) + prey.visible_message(span_danger("[prey] is attempting to make [pred] [LOWER_TEXT(pred_component.selected_belly.insert_verb)] [prey] into their [LOWER_TEXT(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) if(!do_after(prey, VORE_DELAY, pred)) return if(!check_vore_grab(prey) || !check_vore_preferences(parent, pred, prey, assume_active_consent = TRUE)) return #endif - prey.visible_message(span_danger("[prey] manages to make [pred] [lowertext(pred_component.selected_belly.insert_verb)] [prey] into their [lowertext(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) + prey.visible_message(span_danger("[prey] manages to make [pred] [LOWER_TEXT(pred_component.selected_belly.insert_verb)] [prey] into their [LOWER_TEXT(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) pred_component.complete_vore(prey) /datum/component/vore/proc/feed_other_to_other(mob/living/pred) @@ -418,7 +418,7 @@ // check_vore_preferences asserts this exists var/datum/component/vore/pred_component = pred.GetComponent(/datum/component/vore) #ifdef VORE_DELAY - feeder.visible_message(span_danger("[feeder] is attempting to make [pred] [lowertext(pred_component.selected_belly.insert_verb)] [prey] into their [lowertext(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) + feeder.visible_message(span_danger("[feeder] is attempting to make [pred] [LOWER_TEXT(pred_component.selected_belly.insert_verb)] [prey] into their [LOWER_TEXT(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) if(!do_after(feeder, VORE_DELAY, pred)) return if(!check_vore_grab(feeder) || !check_vore_preferences(feeder, pred, prey, assume_active_consent = TRUE)) @@ -426,7 +426,7 @@ if(!feeder.can_perform_action(pred, pred.interaction_flags_click | FORBID_TELEKINESIS_REACH)) return #endif - feeder.visible_message(span_danger("[feeder] manages to make [pred] [lowertext(pred_component.selected_belly.insert_verb)] [prey] into their [lowertext(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) + feeder.visible_message(span_danger("[feeder] manages to make [pred] [LOWER_TEXT(pred_component.selected_belly.insert_verb)] [prey] into their [LOWER_TEXT(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable) pred_component.complete_vore(prey) /datum/component/vore/proc/complete_vore(mob/living/prey) diff --git a/modular_zubbers/code/datums/diseases/advance/presets.dm b/modular_zubbers/code/datums/diseases/advance/presets.dm index 55e9e3c06b1..cec70422c8f 100644 --- a/modular_zubbers/code/datums/diseases/advance/presets.dm +++ b/modular_zubbers/code/datums/diseases/advance/presets.dm @@ -53,7 +53,7 @@ name = "[name]sis" else //Last letter was a consonant name = "[name]ia" - name = capitalize(lowertext(trim(name))) + name = capitalize(LOWER_TEXT(trim(name))) var/existed = SSdisease.archive_diseases[src.GetDiseaseID()] @@ -79,4 +79,4 @@ /datum/symptom/viraladaptation, /datum/symptom/viralevolution, /datum/symptom/vomit - ) \ No newline at end of file + ) diff --git a/modular_zubbers/code/datums/mood_events/miasma_events.dm b/modular_zubbers/code/datums/mood_events/miasma_events.dm index 5469ae436ce..0ff34d8614a 100644 --- a/modular_zubbers/code/datums/mood_events/miasma_events.dm +++ b/modular_zubbers/code/datums/mood_events/miasma_events.dm @@ -11,4 +11,4 @@ /datum/mood_event/miasma/heavy description = "The stench of rotting carcasses is unbearable!" - mood_change = -8 \ No newline at end of file + mood_change = -8 diff --git a/modular_zubbers/code/datums/quirks/neutral_quirks/entombed.dm b/modular_zubbers/code/datums/quirks/neutral_quirks/entombed.dm index d506bf1fef4..f0fadbabef7 100644 --- a/modular_zubbers/code/datums/quirks/neutral_quirks/entombed.dm +++ b/modular_zubbers/code/datums/quirks/neutral_quirks/entombed.dm @@ -58,7 +58,7 @@ var/mob/living/carbon/human/human_holder = quirk_holder human_holder.visible_message(span_danger("[human_holder] suddenly staggers, a dire pallor overtaking [human_holder.p_their()] features as a feeble 'breep' emanates from their suit..."), span_userdanger("Terror descends as your suit's life support system breeps feebly, and then goes horrifyingly silent.")) - human_holder.balloon_alert(human_holder, "SUIT LIFE SUPPORT FAILING!") + human_holder.balloon_alert(human_holder, UNLINT("SUIT LIFE SUPPORT FAILING!")) playsound(human_holder, 'sound/effects/alert.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) // OH GOD THE STRESS NOISE life_support_failed = TRUE @@ -88,7 +88,7 @@ if (modsuit_skin == NONE) modsuit_skin = "civilian" - modsuit.skin = lowertext(modsuit_skin) + modsuit.skin = LOWER_TEXT(modsuit_skin) var/modsuit_name = client_source?.prefs.read_preference(/datum/preference/text/entombed_mod_name) if (modsuit_name) @@ -100,7 +100,7 @@ var/modsuit_skin_prefix = client_source?.prefs.read_preference(/datum/preference/text/entombed_mod_prefix) if (modsuit_skin_prefix) - modsuit.theme.name = lowertext(modsuit_skin_prefix) + modsuit.theme.name = LOWER_TEXT(modsuit_skin_prefix) // ensure we're applying our config theme changes, just in case for(var/obj/item/part as anything in modsuit.get_parts()) diff --git a/modular_zubbers/code/game/Items/nerdcrowbar.dm b/modular_zubbers/code/game/Items/nerdcrowbar.dm index 626985059ec..28bfda5a5b9 100644 --- a/modular_zubbers/code/game/Items/nerdcrowbar.dm +++ b/modular_zubbers/code/game/Items/nerdcrowbar.dm @@ -6,4 +6,4 @@ attack_speed = CLICK_CD_RAPID //4 times faster. toolspeed = 0.25 - demolition_mod = 2 \ No newline at end of file + demolition_mod = 2 diff --git a/modular_zubbers/code/game/Items/sec_hailer.dm b/modular_zubbers/code/game/Items/sec_hailer.dm index f906dd701e5..fd311039dd6 100644 --- a/modular_zubbers/code/game/Items/sec_hailer.dm +++ b/modular_zubbers/code/game/Items/sec_hailer.dm @@ -38,7 +38,7 @@ /obj/item/clothing/mask/gas/sechailer/proc/emp_reset() SIGNAL_HANDLER - balloon_alert(src, "Backup Hailer Recalibrated") + balloon_alert(src, "backup hailer recalibrated") emped = FALSE /obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action) @@ -56,13 +56,13 @@ if (!isliving(usr) || !can_use(usr)) return if (!COOLDOWN_FINISHED(src, backup_cooldown)) - balloon_alert(usr, "On Cooldown!") + balloon_alert(usr, "on cooldown!") return if (emped) - balloon_alert(usr, "Backup Malfunctioning!") + balloon_alert(usr, "backup malfunctioning!") return if (!is_station_level(turf_location.z)) - balloon_alert(usr, "Out of Range!") + balloon_alert(usr, "out of range!") return COOLDOWN_START(src, backup_cooldown, 1 MINUTES) diff --git a/modular_zubbers/code/game/area/areas/centcom.dm b/modular_zubbers/code/game/area/areas/centcom.dm index 1f73f05ec2c..eae5146d851 100644 --- a/modular_zubbers/code/game/area/areas/centcom.dm +++ b/modular_zubbers/code/game/area/areas/centcom.dm @@ -1,2 +1,2 @@ /area/centcom/central_command_areas/admin/interlink - name = "Interlink Administrative Office" \ No newline at end of file + name = "Interlink Administrative Office" diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm index 620083f0c26..9c63ecc9519 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm @@ -389,15 +389,15 @@ . = TRUE if("ventdirection") toggle_reverse_vents(usr) - balloon_alert(usr, "After a second you feel like the vents direction changed.") + balloon_alert(usr, "after a second you feel like the vents direction changed.") . = TRUE if("safetytoggle") if(safety == TRUE) - balloon_alert(usr, "Safety lights are off!") + balloon_alert(usr, "safety lights are off!") safety = FALSE return if(safety == FALSE) - balloon_alert(usr, "Safety lights are on!") + balloon_alert(usr, "safety lights are on!") safety = TRUE return . = TRUE diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor_circuit.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor_circuit.dm index 23ced6a4ed2..d13b3fa62cd 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor_circuit.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor_circuit.dm @@ -10,4 +10,4 @@ /datum/stock_part/matter_bin = 2, /datum/stock_part/servo = 4 ) - needs_anchored = TRUE \ No newline at end of file + needs_anchored = TRUE diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor_icon.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor_icon.dm index 9488f81ad17..b6e50f7415c 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor_icon.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor_icon.dm @@ -44,4 +44,4 @@ meter_overlay.appearance_flags |= RESET_COLOR var/return_pressure_mod = clamp( (rod_mix_pressure - stored_rod.pressure_limit*0.5) / stored_rod.pressure_limit*0.5,0,1) meter_overlay.color = rgb(return_pressure_mod*255,255 - return_pressure_mod*255,0) - . += meter_overlay \ No newline at end of file + . += meter_overlay diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor_processing.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor_processing.dm index 81f34daa90b..882f03bbfde 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor_processing.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor_processing.dm @@ -91,7 +91,7 @@ if(prob(5)) playsound(src, 'sound/misc/metal_creak.ogg', 50, TRUE, extrarange = -3) - if(!jammed && safety && (last_power_generation >= safeties_max_power_generation || rod_mix_pressure > stored_rod.pressure_limit*0.9)) //The safety system is very strict. NanoTrasen wants employees to feel safe! + if(!jammed && safety && (last_power_generation >= safeties_max_power_generation || rod_mix_pressure > stored_rod.pressure_limit*0.9)) //The safety system is very strict. Nanotrasen wants employees to feel safe! var/health_percent = atom_integrity/max_integrity var/jam_chance = 80 - (health_percent * 100) - (venting ? 0 : 40) if(jam_chance > 0 && prob(jam_chance)) diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor_wires.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor_wires.dm index 5928acac16d..59a2810f996 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor_wires.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor_wires.dm @@ -126,4 +126,4 @@ #undef WIRE_VENT_DIRECTION #undef WIRE_VENT_POWER -#undef WIRE_TAMPER \ No newline at end of file +#undef WIRE_TAMPER diff --git a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer.dm b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer.dm index d3dd7a14ad6..08eeb2e9bf0 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer.dm @@ -127,4 +127,4 @@ return TRUE -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/rbmk2_sniffer, 24) \ No newline at end of file +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/rbmk2_sniffer, 24) diff --git a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_acts.dm b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_acts.dm index a7cbefaf49c..289bea58667 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_acts.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_acts.dm @@ -14,4 +14,4 @@ /obj/machinery/rbmk2_sniffer/wirecutter_act(mob/living/user, obj/item/tool) if(panel_open) wires.interact(user) - return TRUE \ No newline at end of file + return TRUE diff --git a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_circuit.dm b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_circuit.dm index 7c80f1634eb..cbb07914e98 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_circuit.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_circuit.dm @@ -6,4 +6,4 @@ /obj/item/stack/cable_coil = 4, /obj/item/stack/sheet/mineral/uranium = 1 ) - needs_anchored = TRUE \ No newline at end of file + needs_anchored = TRUE diff --git a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_wires.dm b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_wires.dm index adefc6e3d70..50cbcb30341 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_wires.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor_sniffer/reactor_sniffer_wires.dm @@ -85,4 +85,4 @@ #undef WIRE_LINK #undef WIRE_UNLINK -#undef WIRE_TEST \ No newline at end of file +#undef WIRE_TEST diff --git a/modular_zubbers/code/game/machinery/doors/door.dm b/modular_zubbers/code/game/machinery/doors/door.dm index 8aa021ffbc9..7e028ea7a11 100644 --- a/modular_zubbers/code/game/machinery/doors/door.dm +++ b/modular_zubbers/code/game/machinery/doors/door.dm @@ -19,7 +19,7 @@ to_chat(user, span_warning("This door isn't powered.")) return - src.balloon_alert(user, "AI requested") + src.balloon_alert(user, UNLINT("AI requested")) for(var/mob/living/silicon/ai/AI as anything in GLOB.ai_list) if(AI.stat == DEAD) diff --git a/modular_zubbers/code/game/machinery/syndiepad.dm b/modular_zubbers/code/game/machinery/syndiepad.dm index 1f324075c28..075675b162a 100644 --- a/modular_zubbers/code/game/machinery/syndiepad.dm +++ b/modular_zubbers/code/game/machinery/syndiepad.dm @@ -128,7 +128,7 @@ return FALSE return TRUE -/obj/machinery/computer/piratepad_control/syndiepad/proc/reset_icon(var/obj/machinery/piratepad/syndiepad/pad) +/obj/machinery/computer/piratepad_control/syndiepad/proc/reset_icon(obj/machinery/piratepad/syndiepad/pad) if(!pad) return flick(pad.sending_state,pad) diff --git a/modular_zubbers/code/game/objects/items/robot/items/storage.dm b/modular_zubbers/code/game/objects/items/robot/items/storage.dm index f1a54397624..188f721cb32 100644 --- a/modular_zubbers/code/game/objects/items/robot/items/storage.dm +++ b/modular_zubbers/code/game/objects/items/robot/items/storage.dm @@ -138,7 +138,7 @@ ) . = ..() -/obj/item/borg/apparatus/sheet_manipulator/Initialize() +/obj/item/borg/apparatus/sheet_manipulator/Initialize(mapload) . = ..() storable += /obj/item/stack/rods diff --git a/modular_zubbers/code/game/objects/items/storage/garment.dm b/modular_zubbers/code/game/objects/items/storage/garment.dm index 3326ab13907..e03b47d7291 100644 --- a/modular_zubbers/code/game/objects/items/storage/garment.dm +++ b/modular_zubbers/code/game/objects/items/storage/garment.dm @@ -1,4 +1,4 @@ /obj/item/storage/bag/garment/chief_medical/PopulateContents() . = ..() new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck(src) - new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck/skirt(src) \ No newline at end of file + new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck/skirt(src) diff --git a/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm b/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm index ed025b2b1f8..4d391f21626 100644 --- a/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm +++ b/modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm @@ -2,11 +2,11 @@ /obj/structure/chair/sofa/attack_hand_secondary(mob/user, list/modifiers) if(!ishuman(user) || !user.ckey) return ..() - balloon_alert(user, "Searching under pillows...") + balloon_alert(user, "searching under pillows...") to_chat(user, span_alert("You start scouring through the sofa's pillows....")) if(do_after(user, 10 SECONDS, src)) if(prob(10)) - balloon_alert(user, "Found something") + balloon_alert(user, "found something") if(prob(1)) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(5, 1, loc) @@ -15,4 +15,4 @@ // New epic way of making money. Totally new /obj/item/coin/iron(loc) else - balloon_alert(user, "Nothing") + balloon_alert(user, "nothing") diff --git a/modular_zubbers/code/game/turfs/open/glass_floor.dm b/modular_zubbers/code/game/turfs/open/glass_floor.dm index aebb0c19c85..acc3f11a5c8 100644 --- a/modular_zubbers/code/game/turfs/open/glass_floor.dm +++ b/modular_zubbers/code/game/turfs/open/glass_floor.dm @@ -19,4 +19,4 @@ scrape_below = TRUE /turf/open/floor/glass/reinforced/plasma/scrape_below - scrape_below = TRUE \ No newline at end of file + scrape_below = TRUE diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm index 30ffb1cbd9e..351431b946f 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm @@ -303,7 +303,7 @@ var/datum/status_effect/frenzy/status_effect = owner.current.has_status_effect(/datum/status_effect/frenzy) if(bloodsucker_blood_volume >= frenzy_exit_threshold() && frenzied && status_effect?.duration == -1) status_effect.duration = world.time + 10 SECONDS - owner.current.balloon_alert(owner.current, "Frenzy ends in 10 seconds!") + owner.current.balloon_alert(owner.current, "frenzy ends in 10 seconds!") // BLOOD_VOLUME_BAD: [224] - Jitter if(bloodsucker_blood_volume < BLOOD_VOLUME_BAD && prob(0.5) && !is_in_torpor() && !HAS_TRAIT(owner.current, TRAIT_MASQUERADE)) owner.current.set_timed_status_effect(3 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm index 3b0aa7f35c4..c6f6540be21 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm @@ -279,7 +279,7 @@ /datum/antagonist/bloodsucker/proc/regain_heart(mob/living/carbon/target, obj/structure/closet/crate/coffin/coffin) var/obj/item/organ/heart = locate(/obj/item/organ/heart) in coffin.contents if(heart && !target.get_organ_slot(ORGAN_SLOT_HEART) && heart.Insert(target)) - to_chat(span_warning("You have regained your heart!")) + to_chat(target, span_warning("You have regained your heart!")) /datum/antagonist/bloodsucker/proc/allow_head_to_talk(mob/speaker, message, ignore_spam, forced) SIGNAL_HANDLER diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm index 933431759f4..96a18af8325 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm @@ -293,7 +293,7 @@ option.info = "[initial(ghouldatums.name)] - [span_boldnotice(initial(ghouldatums.ghoul_description))]" radial_display[initial(ghouldatums.name)] = option if(!length(options)) - master.balloon_alert(master, "Out of Special Ghoul slots!") + master.balloon_alert(master, "out of Special Ghoul slots!") return FALSE to_chat(master, span_notice("You can change who this Ghoul is, who are they to you? This will cost [SPECIAL_GHOUL_COST] blood.")) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm index 2a1eb497f0d..1e1a513c8ac 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm @@ -62,7 +62,7 @@ var/list/options = list_available_powers(ghouldatum.bloodsucker_powers) var/mob/living/carbon/human/target = ghouldatum.owner.current var/datum/action/cooldown/bloodsucker/choice = choose_powers( - "You have the opportunity to level up your Favorite Ghoul. Select a power you wish them to recieve.", + "You have the opportunity to level up your Favorite Ghoul. Select a power you wish them to receive.", "A wise master's hand is neccesary", options ) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm index a1d8eb1328e..22f423b1cb5 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm @@ -51,7 +51,7 @@ // ERROR! Wall! if(iswallturf(from_turf)) var/wallwarning = (i == 1) ? "in the way" : "at your destination" - owner.balloon_alert(owner, "There is a wall [wallwarning].") + owner.balloon_alert(owner, "there is a wall [wallwarning].") return FALSE // Done target_turf = from_turf diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm index 271b2a6b54b..c46eb4c1dad 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm @@ -268,7 +268,7 @@ righthand_file = 'modular_zubbers/icons/mob/inhands/weapons/bloodsucker_righthand.dmi' block_chance = BLOOD_SHIELD_BLOCK_CHANCE -/obj/item/shield/bloodsucker/Initialize() +/obj/item/shield/bloodsucker/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm index 60d7bad0e79..303a32a9281 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm @@ -514,7 +514,7 @@ var/mutable_appearance/armrest // Add rotating and armrest -/obj/structure/bloodsucker/bloodthrone/Initialize() +/obj/structure/bloodsucker/bloodthrone/Initialize(mapload) AddComponent(/datum/component/simple_rotation) armrest = GetArmrest() armrest.layer = ABOVE_MOB_LAYER diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/bundle.dm b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/bundle.dm index 8398e2b1c82..dab7b6add28 100644 --- a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/bundle.dm +++ b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/bundle.dm @@ -5,4 +5,4 @@ and spies alike. Includes cameras, records, PDA server access, and a fax machine. \ Basic knowledge of communication systems not included. Requires power in area deployed." item = /obj/item/survivalcapsule/plap - cost = 10 \ No newline at end of file + cost = 10 diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/device_tools.dm b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/device_tools.dm index 0b19b7449d9..9b048eabd5a 100644 --- a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/device_tools.dm +++ b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/device_tools.dm @@ -4,4 +4,4 @@ limited_stock = 1 /datum/uplink_item/device_tools/powersink - limited_stock = 1 \ No newline at end of file + limited_stock = 1 diff --git a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/clothes.dm b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/clothes.dm index 1150b9b21fc..e4249b1effd 100644 --- a/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/clothes.dm +++ b/modular_zubbers/code/modules/antagonists/traitor/uplink/uplink_items/syndimaid/clothes.dm @@ -11,8 +11,8 @@ wound = 25 /obj/item/clothing/under/syndicate/skyrat/maid/armored - desc = "A 'tactical' skirtleneck fashioned to the likeness of a maid outfit.\ - The armor on this one is bulky and blocks the user from wearing any chest armor." + desc = "A 'tactical' skirtleneck fashioned to the likeness of a maid outfit. \ + The armor on this one is bulky and blocks the user from wearing any chest armor." armor_type = /datum/armor/clothing_under/syndimaid body_parts_covered = CHEST|GROIN|LEGS resistance_flags = parent_type::resistance_flags | FIRE_PROOF diff --git a/modular_zubbers/code/modules/antagonists/wizard/events_removal.dm b/modular_zubbers/code/modules/antagonists/wizard/events_removal.dm index 773764ba26b..998f8040c24 100644 --- a/modular_zubbers/code/modules/antagonists/wizard/events_removal.dm +++ b/modular_zubbers/code/modules/antagonists/wizard/events_removal.dm @@ -23,4 +23,4 @@ // Also, a lot of features don't really blend well with not knowning Galactic Common /datum/round_event_control/wizard/tower_of_babel max_occurrences = 0 - weight = 0 \ No newline at end of file + weight = 0 diff --git a/modular_zubbers/code/modules/antagonists/wizard/grand_finale_removal.dm b/modular_zubbers/code/modules/antagonists/wizard/grand_finale_removal.dm index 2b86864920d..c570e365ca2 100644 --- a/modular_zubbers/code/modules/antagonists/wizard/grand_finale_removal.dm +++ b/modular_zubbers/code/modules/antagonists/wizard/grand_finale_removal.dm @@ -5,4 +5,4 @@ // Jubilation. Turns everyone into clowns. Kind of pointless because SAD exists. Also snowflakes will complain. /datum/grand_finale/clown - desc = null \ No newline at end of file + desc = null diff --git a/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm b/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm index caf6c753345..45b53112b9a 100644 --- a/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm +++ b/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm @@ -24,7 +24,7 @@ var/datum/minesweeper/board -/obj/machinery/computer/arcade/minesweeper/Initialize() +/obj/machinery/computer/arcade/minesweeper/Initialize(mapload) . = ..() board = new /datum/minesweeper() board.emaggable = TRUE diff --git a/modular_zubbers/code/modules/ashwalkers/ashwalker_names.dm b/modular_zubbers/code/modules/ashwalkers/ashwalker_names.dm index bab483c0613..4824a641614 100644 --- a/modular_zubbers/code/modules/ashwalkers/ashwalker_names.dm +++ b/modular_zubbers/code/modules/ashwalkers/ashwalker_names.dm @@ -8,7 +8,7 @@ var/object_name = initial(object.name) if(!object_name || !regex_inclusion.Find(object_name)) continue - .[capitalize(lowertext(object_name))] = TRUE + .[capitalize(LOWER_TEXT(object_name))] = TRUE return . diff --git a/modular_zubbers/code/modules/bitrunning/disks.dm b/modular_zubbers/code/modules/bitrunning/disks.dm index a78ed90b208..452a0e43d30 100644 --- a/modular_zubbers/code/modules/bitrunning/disks.dm +++ b/modular_zubbers/code/modules/bitrunning/disks.dm @@ -39,7 +39,7 @@ loaded_preference = new(user.client) loaded_preference.load_character(prefdata_names.Find(choice)) - balloon_alert(user, "Character set") + balloon_alert(user, "character set") to_chat(user, span_notice("Character set to [choice] sucessfully!")) /datum/outfit/job/bitrunner diff --git a/modular_zubbers/code/modules/bow_adjustments/bow.dm b/modular_zubbers/code/modules/bow_adjustments/bow.dm index b3176aa34eb..67a20325763 100644 --- a/modular_zubbers/code/modules/bow_adjustments/bow.dm +++ b/modular_zubbers/code/modules/bow_adjustments/bow.dm @@ -11,4 +11,4 @@ force = 8 /obj/item/gun/ballistic/bow/clockwork - force = 14 \ No newline at end of file + force = 14 diff --git a/modular_zubbers/code/modules/cargo/exports/weapons.dm b/modular_zubbers/code/modules/cargo/exports/weapons.dm index 2bab3c4775e..b892ef6756f 100644 --- a/modular_zubbers/code/modules/cargo/exports/weapons.dm +++ b/modular_zubbers/code/modules/cargo/exports/weapons.dm @@ -4,4 +4,4 @@ /datum/export/weapon/wt551 export_types = list(/obj/item/gun/ballistic/automatic/wt550/security) cost = CARGO_CRATE_VALUE * 1.25 - unit_name = "WT-551 automatic rifle" \ No newline at end of file + unit_name = "WT-551 automatic rifle" diff --git a/modular_zubbers/code/modules/cargo/packs/security.dm b/modular_zubbers/code/modules/cargo/packs/security.dm index 2de733a57ec..9c06dd36616 100644 --- a/modular_zubbers/code/modules/cargo/packs/security.dm +++ b/modular_zubbers/code/modules/cargo/packs/security.dm @@ -1,6 +1,6 @@ /datum/supply_pack/security/armory/wt551 name = "WT-551 Autorifle Crate" - desc = "Contains a pair of WT-551 Autorifles pre-loaded with less-lethal rubber-tipped rounds. Additional ammo sold seperately. Backwards-compatible with WT-550 magazines. NanoTrasen reminds you that the other weapon is for a friend, and not for going guns akimbo." + desc = "Contains a pair of WT-551 Autorifles pre-loaded with less-lethal rubber-tipped rounds. Additional ammo sold seperately. Backwards-compatible with WT-550 magazines. Nanotrasen reminds you that the other weapon is for a friend, and not for going guns akimbo." cost = CARGO_CRATE_VALUE * 8 contains = list(/obj/item/gun/ballistic/automatic/wt550/security/rubber = 2) crate_name = "wt-550 autorifle crate" diff --git a/modular_zubbers/code/modules/changeling_zombies/antagonist.dm b/modular_zubbers/code/modules/changeling_zombies/antagonist.dm index 752cea0f2f0..34ee55daabc 100644 --- a/modular_zubbers/code/modules/changeling_zombies/antagonist.dm +++ b/modular_zubbers/code/modules/changeling_zombies/antagonist.dm @@ -52,4 +52,4 @@ explanation_text = "Infect at least [required_infections] other victims." /datum/objective/changeling_zombie_infect/check_completion() - return total_infections >= required_infections \ No newline at end of file + return total_infections >= required_infections diff --git a/modular_zubbers/code/modules/changeling_zombies/event.dm b/modular_zubbers/code/modules/changeling_zombies/event.dm index c05450e4917..83cc4164b59 100644 --- a/modular_zubbers/code/modules/changeling_zombies/event.dm +++ b/modular_zubbers/code/modules/changeling_zombies/event.dm @@ -33,7 +33,7 @@ broken_one.smash(src.loc,null,FALSE,TRUE) //The cure. -/obj/item/paper/fluff/shuttles/changeling_zombie_instructions/Initialize(...) +/obj/item/paper/fluff/shuttles/changeling_zombie_instructions/Initialize(mapload, ...) . = ..() default_raw_text = "

NT-CZV-1 Cure Instructions


To cure an infected crewmember who has not yet turned, let them have at least [CHANGELING_ZOMBIE_TOXINS_THRESHOLD_TO_CURE] units of toxins damage, then purge all those toxins quickly.
To cure an already turned crewmember, apply shotgun to head repeatedly." @@ -43,4 +43,4 @@ new /obj/item/ammo_box/advanced/s12gauge/buckshot(src) /obj/structure/closet/crate/medical/changeling_zombie_cure/populate_contents_immediate() //This has no reason to exist other than to satisfy linters. - new /obj/item/gun/ballistic/shotgun/lethal(src) \ No newline at end of file + new /obj/item/gun/ballistic/shotgun/lethal(src) diff --git a/modular_zubbers/code/modules/changeling_zombies/husking.dm b/modular_zubbers/code/modules/changeling_zombies/husking.dm index d291192a174..3295e0793ea 100644 --- a/modular_zubbers/code/modules/changeling_zombies/husking.dm +++ b/modular_zubbers/code/modules/changeling_zombies/husking.dm @@ -3,4 +3,4 @@ if(!.) return if(source == CHANGELING_DRAIN) - src.AddComponent(/datum/component/changeling_zombie_infection) \ No newline at end of file + src.AddComponent(/datum/component/changeling_zombie_infection) diff --git a/modular_zubbers/code/modules/changeling_zombies/infection.dm b/modular_zubbers/code/modules/changeling_zombies/infection.dm index b89c78182b1..c7537d1b63b 100644 --- a/modular_zubbers/code/modules/changeling_zombies/infection.dm +++ b/modular_zubbers/code/modules/changeling_zombies/infection.dm @@ -1,6 +1,6 @@ GLOBAL_VAR_INIT(changeling_zombies_detected,FALSE) -/proc/can_become_changeling_zombie(var/datum/parent) +/proc/can_become_changeling_zombie(datum/parent) if(!ishuman(parent) || HAS_TRAIT(parent,TRAIT_NO_ZOMBIFY) || HAS_TRAIT(parent,TRAIT_GENELESS)) return FALSE @@ -256,7 +256,7 @@ GLOBAL_VAR_INIT(changeling_zombies_detected,FALSE) if(!was_changeling_husked && !GLOB.changeling_zombies_detected) //Only announce if it's from a non-changeling spawn. var/turf/T = get_turf(host) - if(is_station_level(T.z)) //Prevents the announcements if admins are fucking around on centcomm. + if(is_station_level(T.z)) //Prevents the announcements if admins are fucking around on centcom. var/list/turf/found_turfs = get_area_turfs(/area/station/medical,subtypes=TRUE) if(length(found_turfs)) var/turf/chosen_turf = pick(found_turfs) diff --git a/modular_zubbers/code/modules/clothing/accessory/accessory.dm b/modular_zubbers/code/modules/clothing/accessory/accessory.dm index a43dd256650..d8ed969408c 100644 --- a/modular_zubbers/code/modules/clothing/accessory/accessory.dm +++ b/modular_zubbers/code/modules/clothing/accessory/accessory.dm @@ -57,20 +57,20 @@ ) // Pride Pin Over-ride /obj/item/clothing/accessory/pride - icon = 'modular_skyrat/master_files/icons/obj/clothing/accessories.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/accessories.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/accessories.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/accessories.dmi' - unique_reskin = list( - "Rainbow Pride" = "pride", - "Bisexual Pride" = "pride_bi", - "Pansexual Pride" = "pride_pan", - "Asexual Pride" = "pride_ace", - "Non-binary Pride" = "pride_enby", - "Transgender Pride" = "pride_trans", - "Intersex Pride" = "pride_intersex", - "Lesbian Pride" = "pride_lesbian", - "Man-Loving-Man / Gay Pride" = "pride_mlm", - "Genderfluid Pride" = "pride_genderfluid", - "Genderqueer Pride" = "pride_genderqueer", - "Aromantic Pride" = "pride_aromantic", + unique_reskin = list( + "Rainbow Pride" = "pride", + "Bisexual Pride" = "pride_bi", + "Pansexual Pride" = "pride_pan", + "Asexual Pride" = "pride_ace", + "Non-binary Pride" = "pride_enby", + "Transgender Pride" = "pride_trans", + "Intersex Pride" = "pride_intersex", + "Lesbian Pride" = "pride_lesbian", + "Man-Loving-Man / Gay Pride" = "pride_mlm", + "Genderfluid Pride" = "pride_genderfluid", + "Genderqueer Pride" = "pride_genderqueer", + "Aromantic Pride" = "pride_aromantic", ) diff --git a/modular_zubbers/code/modules/clothing/shoes/boots.dm b/modular_zubbers/code/modules/clothing/shoes/boots.dm index 5ab10f2d56b..2f4d4ebf8ad 100644 --- a/modular_zubbers/code/modules/clothing/shoes/boots.dm +++ b/modular_zubbers/code/modules/clothing/shoes/boots.dm @@ -242,7 +242,7 @@ if(iscyborg(hit_atom)) return -/obj/item/clothing/shoes/banana_slippers/Initialize() +/obj/item/clothing/shoes/banana_slippers/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 80) RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) diff --git a/modular_zubbers/code/modules/clothing/undershirt.dm b/modular_zubbers/code/modules/clothing/undershirt.dm index 28d9e4ec800..5ad14c841b3 100644 --- a/modular_zubbers/code/modules/clothing/undershirt.dm +++ b/modular_zubbers/code/modules/clothing/undershirt.dm @@ -1,8 +1,8 @@ /datum/sprite_accessory/undershirt/dogborgshirt - name = "I Love Dogborgs" - icon = 'modular_zubbers/icons/mob/clothing/underwear.dmi' - icon_state = "shirt_dogborg" - use_static = null + name = "I Love Dogborgs" + icon = 'modular_zubbers/icons/mob/clothing/underwear.dmi' + icon_state = "shirt_dogborg" + use_static = null /datum/sprite_accessory/bra/cowprint name = "Bra - Cowprint" diff --git a/modular_zubbers/code/modules/credits/credits.dm b/modular_zubbers/code/modules/credits/credits.dm index 4c0c8a3638e..ed90033d1f6 100644 --- a/modular_zubbers/code/modules/credits/credits.dm +++ b/modular_zubbers/code/modules/credits/credits.dm @@ -91,7 +91,7 @@ GLOBAL_LIST(end_titles) UNLINT(animate(src, alpha = 0, flags = ANIMATION_PARALLEL, time = CREDIT_EASE_DURATION, delay = CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION)) parent?.screen += src -/atom/movable/screen/credit/proc/fadeout(var/matrix/direction) +/atom/movable/screen/credit/proc/fadeout(matrix/direction) sleep(CREDIT_EASE_DURATION) qdel(src) @@ -113,7 +113,7 @@ GLOBAL_LIST(end_titles) if(!GLOB.end_credits_title) /* Establish a big-ass list of potential titles for the "episode". */ possible_titles += "THE [pick("DOWNFALL OF", "RISE OF", "TROUBLE WITH", "FINAL STAND OF", "DARK SIDE OF", "DESOLATION OF", "DESTRUCTION OF", "CRISIS OF")]\ - [pick("SPACEMEN", "HUMANITY", "DIGNITY", "SANITY", "THE CHIMPANZEES", "THE VENDOMAT PRICES", "GIANT ARMORED", "THE GAS JANITOR",\ + [pick("SPACEMEN", "HUMANITY", "DIGNITY", "SANITY", "THE CHIMPANZEES", "THE VENDOMAT PRICES", "GIANT ARMORED", "THE GAS JANITOR",\ "THE SUPERMATTER CRYSTAL", "MEDICAL", "ENGINEERING", "SECURITY", "RESEARCH", "THE SERVICE DEPARTMENT", "COMMAND", "THE EXPLORERS", "THE PATHFINDER",\ "BUBBER STATION")]" possible_titles += "THE CREW GETS [pick("TINGLED", "PICKLED", "AN INCURABLE DISEASE", "PIZZA", "A VALUABLE HISTORY LESSON", "A BREAK", "HIGH", "TO LIVE", "TO RELIVE THEIR CHILDHOOD", "EMBROILED IN CIVIL WAR", "A BAD HANGOVER", "SERIOUS ABOUT [pick("DRUG ABUSE", "CRIME", "PRODUCTIVITY", "ANCIENT AMERICAN CARTOONS", "SPACEBALL", "DECOMPRESSION PROCEDURES")]")]" @@ -163,7 +163,7 @@ GLOBAL_LIST(end_titles) titles += "
BASED ON REAL EVENTS
In memory of [english_list(corpses)].
" var/list/staff = list("PRODUCTION STAFF:") - var/list/static/staffjobs = list("Coffee Fetcher", "Cameraman", "Angry Yeller", "Chair Operator", "Choreographer", "Historical Consultant", "Costume Designer", "Chief Editor", "Executive Assistant") + var/static/list/staffjobs = list("Coffee Fetcher", "Cameraman", "Angry Yeller", "Chair Operator", "Choreographer", "Historical Consultant", "Costume Designer", "Chief Editor", "Executive Assistant") var/list/goodboys = list() for(var/client/C) if(!C?.holder) @@ -176,9 +176,9 @@ GLOBAL_LIST(end_titles) titles += "
STAFF'S GOOD BOYS:
[english_list(goodboys)]

" var/disclaimer = "
Sponsored by [pick("Nanotrasen", "The Syndicate", "Armadyne Corporation")].
All rights reserved.
\ - This motion picture is protected under the copyright laws of the Terran Government
and other nations throughout the galaxy.
\ - Colony of First Publication: [pick("Mars", "Luna", "Earth", "Venus", "Phobos", "Ceres", "Tiamat", "Ceti Epsilon", "Eos", "Pluto", "Ouere",\ - "Lordania", "Kingston", "Cinu", "Yuklid V", "Lorriman", "Tersten", "Gaia")].
" + This motion picture is protected under the copyright laws of the Terran Government
and other nations throughout the galaxy.
\ + Colony of First Publication: [pick("Mars", "Luna", "Earth", "Venus", "Phobos", "Ceres", "Tiamat", "Ceti Epsilon", "Eos", "Pluto", "Ouere", \ + "Lordania", "Kingston", "Cinu", "Yuklid V", "Lorriman", "Tersten", "Gaia")].
" disclaimer += pick("Use for parody prohibited. PROHIBITED.", "All stunts were performed by underpaid interns. Do NOT try at home.", "[pick("Nanotrasen", "The Syndicate", "Armadyne Corporation")] does not endorse behaviour depicted. Attempt at your own risk.", diff --git a/modular_zubbers/code/modules/customization/species/synths/death_sound.dm b/modular_zubbers/code/modules/customization/species/synths/death_sound.dm index 6c2834ff235..e7772ed879b 100644 --- a/modular_zubbers/code/modules/customization/species/synths/death_sound.dm +++ b/modular_zubbers/code/modules/customization/species/synths/death_sound.dm @@ -1,2 +1,2 @@ /datum/species/synthetic - death_sound = 'sound/mobs/non-humanoids/cyborg/borg_deathsound.ogg' + death_sound = 'sound/mobs/non-humanoids/cyborg/borg_deathsound.ogg' diff --git a/modular_zubbers/code/modules/debug_tools/physgun.dm b/modular_zubbers/code/modules/debug_tools/physgun.dm index 61dfa48e9f4..0b58e6ed103 100644 --- a/modular_zubbers/code/modules/debug_tools/physgun.dm +++ b/modular_zubbers/code/modules/debug_tools/physgun.dm @@ -60,10 +60,10 @@ playsound(user, 'modular_zubbers/sound/phystools/physgun_cant_grab.ogg', 100, TRUE) return if(!COOLDOWN_FINISHED(src, grab_cooldown) && !handled_atom) - user.balloon_alert(user, "On cooldown!") + user.balloon_alert(user, "on cooldown!") return if(!range_check(target, user) && !handled_atom) - user.balloon_alert(user, "Too far!") + user.balloon_alert(user, "too far!") return catch_atom(target, user) COOLDOWN_START(src, grab_cooldown, use_cooldown) @@ -171,7 +171,7 @@ . = COMSIG_MOB_CANCEL_CLICKON if(LAZYACCESS(modifiers, RIGHT_CLICK)) if(!advanced) - physgun_user.balloon_alert(physgun_user, "Not enough power!") + physgun_user.balloon_alert(physgun_user, "not enough power!") return pause_atom(handled_atom) return @@ -186,7 +186,7 @@ /obj/item/physic_manipulation_tool/proc/on_living_resist(mob/living) SIGNAL_HANDLER if(force_grab) - handled_atom.balloon_alert(handled_atom, "Can't escape!") + handled_atom.balloon_alert(handled_atom, "can't escape!") return if(handled_atom) release_atom() @@ -319,7 +319,7 @@ SIGNAL_HANDLER if(force) - owner.balloon_alert("Can't escape!") + owner.balloon_alert(owner, "can't escape!") return if(!HAS_TRAIT(owner, TRAIT_PHYSGUN_PAUSE)) diff --git a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_build.dm b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_build.dm index 89d64c9a836..e66ab41d314 100644 --- a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_build.dm +++ b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_build.dm @@ -14,7 +14,7 @@ ) var/choised_mode = show_radial_menu(user, user, choise, require_near = TRUE) if(!choised_mode) - user.balloon_alert(user, "Select one!") + user.balloon_alert(user, "select one!") return FALSE var/list/pick = list() if(choised_mode == "Wall mode") @@ -43,14 +43,14 @@ . = ..() if(!selected_atom) - user.balloon_alert(user, "Select atom first!") + user.balloon_alert(user, "select atom first!") return FALSE if(!isopenturf(target)) - user.balloon_alert(user, "Blocked!") + user.balloon_alert(user, "blocked!") return FALSE var/turf/T = target if(T.is_blocked_turf()) - user.balloon_alert(user, "Blocked!") + user.balloon_alert(user, "blocked!") return FALSE if(!isturf(selected_atom)) T.place_on_top(selected_atom) diff --git a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_color.dm b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_color.dm index fdee5d5bb0d..8babb349709 100644 --- a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_color.dm +++ b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_color.dm @@ -13,7 +13,7 @@ if(isliving(target)) var/mob/living/L = target if(L.client) - user.balloon_alert(user, "Can't color!") + user.balloon_alert(user, "can't color!") return FALSE if(!selected_color) selected_color = COLOR_WHITE diff --git a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_remove.dm b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_remove.dm index b934679beab..79320a53d5a 100644 --- a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_remove.dm +++ b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_remove.dm @@ -7,7 +7,7 @@ if(isliving(target)) var/mob/living/living_target = target if(living_target.client) - user.balloon_alert(user, "Client inside!") + user.balloon_alert(user, "client inside!") return FALSE //Is there is somthing inside target. if(target.contents.len) diff --git a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_spawn.dm b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_spawn.dm index fbf48df2911..9732214419c 100644 --- a/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_spawn.dm +++ b/modular_zubbers/code/modules/debug_tools/toolgun_module/phys_spawn.dm @@ -21,7 +21,7 @@ . = ..() var/text_path = tgui_input_text(user, "Enter object path:", "Spawn tool", "none", 256, FALSE) if(!text_path) - user.balloon_alert(user, "Enter path!") + user.balloon_alert(user, "enter path!") return FALSE selected_object = text2path(text_path) if(!ispath(selected_object)) @@ -29,20 +29,20 @@ for(var/black_list_item in black_list) if(ispath(selected_object, black_list_item)) selected_object = null - user.balloon_alert(user, "Spawn blocked!") + user.balloon_alert(user, "spawn blocked!") return FALSE - user.balloon_alert(user, "Selected!") + user.balloon_alert(user, "selected!") to_chat(user, span_notice("Current spawn type [selected_object].")) /datum/phystool_mode/spawn_mode/main_act(atom/target, mob/user) . = ..() if(!selected_object) - user.balloon_alert(user, "Select type first!") + user.balloon_alert(user, "select type first!") return FALSE if(!COOLDOWN_FINISHED(src, spawn_cooldown)) - user.balloon_alert(user, "Wait!") + user.balloon_alert(user, "wait!") return FALSE var/target_cooldown if(ispath(selected_object, /mob/living/simple_animal/hostile/megafauna)) diff --git a/modular_zubbers/code/modules/events/meteor_wave.dm b/modular_zubbers/code/modules/events/meteor_wave.dm index 3c54739dc29..073a6cfb804 100644 --- a/modular_zubbers/code/modules/events/meteor_wave.dm +++ b/modular_zubbers/code/modules/events/meteor_wave.dm @@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(meteors_candy_halloween, list( dropamt = 9 threat = 10 -/obj/effect/meteor/candy/pumpking/Initialize() +/obj/effect/meteor/candy/pumpking/Initialize(mapload) . = ..() src.transform *= 2 meteorsound = pick('sound/effects/hallucinations/im_here1.ogg', 'sound/effects/hallucinations/im_here2.ogg') diff --git a/modular_zubbers/code/modules/fishing/fishing_minigame.dm b/modular_zubbers/code/modules/fishing/fishing_minigame.dm index 959b014ae3f..49e7ee1db5c 100644 --- a/modular_zubbers/code/modules/fishing/fishing_minigame.dm +++ b/modular_zubbers/code/modules/fishing/fishing_minigame.dm @@ -4,4 +4,4 @@ ui = new(user, src, "FishingBubbers") ui.set_autoupdate(FALSE) ui.set_mouse_hook(TRUE) - ui.open() \ No newline at end of file + ui.open() diff --git a/modular_zubbers/code/modules/hydroponics/gene_modder.dm b/modular_zubbers/code/modules/hydroponics/gene_modder.dm index 0161296709a..9b33e40d34b 100644 --- a/modular_zubbers/code/modules/hydroponics/gene_modder.dm +++ b/modular_zubbers/code/modules/hydroponics/gene_modder.dm @@ -446,7 +446,7 @@ var/read_only = 0 //Well, it's still a floppy disk obj_flags = UNIQUE_RENAME -/obj/item/disk/plantgene/Initialize() +/obj/item/disk/plantgene/Initialize(mapload) . = ..() add_overlay("datadisk_gene") src.pixel_x = rand(-5, 5) diff --git a/modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm b/modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm index 8eb12d250ea..02a48eb0370 100644 --- a/modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm +++ b/modular_zubbers/code/modules/jobs/job_types/cargo_technician.dm @@ -1,4 +1,4 @@ /datum/job/cargo_technician/New() mail_goodies -= /obj/item/gun/ballistic/automatic/wt550 mail_goodies += /obj/item/gun/ballistic/automatic/wt550/security - . = ..() \ No newline at end of file + . = ..() diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm index f34718fe87d..8e289d0e62f 100644 --- a/modular_zubbers/code/modules/loadout/categories/neck.dm +++ b/modular_zubbers/code/modules/loadout/categories/neck.dm @@ -57,16 +57,16 @@ can_be_reskinned = TRUE /datum/loadout_item/neck/holobadge/hos - name = "Head of Security's Holobadge" - item_path = /obj/item/clothing/accessory/badge/holo/hos - restricted_roles = list(JOB_HEAD_OF_SECURITY) + name = "Head of Security's Holobadge" + item_path = /obj/item/clothing/accessory/badge/holo/hos + restricted_roles = list(JOB_HEAD_OF_SECURITY) /datum/loadout_item/neck/holobadge/warden - name = "Warden's Holobadge" - item_path = /obj/item/clothing/accessory/badge/holo/warden - restricted_roles = list(JOB_WARDEN) + name = "Warden's Holobadge" + item_path = /obj/item/clothing/accessory/badge/holo/warden + restricted_roles = list(JOB_WARDEN) /datum/loadout_item/neck/holobadge/detective - name = "Detective's Holobadge" - item_path = /obj/item/clothing/accessory/badge/holo/detective - restricted_roles = list(JOB_DETECTIVE) + name = "Detective's Holobadge" + item_path = /obj/item/clothing/accessory/badge/holo/detective + restricted_roles = list(JOB_DETECTIVE) diff --git a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm index 88694b1635a..4b713be7ada 100644 --- a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm +++ b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm @@ -106,9 +106,9 @@ //ckeywhitelist = list("sexmaster", "leafydasurvivor") /datum/loadout_item/suit/holographic - name = "Holographic Suit V4000" - item_path = /obj/item/clothing/suit/misc/holographic - ckeywhitelist = list("blovy", "snailomi") + name = "Holographic Suit V4000" + item_path = /obj/item/clothing/suit/misc/holographic + ckeywhitelist = list("blovy", "snailomi") /datum/loadout_item/suit/flight //Donor item for ironknight060 name = "MA-1 flight jacket" @@ -186,9 +186,9 @@ ckeywhitelist = list("MyGuy49") /datum/loadout_item/inhand/kanken_pack // donator item for LT3 - name = "Kånken Backpack" - item_path = /obj/item/storage/backpack/kanken - ckeywhitelist = list("lt3", "gavla") + name = "Kånken Backpack" + item_path = /obj/item/storage/backpack/kanken + ckeywhitelist = list("lt3", "gavla") /* * POCKETS diff --git a/modular_zubbers/code/modules/mkultra/enthrall.dm b/modular_zubbers/code/modules/mkultra/enthrall.dm index a28bd948789..e5865f0fc39 100644 --- a/modular_zubbers/code/modules/mkultra/enthrall.dm +++ b/modular_zubbers/code/modules/mkultra/enthrall.dm @@ -447,26 +447,26 @@ if(trigger_cached > 0) return var/mob/living/carbon/enthralled_mob = owner - var/raw_message = lowertext(hearing_args[HEARING_RAW_MESSAGE]) + var/raw_message = LOWER_TEXT(hearing_args[HEARING_RAW_MESSAGE]) for(var/trigger in custom_triggers) - var/cached_trigger = lowertext(trigger) + var/cached_trigger = LOWER_TEXT(trigger) if(findtext(raw_message, cached_trigger))//if trigger1 is the message trigger_cached = 5 //Stops triggerparties and as a result, stops servercrashes. //Speak (Forces player to talk) - if(lowertext(custom_triggers[trigger][1]) == "speak")//trigger2 + if(LOWER_TEXT(custom_triggers[trigger][1]) == "speak")//trigger2 var/saytext = "Your mouth moves on it's own before you can even catch it." addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, enthralled_mob, span_hear(saytext)), 5) addtimer(CALLBACK(enthralled_mob, /atom/movable/proc/say, "[custom_triggers[trigger][2]]"), 5) //Echo (repeats message!) allows customisation, but won't display var calls! Defaults to hypnophrase. - else if(lowertext(custom_triggers[trigger][1]) == "echo")//trigger2 + else if(LOWER_TEXT(custom_triggers[trigger][1]) == "echo")//trigger2 addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, enthralled_mob, span_velvet("[custom_triggers[trigger][2]]")), 5) //(to_chat(owner, "[custom_triggers[trigger][2]]"))//trigger3 //Shocking truth! - else if(lowertext(custom_triggers[trigger]) == "shock") + else if(LOWER_TEXT(custom_triggers[trigger]) == "shock") if(lewd && ishuman(enthralled_mob)) var/mob/living/carbon/human/human_mob = enthralled_mob human_mob.adjust_arousal(5) @@ -477,12 +477,12 @@ to_chat(owner, span_warning("Your muscles seize up, then start spasming wildy!")) //kneel (knockdown) - else if(lowertext(custom_triggers[trigger]) == "kneel")//as close to kneeling as you can get, I suppose. + else if(LOWER_TEXT(custom_triggers[trigger]) == "kneel")//as close to kneeling as you can get, I suppose. to_chat(owner, span_hear("You drop to the ground unsurreptitiously.")) enthralled_mob.toggle_resting() //strip (some) clothes - else if(lowertext(custom_triggers[trigger]) == "strip")//This wasn't meant to just be a lewd thing oops. + else if(LOWER_TEXT(custom_triggers[trigger]) == "strip")//This wasn't meant to just be a lewd thing oops. var/mob/living/carbon/human/human_mob = owner var/items = human_mob.get_contents() for(var/obj/item/storage_item in items) @@ -491,7 +491,7 @@ to_chat(owner, span_hear("You feel compelled to strip your clothes.")) //trance - else if(lowertext(custom_triggers[trigger]) == "trance")//Maaaybe too strong. Weakened it, only lasts 50 ticks. + else if(LOWER_TEXT(custom_triggers[trigger]) == "trance")//Maaaybe too strong. Weakened it, only lasts 50 ticks. var/mob/living/carbon/human/human_mob = owner human_mob.apply_status_effect(/datum/status_effect/trance, 200, TRUE) trance_time = 50 diff --git a/modular_zubbers/code/modules/mkultra/vocal_cords.dm b/modular_zubbers/code/modules/mkultra/vocal_cords.dm index f28dd287120..656a2016218 100644 --- a/modular_zubbers/code/modules/mkultra/vocal_cords.dm +++ b/modular_zubbers/code/modules/mkultra/vocal_cords.dm @@ -50,7 +50,7 @@ var/log_message = message //FIND THRALLS - message = lowertext(message) + message = LOWER_TEXT(message) var/list/mob/living/listeners = list() for(var/mob/living/enthrall_listener in get_hearers_in_view(8, user)) if(enthrall_listener.can_hear() && enthrall_listener.stat != DEAD) @@ -578,7 +578,7 @@ var/trigger = html_decode(stripped_input(user, "Enter the trigger phrase", MAX_MESSAGE_LEN)) var/custom_words_words_list = list("Speak", "Echo", "Shock", "Kneel", "Strip", "Trance", "Cancel") var/trigger2 = input(user, "Pick an effect", "Effects") in custom_words_words_list - trigger2 = lowertext(trigger2) + trigger2 = LOWER_TEXT(trigger2) if ((findtext(trigger2, custom_words_words))) if (trigger2 == "speak" || trigger2 == "echo") var/trigger3 = html_decode(stripped_input(user, "Enter the phrase spoken. Abusing this to self antag is bannable.", MAX_MESSAGE_LEN)) @@ -616,7 +616,7 @@ var/trigger = stripped_input(user, "Enter the loop phrase", MAX_MESSAGE_LEN) var/custom_span = list("Notice", "Warning", "Hypnophrase", "Love", "Velvet") var/trigger2 = input(user, "Pick the style", "Style") in custom_span - trigger2 = lowertext(trigger2) + trigger2 = LOWER_TEXT(trigger2) enthrall_chem.custom_echo = trigger enthrall_chem.custom_span = trigger2 user.SetStun(0) @@ -642,12 +642,12 @@ to_chat(user, "You can't give your pet an objective to do nothing!") continue //Pets don't understand harm - objective = replacetext(lowertext(objective), "kill", "hug") - objective = replacetext(lowertext(objective), "murder", "cuddle") - objective = replacetext(lowertext(objective), "harm", "snuggle") - objective = replacetext(lowertext(objective), "decapitate", "headpat") - objective = replacetext(lowertext(objective), "strangle", "meow at") - objective = replacetext(lowertext(objective), "suicide", "self-love") + objective = replacetext(LOWER_TEXT(objective), "kill", "hug") + objective = replacetext(LOWER_TEXT(objective), "murder", "cuddle") + objective = replacetext(LOWER_TEXT(objective), "harm", "snuggle") + objective = replacetext(LOWER_TEXT(objective), "decapitate", "headpat") + objective = replacetext(LOWER_TEXT(objective), "strangle", "meow at") + objective = replacetext(LOWER_TEXT(objective), "suicide", "self-love") message_admins("[humanoid] has been implanted by [user] with the objective [objective].") addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, humanoid, "[(enthrall_chem.lewd?"Your [enthrall_chem.enthrall_gender]":"[enthrall_chem.enthrall_mob]")] whispers you a new objective."), 5) brainwash(humanoid, objective) diff --git a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index 7d2eb79c10e..4a2a8f54730 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -63,13 +63,13 @@ icon_state = "hair_tails_berly" /datum/sprite_accessory/hair/edgerunner - icon = 'modular_zubbers/icons/customization/hair_big.dmi' - name = "Edgerunner" - icon_state = "edgerunner" + icon = 'modular_zubbers/icons/customization/hair_big.dmi' + name = "Edgerunner" + icon_state = "edgerunner" //-->fixed dreadlocks, added alt version for anthros, added new style <3 /datum/sprite_accessory/hair/dreadlocks - icon = 'modular_zubbers/icons/customization/hair.dmi' + icon = 'modular_zubbers/icons/customization/hair.dmi' /datum/sprite_accessory/hair/dreadlocks_alt icon = 'modular_zubbers/icons/customization/hair.dmi' diff --git a/modular_zubbers/code/modules/mob/living/basic/pets/cat/super_cat.dm b/modular_zubbers/code/modules/mob/living/basic/pets/cat/super_cat.dm index c1b1057c708..50e20419ec7 100644 --- a/modular_zubbers/code/modules/mob/living/basic/pets/cat/super_cat.dm +++ b/modular_zubbers/code/modules/mob/living/basic/pets/cat/super_cat.dm @@ -28,7 +28,7 @@ /mob/living/basic/pet/cat/super/can_use_guns(obj/item/G) . = ..() if(HAS_TRAIT(src, TRAIT_NOGUNS)) // Who am I to stop admins from making them stronger? - balloon_alert(src, "Your paws are too soft!") + balloon_alert(src, "your paws are too soft!") return FALSE /mob/living/basic/pet/cat/super/move_into_vent(obj/machinery/atmospherics/components/ventcrawl_target) @@ -110,7 +110,7 @@ /mob/living/basic/pet/cat/syndicat/super/can_use_guns(obj/item/G) . = ..() if(HAS_TRAIT(src, TRAIT_NOGUNS)) // Who am I to stop admins from making them stronger? - balloon_alert(src, "Your paws are too weak!") + balloon_alert(src, "your paws are too weak!") return FALSE /mob/living/basic/pet/cat/syndicat/super/move_into_vent(obj/machinery/atmospherics/components/ventcrawl_target) diff --git a/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm b/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm index afa0f8a5af2..e5c8dd59e82 100644 --- a/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm +++ b/modular_zubbers/code/modules/mob/living/basic/trooper/nanotrasen.dm @@ -1,3 +1,3 @@ /mob/living/basic/trooper/nanotrasen/ranged/smg casingtype = /obj/item/ammo_casing/c46x30mm/flathead - r_hand = /obj/item/gun/ballistic/automatic/wt550/security \ No newline at end of file + r_hand = /obj/item/gun/ballistic/automatic/wt550/security diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm index 540ee3a3985..f9629cece77 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm @@ -102,7 +102,7 @@ SPECIES_PERK_ICON = FA_ICON_PERSON_FALLING, SPECIES_PERK_NAME = "Cat Grace", SPECIES_PERK_DESC = "Tajara are catlike and have catlike instincts allowing them to land upright on their feet. \ - Instead of being knocked down from falling, you only recieve a short slowdown. \ + Instead of being knocked down from falling, you only receive a short slowdown. \ However, the fall will deal additional damage since they are not the size and weight of a cat.", ), ) diff --git a/modular_zubbers/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/modular_zubbers/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index d6f517e95d7..4ac0a87223f 100644 --- a/modular_zubbers/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/modular_zubbers/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -6,8 +6,8 @@ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /mob/living/simple_animal/hostile/megafauna/dragon/proc/on_move(atom/source, atom/new_loc) - SIGNAL_HANDLER - for(var/obj/item/food/meat/slab/drakebait in view(src, 1.5)) //Checks if the bait is on, or is next to the Ashdrake - qdel(drakebait)// bait is kil - new /obj/item/stack/sheet/animalhide/ashdrake(get_turf(src)) - visible_message(span_notice("[src] accepts your offering."), span_notice("The drake consumes the meat.")) + SIGNAL_HANDLER + for(var/obj/item/food/meat/slab/drakebait in view(src, 1.5)) //Checks if the bait is on, or is next to the Ashdrake + qdel(drakebait)// bait is kil + new /obj/item/stack/sheet/animalhide/ashdrake(get_turf(src)) + visible_message(span_notice("[src] accepts your offering."), span_notice("The drake consumes the meat.")) diff --git a/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm index 88d770121c2..6b26909335b 100644 --- a/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -23,13 +23,13 @@ id = /obj/item/card/id/advanced/lizardgas /datum/outfit/lavaland_gasstation/post_equip(mob/living/carbon/human/clerk, visualsOnly = FALSE) - var/obj/item/card/id/id_card = clerk.wear_id - if(istype(id_card)) - id_card.registered_name = clerk.real_name - id_card.update_label() - id_card.update_icon() - handlebank(clerk) - return ..() + var/obj/item/card/id/id_card = clerk.wear_id + if(istype(id_card)) + id_card.registered_name = clerk.real_name + id_card.update_label() + id_card.update_icon() + handlebank(clerk) + return ..() /datum/outfit/hermit backpack_contents = list(/obj/item/research_paper = 1) diff --git a/modular_zubbers/code/modules/mod/modules.dm b/modular_zubbers/code/modules/mod/modules.dm index ab673faa726..b240193a63b 100644 --- a/modular_zubbers/code/modules/mod/modules.dm +++ b/modular_zubbers/code/modules/mod/modules.dm @@ -78,7 +78,7 @@ balloon_alert(mod.ai_assistant, "host is unresponsive") return if(isnull(mod.ai_assistant.client)) - balloon_alert(mod.wearer, "AI is unresponsive") + balloon_alert(mod.wearer, UNLINT("AI is unresponsive")) return return ..() diff --git a/modular_zubbers/code/modules/paperwork/fax.dm b/modular_zubbers/code/modules/paperwork/fax.dm index 4d649b8ea45..f5692528777 100644 --- a/modular_zubbers/code/modules/paperwork/fax.dm +++ b/modular_zubbers/code/modules/paperwork/fax.dm @@ -1,4 +1,4 @@ -/obj/machinery/fax/Initialize() +/obj/machinery/fax/Initialize(mapload) .=..() special_networks |= list( //Food Delivery diff --git a/modular_zubbers/code/modules/paperwork/paper_premade.dm b/modular_zubbers/code/modules/paperwork/paper_premade.dm index 2336e7061e0..469a8e6da50 100644 --- a/modular_zubbers/code/modules/paperwork/paper_premade.dm +++ b/modular_zubbers/code/modules/paperwork/paper_premade.dm @@ -6,7 +6,7 @@ //I love madlibs. //The fallbacks should never roll but you never know. var/pr_number = 40000 + (text2num(copytext("\ref[src]",2),16) % 100000) //While scientific notation is funny, it wasn't precise enough - var/thing_to_remove = lowertext(pick_list_replacements(ION_FILE, "ionobjects")) || "Kebab" //2006 called, they want their meme back + var/thing_to_remove = LOWER_TEXT(pick_list_replacements(ION_FILE, "ionobjects")) || "Kebab" //2006 called, they want their meme back var/obj/machinery/nuclearbomb/selfdestruct/self_destruct = locate() in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/nuclearbomb/selfdestruct) //Wait, why the fuck are we trying to get the nuke??? Coder backdoor??? if(self_destruct) if(self_destruct.r_code == NUKE_CODE_UNSET) diff --git a/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm index 5fce7c34253..ce07a142872 100644 --- a/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm +++ b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -34,4 +34,4 @@ can_be_printed = TRUE advanced_print_req = FALSE harmful = FALSE - custom_materials = AMMO_MATS_BASIC \ No newline at end of file + custom_materials = AMMO_MATS_BASIC diff --git a/modular_zubbers/code/modules/reagents/chemistry/reagents/food_reagents.dm b/modular_zubbers/code/modules/reagents/chemistry/reagents/food_reagents.dm index b26eabb0374..6241f6965bd 100644 --- a/modular_zubbers/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/modular_zubbers/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -1,7 +1,7 @@ /datum/reagent/consumable/garlic/on_mob_add(mob/living/affected_mob, amount) . = ..() if(IS_BLOODSUCKER(affected_mob)) - affected_mob.balloon_alert(affected_mob, "The garlic you ingested suppresses your healing!") + affected_mob.balloon_alert(affected_mob, "the garlic you ingested suppresses your healing!") /datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm index 711bbc496cf..1ba182c4812 100644 --- a/modular_zubbers/code/modules/security/secmed/security_medic.dm +++ b/modular_zubbers/code/modules/security/secmed/security_medic.dm @@ -144,9 +144,9 @@ //Prevents secmed hours from counting towards HoS /datum/controller/subsystem/job/setup_occupations() - . = ..() - var/list/sec_exp_list = experience_jobs_map[EXP_TYPE_SECURITY] - for(var/datum/job/job_type in sec_exp_list) - if(istype(job_type, /datum/job/security_medic)) - LAZYREMOVE(sec_exp_list, job_type) - break + . = ..() + var/list/sec_exp_list = experience_jobs_map[EXP_TYPE_SECURITY] + for(var/datum/job/job_type in sec_exp_list) + if(istype(job_type, /datum/job/security_medic)) + LAZYREMOVE(sec_exp_list, job_type) + break diff --git a/modular_zubbers/code/modules/security/security_glock/cargo.dm b/modular_zubbers/code/modules/security/security_glock/cargo.dm index af4312f80de..c00a9be3ec7 100644 --- a/modular_zubbers/code/modules/security/security_glock/cargo.dm +++ b/modular_zubbers/code/modules/security/security_glock/cargo.dm @@ -6,7 +6,7 @@ /datum/supply_pack/security/armory/sec_glock name = "C-CK 9x25mm Crate" - desc = "Contains a pair of C-CK 9x25mm pistols pre-loaded with less-than-lethal rubber-tipped rounds. Additional ammo sold seperately. NanoTrasen reminds you that the other weapon is for a friend, and not for going guns akimbo." + desc = "Contains a pair of C-CK 9x25mm pistols pre-loaded with less-than-lethal rubber-tipped rounds. Additional ammo sold seperately. Nanotrasen reminds you that the other weapon is for a friend, and not for going guns akimbo." cost = CARGO_CRATE_VALUE * 6 contains = list(/obj/item/gun/ballistic/automatic/pistol/sec_glock/security/rubber = 2) crate_name = "C-CK 9x25mm crate" diff --git a/modular_zubbers/code/modules/security/security_glock/case.dm b/modular_zubbers/code/modules/security/security_glock/case.dm index 6ccaff68812..d7eafc93640 100644 --- a/modular_zubbers/code/modules/security/security_glock/case.dm +++ b/modular_zubbers/code/modules/security/security_glock/case.dm @@ -12,4 +12,4 @@ /obj/item/storage/toolbox/guncase/skyrat/pistol/hos_glock/PopulateContents() new /obj/item/gun/ballistic/automatic/pistol/sec_glock(src) new /obj/item/ammo_box/magazine/m9mm(src) - new /obj/item/ammo_box/magazine/m9mm(src) \ No newline at end of file + new /obj/item/ammo_box/magazine/m9mm(src) diff --git a/modular_zubbers/code/modules/security/security_glock/research.dm b/modular_zubbers/code/modules/security/security_glock/research.dm index d201b3d8dea..21cda295ea2 100644 --- a/modular_zubbers/code/modules/security/security_glock/research.dm +++ b/modular_zubbers/code/modules/security/security_glock/research.dm @@ -41,4 +41,4 @@ /datum/techweb_node/adv_weaponry/New() design_ids += "glock9mm_ammo_normal" - . = ..() \ No newline at end of file + . = ..() diff --git a/modular_zubbers/code/modules/shelves/shelf.dm b/modular_zubbers/code/modules/shelves/shelf.dm index 9ed55cb615b..22fe9fc1c72 100644 --- a/modular_zubbers/code/modules/shelves/shelf.dm +++ b/modular_zubbers/code/modules/shelves/shelf.dm @@ -18,7 +18,7 @@ /obj/structure/cargo_shelf/debug capacity = 12 -/obj/structure/cargo_shelf/Initialize() +/obj/structure/cargo_shelf/Initialize(mapload) . = ..() shelf_contents = new/list(capacity) // Initialize our shelf's contents list, this will be used later. var/stack_layer // This is used to generate the sprite layering of the shelf pieces. diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_items.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_items.dm index c14475d3448..f25163f7eeb 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot_items.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_items.dm @@ -134,7 +134,7 @@ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return ITEM_INTERACT_SUCCESS if(cyborg.cell.charge <= charge_cost)//Prevents usage when charge is low - user.balloon_alert(user, "Low charge!") + user.balloon_alert(user, "low charge!") return ITEM_INTERACT_SUCCESS if(!interacting_with.density && jaunt?.teleport(user, interacting_with)) cyborg?.cell?.use(charge_cost) diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm index dda0bdb571a..d8432bb82a3 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm @@ -48,13 +48,13 @@ items_to_remove = list(/obj/item/storage/part_replacer) // Drapes upgrades -/obj/item/borg/upgrade/processor/Initialize() +/obj/item/borg/upgrade/processor/Initialize(mapload) . = ..() model_type += /obj/item/robot_model/sci model_flags += BORG_MODEL_RESEARCH // Engineering BRPED -/obj/item/borg/upgrade/rped/Initialize() +/obj/item/borg/upgrade/rped/Initialize(mapload) . = ..() items_to_add = list(/obj/item/storage/part_replacer/bluespace) items_to_add -= list(/obj/item/storage/part_replacer) diff --git a/modular_zubbers/code/modules/species_refits_awareness/code/refithelper.dm b/modular_zubbers/code/modules/species_refits_awareness/code/refithelper.dm index ab9dd04d788..f1faba69968 100644 --- a/modular_zubbers/code/modules/species_refits_awareness/code/refithelper.dm +++ b/modular_zubbers/code/modules/species_refits_awareness/code/refithelper.dm @@ -7,7 +7,7 @@ * * icon_state - The iconstate of the item. Usually, call this by the second argument, item.icon_state * * obj/item - The item path that we'll operate on, to check for refits. */ -/proc/check_for_refits(icon_state, var/obj/item/referenced_item) +/proc/check_for_refits(icon_state, obj/item/referenced_item) var/list/available_refits = list() var/list/supported_species = list( SPECIES_TESHARI, diff --git a/modular_zubbers/code/modules/spells/spell_types/disabled_spells.dm b/modular_zubbers/code/modules/spells/spell_types/disabled_spells.dm index d2d297b0a85..16df3e668fa 100644 --- a/modular_zubbers/code/modules/spells/spell_types/disabled_spells.dm +++ b/modular_zubbers/code/modules/spells/spell_types/disabled_spells.dm @@ -16,4 +16,4 @@ // Blood in a Bottle: Spawns a Slaughter Demon. Players consumed are effectively round removed until the slaughter demon dies. // 99% of slaughter demons just target medbay and it's not really fun for anyone except the slaughter demon (and ghost chat). /datum/spellbook_entry/item/bloodbottle - category = null \ No newline at end of file + category = null diff --git a/modular_zubbers/code/modules/stone/code/stone.dm b/modular_zubbers/code/modules/stone/code/stone.dm index 0ff442412e6..f5e476538bd 100644 --- a/modular_zubbers/code/modules/stone/code/stone.dm +++ b/modular_zubbers/code/modules/stone/code/stone.dm @@ -1,3 +1,3 @@ /obj/item/stack/stone - force = 10 - throwforce = 15 // stoning + force = 10 + throwforce = 15 // stoning diff --git a/modular_zubbers/code/modules/storyteller/divergency_report.dm b/modular_zubbers/code/modules/storyteller/divergency_report.dm index 947dbaa158f..4f56282109a 100644 --- a/modular_zubbers/code/modules/storyteller/divergency_report.dm +++ b/modular_zubbers/code/modules/storyteller/divergency_report.dm @@ -26,7 +26,7 @@ * * Returns a formatted string all station goals that are available to the station. */ -/datum/controller/subsystem/gamemode/proc/generate_station_goal_report(var/list/station_goals) +/datum/controller/subsystem/gamemode/proc/generate_station_goal_report(list/station_goals) . = "
Special Orders for [station_name()]:
" var/list/goal_reports = list() for(var/datum/station_goal/station_goal as anything in station_goals) diff --git a/modular_zubbers/code/modules/tgui_input/color.dm b/modular_zubbers/code/modules/tgui_input/color.dm index f4713f40f3f..65cb7360499 100644 --- a/modular_zubbers/code/modules/tgui_input/color.dm +++ b/modular_zubbers/code/modules/tgui_input/color.dm @@ -132,7 +132,7 @@ return switch(action) if("submit") - var/raw_data = lowertext(params["entry"]) + var/raw_data = LOWER_TEXT(params["entry"]) var/hex = sanitize_hexcolor(raw_data, desired_format = 6, include_crunch = TRUE) if (!hex) return diff --git a/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm b/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm index 5fbaf025e88..7e5e997e2df 100644 --- a/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm +++ b/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm @@ -132,7 +132,7 @@ qdel(src) -/obj/item/dice/d20/teleporting_die_of_fate/proc/apply_random_smite(var/mob/living/carbon/human/target) +/obj/item/dice/d20/teleporting_die_of_fate/proc/apply_random_smite(mob/living/carbon/human/target) switch(smite_rng_seed % 9) if(0) diff --git a/modular_zubbers/code/modules/zantag_tickets/commands.dm b/modular_zubbers/code/modules/zantag_tickets/commands.dm index ad2dd02fedd..5f945ed79bd 100644 --- a/modular_zubbers/code/modules/zantag_tickets/commands.dm +++ b/modular_zubbers/code/modules/zantag_tickets/commands.dm @@ -5,7 +5,7 @@ var/antag_ticket_rate = CONFIG_GET(number/antag_tickets_per_update) if(!antag_ticket_rate) - to_chat(span_notice("Antag tickets are currently disabled.")) + to_chat(src,span_notice("Antag tickets are currently disabled.")) return var/antag_ticket_count = get_antag_tickets() diff --git a/modular_zubbers/maps/biodome/magazines.dm b/modular_zubbers/maps/biodome/magazines.dm index 354f8def445..27047b28b5a 100644 --- a/modular_zubbers/maps/biodome/magazines.dm +++ b/modular_zubbers/maps/biodome/magazines.dm @@ -4,15 +4,15 @@ //Flavor item for the Biodome arrivals shuttle, but I think it's funny if it still appears elsewhere. /obj/item/book/granter/magazine/biodome - name = "NanoTrasen 'Biodome' Travel Brochure" - starting_title = "NanoTrasen 'Biodome' Travel Brochure" - desc = "A somewhat tacky brochure for NanoTrasen's new line of 'Biodome'-class stations." + name = "Nanotrasen 'Biodome' Travel Brochure" + starting_title = "Nanotrasen 'Biodome' Travel Brochure" + desc = "A somewhat tacky brochure for Nanotrasen's new line of 'Biodome'-class stations." icon_state = "biochure" pages_to_mastery = 2 //so you can see a few remarks each time remarks = list( "Now with live, open-air entertainment (entertainment is still largely clown-based)...", "See the dome in style with our new 'BioTube' transit system...", - "Get all the tools you could ever need from 'The Grotto'... but watch your step! (NanoTrasen is not liable for injuries related to use of The Grotto(tm).)", + "Get all the tools you could ever need from 'The Grotto'... but watch your step! (Nanotrasen is not liable for injuries related to use of The Grotto(tm).)", "Take a calming river ride across the scenic Biodome Lake! (Minimum speed 70 kph).", "Research in style in our state-of-the-art 'VapoRnDwave' facilities!", "See such exciting zoo exhibits as axolotls, endangered lagomorphs, or even the rare Amoungs!", diff --git a/modular_zubbers/maps/offstation/dauntless/gasminers.dm b/modular_zubbers/maps/offstation/dauntless/gasminers.dm index 0ce8971bdf9..3503f60a764 100644 --- a/modular_zubbers/maps/offstation/dauntless/gasminers.dm +++ b/modular_zubbers/maps/offstation/dauntless/gasminers.dm @@ -10,12 +10,12 @@ name = "syndicate gas miner beacon" allowed_areas = list(/area/ruin/space/has_grav/bubbers/dauntless/cargo, - /area/ruin/space/has_grav/bubbers/dauntless/engineering, - /area/ruin/space/has_grav/bubbers/dauntless/engineering/turbine, - /area/ruin/space/has_grav/bubbers/persistance/engineering, - /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics, - /area/ruin/space/has_grav/bubbers/persistance/engineering/mining, - /area/ruin/space/has_grav/bubbers/persistance/engineering/gas, - /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities - ) + /area/ruin/space/has_grav/bubbers/dauntless/engineering, + /area/ruin/space/has_grav/bubbers/dauntless/engineering/turbine, + /area/ruin/space/has_grav/bubbers/persistance/engineering, + /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics, + /area/ruin/space/has_grav/bubbers/persistance/engineering/mining, + /area/ruin/space/has_grav/bubbers/persistance/engineering/gas, + /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities + ) area_string = "dauntless" diff --git a/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm b/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm index 6631a4c1e59..544ca9643c6 100644 --- a/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm +++ b/modular_zubbers/master_files/code/modules/research/designs/weapon_designs.dm @@ -36,7 +36,7 @@ /datum/design/wt550_ammo_ap name = "WT-550/WT-551 Magazine (4.6x30mm Armor-Piercing) (Lethal)" - desc = "A magazine for the WT-550/WT-551 Autorifle. Contains lethal armor-piercing ammo. NanoTrasen prefers you didn't use these on your pressurized space station." + desc = "A magazine for the WT-550/WT-551 Autorifle. Contains lethal armor-piercing ammo. Nanotrasen prefers you didn't use these on your pressurized space station." id = "wt550_ammo_ap" build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 12, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2)