diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 70f53a4aefe4c..7fea425861a3d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -270,7 +270,7 @@ This is good: * Variable Editing (Var-edits) * While var-editing an item within the editor is perfectly fine, it is preferred that when you are changing the base behavior of an item (how it functions) that you make a new subtype of that item within the code, especially if you plan to use the item in multiple locations on the same map, or across multiple maps. This makes it easier to make corrections as needed to all instances of the item at one time as opposed to having to find each instance of it and change them all individually. - * Subtypes only intended to be used on away mission or ruin maps should be contained within an .dm file with a name corresponding to that map within `code\modules\awaymissions` or `code\modules\ruins` respectively. This is so in the event that the map is removed, that subtype will be removed at the same time as well to minimize leftover/unused data within the repo. + * Subtypes only intended to be used on away mission or ruin maps should be contained within a .dm file with a name corresponding to that map within `code\modules\awaymissions` or `code\modules\ruins` respectively. This is so in the event that the map is removed, that subtype will be removed at the same time as well to minimize leftover/unused data within the repo. * Please attempt to clean out any dirty variables that may be contained within items you alter through var-editing. For example, due to how DM functions, changing the `pixel_x` variable from 23 to 0 will leave a dirty record in the map's code of `pixel_x = 0`. Likewise this can happen when changing an item's icon to something else and then back. This can lead to some issues where an item's icon has changed within the code, but becomes broken on the map due to it still attempting to use the old entry. * Areas should not be var-edited on a map to change it's name or attributes. All areas of a single type and it's altered instances are considered the same area within the code, and editing their variables on a map can lead to issues with powernets and event subsystems which are difficult to debug. diff --git a/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm b/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm index 1bf552464288a..9cc8437155585 100644 --- a/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm +++ b/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm @@ -160,7 +160,7 @@ /mob/living/simple_animal/hostile/retaliate/goose{ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0); damage_coeff = list("brute" = 0, "fire" = 0, "toxin" = 0, "clone" = 0, "stamina" = 0, "oxygen" = 0); - desc = "If you are alive and reading this you should not be in this room and should prob tell a admin how you got here."; + desc = "If you are alive and reading this you should not be in this room and should prob tell an admin how you got here."; name = "The Paradox Goose" }, /turf/open/indestructible/hoteltile, diff --git a/code/__DEFINES/_globals.dm b/code/__DEFINES/_globals.dm index b4651a345b4ad..f85f3f973df36 100644 --- a/code/__DEFINES/_globals.dm +++ b/code/__DEFINES/_globals.dm @@ -56,5 +56,5 @@ /// Create a null global list #define GLOBAL_LIST(X) GLOBAL_RAW(/list/##X); GLOBAL_UNMANAGED(X) -/// Create an typed null global +/// Create a typed null global #define GLOBAL_DATUM(X, Typepath) GLOBAL_RAW(Typepath/##X); GLOBAL_UNMANAGED(X) diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index 0cd4a4f77410c..e32c9849a63ea 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -39,7 +39,7 @@ //Write an info `message` to a server log #define TGS_INFO_LOG(message) -//Write an warning `message` to a server log +//Write a warning `message` to a server log #define TGS_WARNING_LOG(message) //Write an error `message` to a server log diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 2426cf27c63c8..b5b1ba3f03aab 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -546,7 +546,7 @@ ) return (is_type_in_list(item, pire_wire)) -// Find a obstruction free turf that's within the range of the center. Can also condition on if it is of a certain area type. +// Find an obstruction free turf that's within the range of the center. Can also condition on if it is of a certain area type. /proc/find_obstruction_free_location(range, atom/center, area/specific_area) var/list/turfs = RANGE_TURFS(range, center) var/list/possible_loc = list() diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 3dec5a4fed5cb..3a9a730606e5e 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -61,7 +61,7 @@ else return -//Converts an angle (degrees) into an ss13 direction +//Converts an angle (degrees) into a ss13 direction GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,SOUTHWEST,WEST,NORTHWEST)) #define angle2dir(X) (GLOB.modulo_angle_to_dir[round((((X%360)+382.5)%360)/45)+1]) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index ae2512e804dc9..dfe733fb33880 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -541,7 +541,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) qdel(TR, TRUE) UNSETEMPTY(turf_reservations) var/list/clearing = list() - for(var/l in unused_turfs) //unused_turfs is a assoc list by z = list(turfs) + for(var/l in unused_turfs) //unused_turfs is an assoc list by z = list(turfs) if(islist(unused_turfs[l])) clearing |= unused_turfs[l] clearing |= used_turfs //used turfs is an associative list, BUT, reserve_turfs() can still handle it. If the code above works properly, this won't even be needed as the turfs would be freed already. diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index a5fdae4d91ffd..80ddbe841b024 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -388,7 +388,7 @@ * * Returns the component that was created. Or the old component in a dupe situation where [COMPONENT_DUPE_UNIQUE] was set * - * If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it + * If this tries to add a component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it * * Properly handles duplicate situations based on the `dupe_mode` var */ diff --git a/code/datums/components/ntnet_interface.dm b/code/datums/components/ntnet_interface.dm index 7623d5ef8669e..1d3fc1c7cd07e 100644 --- a/code/datums/components/ntnet_interface.dm +++ b/code/datums/components/ntnet_interface.dm @@ -1,4 +1,4 @@ -//Thing meant for allowing datums and objects to access a NTnet network datum. +//Thing meant for allowing datums and objects to access an NTnet network datum. /datum/proc/ntnet_receive(datum/netdata/data) return diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 5f7f0ac429084..ba8c3bdb41cef 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) INVOKE_ASYNC(D, (opening ? /obj/machinery/door/firedoor.proc/open : /obj/machinery/door/firedoor.proc/close)) /** - * Generate an firealarm alert for this area + * Generate a firealarm alert for this area * * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world * diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f8ffa00ab4db0..b2624057960dc 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -751,7 +751,7 @@ return FALSE /** - * Respond to a electric bolt action on our item + * Respond to an electric bolt action on our item * * Default behaviour is to return, we define here to allow for cleaner code later on */ diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 1026aa6664ae1..45972012de406 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1137,7 +1137,7 @@ return var/airlock_type = painter.available_paint_jobs["[current_paintjob]"] // get the airlock type path associated with the airlock name the user just chose - var/obj/machinery/door/airlock/airlock = new airlock_type // we need to create an new instance of the airlock and assembly to read vars from them + var/obj/machinery/door/airlock/airlock = new airlock_type // we need to create a new instance of the airlock and assembly to read vars from them var/obj/structure/door_assembly/assembly = new airlock.assemblytype if(airlock_material == "glass" && assembly.noglass) // prevents painting glass airlocks with a paint job that doesn't have a glass version, such as the freezer diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index ca7b2d900cab8..aa84d1103df63 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -3,7 +3,7 @@ CONTAINS: RSF */ -///Extracts the related object from a associated list of objects and values, or lists and objects. +///Extracts the related object from an associated list of objects and values, or lists and objects. #define OBJECT_OR_LIST_ELEMENT(from, input) (islist(input) ? from[input] : input) /obj/item/rsf name = "\improper Rapid-Service-Fabricator" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 667eef1626437..2d25bc327f2e6 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -765,7 +765,7 @@ GENE SCANNER item_state = "healthanalyzer" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - desc = "An wand for scanning someone else for a medical analysis. Insert into a kiosk is make the scanned patient the target of a health scan." + desc = "A wand for scanning someone else for a medical analysis. Insert into a kiosk is make the scanned patient the target of a health scan." force = 0 throwforce = 0 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 4073556335bcd..73b04d900b789 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -95,7 +95,7 @@ /obj/item/storage/toolbox/mechanical/old/clean name = "toolbox" - desc = "A old, blue toolbox, it looks robust." + desc = "An old, blue toolbox, it looks robust." icon_state = "oldtoolboxclean" item_state = "toolbox_blue" has_latches = FALSE diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 664947df1884c..faf7bace01387 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -245,7 +245,7 @@ ///Table on wheels /obj/structure/table/rolling name = "Rolling table" - desc = "A NT brand \"Rolly poly\" rolling table. It can and will move." + desc = "An NT brand \"Rolly poly\" rolling table. It can and will move." anchored = FALSE smooth = SMOOTH_FALSE canSmoothWith = list() diff --git a/code/game/objects/structures/votingbox.dm b/code/game/objects/structures/votingbox.dm index 3d2515a4fd9b9..de2a4990f5f46 100644 --- a/code/game/objects/structures/votingbox.dm +++ b/code/game/objects/structures/votingbox.dm @@ -3,7 +3,7 @@ /obj/structure/votebox name = "voting box" - desc = "A automatic voting box." + desc = "An automatic voting box." icon = 'icons/obj/votebox.dmi' icon_state = "votebox_maint" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 39973b2f755ab..91c95c0ce4695 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -40,8 +40,8 @@ GLOBAL_PROTECT(admin_verbs_admin) /client/proc/toggle_view_range, /*changes how far we can see*/ /client/proc/getserverlogs, /*for accessing server logs*/ /client/proc/getcurrentlogs, /*for accessing server logs for the current round*/ - /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ - /client/proc/cmd_admin_headset_message, /*send an message to somebody through their headset as CentCom*/ + /client/proc/cmd_admin_subtle_message, /*send a message to somebody as a 'voice in their head'*/ + /client/proc/cmd_admin_headset_message, /*send a message to somebody through their headset as CentCom*/ /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/centcom_podlauncher,/*Open a window to launch a Supplypod and configure it or it's contents*/ diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 8b70ac77d9ba8..c919be598a30e 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -198,7 +198,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) return removed - ///Removes a amount of a specific gas from the gas_mixture. + ///Removes an amount of a specific gas from the gas_mixture. ///Returns: gas_mixture with the gas removed /datum/gas_mixture/proc/remove_specific(gas_id, amount) var/list/cached_gases = gases diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm index c0af9cd08cdaf..537f240002037 100644 --- a/code/modules/awaymissions/mission_code/moonoutpost19.dm +++ b/code/modules/awaymissions/mission_code/moonoutpost19.dm @@ -104,7 +104,7 @@ /obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald name = "Personal Log - Gerald Rosswell" - info = "Personal Log for Research Director Gerald Rosswell

