From 688923c4c8a53ab00b5c684b446a8bf1655fcc8f Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 5 Apr 2021 12:48:09 -0400 Subject: [PATCH] Fixup things for dm-langserver --- code/__defines/sound.dm | 2 +- .../gamemodes/events/holidays/Holidays.dm | 6 +- code/game/gamemodes/technomancer/core_obj.dm | 2 +- code/game/gamemodes/technomancer/equipment.dm | 3 - code/modules/food/kitchen/microwave.dm | 121 +++++++++--------- .../mob/living/carbon/human/human_movement.dm | 2 +- .../mechanical/hivebot/ranged_damage.dm | 2 +- code/modules/surgery/organs_internal.dm | 17 --- 8 files changed, 68 insertions(+), 87 deletions(-) diff --git a/code/__defines/sound.dm b/code/__defines/sound.dm index 7db8a2f7608..7be3e688571 100644 --- a/code/__defines/sound.dm +++ b/code/__defines/sound.dm @@ -112,7 +112,7 @@ 'sound/ambience/generic/generic2.ogg',\ 'sound/ambience/generic/generic3.ogg'\ ) -// 'sound/ambience/generic/generic4.ogg'\ +// 'sound/ambience/generic/generic4.ogg' // Sounds of PA announcements, presumably involving shuttles? #define AMBIENCE_ARRIVALS list(\ diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 913b58e23b6..cee83656cb9 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -127,7 +127,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t if(8) //Aug switch(DD) // if(10) -// Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, \ +// Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, // on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common." //VOREStation Add - Of course we need this. if(8) @@ -167,8 +167,8 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t Holiday["Kindness Day"] = "Kindness Day is an unofficial holiday to highlight good deeds in the \ community, focusing on the positive power and the common thread of kindness which binds humanity and \ friends together." -// if(28) //Space thanksgiving. -// Holiday["Appreciation Day"] = "Originally an old holiday from Earth, Appreciation Day follows many of the \ + if(28) //Space thanksgiving. + Holiday["Appreciation Day"] = "Originally an old holiday from Earth, Appreciation Day follows many of the \ traditions that its predecessor did, such as having a large feast (turkey often included), gathering with family, and being thankful \ for what one has in life." if(28 > DD > 20) diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index 3912bc6c6b8..2f4d95db9f3 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -30,7 +30,7 @@ "wizard's cloak" = "wizard_cloak" ) - // Some spell-specific variables go here, since spells themselves are temporary. Cores are more long term and more accessable than \ + // Some spell-specific variables go here, since spells themselves are temporary. Cores are more long term and more accessable than // mind datums. It may also allow creative players to try to pull off a 'soul jar' scenario. var/list/summoned_mobs = list() // Maintained horribly with maintain_summon_list(). var/list/wards_in_use = list() // Wards don't count against the cap for other summons. diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index 8d1fb4c6ad1..940e31f3cd5 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -1,8 +1,5 @@ /datum/technomancer/equipment/default_core name = "Manipulation Core" -// desc = "The default core that you most likely already have. This is here in-case you change your mind after buying \ -// another core, don't forget to refund the old core. This has a capacity of 10,000 units of energy, and recharges at a \ -// rate of 50 units. It also reduces incoming instability from functions by 20%." desc = "The default core that you most likely already have. This is here in-case you change your mind after buying \ another core, don't forget to refund the old core.
\ Capacity: 10k
\ diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 6b866d23bae..a92e17c6da4 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -27,7 +27,7 @@ var/datum/looping_sound/microwave/soundloop -// see code/modules/food/recipes_microwave.dm for recipes +//see code/modules/food/recipes_microwave.dm for recipes /******************* * Initialising @@ -283,68 +283,69 @@ if("dispose") dispose() return TRUE - -// /obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu -// var/dat = "" -// if(src.broken > 0) -// dat = {"Bzzzzttttt"} -// else if(src.operating) -// dat = {"Microwaving in progress!
Please wait...!"} -// else if(src.dirty==100) -// dat = {"This microwave is dirty!
Please clean it before use!"} -// else -// var/list/items_counts = new -// var/list/items_measures = new -// var/list/items_measures_p = new -// for (var/obj/O in ((contents - component_parts) - circuit)) -// var/display_name = O.name -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) -// items_measures[display_name] = "egg" -// items_measures_p[display_name] = "eggs" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) -// items_measures[display_name] = "tofu chunk" -// items_measures_p[display_name] = "tofu chunks" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat -// items_measures[display_name] = "slab of meat" -// items_measures_p[display_name] = "slabs of meat" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) -// display_name = "Turnovers" -// items_measures[display_name] = "turnover" -// items_measures_p[display_name] = "turnovers" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) -// items_measures[display_name] = "fillet of meat" -// items_measures_p[display_name] = "fillets of meat" -// items_counts[display_name]++ -// for (var/O in items_counts) -// var/N = items_counts[O] -// if (!(O in items_measures)) -// dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} -// else -// if (N==1) -// dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} -// else -// dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} +/* +/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu + var/dat = "" + if(src.broken > 0) + dat = {"Bzzzzttttt"} + else if(src.operating) + dat = {"Microwaving in progress!
Please wait...!"} + else if(src.dirty==100) + dat = {"This microwave is dirty!
Please clean it before use!"} + else + var/list/items_counts = new + var/list/items_measures = new + var/list/items_measures_p = new + for (var/obj/O in ((contents - component_parts) - circuit)) + var/display_name = O.name + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) + items_measures[display_name] = "egg" + items_measures_p[display_name] = "eggs" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) + items_measures[display_name] = "tofu chunk" + items_measures_p[display_name] = "tofu chunks" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat + items_measures[display_name] = "slab of meat" + items_measures_p[display_name] = "slabs of meat" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) + display_name = "Turnovers" + items_measures[display_name] = "turnover" + items_measures_p[display_name] = "turnovers" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) + items_measures[display_name] = "fillet of meat" + items_measures_p[display_name] = "fillets of meat" + items_counts[display_name]++ + for (var/O in items_counts) + var/N = items_counts[O] + if (!(O in items_measures)) + dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} + else + if (N==1) + dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} + else + dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} -// for (var/datum/reagent/R in reagents.reagent_list) -// var/display_name = R.name -// if (R.id == "capsaicin") -// display_name = "Hotsauce" -// if (R.id == "frostoil") -// display_name = "Coldsauce" -// dat += {"[display_name]: [R.volume] unit\s
"} + for (var/datum/reagent/R in reagents.reagent_list) + var/display_name = R.name + if (R.id == "capsaicin") + display_name = "Hotsauce" + if (R.id == "frostoil") + display_name = "Coldsauce" + dat += {"[display_name]: [R.volume] unit\s
"} -// if (items_counts.len==0 && reagents.reagent_list.len==0) -// dat = {"The microwave is empty
"} -// else -// dat = {"Ingredients:
[dat]"} -// dat += {"

