diff --git a/code/game/objects/items/devices/scanners/guide.dm b/code/game/objects/items/devices/scanners/guide.dm index 27e66808c8..deb7c6ee8c 100644 --- a/code/game/objects/items/devices/scanners/guide.dm +++ b/code/game/objects/items/devices/scanners/guide.dm @@ -1,6 +1,6 @@ /obj/item/healthanalyzer/verb/toggle_guide() set name = "Toggle Guidance" - set desc = "Toggles whether or not \the [src] will provide guidance and instruction in addition to scanning." + set desc = "Toggles whether or not the health analyzer will provide guidance and instruction in addition to scanning." set category = "Object" guide = !guide to_chat(usr, span_notice("You toggle \the [src]'s guidance system [guide ? "on" : "off"].")) diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 002a79e6ba..c63796ffa7 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -2903,7 +2903,7 @@ acronym = "SAARE" desc = "SAARE consistently have the worst reputation of any paramilitary group. This is because they specialize in deniability and secrecy. Although publically they work in asset recovery, they have a substantiated reputation for info-theft and piracy that has lead to them butting heads with the law on more than one occasion. Nonetheless, they are an invaluable part of the Solar economy, and other TSCs and small colonial governments keep them in business.\

\ - For the purposes of plausible deniability, SAARE designates their ships using a series of rotating identifiers, with ships on a specific operation or in a particular area all using the same initial designation (e.g. 'Sledgehammer') and having a different numerical identifier, with the most important ships involved bearing a unique additional codename (such as 'Actual' for Command \& Control ships). As ships are shuffled in and out of operating areas, it can be difficult to pin down exactly which ship in SAARE's fleet was responsible for which act. SAARE's misdirection is multilayered, including elements such as extensive use of repainting, false IFFs, bribes, forged documents, intimidation, camouflage, and all manner of other underhanded tactics." + For the purposes of plausible deniability, SAARE designates their ships using a series of rotating identifiers, with ships on a specific operation or in a particular area all using the same initial designation (e.g. 'Sledgehammer') and having a different numerical identifier, with the most important ships involved bearing a unique additional codename (such as 'Actual' for Command & Control ships). As ships are shuffled in and out of operating areas, it can be difficult to pin down exactly which ship in SAARE's fleet was responsible for which act. SAARE's misdirection is multilayered, including elements such as extensive use of repainting, false IFFs, bribes, forged documents, intimidation, camouflage, and all manner of other underhanded tactics." history = "" work = "mercenary contractors" headquarters = "" @@ -3005,4 +3005,4 @@ i-- //ex: "Phalanx One-Niner", "Sledgehammer Actual" (CO/VIP), "Kodiak Seven-Four", "Tomahawk Two-Zero" - //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine \ No newline at end of file + //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index d9645b9488..57128e8efe 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -198,7 +198,7 @@ /obj/item/clothing/head/helmet/space/void/aether/verb/select_color() set name = "Helmet Color" - set desc = "Change the color of [src]" + set desc = "Change the color of the helmet" set category = "Object" var/choice = tgui_input_list(usr, "Select a new color:", "[src] Color", list("White", "Blue", "Purple", "Yellow", "Red", "Green")) diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 606f103e54..e964efe88d 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -406,7 +406,7 @@ /mob/living/carbon/human/proc/alraune_fruit_pick() set name = "Pick Fruit" - set desc = "Pick fruit off of [src]." + set desc = "Pick fruit off of the fruit gland." set category = "Object" set src in view(1) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm index b7a73b81b4..c879211b80 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm @@ -322,7 +322,7 @@ if(!destinations.len) to_chat(src, span_warning("There is nowhere nearby to land! You need to get closer to somewhere else that you can transition to before you can transition.")) return - for(var/obj/effect/landmark/stardog/l in destinations) + //for(var/obj/effect/landmark/stardog/l in destinations) var/obj/effect/overmap/visitable/our_dest = tgui_input_list(src, "Where would you like to try to go?", "Transition", destinations, timeout = 15 SECONDS, strict_modern = TRUE) if(!our_dest) to_chat(src, span_warning("You decide not to transition.")) diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm index 73c277cc42..d0617f94de 100644 --- a/code/modules/power/fusion/fusion_reactions.dm +++ b/code/modules/power/fusion/fusion_reactions.dm @@ -17,8 +17,7 @@ var/list/fusion_reactions /proc/get_fusion_reaction(var/p_react, var/s_react, var/m_energy) if(!fusion_reactions) fusion_reactions = list() - for(var/rtype in subtypesof(/decl/fusion_reaction) - ) + for(var/rtype in subtypesof(/decl/fusion_reaction)) var/decl/fusion_reaction/cur_reaction = new rtype() if(!fusion_reactions[cur_reaction.p_react]) fusion_reactions[cur_reaction.p_react] = list() diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm index 08f50c4898..698ac70d9d 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm @@ -1,17 +1,38 @@ -/obj/item/reagent_containers/chem_disp_cartridge - //Xenoflora - ammonia spawn_reagent = REAGENT_ID_AMMONIA - diethylamine spawn_reagent = REAGENT_ID_DIETHYLAMINE - plantbgone spawn_reagent = REAGENT_ID_PLANTBGONE - mutagen spawn_reagent = REAGENT_ID_MUTAGEN +//Xenoflora - //Biochem - nutriment spawn_reagent = REAGENT_ID_NUTRIMENT - protein spawn_reagent = REAGENT_ID_PROTEIN +/obj/item/reagent_containers/chem_disp_cartridge/ammonia + spawn_reagent = REAGENT_ID_AMMONIA - //Special Ops - biomass spawn_reagent = REAGENT_ID_BIOMASS - carthatoline spawn_reagent = REAGENT_ID_CARTHATOLINE - corophizine spawn_reagent = REAGENT_ID_COROPHIZINE - myelamine spawn_reagent = REAGENT_ID_MYELAMINE - osteodaxon spawn_reagent = REAGENT_ID_OSTEODAXON +/obj/item/reagent_containers/chem_disp_cartridge/diethylamine + spawn_reagent = REAGENT_ID_DIETHYLAMINE + +/obj/item/reagent_containers/chem_disp_cartridge/plantbgone + spawn_reagent = REAGENT_ID_PLANTBGONE + +/obj/item/reagent_containers/chem_disp_cartridge/mutagen + spawn_reagent = REAGENT_ID_MUTAGEN + +//Biochem + +/obj/item/reagent_containers/chem_disp_cartridge/nutriment + spawn_reagent = REAGENT_ID_NUTRIMENT + +/obj/item/reagent_containers/chem_disp_cartridge/protein + spawn_reagent = REAGENT_ID_PROTEIN + +//Special Ops + +/obj/item/reagent_containers/chem_disp_cartridge/biomass + spawn_reagent = REAGENT_ID_BIOMASS + +/obj/item/reagent_containers/chem_disp_cartridge/carthatoline + spawn_reagent = REAGENT_ID_CARTHATOLINE + +/obj/item/reagent_containers/chem_disp_cartridge/corophizine + spawn_reagent = REAGENT_ID_COROPHIZINE + +/obj/item/reagent_containers/chem_disp_cartridge/myelamine + spawn_reagent = REAGENT_ID_MYELAMINE + +/obj/item/reagent_containers/chem_disp_cartridge/osteodaxon + spawn_reagent = REAGENT_ID_OSTEODAXON diff --git a/code/modules/scripting/AST/AST Nodes.dm b/code/modules/scripting/AST/AST Nodes.dm index ceeacdcdc3..0ab6a90118 100644 --- a/code/modules/scripting/AST/AST Nodes.dm +++ b/code/modules/scripting/AST/AST Nodes.dm @@ -12,8 +12,7 @@ Articles: - */ -var - const + /* Constants: Operator Precedence OOP_OR - Logical or @@ -27,16 +26,16 @@ var OOP_UNARY - Unary Operators OOP_GROUP - Parentheses */ - OOP_OR = 1 //|| - OOP_AND = OOP_OR + 1 //&& - OOP_BIT = OOP_AND + 1 //&, | - OOP_EQUAL = OOP_BIT + 1 //==, != - OOP_COMPARE = OOP_EQUAL + 1 //>, <, >=, <= - OOP_ADD = OOP_COMPARE + 1 //+, - - OOP_MULTIPLY= OOP_ADD + 1 //*, /, % - OOP_POW = OOP_MULTIPLY+ 1 //^ - OOP_UNARY = OOP_POW + 1 //! - OOP_GROUP = OOP_UNARY + 1 //() +var/const/OOP_OR = 1 // || +var/const/OOP_AND = OOP_OR + 1 // && +var/const/OOP_BIT = OOP_AND + 1 // &, | +var/const/OOP_EQUAL = OOP_BIT + 1 // ==, != +var/const/OOP_COMPARE = OOP_EQUAL + 1 // >, <, >=, <= +var/const/OOP_ADD = OOP_COMPARE + 1 // +, - +var/const/OOP_MULTIPLY= OOP_ADD + 1 // *, /, % +var/const/OOP_POW = OOP_MULTIPLY + 1 // ^ +var/const/OOP_UNARY = OOP_POW + 1 // ! +var/const/OOP_GROUP = OOP_UNARY + 1 // () /* Class: node