Entry One - 17/05/2554:
You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.

Entry Two - 25/05/2554:
Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.

Entry Three - 27/05/2554:
The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.

Entry Four - 06/06/2554:
My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.

Entry Five - 10/06/2554:
Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.

Entry Six - 17/06/2554:
The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information." + info = "Personal Log for Research Director Gerald Rosswell

Entry One - 17/05/2554:
You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.

Entry Two - 25/05/2554:
Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on a xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.

Entry Three - 27/05/2554:
The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.

Entry Four - 06/06/2554:
My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.

Entry Five - 10/06/2554:
Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.

Entry Six - 17/06/2554:
The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information." /obj/item/paper/fluff/awaymissions/moonoutpost19/food_specials name = "Specials This Week" diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm index 95cb31d27a5e6..e74141e46c273 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm @@ -44,7 +44,7 @@ /datum/blackmarket_item/clothing/full_spacesuit_set/spawn_item(loc) var/obj/item/storage/box/B = ..() B.name = "Spacesuit Box" - B.desc = "It has a NT logo on it." + B.desc = "It has an NT logo on it." new /obj/item/clothing/suit/space(B) new /obj/item/clothing/head/helmet/space(B) return B diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index af060d67d22f0..8324e12a0a968 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1925,7 +1925,7 @@ /datum/supply_pack/organic/vending/hydro_refills name = "Hydroponics Vending Machines Refills" - desc = "When the clown takes all the banana seeds. Contains a NutriMax refill and an MegaSeed Servitor refill." + desc = "When the clown takes all the banana seeds. Contains a NutriMax refill and a MegaSeed Servitor refill." cost = 2000 crate_type = /obj/structure/closet/crate contains = list(/obj/item/vending_refill/hydroseeds, diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 06809a06ff30e..87f57f39f6e6a 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -219,7 +219,7 @@ /obj/item/clothing/head/helmet/space/plasmaman/cargo name = "cargo plasma envirosuit helmet" - desc = "An plasmaman envirohelmet designed for cargo techs and quartermasters." + desc = "A plasmaman envirohelmet designed for cargo techs and quartermasters." icon_state = "cargo_envirohelm" item_state = "cargo_envirohelm" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 160a936cdfacc..b7f5b1a820f7c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -55,7 +55,7 @@ //Detective /obj/item/clothing/suit/det_suit name = "trenchcoat" - desc = "An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business." + desc = "A 18th-century multi-purpose trenchcoat. Someone who wears this means serious business." icon_state = "detective" item_state = "det_suit" blood_overlay_type = "coat" diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 6b1af60eef4a3..4945cc5ed5f5d 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -232,7 +232,7 @@ /obj/item/clothing/accessory/armband name = "red armband" - desc = "An fancy red armband!" + desc = "A fancy red armband!" icon_state = "redband" attachment_slot = null diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 7360cb5fa053b..55a7874646af0 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -257,7 +257,7 @@ /obj/item/reagent_containers/food/drinks/bottle/absinthe name = "extra-strong absinthe" - desc = "An strong alcoholic drink brewed and distributed by" + desc = "A strong alcoholic drink brewed and distributed by" icon_state = "absinthebottle" list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100) diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index de8f1e91dcc96..36f872100fb6a 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -364,7 +364,7 @@ /obj/item/reagent_containers/food/snacks/burger/soylent name = "soylent burger" - desc = "A eco-friendly burger made using upcycled low value biomass." + desc = "An eco-friendly burger made using upcycled low value biomass." icon_state = "soylentburger" bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3) tastes = list("bun" = 2, "assistant" = 4) diff --git a/code/modules/mob/dead/new_player/poll.dm b/code/modules/mob/dead/new_player/poll.dm index 869ce4cad8fdc..76d80a3fdee00 100644 --- a/code/modules/mob/dead/new_player/poll.dm +++ b/code/modules/mob/dead/new_player/poll.dm @@ -355,7 +355,7 @@ to_chat(usr, "Vote successful.") /** - * Processes vote form data and saves results to the database for a option type poll. + * Processes vote form data and saves results to the database for an option type poll. * */ /mob/dead/new_player/proc/vote_on_poll_option(datum/poll_question/poll, href_list, admin_rank, sql_poll_id, vote_id) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm index 60f85d0aa14f5..9ad83bab706d3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm @@ -2,10 +2,10 @@ KING OF GOATS The king of goat is inside a 9x9 arena protected by two guards while during stage one it is generally a cake walk the later stages however can prove extremely challenging and downright impossible for less skilled miners.. The king goat is as indicated by his name the king of all goats and as such if you attempt to fight him you will learn why he is the king in the first place... -It has no ranged attacks what so ever but makes up for it by being confined in a small space and having the ability to summon guards, charge at his enemy and do a aoe explosion attack which can prove devistating for most miners. +It has no ranged attacks what so ever but makes up for it by being confined in a small space and having the ability to summon guards, charge at his enemy and do an aoe explosion attack which can prove devistating for most miners. The three stages of the king goat: Stage 1: The king goat is pretty much just a slightly more robust regular goat, the king will proceed to charge at you full force in the hopes of taking you out easily but can be easily defeated by even a unexperienced miner. - Stage 2: This is where things start heating up. At this stage the king goat will become slightly larger and start doing special attacks which range from summoning guards to come to his aid to stomping his hooves on the ground causing the arena to shake and a aoe explosion to appear around him most miners do not make it pass this stage but if you do... + Stage 2: This is where things start heating up. At this stage the king goat will become slightly larger and start doing special attacks which range from summoning guards to come to his aid to stomping his hooves on the ground causing the arena to shake and an aoe explosion to appear around him most miners do not make it pass this stage but if you do... Stage 3: Oh boy your in for it now at this stage the king goat will completly heal and grow slightly bigger and start glowing it has the exact same attacks as stage 2 but is much more intimidating if you can defeat him at stage three he will fall over dead on the ground and drop a ladder so you may now leave the arena but dont forget to grab the loot first! The loot: The goat gun: This weapon as the name implies fires goats at your enemies knocking them down and doing a bit of brute damage it self recharges and combined with the goat pope hat or king goat pelt can lead to some interesting shenigans, diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 66e62ba68ca9a..541b78e638f44 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -9,7 +9,7 @@ * A slow-moving projectile user with a few tricks up it's sleeve. Less unga-bunga than Colossus, with more cleverness in it's fighting style. * As it's health gets lower, the amount of projectiles fired per-attack increases. * It's attacks are as follows: - * - Fires three projectiles in a a given direction. + * - Fires three projectiles in a given direction. * - Fires a spread in every cardinal and diagonal direction at once, then does it again after a bit. * - Shoots a single, golden bolt. Wherever it lands, the herald will be teleported to the location. * - Spawns a mirror which reflects projectiles directly at the target. diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 5808614550b62..20a2a85c7e603 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -72,7 +72,7 @@ /datum/computer_file/program/proc/is_supported_by_hardware(hardware_flag = 0, loud = 0, mob/user = null) if(!(hardware_flag & usage_flags)) if(loud && computer && user) - to_chat(user, "\The [computer] flashes an \"Hardware Error - Incompatible software\" warning.") + to_chat(user, "\The [computer] flashes a \"Hardware Error - Incompatible software\" warning.") return 0 return 1 diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm index 279d646cfd718..3c1daa5af3603 100644 --- a/code/modules/modular_computers/file_system/program_events.dm +++ b/code/modules/modular_computers/file_system/program_events.dm @@ -13,6 +13,6 @@ /datum/computer_file/program/proc/event_networkfailure(background) kill_program(forced = TRUE) if(background) - computer.visible_message("\The [computer]'s screen displays an \"Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error\" error") + computer.visible_message("\The [computer]'s screen displays a \"Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error\" error") else computer.visible_message("\The [computer]'s screen briefly freezes and then shows \"NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator.\" error.") diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index e9a6993668442..2b76f9cd47c46 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -72,7 +72,7 @@ /proc/begin_the_end() sleep(50) if(QDELETED(GLOB.cult_narsie)) // uno - priority_announce("Status report? We detected a anomaly, but it disappeared almost immediately.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') + priority_announce("Status report? We detected an anomaly, but it disappeared almost immediately.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') GLOB.cult_narsie = null sleep(20) INVOKE_ASYNC(GLOBAL_PROC, .proc/cult_ending_helper, 2) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 17b20a6ed03ae..8c5d0c8050794 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -593,7 +593,7 @@ /datum/reagent/consumable/mayonnaise name = "Mayonnaise" - description = "An white and oily mixture of mixed egg yolks." + description = "A white and oily mixture of mixed egg yolks." color = "#DFDFDF" taste_description = "mayonnaise" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 77a487f9c3016..76370f5b41df5 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -170,28 +170,28 @@ /obj/item/reagent_containers/hypospray/medipen/oxandrolone name = "oxandrolone medipen" - desc = "A autoinjector containing oxandrolone, used to treat severe burns." + desc = "An autoinjector containing oxandrolone, used to treat severe burns." icon_state = "oxapen" item_state = "oxapen" list_reagents = list(/datum/reagent/medicine/oxandrolone = 10) /obj/item/reagent_containers/hypospray/medipen/penacid name = "pentetic acid medipen" - desc = "A autoinjector containing pentetic acid, used to reduce high levels of radiations and moderate toxins." + desc = "An autoinjector containing pentetic acid, used to reduce high levels of radiations and moderate toxins." icon_state = "penacid" item_state = "penacid" list_reagents = list(/datum/reagent/medicine/pen_acid = 10) /obj/item/reagent_containers/hypospray/medipen/salacid name = "salicylic acid medipen" - desc = "A autoinjector containing salicylic acid, used to treat severe brute damage." + desc = "An autoinjector containing salicylic acid, used to treat severe brute damage." icon_state = "salacid" item_state = "salacid" list_reagents = list(/datum/reagent/medicine/sal_acid = 10) /obj/item/reagent_containers/hypospray/medipen/salbutamol name = "salbutamol medipen" - desc = "A autoinjector containing salbutamol, used to heal oxygen damage quickly." + desc = "An autoinjector containing salbutamol, used to heal oxygen damage quickly." icon_state = "salpen" item_state = "salpen" list_reagents = list(/datum/reagent/medicine/salbutamol = 10) diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index baa2e7d201ec5..e1b05f433c045 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -265,7 +265,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good /obj/item/stock_parts/capacitor/quadratic name = "quadratic capacitor" - desc = "An capacity capacitor used in the construction of a variety of devices." + desc = "A capacity capacitor used in the construction of a variety of devices." icon_state = "quadratic_capacitor" rating = 4 custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm index 3e15a818674b5..0cce809bef511 100644 --- a/code/modules/research/xenobiology/crossbreeding/_potions.dm +++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm @@ -7,7 +7,7 @@ Slimecrossing Potions //Extract cloner - Charged Grey /obj/item/slimepotion/extract_cloner name = "extract cloning potion" - desc = "An more powerful version of the extract enhancer potion, capable of cloning regular slime extracts." + desc = "A more powerful version of the extract enhancer potion, capable of cloning regular slime extracts." icon = 'icons/obj/chemical.dmi' icon_state = "potpurple" diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm index 8edf273711959..8b0980bb7c7e3 100644 --- a/code/modules/research/xenobiology/crossbreeding/consuming.dm +++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm @@ -101,7 +101,7 @@ Consuming extracts: /obj/item/slime_cookie/orange name = "fiery cookie" - desc = "A orange cookie with a fiery pattern. Feels warm." + desc = "An orange cookie with a fiery pattern. Feels warm." icon_state = "orange" taste = "cinnamon and burning" diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm index c7f400141bfa0..aaf524a67348d 100644 --- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm @@ -106,7 +106,7 @@ //***Grave mounds. /obj/structure/closet/crate/grave name = "burial mound" - desc = "An marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?" + desc = "A marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?" icon = 'icons/obj/crates.dmi' icon_state = "grave" dense_when_open = TRUE diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index da43e38403233..e31fe68784fbb 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -9,7 +9,7 @@ var/list/chems_needed = list() //list of chems needed to complete the step. Even on success, the step will have no effect if there aren't the chems required in the mob. var/require_all_chems = TRUE //any on the list or all on the list? var/silicons_obey_prob = FALSE - /// The amount of a experience given for successfully completing the step. + /// The amount of experience given for successfully completing the step. var/experience_given = MEDICAL_SKILL_EASY /datum/surgery_step/proc/try_op(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE) diff --git a/code/modules/tgui/subsystem.dm b/code/modules/tgui/subsystem.dm index 76cd9351e5413..3fbf98c3df373 100644 --- a/code/modules/tgui/subsystem.dm +++ b/code/modules/tgui/subsystem.dm @@ -10,7 +10,7 @@ /** * public * - * Get a open UI given a user, src_object, and ui_key and try to update it with data. + * Get an open UI given a user, src_object, and ui_key and try to update it with data. * * required user mob The mob who opened/is using the UI. * required src_object datum The object/datum which owns the UI. @@ -37,7 +37,7 @@ /** * private * - * Get a open UI given a user, src_object, and ui_key. + * Get an open UI given a user, src_object, and ui_key. * * required user mob The mob who opened/is using the UI. * required src_object datum The object/datum which owns the UI. diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 1e7302d02657a..0ce27f08698d3 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) if(allow_sales) var/datum/team/nuclear/nuclear_team if (gamemode == /datum/game_mode/nuclear) // uplink code kind of needs a redesign - nuclear_team = locate() in GLOB.antagonist_teams // the team discounts could be a in a GLOB with this design but it would make sense for them to be team specific... + nuclear_team = locate() in GLOB.antagonist_teams // the team discounts could be in a GLOB with this design but it would make sense for them to be team specific... if (!nuclear_team) create_uplink_sales(3, "Discounted Gear", 1, sale_items, filtered_uplink_items) else @@ -502,7 +502,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/dangerous/aps name = "Stechkin APS Machine Pistol" - desc = "A ancient Soviet machine pistol, refurbished for the modern age. Uses 9mm auto rounds in 15-round magazines and is compatible \ + desc = "An ancient Soviet machine pistol, refurbished for the modern age. Uses 9mm auto rounds in 15-round magazines and is compatible \ with suppressors. The gun fires in three round bursts." item = /obj/item/gun/ballistic/automatic/pistol/aps cost = 10 @@ -1267,7 +1267,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Infiltrator Case" desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \ this suit proves to be cheaper than your standard issue hardsuit, with none of the movement restrictions of the outdated spacesuits employed by the company. \ - Comes with a armor vest, helmet, sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava. The case is also rather useful as a storage container." + Comes with an armor vest, helmet, sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava. The case is also rather useful as a storage container." item = /obj/item/storage/toolbox/infiltrator cost = 6 limited_stock = 1 //you only get one so you don't end up with too many gun cases diff --git a/tgui/docs/component-reference.md b/tgui/docs/component-reference.md index b853fee4de378..e1f7ebf9b439b 100644 --- a/tgui/docs/component-reference.md +++ b/tgui/docs/component-reference.md @@ -241,7 +241,7 @@ A ghetto checkbox, made entirely using existing Button API. ### `Button.Confirm` -A button with a an extra confirmation step, using native button component. +A button with an extra confirmation step, using native button component. **Props:** diff --git a/tgui/packages/tgui/interfaces/CentcomPodLauncher.js b/tgui/packages/tgui/interfaces/CentcomPodLauncher.js index 7b2123914458a..28ff827f78f09 100644 --- a/tgui/packages/tgui/interfaces/CentcomPodLauncher.js +++ b/tgui/packages/tgui/interfaces/CentcomPodLauncher.js @@ -419,7 +419,7 @@ export const CentcomPodLauncherContent = (props, context) => { This gondola can control when he wants to deliver his supplies if he has a smart enough mind, so offer up his body to ghosts for maximum enjoyment. (Make sure to turn off bluespace and - set a arbitrarily high open-time if you do! + set an arbitrarily high open-time if you do! `} onClick={() => act('styleGondola')} />