\ -// Turn on!
\ -// Eject ingredients!
\ -// "} + if (items_counts.len==0 && reagents.reagent_list.len==0) + dat = {"The microwave is empty
"} + else + dat = {"Ingredients:
[dat]"} + dat += {"

\ +Turn on!
\ +Eject ingredients!
\ +"} -// user << browse("Microwave Controls[dat]", "window=microwave") -// onclose(user, "microwave") -// return + user << browse("Microwave Controls[dat]", "window=microwave") + onclose(user, "microwave") + return +*/ /*********************************** * Microwave Menu Handling/Cooking diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 3ac9edc0688..202d0c2f348 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -189,7 +189,7 @@ if(istype(back, /obj/item/weapon/tank/jetpack)) return back else if(istype(rig)) - for(var/obj/item/rig_module/maneuvering_jets.module in rig.installed_modules) + for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules) return module.jets /mob/living/carbon/human/Process_Spacemove(var/check_drift = 0) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index a846b560d6f..09bf26f05da 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -89,7 +89,7 @@ // Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it. -// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and \ +// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and // the projectiles have an AoE component, where as backline hivebots do not. /mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline name = "backline hivebot" diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index a6a9a87386f..06dd35434c8 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -466,20 +466,3 @@ user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") affected.createwound(BRUISE, 20) - -////////////////////////////////////////////////////////////////// -// HEART SURGERY // -////////////////////////////////////////////////////////////////// -// To be finished after some tests. -// /datum/surgery_step/ribcage/heart/cut -// allowed_tools = list( -// /obj/item/weapon/surgical/scalpel = 100, \ -// /obj/item/weapon/material/knife = 75, \ -// /obj/item/weapon/material/shard = 50, \ -// ) - -// min_duration = 30 -// max_duration = 40 - -// /datum/surgery_step/ribcage/heart/cut/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -// return ..() && target.op_stage.ribcage == 2 \ No newline at end of file