diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 07b9292df35..50890d99f0b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8115,7 +8115,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; - name = "Auxillary Base Shutters" + name = "Auxiliary Base Shutters" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -8295,7 +8295,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Auxillary Base Construction"; + c_tag = "Auxiliary Base Construction"; dir = 8 }, /obj/machinery/computer/camera_advanced/base_construction{ @@ -12787,7 +12787,7 @@ /obj/machinery/power/apc{ areastring = "/area/construction/mining/aux_base"; dir = 2; - name = "Auxillary Base Construction APC"; + name = "Auxiliary Base Construction APC"; pixel_x = 0; pixel_y = -23 }, @@ -13852,7 +13852,7 @@ /area/chapel/main) "aLu" = ( /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; + name = "Auxiliary Base Construction"; req_one_access_txt = "32;47;48" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ec3c357b55a..e1f98b48039 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1302,7 +1302,7 @@ /obj/item/clipboard, /obj/item/mining_voucher, /obj/machinery/camera{ - c_tag = "Auxillary Construction - Storage"; + c_tag = "Auxiliary Construction - Storage"; dir = 4; name = "engineering camera" }, @@ -1897,7 +1897,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ - c_tag = "Auxillary Construction"; + c_tag = "Auxiliary Construction"; dir = 4; name = "engineering camera" }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index f3c90c61244..f39d0b90d81 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -14983,7 +14983,7 @@ /area/engine/engineering) "aIf" = ( /obj/machinery/camera{ - c_tag = "Auxillary Base Construction"; + c_tag = "Auxiliary Base Construction"; dir = 1 }, /obj/machinery/button/door{ @@ -19116,7 +19116,7 @@ "aSL" = ( /obj/machinery/power/apc{ areastring = "/area/construction/mining/aux_base"; - name = "Auxillary Base Construction APC"; + name = "Auxiliary Base Construction APC"; pixel_y = -23 }, /obj/effect/turf_decal/tile/yellow, @@ -63563,9 +63563,9 @@ /area/space) "cYK" = ( /obj/machinery/computer/security/telescreen{ - desc = "Used for the Auxillary Mining Base."; + desc = "Used for the Auxiliary Mining Base."; dir = 1; - name = "Auxillary Base Monitor"; + name = "Auxiliary Base Monitor"; network = list("auxbase"); pixel_y = -28 }, @@ -63580,7 +63580,7 @@ "cYL" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; - name = "Auxillary Base Shutters" + name = "Auxiliary Base Shutters" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -63590,7 +63590,7 @@ dir = 1 }, /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; + name = "Auxiliary Base Construction"; req_one_access_txt = "32;47;48" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index c1ec4147a48..dc423de58ce 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -16722,7 +16722,7 @@ /obj/item/wallframe/camera, /obj/item/assault_pod/mining, /obj/machinery/camera{ - c_tag = "Auxillary Base Construction"; + c_tag = "Auxiliary Base Construction"; dir = 8 }, /obj/machinery/light{ @@ -51112,7 +51112,7 @@ /area/hallway/primary/central) "hDG" = ( /obj/machinery/door/airlock/engineering{ - name = "Auxillary Base Construction"; + name = "Auxiliary Base Construction"; req_one_access_txt = "32;47;48" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -51752,7 +51752,7 @@ "iPO" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; - name = "Auxillary Base Shutters" + name = "Auxiliary Base Shutters" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -53876,7 +53876,7 @@ /obj/machinery/power/apc{ areastring = "/area/construction/mining/aux_base"; dir = 8; - name = "Auxillary Base Construction APC"; + name = "Auxiliary Base Construction APC"; pixel_x = -25 }, /obj/structure/cable, @@ -56140,7 +56140,7 @@ /area/science/genetics) "scp" = ( /obj/machinery/door/airlock/maintenance{ - name = "Auxillary Base Maintenance"; + name = "Auxiliary Base Maintenance"; req_access_txt = "12"; req_one_access_txt = "32;47;48" }, @@ -57356,7 +57356,7 @@ "uCS" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; - name = "Auxillary Base Shutters" + name = "Auxiliary Base Shutters" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 98a3d01bafc..8018bb0b2ee 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -4090,7 +4090,7 @@ dwidth = 25; height = 50; id = "emergency_syndicate"; - name = "Syndicate Auxillary Shuttle Dock"; + name = "Syndicate Auxiliary Shuttle Dock"; width = 50 }, /turf/open/floor/plating/asteroid/snow/airless, @@ -4882,7 +4882,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/supply) "mc" = ( -/obj/machinery/computer/auxillary_base{ +/obj/machinery/computer/auxiliary_base{ pixel_y = 32 }, /obj/structure/table/reinforced, @@ -6894,7 +6894,7 @@ /area/centcom/supplypod/loading/ert) "pF" = ( /obj/machinery/door/airlock/centcom{ - name = "Auxillary Dock"; + name = "Auxiliary Dock"; req_access_txt = "" }, /turf/open/floor/plating, @@ -7679,7 +7679,7 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "rl" = ( -/obj/machinery/computer/auxillary_base{ +/obj/machinery/computer/auxiliary_base{ pixel_y = 32 }, /obj/structure/table/reinforced, diff --git a/_maps/shuttles/aux_base_default.dmm b/_maps/shuttles/aux_base_default.dmm index 8ee566b0343..f033c3f84d1 100644 --- a/_maps/shuttles/aux_base_default.dmm +++ b/_maps/shuttles/aux_base_default.dmm @@ -4,73 +4,73 @@ dir = 8 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "e" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /obj/structure/ore_box, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "i" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "k" = ( /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "t" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "v" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "w" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "x" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "z" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "P" = ( -/obj/docking_port/mobile/auxillary_base{ +/obj/docking_port/mobile/auxiliary_base{ dir = 2 }, /obj/machinery/bluespace_beacon, -/obj/machinery/computer/auxillary_base, +/obj/machinery/computer/auxiliary_base, /turf/closed/wall, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "U" = ( /obj/structure/closet/secure_closet/miner/unlocked, /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "W" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "X" = ( /obj/machinery/camera{ c_tag = "Auxiliary Base"; @@ -79,7 +79,7 @@ }, /obj/structure/mining_shuttle_beacon, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) (1,1,1) = {" e diff --git a/_maps/shuttles/aux_base_small.dmm b/_maps/shuttles/aux_base_small.dmm index 52e680a988c..8701192c9de 100644 --- a/_maps/shuttles/aux_base_small.dmm +++ b/_maps/shuttles/aux_base_small.dmm @@ -5,34 +5,34 @@ }, /obj/structure/ore_box, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "c" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "d" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "e" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "f" = ( /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "g" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "h" = ( /obj/machinery/camera{ dir = 1; @@ -40,45 +40,45 @@ }, /obj/structure/mining_shuttle_beacon, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "i" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "j" = ( -/obj/docking_port/mobile/auxillary_base{ +/obj/docking_port/mobile/auxiliary_base{ dir = 2 }, /obj/machinery/bluespace_beacon, -/obj/machinery/computer/auxillary_base, +/obj/machinery/computer/auxiliary_base, /turf/closed/wall, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "k" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "l" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "m" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) "n" = ( /obj/structure/closet/secure_closet/miner/unlocked, /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/plating, -/area/shuttle/auxillary_base) +/area/shuttle/auxiliary_base) (1,1,1) = {" b diff --git a/_maps/shuttles/emergency_zeta.dmm b/_maps/shuttles/emergency_zeta.dmm index 0f781bdf077..81d67ddb0ae 100644 --- a/_maps/shuttles/emergency_zeta.dmm +++ b/_maps/shuttles/emergency_zeta.dmm @@ -68,7 +68,7 @@ /obj/structure/table/abductor, /obj/machinery/recharger, /obj/item/melee/baton/abductor{ - desc = "Even aliens can see the use of a good old fashioned beating stick." + desc = "Even aliens can see the use of a good old-fashioned beating stick." }, /turf/open/floor/plating/abductor, /area/shuttle/escape) diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index 128751bcdf7..d4ec45b99b4 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -55,7 +55,7 @@ #define SS_POST_FIRE_TIMING 64 //! SUBSYSTEM STATES -#define SS_IDLE 0 /// aint doing shit. +#define SS_IDLE 0 /// ain't doing shit. #define SS_QUEUED 1 /// queued to run #define SS_RUNNING 2 /// actively running #define SS_PAUSED 3 /// paused by mc_tick_check diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm index 64d661d4108..6b6c1325972 100644 --- a/code/__DEFINES/cargo.dm +++ b/code/__DEFINES/cargo.dm @@ -24,8 +24,8 @@ list("syndiepod", "blood-red supply pod", "A dark, intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\ list("squadpod", "\improper MK. II supply pod", "A Nanotrasen supply pod. This one has been marked the markings of some sort of elite strike team."),\ list("cultpod", "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\ - list("missilepod", "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ - list("smissilepod", "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ + list("missilepod", "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible."),\ + list("smissilepod", "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible."),\ list("boxpod", "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\ list("honkpod", "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\ list("fruitpod", "\improper Orange", "An angry orange."),\ diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index f702f4cb22e..b0f0722029a 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -331,4 +331,4 @@ invisibility = is_station_level(posobj.z) ? 0 : INVISIBILITY_ABSTRACT /obj/screen/parallax_layer/planet/update_o() - return //Shit wont move + return //Shit won't move diff --git a/code/controllers/subsystem/discord.dm b/code/controllers/subsystem/discord.dm index a605f2a60f2..983dcdf1e5a 100644 --- a/code/controllers/subsystem/discord.dm +++ b/code/controllers/subsystem/discord.dm @@ -2,8 +2,8 @@ NOTES: There is a DB table to track ckeys and associated discord IDs. This system REQUIRES TGS, and will auto-disable if TGS is not present. -The SS uses fire() instead of just pure shutdown, so people can be notified if it comes back after a crash, where the SS wasnt properly shutdown -It only writes to the disk every 5 minutes, and it wont write to disk if the file is the same as it was the last time it was written. This is to save on disk writes +The SS uses fire() instead of just pure shutdown, so people can be notified if it comes back after a crash, where the SS wasn't properly shutdown +It only writes to the disk every 5 minutes, and it won't write to disk if the file is the same as it was the last time it was written. This is to save on disk writes The system is kept per-server (EG: Terry will not notify people who pressed notify on Sybil), but the accounts are between servers so you dont have to relink on each server. ################## @@ -20,7 +20,7 @@ MIDROUND: 2] On fire, it will write that to the disk, as long as conditions above are correct END ROUND: -1] The file is force-saved, incase it hasnt fired at end round +1] The file is force-saved, incase it hasn't fired at end round This is an absolute clusterfuck, but its my clusterfuck -aa07 */ @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(discord) /// list of people who tried to reverify, so they can only do it once per round as a shitty slowdown var/list/reverify_cache = list() var/notify_file = file("data/notify.json") - /// Is TGS enabled (If not we wont fire because otherwise this is useless) + /// Is TGS enabled (If not we won't fire because otherwise this is useless) var/enabled = 0 /datum/controller/subsystem/discord/Initialize(start_timeofday) @@ -119,7 +119,7 @@ SUBSYSTEM_DEF(discord) return num_only.Replace(input, "") /datum/controller/subsystem/discord/proc/grant_role(id) - // Ignore this shit if config isnt enabled for it + // Ignore this shit if config isn't enabled for it if(!CONFIG_GET(flag/enable_discord_autorole)) return diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index dfe733fb338..ea78f553041 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -151,7 +151,7 @@ SUBSYSTEM_DEF(mapping) qdel(T, TRUE) /* Nuke threats, for making the blue tiles on the station go RED - Used by the AI doomsday and the self destruct nuke. + Used by the AI doomsday and the self-destruct nuke. */ /datum/controller/subsystem/mapping/proc/add_nuke_threat(datum/nuke) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 6720db85288..9a0f4ddd871 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -550,7 +550,7 @@ SUBSYSTEM_DEF(ticker) if(WIZARD_KILLED) news_message = "Tensions have flared with the Space Wizard Federation following the death of one of their members aboard [station_name()]." if(STATION_NUKED) - news_message = "[station_name()] activated its self destruct device for unknown reasons. Attempts to clone the Captain so he can be arrested and executed are underway." + news_message = "[station_name()] activated its self-destruct device for unknown reasons. Attempts to clone the Captain so he can be arrested and executed are underway." if(CLOCK_SUMMON) news_message = "The garbled messages about hailing a mouse and strange energy readings from [station_name()] have been discovered to be an ill-advised, if thorough, prank by a clown." if(CLOCK_SILICONS) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 2942ef64ecd..9b76120cec6 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -75,12 +75,12 @@ SUBSYSTEM_DEF(vote) for (var/non_voter_ckey in non_voters) var/client/C = non_voters[non_voter_ckey] if(C.prefs.preferred_map) - if(choices[C.prefs.preferred_map]) //No votes if the map isnt in the vote. + if(choices[C.prefs.preferred_map]) //No votes if the map isn't in the vote. var/preferred_map = C.prefs.preferred_map choices[preferred_map] += 1 greatest_votes = max(greatest_votes, choices[preferred_map]) else if(config.defaultmap) - if(choices[config.defaultmap]) //No votes if the map isnt in the vote. + if(choices[config.defaultmap]) //No votes if the map isn't in the vote. var/default_map = config.defaultmap.map_name choices[default_map] += 1 greatest_votes = max(greatest_votes, choices[default_map]) diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm index 06fa6ce475d..20b823c0afe 100644 --- a/code/datums/achievements/_awards.dm +++ b/code/datums/achievements/_awards.dm @@ -1,5 +1,5 @@ /datum/award - ///Name of the achievement, If null it wont show up in the achievement browser. (Handy for inheritance trees) + ///Name of the achievement, If null it won't show up in the achievement browser. (Handy for inheritance trees) var/name var/desc = "You did it." ///Found in UI_Icons/Achievements diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 068769e36db..7e0619fe9c5 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -196,9 +196,9 @@ Set var amt to the value current cycle req is pointing to, its amount of type we need to delete Get var/surroundings list of things accessable to crafting by get_environment() Check the type of the current cycle req - If its reagent then do a while loop, inside it try to locate() reagent containers, inside such containers try to locate needed reagent, if there isnt remove thing from surroundings + If its reagent then do a while loop, inside it try to locate() reagent containers, inside such containers try to locate needed reagent, if there isn't remove thing from surroundings If there is enough reagent in the search result then delete the needed amount, create the same type of reagent with the same data var and put it into deletion list - If there isnt enough take all of that reagent from the container, put into deletion list, substract the amt var by the volume of reagent, remove the container from surroundings list and keep searching + If there isn't enough take all of that reagent from the container, put into deletion list, substract the amt var by the volume of reagent, remove the container from surroundings list and keep searching While doing above stuff check deletion list if it already has such reagnet, if yes merge instead of adding second one If its stack check if it has enough amount If yes create new stack with the needed amount and put in into deletion list, substract taken amount from the stack @@ -209,7 +209,7 @@ Then do a loop over parts var of the recipe Do similar stuff to what we have done above, but now in deletion list, until the parts conditions are satisfied keep taking from the deletion list and putting it into parts list for return - After its done loop over deletion list and delete all the shit that wasnt taken by parts loop + After its done loop over deletion list and delete all the shit that wasn't taken by parts loop del_reqs return the list of parts resulting object will receive as argument of CheckParts proc, on the atom level it will add them all to the contents, on all other levels it calls ..() and does whatever is needed afterwards but from contents list already */ diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index 1f61f092596..35f66a1f160 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -158,7 +158,7 @@ active = TRUE var/atom/movable/AM = parent - for(var/obj/machinery/duct/D in AM.loc) //Destroy any ducts under us. Ducts also self destruct if placed under a plumbing machine. machines disable when they get moved + for(var/obj/machinery/duct/D in AM.loc) //Destroy any ducts under us. Ducts also self-destruct if placed under a plumbing machine. machines disable when they get moved if(D.anchored) //that should cover everything D.disconnect_duct() diff --git a/code/datums/components/rad_insulation.dm b/code/datums/components/rad_insulation.dm index 73d8c29440c..b576e4b9d14 100644 --- a/code/datums/components/rad_insulation.dm +++ b/code/datums/components/rad_insulation.dm @@ -9,7 +9,7 @@ RegisterSignal(parent, COMSIG_ATOM_RAD_PROBE, .proc/rad_probe_react) if(contamination_proof) // Can this object be contaminated? RegisterSignal(parent, COMSIG_ATOM_RAD_CONTAMINATING, .proc/rad_contaminating) - if(_amount != 1) // If it's 1 it wont have any impact on radiation passing through anyway + if(_amount != 1) // If it's 1 it won't have any impact on radiation passing through anyway RegisterSignal(parent, COMSIG_ATOM_RAD_WAVE_PASSING, .proc/rad_pass) amount = _amount diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 9d269370c7c..2f3d003e033 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -33,7 +33,7 @@ var/mutable = TRUE //set to FALSE to prevent most in-game methods of altering the disease via virology var/oldres //To prevent setting new cures unless resistance changes. - // The order goes from easy to cure to hard to cure. Keep in mind that sentient diseases pick two cures from tier 6 and up, ensure they wont react away in bodies. + // The order goes from easy to cure to hard to cure. Keep in mind that sentient diseases pick two cures from tier 6 and up, ensure they won't react away in bodies. var/static/list/advance_cures = list( list( // level 1 /datum/reagent/copper, /datum/reagent/silver, /datum/reagent/iodine, /datum/reagent/iron, /datum/reagent/carbon diff --git a/code/datums/dna.dm b/code/datums/dna.dm index ddf53eea4c6..0e025b60cd8 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -370,7 +370,7 @@ for(var/M in mutations) var/datum/mutation/human/HM = M if(HM.allow_transfer || force_transfer_mutations) - dna.force_give(new HM.type(HM.class, copymut=HM)) //using force_give since it may include exotic mutations that otherwise wont be handled properly + dna.force_give(new HM.type(HM.class, copymut=HM)) //using force_give since it may include exotic mutations that otherwise won't be handled properly /mob/living/carbon/proc/create_dna() dna = new /datum/dna(src) @@ -620,7 +620,7 @@ if(elligible_organs.len) var/obj/item/organ/O = pick(elligible_organs) O.Remove(src) - visible_message("[src] vomits up their [O.name]!", "You vomit up your [O.name]") //no "vomit up your the heart" + visible_message("[src] vomits up their [O.name]!", "You vomit up your [O.name]") //no "vomit up your heart" O.forceMove(drop_location()) if(prob(20)) O.animate_atom_living() diff --git a/code/datums/elements/undertile.dm b/code/datums/elements/undertile.dm index 7bdbae2aa14..3f3be0423c6 100644 --- a/code/datums/elements/undertile.dm +++ b/code/datums/elements/undertile.dm @@ -11,7 +11,7 @@ var/tile_overlay ///whether we use alpha or not. TRUE uses ALPHA_UNDERTILE because otherwise we have 200 different instances of this element for different alphas var/use_alpha - ///We will switch between anchored and unanchored. for stuff like satchels that shouldnt be pullable under tiles but are otherwise unanchored + ///We will switch between anchored and unanchored. for stuff like satchels that shouldn't be pullable under tiles but are otherwise unanchored var/use_anchor /datum/element/undertile/Attach(datum/target, invisibility_trait, invisibility_level = INVISIBILITY_MAXIMUM, tile_overlay, use_alpha = TRUE, use_anchor = FALSE) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 280e7004a36..a172ea8874c 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -98,7 +98,7 @@ /datum/mood_event/cult description = "I have seen the truth, praise the almighty one!\n" - mood_change = 10 //maybe being a cultist isnt that bad after all + mood_change = 10 //maybe being a cultist isn't that bad after all hidden = TRUE /datum/mood_event/family_heirloom diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 1ef7f155517..8f6195ca459 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -23,7 +23,7 @@ var/instability = 0 //instability the holder gets when the mutation is not native var/blocks = 4 //Amount of those big blocks with gene sequences var/difficulty = 8 //Amount of missing sequences. Sometimes it removes an entire pair for 2 points - var/timed = FALSE //Boolean to easily check if we're going to self destruct + var/timed = FALSE //Boolean to easily check if we're going to self-destruct var/alias //'Mutation #49', decided every round to get some form of distinction between undiscovered mutations var/scrambled = FALSE //Wheter we can read it if it's active. To avoid cheesing with mutagen var/class //Decides player accesibility, sorta diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index cc4aff1602a..637d4d7746d 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -173,7 +173,7 @@ var/message = speech_args[SPEECH_MESSAGE] if(message) message = " [message] " - message = replacetext(message," i'm not "," I aint ") + message = replacetext(message," i'm not "," I ain't ") message = replacetext(message," girl ",pick(" honey "," baby "," baby doll ")) message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo ")) message = replacetext(message," out of "," outta ") diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 52955a3d815..3ed89d946bf 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -308,7 +308,7 @@ new /obj/effect/temp_visual/bleed/explode(T) for(var/d in GLOB.alldirs) new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d) - playsound(T, "desceration", 100, TRUE, -1) + playsound(T, "desecration", 100, TRUE, -1) /datum/status_effect/stacking/saw_bleed/bloodletting id = "bloodletting" diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 10994a9f4c2..44507ab47c3 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -61,7 +61,7 @@ if(result_filters["Responsive"] && !APC.aidisabled) continue dat += "[A]
\ - Charge: [APC.cell ? "[DisplayEnergy(APC.cell.charge)] / [DisplayEnergy(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)" : "No Powercell Installed"]
\ + Charge: [APC.cell ? "[DisplayEnergy(APC.cell.charge)] / [DisplayEnergy(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)" : "No Power cell Installed"]
\ Area: [APC.area]
\ [APC.aidisabled || APC.panel_open ? "APC does not respond to interface query." : "APC responds to interface query."]

" dat += "Check Logs
" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 65d0c4767ee..03f4d8e290d 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -218,7 +218,7 @@ /obj/machinery/computer/security/qm name = "\improper Quartermaster's camera console" - desc = "A console with access to the mining, auxillary base and vault camera networks." + desc = "A console with access to the mining, auxiliary base and vault camera networks." network = list("mine", "auxbase", "vault") circuit = null @@ -322,8 +322,8 @@ network = list("prison") /obj/machinery/computer/security/telescreen/auxbase - name = "auxillary base monitor" - desc = "A telescreen that connects to the auxillary base's camera." + name = "auxiliary base monitor" + desc = "A telescreen that connects to the auxiliary base's camera." network = list("auxbase") /obj/machinery/computer/security/telescreen/minisat diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index af77d329b4e..a9f7cd2a06c 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -321,13 +321,13 @@ if(!checkCCcooldown()) to_chat(usr, "Arrays recycling. Please stand by.") return - var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") + var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self-Destruct Code Request.","") if(!input || !(usr in view(1,src)) || !checkCCcooldown()) return Nuke_request(input, usr) to_chat(usr, "Request sent.") usr.log_message("has requested the nuclear codes from CentCom with reason \"[input]\"", LOG_SAY) - priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/ai/commandreport.ogg') + priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self-Destruct Codes Requested",'sound/ai/commandreport.ogg') CM.lastTimeUsed = world.time diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 115b827e54e..305d2f6815f 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -123,5 +123,5 @@ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, TRUE, D) s.start() - D.visible_message("\the [D] self destructs!") + D.visible_message("\the [D] self-destructs!") D.gib() diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index 5e22ced2a64..2b08a4ebe51 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -164,7 +164,7 @@ else say("Subject not fat enough.") playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE) - overlays += "[icon_state]_red" //throw a red light icon over it, to show that it wont work + overlays += "[icon_state]_red" //throw a red light icon over it, to show that it won't work /obj/machinery/fat_sucker/proc/stop() processing = FALSE diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 76e502db17c..22a3a083ea0 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -289,7 +289,7 @@ if(ROULETTE_BET_1TO18) return (rolled_number >= 1 && rolled_number <= 18) //between 1 to 18 if(ROULETTE_BET_19TO36) - return rolled_number > 18 //between 19 to 36, no need to check bounds because we wont go higher anyways + return rolled_number > 18 //between 19 to 36, no need to check bounds because we won't go higher anyways if(ROULETTE_BET_BLACK) return "black" == numbers["[rolled_number]"]//Check if our number is black in the numbers dict if(ROULETTE_BET_RED) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index c7b921b6b76..f0938077e40 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -244,7 +244,7 @@ wires.cut_all() /obj/machinery/syndicatebomb/self_destruct - name = "self destruct device" + name = "self-destruct device" desc = "Do not taunt. Warranty invalid if exposed to high temperature. Not suitable for agents under 3 years of age." payload = /obj/item/bombcore/large can_unanchor = FALSE diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index 0419cd30df0..ee25d6a8dc6 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -29,7 +29,7 @@ [internal_damage&MECHA_INT_TANK_BREACH?"GAS TANK HONK
":null] [internal_damage&MECHA_INT_CONTROL_LOST?"HONK-A-DOODLE - Recalibrate
":null] IntegriHONK: [integrity]%
- PowerHONK charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
+ PowerHONK charge: [isnull(cell_charge)?"No power cell installed":"[cell.percent()]%"]
Air source: [use_internal_tank?"Internal Airtank":"Environment"]
AirHONK pressure: [tank_pressure]kPa
AirHONK temperature: [tank_temperature]°K|[tank_temperature - T0C]°C
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index ed53c567222..c0110cb64c6 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -478,7 +478,7 @@ if(R.can_synth && add_known_reagent(R.type,R.name)) occupant_message("Reagent analyzed, identified as [R.name] and added to database.") send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) - occupant_message("Analyzis complete.") + occupant_message("Analysis complete.") return 1 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/add_known_reagent(r_id,r_name) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index e979996cc31..f2a73d91199 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -337,7 +337,7 @@ if(isnull(cur_charge) || !chassis.cell) STOP_PROCESSING(SSobj, src) set_ready_state(1) - occupant_message("No powercell detected.") + occupant_message("No power cell detected.") return if(cur_charge < chassis.cell.maxcharge) var/area/A = get_area(chassis) @@ -440,7 +440,7 @@ var/cur_charge = chassis.get_charge() if(isnull(cur_charge)) set_ready_state(1) - occupant_message("No powercell detected.") + occupant_message("No power cell detected.") log_message("Deactivated.", LOG_MECHA) STOP_PROCESSING(SSobj, src) return @@ -544,7 +544,7 @@ /obj/item/mecha_parts/mecha_equipment/thrusters/gas name = "RCS thruster package" - desc = "A set of thrusters that allow for exosuit movement in zero-gravity enviroments, by expelling gas from the internal life support tank." + desc = "A set of thrusters that allow for exosuit movement in zero-gravity environments, by expelling gas from the internal life support tank." effect_type = /obj/effect/particle_effect/smoke var/move_cost = 20 //moles per step @@ -569,7 +569,7 @@ /obj/item/mecha_parts/mecha_equipment/thrusters/ion //for mechs with built-in thrusters, should never really exist un-attached to a mech name = "Ion thruster package" - desc = "A set of thrusters that allow for exosuit movement in zero-gravity enviroments." + desc = "A set of thrusters that allow for exosuit movement in zero-gravity environments." detachable = FALSE salvageable = FALSE effect_type = /obj/effect/particle_effect/ion_trails diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c3d79aa9484..34b29dfe319 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -711,7 +711,7 @@ if(MECHA_INT_TEMP_CONTROL) occupant_message("Life support system reactivated.") if(MECHA_INT_FIRE) - occupant_message("Internal fire extinquished.") + occupant_message("Internal fire extinguished.") if(MECHA_INT_TANK_BREACH) occupant_message("Damaged internal tank has been sealed.") internal_damage &= ~int_dam_flag diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index d10b2e878a6..0eff29d992a 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -213,7 +213,7 @@ to_chat(user, "You install the power cell.") playsound(src, 'sound/items/screwdriver2.ogg', 50, FALSE) cell = C - log_message("Powercell installed", LOG_MECHA) + log_message("Power cell installed", LOG_MECHA) else to_chat(user, "There's already a power cell installed!") return diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 20627db4607..ef4a5edb83b 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -67,7 +67,7 @@ . = {"[report_internal_damage()] [integrity<30?"DAMAGE LEVEL CRITICAL
":null] Integrity: [integrity]%
- Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
+ Power cell charge: [isnull(cell_charge)?"No power cell installed":"[cell.percent()]%"]
Air source: [internal_tank?"[use_internal_tank?"Internal Airtank":"Environment"]":"Environment"]
Airtank pressure: [internal_tank?"[tank_pressure]kPa":"N/A"]
Airtank temperature: [internal_tank?"[tank_temperature]°K|[tank_temperature - T0C]°C":"N/A"]
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8b20ba7c7ba..fc7de7f4397 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -709,7 +709,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb if(damtype == BURN) . = 'sound/weapons/sear.ogg' else - . = "desceration" + . = "desecration" /obj/item/proc/open_flame(flame_heat=700) var/turf/location = loc diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 4d739f6aae2..413e743c1d1 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -964,7 +964,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) //it's reusable so it won't unequip when empty return - //open flame removed because vapes are a closed system, they wont light anything on fire + //open flame removed because vapes are a closed system, they won't light anything on fire if(super && vapetime > 3)//Time to start puffing those fat vapes, yo. var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 9d072a8ec78..478682b7c4f 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -103,10 +103,10 @@ name = "Carbon Dioxide Supply Control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/carbon_tank -/obj/item/circuitboard/computer/auxillary_base - name = "Auxillary Base Management Console (Computer Board)" +/obj/item/circuitboard/computer/auxiliary_base + name = "Auxiliary Base Management Console (Computer Board)" icon_state = "engineering" - build_path = /obj/machinery/computer/auxillary_base + build_path = /obj/machinery/computer/auxiliary_base /obj/item/circuitboard/computer/base_construction name = "circuit board (Aux Mining Base Construction Console)" diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index ec9dfeb71b3..56c36839fe9 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -84,7 +84,7 @@ add_overlay("hatch") add_overlay("legs_retracted") addtimer(CALLBACK(src, .proc/startUp), 50) - QDEL_IN(src, 8 MINUTES) //Self destruct after 8 min + QDEL_IN(src, 8 MINUTES) //Self-destruct after 8 min /obj/structure/checkoutmachine/proc/startUp() //very VERY snowflake code that adds a neat animation when the pod lands. @@ -193,7 +193,7 @@ icon = 'icons/obj/money_machine_64.dmi' pixel_z = 300 desc = "Get out of the way!" - layer = FLY_LAYER//that wasnt flying, that was falling with style! + layer = FLY_LAYER//that wasn't flying, that was falling with style! icon_state = "missile_blur" /obj/effect/dumpeetTarget diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 2259a04fd68..2f01e211ff1 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -39,7 +39,7 @@ /obj/item/multitool/suicide_act(mob/living/carbon/user) user.visible_message("[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!") - return OXYLOSS//theres a reason it wasnt recommended by doctors + return OXYLOSS//theres a reason it wasn't recommended by doctors // Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby. diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 37aca014414..e7f2620dfab 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -352,12 +352,12 @@ name = "\improper DNA injector (Anti-Shock Touch)" remove_mutations = list(SHOCKTOUCH) -/obj/item/dnainjector/spacialinstability - name = "\improper DNA injector (Spacial Instability)" +/obj/item/dnainjector/spatialinstability + name = "\improper DNA injector (Spatial Instability)" add_mutations = list(BADBLINK) -/obj/item/dnainjector/antispacialinstability - name = "\improper DNA injector (Anti-Spacial Instability)" +/obj/item/dnainjector/antispatialinstability + name = "\improper DNA injector (Anti-Spatial Instability)" remove_mutations = list(BADBLINK) /obj/item/dnainjector/acidflesh diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 29b773562e4..69649f8130e 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -243,7 +243,7 @@ /obj/item/flamethrower/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) var/obj/projectile/P = hitby if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15)) - owner.visible_message("\The [attack_text] hits the fueltank on [owner]'s [name], rupturing it! What a shot!") + owner.visible_message("\The [attack_text] hits the fuel tank on [owner]'s [name], rupturing it! What a shot!") var/turf/target_turf = get_turf(owner) log_game("A projectile ([hitby]) detonated a flamethrower tank held by [key_name(owner)] at [COORD(target_turf)]") igniter.ignite_turf(src,target_turf, release_amount = 100) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 802efc2fcf5..45cc0261f24 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -115,7 +115,7 @@ L.visible_message("[src] lunges at [L]!", "[src] lunges at you!") do_attack_animation(L, null, src) playsound(L, 'sound/weapons/smash.ogg', 50, TRUE) - playsound(L, 'sound/misc/desceration-01.ogg', 50, TRUE) + playsound(L, 'sound/misc/desecration-01.ogg', 50, TRUE) L.adjustBruteLoss(force) adjust_bloodthirst(-5) //Don't stop attacking they're right there! else @@ -177,7 +177,7 @@ var/victims = 0 meal.visible_message("[src] swings open and devours [meal]!", "[src] consumes you!") meal.adjustBruteLoss(200) - playsound(meal, 'sound/misc/desceration-02.ogg', 75, TRUE) + playsound(meal, 'sound/misc/desecration-02.ogg', 75, TRUE) playsound(src, 'sound/items/eatfood.ogg', 100, TRUE) meal.forceMove(src) force_bonus += HIS_GRACE_FORCE_BONUS diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 7ecd444c08f..4f88c2eb024 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -80,8 +80,8 @@
  • High-speed Drill
    • -
  • Propulsion Device: Powercell-powered electro-hydraulic system.
    • -
  • Powercell capacity: Varies.
    • +
  • Propulsion Device: Power cell powered electro-hydraulic system.
    • +
  • Power cell capacity: Varies.

    • Construction:

    diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 6fd00455563..c72be4eba50 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -111,7 +111,7 @@ /obj/item/storage/box/hero/carphunter name = "Carp Hunter, Wildlife Expert - 2506." - desc = "Despite his nickname, this wildlife expert was mainly known as a passionate enviromentalist and conservationist, often coming in contact with dangerous wildlife to teach about the beauty of nature." + desc = "Despite his nickname, this wildlife expert was mainly known as a passionate environmentalist and conservationist, often coming in contact with dangerous wildlife to teach about the beauty of nature." /obj/item/storage/box/hero/carphunter/PopulateContents() new /obj/item/clothing/suit/space/hardsuit/carp/old(src) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 31c30ba76c7..7af101dcc1a 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -44,7 +44,7 @@ user.visible_message("[user] puts [user.p_their()] head into \the [src], and begins closing it! It looks like [user.p_theyre()] trying to commit suicide!") myhead.dismember() myhead.forceMove(src)//force your enemies to kill themselves with your head collection box! - playsound(user, "desceration-01.ogg", 50, TRUE, -1) + playsound(user, "desecration-01.ogg", 50, TRUE, -1) return BRUTELOSS user.visible_message("[user] beating [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 58ad6b3b01d..bed753f2a52 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -87,7 +87,7 @@ var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) if(BP) BP.drop_limb() - playsound(loc, "desceration", 50, TRUE, -1) + playsound(loc, "desecration", 50, TRUE, -1) return (BRUTELOSS) /obj/item/crowbar/power/attack_self(mob/user) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5ca1194bb39..98405bbc1be 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -226,7 +226,7 @@ /* - * Toy gun: Why isnt this an /obj/item/gun? + * Toy gun: Why isn't this an /obj/item/gun? */ /obj/item/toy/gun name = "cap gun" diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 1d72325db32..02432695ca9 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -535,7 +535,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/board_item_type = /obj/vehicle/ridden/scooter/skateboard /obj/item/melee/skateboard/attack_self(mob/user) - var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))//this probably has fucky interactions with telekinesis but for the record it wasnt my fault + var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))//this probably has fucky interactions with telekinesis but for the record it wasn't my fault S.buckle_mob(user) qdel(src) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9e101f005fe..9d91055fcf7 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -240,7 +240,7 @@ else return ..() -/obj/structure/closet/proc/tool_interact(obj/item/W, mob/user)//returns TRUE if attackBy call shouldnt be continued (because tool was used/closet was of wrong type), FALSE if otherwise +/obj/structure/closet/proc/tool_interact(obj/item/W, mob/user)//returns TRUE if attackBy call shouldn't be continued (because tool was used/closet was of wrong type), FALSE if otherwise . = TRUE if(opened) if(istype(W, cutting_tool)) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index b53a4292535..bb737969c23 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -293,7 +293,7 @@ return if(is_locked) - to_chat(user, "The case is shut tight with an old fashioned physical lock. Maybe you should ask the curator for the key?") + to_chat(user, "The case is shut tight with an old-fashioned physical lock. Maybe you should ask the curator for the key?") return if(!added_roundstart) diff --git a/code/game/sound.dm b/code/game/sound.dm index 838008594e3..047f825fffc 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -160,8 +160,8 @@ soundin = pick('sound/machines/terminal_button01.ogg', 'sound/machines/terminal_button02.ogg', 'sound/machines/terminal_button03.ogg', \ 'sound/machines/terminal_button04.ogg', 'sound/machines/terminal_button05.ogg', 'sound/machines/terminal_button06.ogg', \ 'sound/machines/terminal_button07.ogg', 'sound/machines/terminal_button08.ogg') - if ("desceration") - soundin = pick('sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg') + if ("desecration") + soundin = pick('sound/misc/desecration-01.ogg', 'sound/misc/desecration-02.ogg', 'sound/misc/desecration-03.ogg') if ("im_here") soundin = pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg') if ("can_open") diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index 0de4b556219..2a8ec07f24e 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -163,7 +163,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( while(ispath(turf_type, /turf/baseturf_skipover)) amount++ if(amount > new_baseturfs.len) - CRASH("The bottomost baseturf of a turf is a skipover [src]([type])") + CRASH("The bottommost baseturf of a turf is a skipover [src]([type])") turf_type = new_baseturfs[max(1, new_baseturfs.len - amount + 1)] new_baseturfs.len -= min(amount, new_baseturfs.len - 1) // No removing the very bottom if(new_baseturfs.len == 1) diff --git a/code/game/turfs/open/space/transit.dm b/code/game/turfs/open/space/transit.dm index 1deb5303d30..a4caa6c468f 100644 --- a/code/game/turfs/open/space/transit.dm +++ b/code/game/turfs/open/space/transit.dm @@ -36,7 +36,7 @@ if(!AM || istype(AM, /obj/docking_port)) return if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement. - return // Don't move multi tile objects if their origin isnt in transit + return // Don't move multi tile objects if their origin isn't in transit var/max = world.maxx-TRANSITIONEDGE var/min = 1+TRANSITIONEDGE diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 2bd873348e9..bbc01955d5b 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -145,7 +145,7 @@ message_admins("[key_name(usr)] created an abductor team.") log_admin("[key_name(usr)] created an abductor team.") else - message_admins("[key_name_admin(usr)] tried to create an abductor team. Unfortunatly there were not enough candidates available.") + message_admins("[key_name_admin(usr)] tried to create an abductor team. Unfortunately there were not enough candidates available.") log_admin("[key_name(usr)] failed to create an abductor team.") if("revenant") if(src.makeRevenant()) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 474c918a5ca..8a770fa875f 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -738,7 +738,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null text_list += " at [final] [ADMIN_COORDJMP(final)]" a = final.loc else - text_list += " at nonexistant location" + text_list += " at nonexistent location" if(a) text_list += " in area [a]" if(T.loc != a) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index b5be28c1e67..97ddf32a12d 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -27,15 +27,15 @@ // assignment : '=' expression // variable : | variable '.' variable | variable '[' ']' | '{' '}' | '(' expression ')' | call_function // -// bool_expression : expression comparitor expression [bool_operator bool_expression] +// bool_expression : expression comparator expression [bool_operator bool_expression] // expression : ( unary_expression | '(' expression ')' | value ) [binary_operator expression] // expression_list : expression [',' expression_list] // unary_expression : unary_operator ( unary_expression | value ) // -// comparitor : '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' +// comparator : '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' // value : variable | string | number | 'null' | object_type | array | selectors_array // unary_operator : '!' | '-' | '~' -// binary_operator : comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' +// binary_operator : comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' // bool_operator : 'AND' | '&&' | 'OR' | '||' // // array : '[' expression_list ']' @@ -56,7 +56,7 @@ var/list/boolean_operators = list("and", "or", "&&", "||") var/list/unary_operators = list("!", "-", "~") var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^", "%") - var/list/comparitors = list("=", "==", "!=", "<>", "<", "<=", ">", ">=") + var/list/comparators = list("=", "==", "!=", "<>", "<", "<=", ">", ">=") /datum/SDQL_parser/New(query_list) query = query_list @@ -109,7 +109,7 @@ parse_error("Invalid option assignment symbol: [token(i + 1)]") var/val = tokenl(i + 2) if(!(val in SDQL2_VALID_OPTION_VALUES)) - parse_error("Invalid optoin value: [val]") + parse_error("Invalid option value: [val]") assignment_list[type] = val return (i + 3) @@ -396,21 +396,21 @@ var/path = text2path(token(i)) if (path == null) - return parse_error("Nonexistant type path: [token(i)]") + return parse_error("Nonexistent type path: [token(i)]") node += path return i + 1 -//comparitor: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' -/datum/SDQL_parser/proc/comparitor(i, list/node) +//comparator: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' +/datum/SDQL_parser/proc/comparator(i, list/node) if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">=")) node += token(i) else - parse_error("Unknown comparitor [token(i)]") + parse_error("Unknown comparator [token(i)]") return i + 1 @@ -422,7 +422,7 @@ node += token(i) else - parse_error("Unknown comparitor [token(i)]") + parse_error("Unknown comparator [token(i)]") return i + 1 @@ -551,7 +551,7 @@ i = binary_operator(i, node) i = expression(i, node) - else if(token(i) in comparitors) + else if(token(i) in comparators) i = binary_operator(i, node) var/list/rhs = list() @@ -587,10 +587,10 @@ return i -//binary_operator: comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' +//binary_operator: comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' /datum/SDQL_parser/proc/binary_operator(i, list/node) - if(token(i) in (binary_operators + comparitors)) + if(token(i) in (binary_operators + comparators)) node += token(i) else diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index cc8a179bf73..270cd5fafc4 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -543,7 +543,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/msg = "Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!" message_admins(msg) admin_ticket_log(M, msg) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvenate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_create_centcom_report() set category = "Admin - Events" diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm index 9931a750095..5665cbf1eb8 100644 --- a/code/modules/antagonists/abductor/equipment/glands/heal.dm +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -170,7 +170,7 @@ /obj/item/organ/heart/gland/heal/proc/replace_limb(body_zone, obj/item/bodypart/limb) if(limb) owner.visible_message("[owner]'s [limb.name] suddenly detaches from [owner.p_their()] body!", "Your [limb.name] suddenly detaches from your body!") - playsound(owner, "desceration", 50, TRUE, -1) + playsound(owner, "desecration", 50, TRUE, -1) limb.drop_limb() else to_chat(owner, "You feel a weird tingle in your [parse_zone(body_zone)]... even if you don't have one.") diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index 2466f54692b..37ee4c6f194 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -20,7 +20,7 @@ /* changeling code now relies on on_purchase to grant powers. if you override it, MAKE SURE you call parent or it will not be usable -the same goes for Remove(). if you override Remove(), call parent or else your power wont be removed on respec +the same goes for Remove(). if you override Remove(), call parent or else your power won't be removed on respec */ /datum/action/changeling/proc/on_purchase(mob/user, is_respec) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 3d1422e3bb2..d9bc0ef102e 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -152,12 +152,12 @@ /datum/antagonist/cult/admin_add(datum/mind/new_owner,mob/admin) give_equipment = FALSE new_owner.add_antag_datum(src) - message_admins("[key_name_admin(admin)] has cult'ed [key_name_admin(new_owner)].") - log_admin("[key_name(admin)] has cult'ed [key_name(new_owner)].") + message_admins("[key_name_admin(admin)] has cult-ed [key_name_admin(new_owner)].") + log_admin("[key_name(admin)] has cult-ed [key_name(new_owner)].") /datum/antagonist/cult/admin_remove(mob/user) - message_admins("[key_name_admin(user)] has decult'ed [key_name_admin(owner)].") - log_admin("[key_name(user)] has decult'ed [key_name(owner)].") + message_admins("[key_name_admin(user)] has decult-ed [key_name_admin(owner)].") + log_admin("[key_name(user)] has decult-ed [key_name(owner)].") SSticker.mode.remove_cultist(owner,silent=TRUE) //disgusting /datum/antagonist/cult/get_admin_commands() diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index e7fec3c590c..34d81f206b6 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -589,7 +589,7 @@ return if(cultist_to_receive.stat == DEAD) to_chat(user, "[cultist_to_receive] has died!") - log_game("Void torch failed - target died") + log_game("Void torch failed - target died") return if(!iscultist(cultist_to_receive)) to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!") diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index e4098053faa..318f32df322 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -681,7 +681,7 @@ structure_check() searches for nearby cultist structures required for the invoca cultist_to_summon.visible_message("[cultist_to_summon] suddenly disappears in a flash of red light!", \ "Overwhelming vertigo consumes you as you are hurled through the air!") ..() - visible_message("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!") + visible_message("A foggy shape materializes atop [src] and solidifies into [cultist_to_summon]!") cultist_to_summon.forceMove(get_turf(src)) qdel(src) diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index a4acc3492fd..1135932a418 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -237,7 +237,7 @@ else //Already set by admins/something else? nuke_team.memorized_code = nuke.r_code else - stack_trace("Station self destruct not found during lone op team creation.") + stack_trace("Station self-destruct not found during lone op team creation.") nuke_team.memorized_code = null /datum/antagonist/nukeop/reinforcement diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index a5a8cf30b92..0f1c25e9b19 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -235,7 +235,7 @@ user.death() if(3) //Swarm of creatures - T.visible_message("A swarm of creatures surround [user]!") + T.visible_message("A swarm of creatures surrounds [user]!") for(var/direction in GLOB.alldirs) new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction)) if(4) @@ -262,7 +262,7 @@ var/atom/throw_target = get_edge_target_turf(user, throw_dir) user.throw_at(throw_target, 200, 4) if(8) - //Fueltank Explosion + //Fuel tank Explosion T.visible_message("An explosion bursts into existence around [user]!") explosion(get_turf(user),-1,0,2, flame_range = 2) if(9) diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 09d59ce6d3d..f0c48628853 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -112,7 +112,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") info = {"Target: Research-station Epsilon
    Objective: Prototype weaponry. The captain likely keeps them locked in her safe.

    - Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunatly he has been captured by security + Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunately he has been captured by security Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.

    diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 7c6aa16c5dd..5945427d846 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -79,7 +79,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm data["effectLimb"] = temp_pod.effectLimb //If true, pops off a limb (if applicable) from anyone caught under the pod when it lands data["effectOrgans"] = temp_pod.effectOrgans //If true, yeets the organs out of any bodies caught under the pod when it lands data["effectBluespace"] = temp_pod.bluespace //If true, the pod deletes (in a shower of sparks) after landing - data["effectStealth"] = temp_pod.effectStealth //If true, a target icon isnt displayed on the turf where the pod will land + data["effectStealth"] = temp_pod.effectStealth //If true, a target icon isn't displayed on the turf where the pod will land data["effectQuiet"] = temp_pod.effectQuiet //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc) data["effectMissile"] = temp_pod.effectMissile //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground data["effectCircle"] = temp_pod.effectCircle //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here @@ -184,7 +184,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm if (isnull(boomInput[i])) return if (!isnum(boomInput[i])) //If the user doesn't input a number, set that specific explosion value to zero - alert(usr, "That wasnt a number! Value set to default (zero) instead.") + alert(usr, "That wasn't a number! Value set to default (zero) instead.") boomInput = 0 explosionChoice = 1 temp_pod.explosionSize = boomInput @@ -206,7 +206,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm if (isnull(damageInput)) return if (!isnum(damageInput)) //Sanitize the input for damage to deal.s - alert(usr, "That wasnt a number! Value set to default (zero) instead.") + alert(usr, "That wasn't a number! Value set to default (zero) instead.") damageInput = 0 damageChoice = 1 temp_pod.damage = damageInput @@ -290,7 +290,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm if (isnull(timeInput)) return if (!isnum(timeInput)) //Sanitize input, if it doesnt check out, error and set to default - alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.fallDuration)*0.1]) instead.") + alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.fallDuration)*0.1]) instead.") timeInput = initial(temp_pod.fallDuration) temp_pod.fallDuration = 10 * timeInput . = TRUE @@ -302,7 +302,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm if (isnull(timeInput)) return if (!isnum(timeInput)) //Sanitize input, if it doesnt check out, error and set to default - alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.landingDelay)*0.1]) instead.") + alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.landingDelay)*0.1]) instead.") timeInput = initial(temp_pod.landingDelay) temp_pod.landingDelay = 10 * timeInput . = TRUE @@ -314,7 +314,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm if (isnull(timeInput)) return if (!isnum(timeInput)) //Sanitize input - alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.openingDelay)*0.1]) instead.") + alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.openingDelay)*0.1]) instead.") timeInput = initial(temp_pod.openingDelay) temp_pod.openingDelay = 10 * timeInput . = TRUE @@ -326,7 +326,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm if (isnull(timeInput)) return if (!isnum(timeInput)) - alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.departureDelay)*0.1]) instead.") + alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.departureDelay)*0.1]) instead.") timeInput = initial(temp_pod.departureDelay) temp_pod.departureDelay = 10 * timeInput . = TRUE @@ -344,7 +344,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm if (isnull(timeInput)) return if (!isnum(timeInput)) - alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.fallingSoundLength)*0.1]) instead.") + alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.fallingSoundLength)*0.1]) instead.") temp_pod.fallingSound = soundInput temp_pod.fallingSoundLength = 10 * timeInput . = TRUE @@ -527,7 +527,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm numTurfs = 0 //Counts the number of turfs that can be launched (remember, supplypods either launch all at once or one turf-worth of items at a time) acceptableTurfs = list() for (var/turf/T in orderedArea) //Go through the orderedArea list - if (typecache_filter_list_reverse(T.contents, ignored_atoms).len != 0) //if there is something in this turf that isnt in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list + if (typecache_filter_list_reverse(T.contents, ignored_atoms).len != 0) //if there is something in this turf that isn't in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list acceptableTurfs.Add(T) //Because orderedArea was an ordered linear list, acceptableTurfs will be as well. numTurfs ++ diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 8324e12a0a9..876700e9816 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1488,7 +1488,7 @@ /datum/supply_pack/service/noslipfloor name = "High-traction Floor Tiles" - desc = "Make slipping a thing of the past with thirty industrial-grade anti-slip floortiles!" + desc = "Make slipping a thing of the past with thirty industrial-grade anti-slip floor tiles!" cost = 2000 contains = list(/obj/item/stack/tile/noslip/thirty) crate_name = "high-traction floor tiles crate" diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 1603d54dd9e..7b2d93a7287 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -27,7 +27,7 @@ var/effectLimb = FALSE //If true, pops off a limb (if applicable) from anyone caught under the pod when it lands var/effectOrgans = FALSE //If true, yeets out every limb and organ from anyone caught under the pod when it lands var/effectGib = FALSE //If true, anyone under the pod will be gibbed when it lands - var/effectStealth = FALSE //If true, a target icon isnt displayed on the turf where the pod will land + var/effectStealth = FALSE //If true, a target icon isn't displayed on the turf where the pod will land var/effectQuiet = FALSE //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc) var/effectMissile = FALSE //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground var/effectCircle = FALSE //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here @@ -203,7 +203,7 @@ var/mob/M if (istype(holder, /mob)) //Allows mobs to assume the role of the holder, meaning we look at the mob's contents rather than the supplypod's contents. Typically by this point the supplypod's contents have already been moved over to the mob's contents M = holder - if (M.key && !forced && !broken) //If we are player controlled, then we shouldnt open unless the opening is manual, or if it is due to being destroyed (represented by the "broken" parameter) + if (M.key && !forced && !broken) //If we are player controlled, then we shouldn't open unless the opening is manual, or if it is due to being destroyed (represented by the "broken" parameter) return if (openingSound) playsound(get_turf(holder), openingSound, soundVolume, FALSE, FALSE) //Special admin sound to play @@ -268,7 +268,7 @@ pixel_y = -5 pixel_z = 200 desc = "Get out of the way!" - layer = FLY_LAYER//that wasnt flying, that was falling with style! + layer = FLY_LAYER//that wasn't flying, that was falling with style! icon_state = "" /obj/effect/DPfall/Initialize(dropLocation, obj/structure/closet/supplypod/pod) @@ -313,7 +313,7 @@ M.forceMove(src) if(pod.effectStun) //If effectStun is true, stun any mobs caught on this target until the pod gets a chance to hit them for (var/mob/living/M in get_turf(src)) - M.Stun(pod.landingDelay+10, ignore_canstun = TRUE)//you aint goin nowhere, kid. + M.Stun(pod.landingDelay+10, ignore_canstun = TRUE)//you ain't goin nowhere, kid. if (pod.effectStealth) //If effectStealth is true we want to be invisible icon_state = "" if (pod.fallDuration == initial(pod.fallDuration) && pod.landingDelay + pod.fallDuration < pod.fallingSoundLength) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index a76aea68dac..eee36cdc7e6 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -67,7 +67,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if((current_version < 21) && features["ethcolor"] && (features["ethcolor"] == "#9c3030")) features["ethcolor"] = "9c3030" if(current_version < 22) - job_preferences = list() //It loaded null from nonexistant savefile field. + job_preferences = list() //It loaded null from nonexistent savefile field. var/job_civilian_high = 0 var/job_civilian_med = 0 var/job_civilian_low = 0 diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index fb1ab806dcb..d5ab3001406 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -52,7 +52,7 @@ icon_state = "stethoscope" /obj/item/clothing/neck/stethoscope/suicide_act(mob/living/carbon/user) - user.visible_message("[user] puts \the [src] to [user.p_their()] chest! It looks like [user.p_they()] wont hear much!") + user.visible_message("[user] puts \the [src] to [user.p_their()] chest! It looks like [user.p_they()] won't hear much!") return OXYLOSS /obj/item/clothing/neck/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 8c84d2b2543..fdcc5b3f7cc 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -38,7 +38,7 @@ l_leg.dismember() if(r_leg) r_leg.dismember() - playsound(user, "desceration", 50, TRUE, -1) + playsound(user, "desecration", 50, TRUE, -1) return BRUTELOSS else//didnt realize this suicide act existed (was in miscellaneous.dm) and didnt want to remove it, so made it a 50/50 chance. Why not! user.visible_message("[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?") diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index bdcc6821f1f..e24eac6d922 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -30,7 +30,7 @@ SSshuttle.shuttle_loan = src switch(dispatch_type) if(HIJACK_SYNDIE) - priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","CentCom Counter Intelligence") + priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","CentCom Counterintelligence") if(RUSKY_PARTY) priority_announce("Cargo: A group of angry Russians want to have a party. Can you send them your cargo shuttle then make them disappear?","CentCom Russian Outreach Program") if(SPIDER_GIFT) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index a250fc28a23..4ea8a8d0534 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -599,7 +599,7 @@ playsound(H,'sound/items/drink.ogg', 80, TRUE) reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip sleep(5) - H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old fashioned singularity engines anymore.")) + H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore.")) if(H.age >= 30) H.Stun(50) sleep(50) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 09227e2c3d2..749fc31f5fc 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -240,7 +240,7 @@ /datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "You feel more American already."), /datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), /datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), - /datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), + /datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in its passage"), /datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), /datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), /datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 1db077acd59..c7e9a91edef 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -478,7 +478,7 @@ ///Stores the time set for the next handle_reagents var/next_succ = 0 - //makes snacks actually wearable as masks and still edible the old fashioned way. + //makes snacks actually wearable as masks and still edible the old-fashioned way. /obj/item/reagent_containers/food/snacks/chewable/proc/handle_reagents() if(reagents.total_volume) if(iscarbon(loc)) @@ -792,7 +792,7 @@ /obj/item/reagent_containers/food/snacks/crab_rangoon name = "Crab Rangoon" - desc = "Has many names, like crab puffs, cheese wontons, crab dumplings? Whatever you call them, they're a fabulous blast of cream cheesy crab." + desc = "Has many names, like crab puffs, cheese won'tons, crab dumplings? Whatever you call them, they're a fabulous blast of cream cheesy crab." icon_state = "crabrangoon" list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5) filling_color = "#f2efdc" diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 26750e11bd6..b61339552ae 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -49,7 +49,7 @@ L.Paralyze(20) //splat! L.adjust_blurriness(1) L.visible_message("[L] is creamed by [src]!", "You've been creamed by [src]!") - playsound(L, "desceration", 50, TRUE) + playsound(L, "desecration", 50, TRUE) if(is_type_in_typecache(hit_atom, GLOB.creamable)) hit_atom.AddComponent(/datum/component/creamed, src) qdel(src) diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index d94dad955e0..d5e56945257 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -187,7 +187,7 @@ l_arm.dismember() else r_arm.dismember() - playsound(user, "desceration" ,50, TRUE, -1) + playsound(user, "desecration" ,50, TRUE, -1) /obj/item/reagent_containers/food/snacks/proc/i_kill_you(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice)) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 2b9356db487..4293eadea76 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -157,7 +157,7 @@ var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) if(BP) BP.drop_limb() - playsound(src, "desceration" ,50, TRUE, -1) + playsound(src, "desecration" ,50, TRUE, -1) return (BRUTELOSS) /obj/item/scythe/pre_attack(atom/A, mob/living/user, params) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 990e0fcbe95..8fc5d49d00a 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -407,7 +407,7 @@ // The secret of potato supercells! var/datum/plant_gene/trait/cell_charge/CG = G.seed.get_gene(/datum/plant_gene/trait/cell_charge) - if(CG) // Cell charge max is now 40MJ or otherwise known as 400KJ (Same as bluespace powercells) + if(CG) // Cell charge max is now 40MJ or otherwise known as 400KJ (Same as bluespace power cells) pocell.maxcharge *= CG.rate*100 pocell.charge = pocell.maxcharge pocell.name = "[G.name] battery" diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index c2b0ad3596a..cf92cf36966 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -6,13 +6,13 @@ #define BAD_COORDS 3 #define BAD_TURF 4 -/area/shuttle/auxillary_base - name = "Auxillary Base" +/area/shuttle/auxiliary_base + name = "Auxiliary Base" luminosity = 0 //Lighting gets lost when it lands anyway -/obj/machinery/computer/auxillary_base - name = "auxillary base management console" +/obj/machinery/computer/auxiliary_base + name = "auxiliary base management console" icon = 'icons/obj/terminals.dmi' icon_state = "dorm_available" var/shuttleId = "colony_drop" @@ -23,13 +23,13 @@ interface with the mining shuttle at the landing site if a mobile beacon is also req_one_access = list(ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_HEADS, ACCESS_RESEARCH) var/possible_destinations - circuit = /obj/item/circuitboard/computer/auxillary_base + circuit = /obj/item/circuitboard/computer/auxiliary_base -/obj/machinery/computer/auxillary_base/Initialize() +/obj/machinery/computer/auxiliary_base/Initialize() . = ..() AddComponent(/datum/component/gps, "NT_AUX") -/obj/machinery/computer/auxillary_base/ui_interact(mob/user) +/obj/machinery/computer/auxiliary_base/ui_interact(mob/user) . = ..() var/list/options = params2list(possible_destinations) var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId) @@ -72,7 +72,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also popup.open() -/obj/machinery/computer/auxillary_base/Topic(href, href_list) +/obj/machinery/computer/auxiliary_base/Topic(href, href_list) if(..()) return usr.set_machine(src) @@ -90,7 +90,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also say("Launch sequence activated! Prepare for drop!!") playsound(loc, 'sound/machines/warning-buzzer.ogg', 70, FALSE) launch_warning = FALSE - log_shuttle("[key_name(usr)] has launched the auxillary base.") + log_shuttle("[key_name(usr)] has launched the auxiliary base.") else if(!shuttle_error) say("Shuttle request uploaded. Please stand away from the doors.") else @@ -127,16 +127,16 @@ interface with the mining shuttle at the landing site if a mobile beacon is also updateUsrDialog() -/obj/machinery/computer/auxillary_base/proc/set_mining_mode() +/obj/machinery/computer/auxiliary_base/proc/set_mining_mode() if(is_mining_level(z)) //The console switches to controlling the mining shuttle once landed. req_one_access = list() shuttleId = "mining" //The base can only be dropped once, so this gives the console a new purpose. possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public" -/obj/machinery/computer/auxillary_base/proc/set_landing_zone(turf/T, mob/user, no_restrictions) - var/obj/docking_port/mobile/auxillary_base/base_dock = locate(/obj/docking_port/mobile/auxillary_base) in SSshuttle.mobile +/obj/machinery/computer/auxiliary_base/proc/set_landing_zone(turf/T, mob/user, no_restrictions) + var/obj/docking_port/mobile/auxiliary_base/base_dock = locate(/obj/docking_port/mobile/auxiliary_base) in SSshuttle.mobile if(!base_dock) //Not all maps have an Aux base. This object is useless in that case. - to_chat(user, "This station is not equipped with an auxillary base. Please contact your Nanotrasen contractor.") + to_chat(user, "This station is not equipped with an auxiliary base. Please contact your Nanotrasen contractor.") return if(!no_restrictions) var/static/list/disallowed_turf_types = typecacheof(list( @@ -189,7 +189,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also item_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - desc = "Deploy to designate the landing zone of the auxillary base." + desc = "Deploy to designate the landing zone of the auxiliary base." w_class = WEIGHT_CLASS_SMALL shuttle_id = "colony_drop" var/setting = FALSE @@ -207,14 +207,14 @@ interface with the mining shuttle at the landing site if a mobile beacon is also setting = FALSE var/turf/T = get_turf(user) - var/obj/machinery/computer/auxillary_base/AB + var/obj/machinery/computer/auxiliary_base/AB - for (var/obj/machinery/computer/auxillary_base/A in GLOB.machines) + for (var/obj/machinery/computer/auxiliary_base/A in GLOB.machines) if(is_station_level(A.z)) AB = A break if(!AB) - to_chat(user, "No auxillary base console detected.") + to_chat(user, "No auxiliary base console detected.") return switch(AB.set_landing_zone(T, user, no_restrictions)) @@ -235,8 +235,8 @@ interface with the mining shuttle at the landing site if a mobile beacon is also no_restrictions = TRUE -/obj/docking_port/mobile/auxillary_base - name = "auxillary base" +/obj/docking_port/mobile/auxiliary_base + name = "auxiliary base" id = "colony_drop" //Reminder to map-makers to set these values equal to the size of your base. dheight = 4 @@ -244,7 +244,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also width = 9 height = 9 -/obj/docking_port/mobile/auxillary_base/takeoff(list/old_turfs, list/new_turfs, list/moved_atoms, rotation, movement_direction, old_dock, area/underlying_old_area) +/obj/docking_port/mobile/auxiliary_base/takeoff(list/old_turfs, list/new_turfs, list/moved_atoms, rotation, movement_direction, old_dock, area/underlying_old_area) for(var/i in new_turfs) var/turf/place = i if(istype(place, /turf/closed/mineral)) @@ -262,7 +262,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also /obj/structure/mining_shuttle_beacon name = "mining shuttle beacon" - desc = "A bluespace beacon calibrated to mark a landing spot for the mining shuttle when deployed near the auxillary mining base." + desc = "A bluespace beacon calibrated to mark a landing spot for the mining shuttle when deployed near the auxiliary mining base." anchored = FALSE density = FALSE var/shuttle_ID = "landing_zone_dock" @@ -293,13 +293,13 @@ interface with the mining shuttle at the landing site if a mobile beacon is also if(!is_mining_level(landing_spot.z)) to_chat(user, "This device is only to be used in a mining zone.") return - var/obj/machinery/computer/auxillary_base/aux_base_console - for(var/obj/machinery/computer/auxillary_base/ABC in GLOB.machines) + var/obj/machinery/computer/auxiliary_base/aux_base_console + for(var/obj/machinery/computer/auxiliary_base/ABC in GLOB.machines) if(get_dist(landing_spot, ABC) <= console_range) aux_base_console = ABC break if(!aux_base_console) //Needs to be near the base to serve as its dock and configure it to control the mining shuttle. - to_chat(user, "The auxillary base's console must be within [console_range] meters in order to interface.") + to_chat(user, "The auxiliary base's console must be within [console_range] meters in order to interface.") return //Mining shuttles may not be created equal, so we find the map's shuttle dock and size accordingly. @@ -311,7 +311,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also Mport = new(landing_spot) Mport.id = "landing_zone_dock" - Mport.name = "auxillary base landing site" + Mport.name = "auxiliary base landing site" Mport.dwidth = SM.dwidth Mport.dheight = SM.dheight Mport.width = SM.width @@ -343,18 +343,18 @@ interface with the mining shuttle at the landing site if a mobile beacon is also for(var/i in 1 to landing_turfs.len) //You land NEAR the base, not IN it. var/turf/L = landing_turfs[i] if(!L) //This happens at map edges - to_chat(user, "Unable to secure a valid docking zone. Please try again in an open area near, but not within the auxillary mining base.") + to_chat(user, "Unable to secure a valid docking zone. Please try again in an open area near, but not within the auxiliary mining base.") SSshuttle.stationary.Remove(Mport) qdel(Mport) return - if(istype(get_area(L), /area/shuttle/auxillary_base)) + if(istype(get_area(L), /area/shuttle/auxiliary_base)) to_chat(user, "The mining shuttle must not land within the mining base itself.") SSshuttle.stationary.Remove(Mport) qdel(Mport) return if(mining_shuttle.canDock(Mport) != SHUTTLE_CAN_DOCK) - to_chat(user, "Unable to secure a valid docking zone. Please try again in an open area near, but not within the auxillary mining base.") + to_chat(user, "Unable to secure a valid docking zone. Please try again in an open area near, but not within the auxiliary mining base.") SSshuttle.stationary.Remove(Mport) qdel(Mport) return diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 833846b952b..f589c58d411 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -12,7 +12,7 @@ /mob/camera/aiEye/remote/base_construction/setLoc(var/t) var/area/curr_area = get_area(t) - if(curr_area == starting_area || istype(curr_area, /area/shuttle/auxillary_base)) + if(curr_area == starting_area || istype(curr_area, /area/shuttle/auxiliary_base)) return ..() //While players are only allowed to build in the base area, but consoles starting outside the base can move into the base area to begin work. @@ -42,7 +42,7 @@ var/fans_remaining = 0 //Number of fans in stock. var/datum/action/innate/aux_base/install_turret/turret_action = new //Action for spawning turrets var/turret_stock = 0 //Turrets in stock - var/obj/machinery/computer/auxillary_base/found_aux_console //Tracker for the Aux base console, so the eye can always find it. + var/obj/machinery/computer/auxiliary_base/found_aux_console //Tracker for the Aux base console, so the eye can always find it. icon_screen = "mining" icon_keyboard = "rd_key" @@ -63,8 +63,8 @@ /obj/machinery/computer/camera_advanced/base_construction/CreateEye() var/spawn_spot - for(var/obj/machinery/computer/auxillary_base/ABC in GLOB.machines) - if(istype(get_area(ABC), /area/shuttle/auxillary_base)) + for(var/obj/machinery/computer/auxiliary_base/ABC in GLOB.machines) + if(istype(get_area(ABC), /area/shuttle/auxiliary_base)) found_aux_console = ABC break @@ -147,7 +147,7 @@ var/turf/build_target = get_turf(remote_eye) var/area/build_area = get_area(build_target) - if(!istype(build_area, /area/shuttle/auxillary_base)) + if(!istype(build_area, /area/shuttle/auxiliary_base)) to_chat(owner, "You can only build within the mining base!") return FALSE diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 71e8a42e90e..ed3dd4fa207 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/effect/extraction_holder name = "extraction holder" - desc = "you shouldnt see this" + desc = "you shouldn't see this" var/atom/movable/stored_obj /obj/item/extraction_pack/proc/check_for_living_mobs(atom/A) diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index a5cae32230a..66c0cd5fcc8 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -50,7 +50,7 @@ /mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment) // Run base mob body temperature proc before taking damage - // this balances body temp to the enviroment and natural stabilization + // this balances body temp to the environment and natural stabilization . = ..() if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c82a839ee4f..dac4bb8eca7 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1716,7 +1716,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) ////////////////////////// /** - * Enviroment handler for species + * environment handler for species * * vars: * * environment The environment gas mix diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index d0a0a60cf17..80e6258836a 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -960,7 +960,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) - playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize + playsound(H, get_sfx("desecration"), 50, TRUE, -1) //You just want to socialize H.visible_message("[H] rattles loudly and flails around!!", "Your bones hurt so much that your missing muscles spasm!!") H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index f357aea759b..572c2b3de54 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -179,7 +179,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) - playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize + playsound(H, get_sfx("desecration"), 50, TRUE, -1) //You just want to socialize H.visible_message("[H] rattles loudly and flails around!!", "Your bones hurt so much that your missing muscles spasm!!") H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 9df66901779..434dbd0ad06 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -48,7 +48,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) - playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize + playsound(H, get_sfx("desecration"), 50, TRUE, -1) //You just want to socialize H.visible_message("[H] rattles loudly and flails around!!", "Your bones hurt so much that your missing muscles spasm!!") H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 746fd12db92..9235cef10a5 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -69,7 +69,7 @@ /mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment) // Run base mob body temperature proc before taking damage - // this balances body temp to the enviroment and natural stabilization + // this balances body temp to the environment and natural stabilization . = ..() if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4272de018d7..0314418bef9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -776,7 +776,7 @@ . = TRUE if(pulledby.grab_state || resting || HAS_TRAIT(src, TRAIT_GRABWEAKNESS)) var/altered_grab_state = pulledby.grab_state - if((resting || HAS_TRAIT(src, TRAIT_GRABWEAKNESS)) && pulledby.grab_state < GRAB_KILL) //If resting, resisting out of a grab is equivalent to 1 grab state higher. wont make the grab state exceed the normal max, however + if((resting || HAS_TRAIT(src, TRAIT_GRABWEAKNESS)) && pulledby.grab_state < GRAB_KILL) //If resting, resisting out of a grab is equivalent to 1 grab state higher. won't make the grab state exceed the normal max, however altered_grab_state++ var/resist_chance = BASE_GRAB_RESIST_CHANCE // see defines/combat.dm resist_chance = max((resist_chance/altered_grab_state)-sqrt((getBruteLoss()+getFireLoss()+getOxyLoss()+getToxLoss()+getCloneLoss())*0.5+getStaminaLoss()), 0) //stamina loss is weighted twice as heavily as the other damage types in this calculation diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index c3d806af16f..8dadcde3e4a 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -355,7 +355,7 @@ F.PlaceOnTop(initial(tiletype.turf_type), flags = CHANGETURF_INHERIT_AIR) specialtiles -= 1 if(specialtiles == 0) - speak("Requesting refill of custom floortiles to continue replacing.") + speak("Requesting refill of custom floor tiles to continue replacing.") mode = BOT_IDLE update_icon() anchored = FALSE diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 72dfb43afd7..50d4af46dc5 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -108,7 +108,7 @@ cell.forceMove(loc) cell = null visible_message("[user] crowbars out the power cell from [src].", - "You pry the powercell out of [src].") + "You pry the power cell out of [src].") else if(is_wire_tool(I) && open) return attack_hand(user) else if(load && ismob(load)) // chance to knock off rider diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index bd2e942646e..d77cc98cae4 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -129,7 +129,7 @@ /mob/living/simple_animal/drone/derelict/Initialize() . = ..() - AddComponent(/datum/component/stationstuck, TRUE, "Your emergency station return device activates, sending you back to KS13!", "01000110 01010101 01000011 01001011 00100000 01011001 01001111 01010101
    WARNING: Dereliction of KS13 detected. Self destruct activated.") + AddComponent(/datum/component/stationstuck, TRUE, "Your emergency station return device activates, sending you back to KS13!", "01000110 01010101 01000011 01001011 00100000 01011001 01001111 01010101
    WARNING: Dereliction of KS13 detected. Self-destruct activated.") diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 2dcf2f5dcd5..4cc9402ae61 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' recolorentiresprite = TRUE - if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isnt gone for some reason + if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isn't gone for some reason cooloverlay = mutable_appearance(icon, theme) add_overlay(cooloverlay) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 98c613cc345..a24258257f0 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -409,7 +409,7 @@ Difficulty: Hard for(var/mob/living/L in view(7,src)) stored_nearby += L // store the people to grant the achievements to once we die hierophant_burst(null, get_turf(src), 10) - set_stat(CONSCIOUS) // deathgasp wont run if dead, stupid + set_stat(CONSCIOUS) // deathgasp won't run if dead, stupid ..(force_grant = stored_nearby) /mob/living/simple_animal/hostile/megafauna/hierophant/Destroy() 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 9ad83bab706..b068c479f75 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 @@ -171,7 +171,7 @@ Difficulty: Insanely Hard /mob/living/simple_animal/hostile/megafauna/king/Retaliate() ..() if(stat == CONSCIOUS && prob(5)) - visible_message("\The [src] bellows indignantly, with a judgemental gleam in his eye.") + visible_message("\The [src] bellows indignantly, with a judgmental gleam in his eye.") /mob/living/simple_animal/hostile/megafauna/king/phase2/Retaliate() set waitfor = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index a673fd58811..820f201a6b5 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -35,7 +35,7 @@ deathmessage = "fainted." var/cap_color = "#ffffff" var/powerlevel = 0 //Tracks our general strength level gained from eating other shrooms - var/bruised = 0 //If someone tries to cheat the system by attacking a shroom to lower its health, punish them so that it wont award levels to shrooms that eat it + var/bruised = 0 //If someone tries to cheat the system by attacking a shroom to lower its health, punish them so that it won't award levels to shrooms that eat it var/recovery_cooldown = 0 //So you can't repeatedly revive it during a fight var/faint_ticker = 0 //If we hit three, another mushroom's gonna eat us var/static/mutable_appearance/cap_living //Where we store our cap icons so we dont generate them constantly to update our icon diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 9db177f7107..931cc2cad72 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -123,7 +123,7 @@ /mob/living/simple_animal/hostile/netherworld/migo/Initialize() . = ..() - migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/carhorn.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/megaphone.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/items/geiger/high1.ogg', 'sound/items/geiger/high2.ogg', 'sound/voice/beepsky/creep.ogg', 'sound/voice/beepsky/iamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/medbot/patchedup.ogg', 'sound/voice/medbot/feelbetter.ogg', 'sound/voice/human/manlaugh1.ogg', 'sound/voice/human/womanlaugh.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/clockcultalr.ogg', 'sound/ambience/antag/ling_aler.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/ambience/antag/monkey.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clockcult_gateway_disrupted.ogg', 'sound/effects/clownstep2.ogg', 'sound/effects/curse1.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosion_distant.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heart_beat.ogg', 'sound/effects/hyperspace_begin.ogg', 'sound/effects/hyperspace_end.ogg', 'sound/effects/his_grace_awaken.ogg', 'sound/effects/pai_boot.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/ratvar_reveal.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/misc/airraid.ogg', 'sound/misc/bang.ogg','sound/misc/highlander.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/misc/splort.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/beam_sniper.ogg', 'sound/weapons/chainsawhit.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gun/pistol/shot_suppressed.ogg', 'sound/weapons/gun/pistol/shot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/clockcult/steam_whoosh.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlockclose.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlockopen.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/cryo_warning.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/triple_beep.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/outbreak5.ogg', 'sound/ai/outbreak7.ogg', 'sound/ai/poweroff.ogg', 'sound/ai/radiation.ogg', 'sound/ai/shuttlecalled.ogg', 'sound/ai/shuttledock.ogg', 'sound/ai/shuttlerecalled.ogg', 'sound/ai/aimalf.ogg') //hahahaha fuck you code divers + migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/carhorn.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/megaphone.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/items/geiger/high1.ogg', 'sound/items/geiger/high2.ogg', 'sound/voice/beepsky/creep.ogg', 'sound/voice/beepsky/iamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/medbot/patchedup.ogg', 'sound/voice/medbot/feelbetter.ogg', 'sound/voice/human/manlaugh1.ogg', 'sound/voice/human/womanlaugh.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/clockcultalr.ogg', 'sound/ambience/antag/ling_aler.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/ambience/antag/monkey.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clockcult_gateway_disrupted.ogg', 'sound/effects/clownstep2.ogg', 'sound/effects/curse1.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosion_distant.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heart_beat.ogg', 'sound/effects/hyperspace_begin.ogg', 'sound/effects/hyperspace_end.ogg', 'sound/effects/his_grace_awaken.ogg', 'sound/effects/pai_boot.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/ratvar_reveal.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desecration-01.ogg', 'sound/misc/desecration-02.ogg', 'sound/misc/desecration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/misc/airraid.ogg', 'sound/misc/bang.ogg','sound/misc/highlander.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/misc/splort.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/beam_sniper.ogg', 'sound/weapons/chainsawhit.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gun/pistol/shot_suppressed.ogg', 'sound/weapons/gun/pistol/shot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/clockcult/steam_whoosh.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlockclose.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlockopen.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/cryo_warning.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/triple_beep.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/outbreak5.ogg', 'sound/ai/outbreak7.ogg', 'sound/ai/poweroff.ogg', 'sound/ai/radiation.ogg', 'sound/ai/shuttlecalled.ogg', 'sound/ai/shuttledock.ogg', 'sound/ai/shuttlerecalled.ogg', 'sound/ai/aimalf.ogg') //hahahaha fuck you code divers /mob/living/simple_animal/hostile/netherworld/migo/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 8b0dbded864..c2147e12e95 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -350,7 +350,7 @@ mob/living/simple_animal/hostile/space_dragon/proc/dragon_fire_line(turf/T) main_objective.completed = TRUE sound_to_playing_players('sound/machines/alarm.ogg') sleep(100) - priority_announce("A large amount of lifeforms have been detected approaching [station_name()] at extreme speeds. Evacuation of the remamining crew will begin immediately.", "Central Command Spacial Corps") + priority_announce("A large amount of lifeforms have been detected approaching [station_name()] at extreme speeds. Evacuation of the remamining crew will begin immediately.", "Central Command Spatial Corps") for(var/obj/structure/carp_rift/rift in rift_list) rift.carp_stored = 999999 sleep(50) @@ -492,10 +492,10 @@ mob/living/simple_animal/hostile/space_dragon/proc/dragon_fire_line(turf/T) notify_ghosts("The carp rift can summon an additional carp!", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Carp Spawn Available") if(time_charged == (max_charge - 120)) var/area/A = get_area(src) - priority_announce("A rift is causing an unnaturally large energy flux in [A.map_name]. Stop it at all costs!", "Central Command Spacial Corps", 'sound/ai/spanomalies.ogg') + priority_announce("A rift is causing an unnaturally large energy flux in [A.map_name]. Stop it at all costs!", "Central Command Spatial Corps", 'sound/ai/spanomalies.ogg') if(time_charged == max_charge) var/area/A = get_area(src) - priority_announce("Spatial object has reached peak energy charge in [A.map_name], please stand-by.", "Central Command Spacial Corps") + priority_announce("Spatial object has reached peak energy charge in [A.map_name], please stand-by.", "Central Command Spatial Corps") obj_integrity = INFINITY desc = "A rift akin to the ones space carp use to travel long distances. This one is fully charged, and is capable of bringing many carp to the station's location." icon_state = "carp_rift_charged" diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index c18869a6b39..e7ee443a7f4 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -74,7 +74,7 @@ var/parrot_speed = 5 //"Delay in world ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower. var/parrot_lastmove = null //Updates/Stores position of the parrot while it's moving - var/parrot_stuck = 0 //If parrot_lastmove hasnt changed, this will increment until it reaches parrot_stuck_threshold + var/parrot_stuck = 0 //If parrot_lastmove hasn't changed, this will increment until it reaches parrot_stuck_threshold var/parrot_stuck_threshold = 10 //if this == parrot_stuck, it'll force the parrot back to wandering var/list/speech_buffer = list() @@ -392,7 +392,7 @@ //-----SLEEPING if(parrot_state == PARROT_PERCH) - if(parrot_perch && parrot_perch.loc != src.loc) //Make sure someone hasnt moved our perch on us + if(parrot_perch && parrot_perch.loc != src.loc) //Make sure someone hasn't moved our perch on us if(parrot_perch in view(src)) parrot_state = PARROT_SWOOP | PARROT_RETURN icon_state = icon_living @@ -517,7 +517,7 @@ //-----RETURNING TO PERCH else if(parrot_state == (PARROT_SWOOP | PARROT_RETURN)) walk(src, 0) - if(!parrot_perch || !isturf(parrot_perch.loc)) //Make sure the perch exists and somehow isnt inside of something else. + if(!parrot_perch || !isturf(parrot_perch.loc)) //Make sure the perch exists and somehow isn't inside of something else. parrot_perch = null parrot_state = PARROT_WANDER return @@ -751,7 +751,7 @@ return -1 if(!held_item) - if(src == usr) //So that other mobs wont make this message appear when they're bludgeoning you. + if(src == usr) //So that other mobs won't make this message appear when they're bludgeoning you. to_chat(src, "You have nothing to drop!") return 0 diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 2ac1f993472..a90cb9c5ec1 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -613,7 +613,7 @@ /* Certain mob types have problems and should not be allowed to be controlled by players. * * This proc is here to force coders to manually place their mob in this list, hopefully tested. - * This also gives a place to explain -why- players shouldnt be turn into certain mobs and hopefully someone can fix them. + * This also gives a place to explain -why- players shouldn't be turn into certain mobs and hopefully someone can fix them. */ /mob/proc/safe_animal(MP) diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 1743cf515f7..eed03dc9286 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -260,7 +260,7 @@ say("Insufficient credits on card to purchase!") return credits += target_credits - say("[target_credits] cr has been desposited from your account.") + say("[target_credits] cr has been deposited from your account.") return return ..() diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 7f3816d1c12..83dce334250 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -26,7 +26,7 @@ var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) if(BP) BP.drop_limb() - playsound(loc, "desceration" ,50, TRUE, -1) + playsound(loc, "desecration" ,50, TRUE, -1) return (BRUTELOSS) else user.visible_message("[user] repeatedly bashes [src.name] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index 5243e6fe9de..7823e3c0ce0 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -4,7 +4,7 @@ /obj/item/paper/fluff/sop name = "paper- 'Standard Operating Procedure'" - info = "Alert Levels:
    \nBlue- Emergency
    \n\t1. Caused by fire
    \n\t2. Caused by manual interaction
    \n\tAction:
    \n\t\tClose all fire doors. These can only be opened by resetting the alarm
    \nRed- Ejection/Self Destruct
    \n\t1. Caused by module operating computer.
    \n\tAction:
    \n\t\tAfter the specified time the module will eject completely.
    \n
    \nEngine Maintenance Instructions:
    \n\tShut off ignition systems:
    \n\tActivate internal power
    \n\tActivate orbital balance matrix
    \n\tRemove volatile liquids from area
    \n\tWear a fire suit
    \n
    \n\tAfter
    \n\t\tDecontaminate
    \n\t\tVisit medical examiner
    \n
    \nToxin Laboratory Procedure:
    \n\tWear a gas mask regardless
    \n\tGet an oxygen tank.
    \n\tActivate internal atmosphere
    \n
    \n\tAfter
    \n\t\tDecontaminate
    \n\t\tVisit medical examiner
    \n
    \nDisaster Procedure:
    \n\tFire:
    \n\t\tActivate sector fire alarm.
    \n\t\tMove to a safe area.
    \n\t\tGet a fire suit
    \n\t\tAfter:
    \n\t\t\tAssess Damage
    \n\t\t\tRepair damages
    \n\t\t\tIf needed, Evacuate
    \n\tMeteor Shower:
    \n\t\tActivate fire alarm
    \n\t\tMove to the back of ship
    \n\t\tAfter
    \n\t\t\tRepair damage
    \n\t\t\tIf needed, Evacuate
    \n\tAccidental Reentry:
    \n\t\tActivate fire alarms in front of ship.
    \n\t\tMove volatile matter to a fire proof area!
    \n\t\tGet a fire suit.
    \n\t\tStay secure until an emergency ship arrives.
    \n
    \n\t\tIf ship does not arrive-
    \n\t\t\tEvacuate to a nearby safe area!" + info = "Alert Levels:
    \nBlue- Emergency
    \n\t1. Caused by fire
    \n\t2. Caused by manual interaction
    \n\tAction:
    \n\t\tClose all fire doors. These can only be opened by resetting the alarm
    \nRed- Ejection/Self-Destruct
    \n\t1. Caused by module operating computer.
    \n\tAction:
    \n\t\tAfter the specified time the module will eject completely.
    \n
    \nEngine Maintenance Instructions:
    \n\tShut off ignition systems:
    \n\tActivate internal power
    \n\tActivate orbital balance matrix
    \n\tRemove volatile liquids from area
    \n\tWear a fire suit
    \n
    \n\tAfter
    \n\t\tDecontaminate
    \n\t\tVisit medical examiner
    \n
    \nToxin Laboratory Procedure:
    \n\tWear a gas mask regardless
    \n\tGet an oxygen tank.
    \n\tActivate internal atmosphere
    \n
    \n\tAfter
    \n\t\tDecontaminate
    \n\t\tVisit medical examiner
    \n
    \nDisaster Procedure:
    \n\tFire:
    \n\t\tActivate sector fire alarm.
    \n\t\tMove to a safe area.
    \n\t\tGet a fire suit
    \n\t\tAfter:
    \n\t\t\tAssess Damage
    \n\t\t\tRepair damages
    \n\t\t\tIf needed, Evacuate
    \n\tMeteor Shower:
    \n\t\tActivate fire alarm
    \n\t\tMove to the back of ship
    \n\t\tAfter
    \n\t\t\tRepair damage
    \n\t\t\tIf needed, Evacuate
    \n\tAccidental Reentry:
    \n\t\tActivate fire alarms in front of ship.
    \n\t\tMove volatile matter to a fire proof area!
    \n\t\tGet a fire suit.
    \n\t\tStay secure until an emergency ship arrives.
    \n
    \n\t\tIf ship does not arrive-
    \n\t\t\tEvacuate to a nearby safe area!" /obj/item/paper/fluff/shuttles/daniel info = "i love daniel
    daniel is my best friend

    you are tearing me apart elise" diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index b1a3dc0a76e..9c103357625 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -194,7 +194,7 @@ * (Alan) Edaggers */ /obj/item/pen/edagger - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these won't show up if the pen is off sharpness = IS_SHARP var/on = FALSE diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index 9d8699db3b4..d57dec29d5b 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -291,7 +291,7 @@ All the important duct code: "You hear ratcheting.") attempt_connect() return TRUE -///collection of all the sanity checks to prevent us from stacking ducts that shouldnt be stacked +///collection of all the sanity checks to prevent us from stacking ducts that shouldn't be stacked /obj/machinery/duct/proc/can_anchor(turf/T) if(!T) T = get_turf(src) @@ -371,7 +371,7 @@ All the important duct code: else connects = EAST | WEST -///don't connect to other multilayered stuff because honestly it shouldnt be done and I dont wanna deal with it +///don't connect to other multilayered stuff because honestly it shouldn't be done and I dont wanna deal with it /obj/machinery/duct/multilayered/connect_duct(obj/machinery/duct/D, direction, ignore_color) if(istype(D, /obj/machinery/duct/multilayered)) return diff --git a/code/modules/plumbing/plumbers/pumps.dm b/code/modules/plumbing/plumbers/pumps.dm index dd0b709be9e..9bbcd008788 100644 --- a/code/modules/plumbing/plumbers/pumps.dm +++ b/code/modules/plumbing/plumbers/pumps.dm @@ -1,7 +1,7 @@ ///We pump liquids from activated(plungerated) geysers to a plumbing outlet. We need to be wired. /obj/machinery/plumbing/liquid_pump name = "liquid pump" - desc = "Pump up those sweet liquids from under the surface. Uses thermal energy from geysers to power itself." //better than placing 200 cables, because it wasnt fun + desc = "Pump up those sweet liquids from under the surface. Uses thermal energy from geysers to power itself." //better than placing 200 cables, because it wasn't fun icon = 'icons/obj/plumbing/plumbers.dmi' icon_state = "pump" anchored = FALSE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index a6be374426c..7f846e32330 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -797,7 +797,7 @@ var/mob/living/carbon/human/H = user var/datum/species/ethereal/E = H.dna.species if((H.a_intent == INTENT_HARM) && (E.drain_time < world.time)) - if(cell.charge <= (cell.maxcharge / 2)) // if charge is under 50% you shouldnt drain it + if(cell.charge <= (cell.maxcharge / 2)) // if charge is under 50% you shouldn't drain it to_chat(H, "The APC doesn't have much power, you probably shouldn't drain any.") return var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 8ffb41c4570..acdf4a18f30 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -277,7 +277,7 @@ //Determines how strong could be shock, deals damage to mob, uses power. //M is a mob who touched wire/whatever -//power_source is a source of electricity, can be powercell, area, apc, cable, powernet or null +//power_source is a source of electricity, can be power cell, area, apc, cable, powernet or null //source is an object caused electrocuting (airlock, grille, etc) //siemens_coeff - layman's terms, conductivity //dist_check - set to only shock mobs within 1 of source (vendors, airlocks, etc.) diff --git a/code/modules/projectiles/guns/energy/dueling.dm b/code/modules/projectiles/guns/energy/dueling.dm index 0255525e13d..91d2928c6cf 100644 --- a/code/modules/projectiles/guns/energy/dueling.dm +++ b/code/modules/projectiles/guns/energy/dueling.dm @@ -83,7 +83,7 @@ /datum/duel/proc/back_to_prep() - message_duelists("Positions invalid. Please move to valid positions [required_distance] steps aways from each other to continue.") + message_duelists("Positions invalid. Please move to valid positions [required_distance] steps away from each other to continue.") state = DUEL_PREPARATION confirmations.Cut() countdown_step = countdown_length diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 9700012dd1b..4d09118ee41 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -203,6 +203,6 @@ /obj/projectile/beam/shrink/on_hit(atom/target, blocked = FALSE) . = ..() - if(isopenturf(target) || istype(target, /turf/closed/indestructible))//shrunk floors wouldnt do anything except look weird, i-walls shouldnt be bypassable + if(isopenturf(target) || istype(target, /turf/closed/indestructible))//shrunk floors wouldnt do anything except look weird, i-walls shouldn't be bypassable return target.AddComponent(/datum/component/shrink, shrink_time) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 78605459282..bce8e5792c6 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -554,7 +554,7 @@ remove_reagent(B, (multiplier * cached_required_reagents[B]), safety = 1) for(var/P in selected_reaction.results) - multiplier = max(multiplier, 1) //this shouldnt happen ... + multiplier = max(multiplier, 1) //this shouldn't happen ... SSblackbox.record_feedback("tally", "chemical_reaction", cached_results[P]*multiplier, P) add_reagent(P, cached_results[P]*multiplier, null, chem_temp) @@ -741,7 +741,7 @@ update_total() var/cached_total = total_volume if(cached_total + amount > maximum_volume) - amount = (maximum_volume - cached_total) //Doesnt fit in. Make it disappear. Shouldnt happen. Will happen. + amount = (maximum_volume - cached_total) //Doesnt fit in. Make it disappear. shouldn't happen. Will happen. if(amount <= 0) return FALSE var/new_total = cached_total + amount diff --git a/code/modules/reagents/chemistry/readme.md b/code/modules/reagents/chemistry/readme.md index e72fe3b83cc..f1f32485ff2 100644 --- a/code/modules/reagents/chemistry/readme.md +++ b/code/modules/reagents/chemistry/readme.md @@ -40,7 +40,7 @@ The holder (reagents datum) is the datum that holds a list of all reagents curre metabolize(var/mob/living/carbon/C) This proc is called by the mobs life proc. It simply calls on_mob_life for - all contained reagents. You shouldnt have to use this one directly. + all contained reagents. You shouldn't have to use this one directly. handle_reactions() This proc check all recipes and, on a match, uses them. @@ -80,7 +80,7 @@ The holder (reagents datum) is the datum that holds a list of all reagents curre add_reagent(var/reagent, var/amount, var/data) Attempts to add X of the matching reagent to the holder. - You wont use this much. Mostly in new procs for pre-filled + You won't use this much. Mostly in new procs for pre-filled objects. remove_reagent(var/reagent, var/amount) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 4f4a686c6e1..0491a6b08ba 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1501,7 +1501,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/quadruple_sec name = "Quadruple Sec" - description = "Kicks just as hard as licking the powercell on a baton, but tastier." + description = "Kicks just as hard as licking the power cell on a baton, but tastier." color = "#cc0000" boozepwr = 35 quality = DRINK_GOOD diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index c724f02e319..f9e2902d174 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -408,7 +408,7 @@ taste_description = "carbonated oil" glass_icon_state = "grey_bull_glass" glass_name = "glass of Grey Bull" - glass_desc = "Surprisingly it isnt grey." + glass_desc = "Surprisingly it isn't grey." /datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L) ..() diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index af0ba84621d..7ebbb965811 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -230,7 +230,7 @@ var/mob/living/carbon/patient = M if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, "burn") && patient.getFireLoss() < THRESHOLD_UNHUSK) //One carp yields 12u rezadone. patient.cure_husk("burn") - patient.visible_message("[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance.") + patient.visible_message("[patient]'s body rapidly absorbs moisture from the environment, taking on a more healthy appearance.") /datum/reagent/medicine/spaceacillin name = "Spaceacillin" diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 6e4a0ff06d1..fe84f7f8fad 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -930,7 +930,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = M.get_bodypart(selected_part) if(bp) - playsound(M, get_sfx("desceration"), 50, TRUE, -1) + playsound(M, get_sfx("desecration"), 50, TRUE, -1) M.visible_message("[M]'s bones hurt too much!!", "Your bones hurt too much!!") M.say("OOF!!", forced = /datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(0, 0, 200) diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index d5133b35a65..dd7eeed7e55 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -66,7 +66,7 @@ * * amount_to_spawn - how much /mob to spawn * * reaction_name - what is the name of this reaction. be creative, the world is your oyster after all! * * mob_class - determines if the mob will be friendly, neutral or hostile - * * mob_faction - used in determining targets, mobs from the same faction wont harm eachother. + * * mob_faction - used in determining targets, mobs from the same faction won't harm eachother. * * random - creates random mobs. self explanatory. */ /datum/chemical_reaction/proc/chemical_mob_spawn(datum/reagents/holder, amount_to_spawn, reaction_name, mob_class = HOSTILE_SPAWN, mob_faction = "chemicalsummon", random = TRUE) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 3feeac1288b..dec80370539 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -212,7 +212,7 @@ All ShuttleMove procs go here if(pipe_vision_img) pipe_vision_img.loc = loc -/obj/machinery/computer/auxillary_base/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) +/obj/machinery/computer/auxiliary_base/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() if(is_mining_level(z)) //Avoids double logging and landing on other Z-levels due to badminnery SSblackbox.record_feedback("associative", "colonies_dropped", 1, list("x" = x, "y" = y, "z" = z)) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index f107963ac8a..f95f6304c9a 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -486,7 +486,7 @@ oldT.change_area(old_area, underlying_area) oldT.empty(FALSE) - // Here we locate the bottomost shuttle boundary and remove all turfs above it + // Here we locate the bottommost shuttle boundary and remove all turfs above it var/list/baseturf_cache = oldT.baseturfs for(var/k in 1 to length(baseturf_cache)) if(ispath(baseturf_cache[k], /turf/baseturf_skipover/shuttle)) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index e20f935f74e..b3a767199b8 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -130,7 +130,7 @@ if(T.mothership == mothership) to_chat(H, "[src] is already attuned to the same channel as your own.") - H.visible_message("[H] holds [src] in their hands, and concentrates for a moment.", "You attempt to modify the attunation of [src].") + H.visible_message("[H] holds [src] in their hands, and concentrates for a moment.", "You attempt to modify the attenuation of [src].") if(do_after(H, delay=15, target=src)) to_chat(H, "You attune [src] to your own channel.") mothership = T.mothership diff --git a/sound/misc/desceration-01.ogg b/sound/misc/desecration-01.ogg similarity index 100% rename from sound/misc/desceration-01.ogg rename to sound/misc/desecration-01.ogg diff --git a/sound/misc/desceration-02.ogg b/sound/misc/desecration-02.ogg similarity index 100% rename from sound/misc/desceration-02.ogg rename to sound/misc/desecration-02.ogg diff --git a/sound/misc/desceration-03.ogg b/sound/misc/desecration-03.ogg similarity index 100% rename from sound/misc/desceration-03.ogg rename to sound/misc/desecration-03.ogg