diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 937890e100..005ce22589 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -474,7 +474,7 @@ "bD" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/bottle/cyanide{ - desc = "A cocktail of chemotherpy drugs intended to treat bladder cancer."; + desc = "A cocktail of chemotherapy drugs intended to treat bladder cancer."; name = "MVAC regimen" }, /obj/item/weapon/reagent_containers/syringe, diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm index 33f514c051..a03b3b148e 100644 --- a/_maps/RandomZLevels/Cabin.dmm +++ b/_maps/RandomZLevels/Cabin.dmm @@ -250,7 +250,7 @@ /area/awaymission/cabin) "aQ" = ( /obj/machinery/door/airlock/wood{ - name = "maintence" + name = "maintenance" }, /turf/open/floor/plating, /area/awaymission/cabin) diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 127813046e..7d313a0915 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -1060,7 +1060,7 @@ "dd" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1081,7 +1081,7 @@ read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1143,7 +1143,7 @@ "dp" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1289,12 +1289,12 @@ "dL" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastely written over it."; + desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastily written over it."; fields = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+"); name = "old genetics data disk" }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1306,12 +1306,12 @@ "dM" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -2794,12 +2794,12 @@ "hS" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines. This one has the initials 'C.P' marked on the front. "; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines. This one has the initials 'C.P' marked on the front. "; name = "encrypted genetic data disk"; read_only = 1 }, @@ -2812,12 +2812,12 @@ "hT" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -2949,7 +2949,7 @@ "il" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -3336,7 +3336,7 @@ /area/awaymission/research/interior/dorm) "jp" = ( /obj/structure/barricade/wooden{ - desc = "A wooden table hastely flipped over for cover."; + desc = "A wooden table hastily flipped over for cover."; obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; @@ -3402,7 +3402,7 @@ /area/awaymission/research/interior/medbay) "jy" = ( /obj/machinery/door/airlock/medical{ - name = "Medical Surgey" + name = "Medical Surgery" }, /turf/open/floor/plasteel/whiteblue, /area/awaymission/research/interior/medbay) @@ -3446,7 +3446,7 @@ /area/awaymission/research/interior/dorm) "jG" = ( /obj/structure/barricade/wooden{ - desc = "A wooden table hastely flipped over for cover."; + desc = "A wooden table hastily flipped over for cover."; obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; @@ -3569,7 +3569,7 @@ /area/awaymission/research/interior/dorm) "kb" = ( /obj/structure/barricade/wooden{ - desc = "A wooden table hastely flipped over for cover."; + desc = "A wooden table hastily flipped over for cover."; obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 0cb107f9e1..b390094018 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -635,10 +635,10 @@ /area/awaymission/snowdin/base) "bC" = ( /obj/structure/showcase{ - desc = "A strange machine thats supposedly used to help pick up and decypth wave signals. "; + desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "; icon = 'icons/obj/machines/telecomms.dmi'; icon_state = "processor"; - name = "subsystem signal decrypher" + name = "subsystem signal decrypter" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -2504,10 +2504,10 @@ "gL" = ( /obj/machinery/light/small, /obj/structure/showcase{ - desc = "A strange machine thats supposedly used to help pick up and decypth wave signals. "; + desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "; icon = 'icons/obj/machines/telecomms.dmi'; icon_state = "processor"; - name = "subsystem signal decrypher" + name = "subsystem signal decrypter" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index b985470bc1..fb82bb398a 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -9874,7 +9874,7 @@ dir = 8 }, /obj/machinery/button/door{ - desc = "A remote control-switch whichs locks the research division down in the event of a biohazard leak or contamination."; + desc = "A remote control-switch which locks the research division down in the event of a biohazard leak or contamination."; id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = 8; diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 14118443f6..26feb0fa1b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -34356,7 +34356,7 @@ /area/janitor) "bAV" = ( /obj/machinery/door/window/westleft{ - name = "Janitoral Delivery"; + name = "Janitorial Delivery"; req_access_txt = "26" }, /obj/effect/turf_decal/delivery, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index f8bf06a40c..432d5ae341 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -2091,7 +2091,7 @@ /area/mine/living_quarters) "ft" = ( /obj/machinery/camera{ - c_tag = "Dormatories"; + c_tag = "Dormitories"; dir = 4; network = list("MINE") }, diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 66b8bd0708..8a7311fb5a 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -35023,7 +35023,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Chaplen Quarters"; + c_tag = "Chaplain's Quarters"; dir = 2; network = list("SS13") }, @@ -36017,7 +36017,7 @@ pixel_y = -32 }, /obj/machinery/camera{ - c_tag = "Xenobilogy Lab"; + c_tag = "Xenobiology Lab"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm.rej b/_maps/map_files/PubbyStation/PubbyStation.dmm.rej new file mode 100644 index 0000000000..80fa973d0a --- /dev/null +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm.rej @@ -0,0 +1,213 @@ +diff a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm (rejected hunks) +@@ -17662,7 +17662,7 @@ + /obj/machinery/conveyor_switch/oneway{ + convdir = 1; + id = "garbagestacked"; +- name = "disposal coveyor" ++ name = "disposal conveyor" + }, + /obj/effect/turf_decal/stripes/line, + /turf/open/floor/plating{ +@@ -19866,7 +19866,7 @@ + /obj/machinery/conveyor_switch/oneway{ + convdir = -1; + id = "garbage"; +- name = "disposal coveyor" ++ name = "disposal conveyor" + }, + /obj/effect/turf_decal/stripes/line{ + dir = 1 +@@ -29076,7 +29076,7 @@ + /area/science/explab) + "blV" = ( + /obj/structure/sign/atmosplaque{ +- desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the uncorruptable cyborg servants of tomorrow, available today."; ++ desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today."; + icon_state = "kiddieplaque"; + name = "\improper 'Perfect Drone' sign"; + pixel_y = 32 +@@ -31843,7 +31843,7 @@ + /area/science/xenobiology) + "brT" = ( + /obj/machinery/computer/security/telescreen{ +- name = "Test Chamber Moniter"; ++ name = "Test Chamber Monitor"; + network = list("Xeno"); + pixel_y = 2 + }, +@@ -36758,7 +36758,7 @@ + /obj/item/device/radio/intercom{ + dir = 8; + freerange = 1; +- name = "Station Intercom (Telecoms)"; ++ name = "Station Intercom (Telecomms)"; + pixel_x = 28; + pixel_y = 24 + }, +@@ -42005,7 +42005,7 @@ + /obj/item/device/radio/intercom{ + dir = 8; + freerange = 1; +- name = "Station Intercom (Telecoms)"; ++ name = "Station Intercom (Telecomms)"; + pixel_y = 26 + }, + /turf/open/floor/plasteel, +@@ -49228,7 +49228,7 @@ + /area/chapel/main/monastery) + "ccI" = ( + /obj/machinery/door/airlock/centcom{ +- name = "Chape Access"; ++ name = "Chapel Access"; + opacity = 1 + }, + /turf/open/floor/plasteel/black, +@@ -50408,7 +50408,7 @@ + /area/engine/engineering) + "cfs" = ( + /obj/machinery/camera{ +- c_tag = "Engineering Telecoms Access"; ++ c_tag = "Engineering Telecomms Access"; + dir = 8; + network = list("Labor") + }, +@@ -50416,11 +50416,11 @@ + dir = 4 + }, + /obj/machinery/computer/security/telescreen{ +- desc = "Used for watching telecoms."; ++ desc = "Used for watching telecomms."; + dir = 8; + layer = 4; +- name = "Telecoms Telescreen"; +- network = list("Telecoms"); ++ name = "Telecomms Telescreen"; ++ network = list("Telecomms"); + pixel_x = 30 + }, + /turf/open/floor/plasteel, +@@ -52887,9 +52887,9 @@ + /area/space) + "clu" = ( + /obj/machinery/camera{ +- c_tag = "Telecoms External Fore"; ++ c_tag = "Telecomms External Fore"; + dir = 1; +- network = list("SS13, Telecoms"); ++ network = list("SS13, Telecomms"); + start_active = 1 + }, + /turf/open/space, +@@ -53072,9 +53072,9 @@ + /area/tcommsat/computer) + "clX" = ( + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Access"; ++ c_tag = "Telecomms External Access"; + dir = 1; +- network = list("SS13","Telecoms") ++ network = list("SS13","Telecomms") + }, + /turf/open/floor/plasteel, + /area/tcommsat/computer) +@@ -53136,9 +53136,9 @@ + "cmg" = ( + /obj/machinery/requests_console{ + announcementConsole = 1; +- department = "Telecoms Admin"; ++ department = "Telecomms Admin"; + departmentType = 5; +- name = "Telecoms RC"; ++ name = "Telecomms RC"; + pixel_y = 30 + }, + /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +@@ -53169,9 +53169,9 @@ + pixel_y = 26 + }, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms Monitoring"; ++ c_tag = "Telecomms Monitoring"; + dir = 2; +- network = list("SS13","Telecoms") ++ network = list("SS13","Telecomms") + }, + /turf/open/floor/plasteel/yellow/side{ + dir = 1 +@@ -53197,7 +53197,7 @@ + "cmk" = ( + /obj/machinery/power/apc{ + dir = 1; +- name = "Telecoms Monitoring APC"; ++ name = "Telecomms Monitoring APC"; + pixel_y = 25 + }, + /obj/structure/cable{ +@@ -53282,9 +53282,9 @@ + "cmt" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Port"; ++ c_tag = "Telecomms External Port"; + dir = 8; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) +@@ -53342,9 +53342,9 @@ + "cmz" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Starboard"; ++ c_tag = "Telecomms External Starboard"; + dir = 4; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) +@@ -53430,7 +53430,7 @@ + cell_type = 5000; + dir = 1; + layer = 4; +- name = "Telecoms Server APC"; ++ name = "Telecomms Server APC"; + pixel_y = 24 + }, + /obj/structure/cable, +@@ -53719,9 +53719,9 @@ + /area/tcommsat/server) + "cnu" = ( + /obj/machinery/camera/motion{ +- c_tag = "Telecoms Server Room"; ++ c_tag = "Telecomms Server Room"; + dir = 1; +- network = list("SS13","Telecoms") ++ network = list("SS13","Telecomms") + }, + /turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" +@@ -53758,18 +53758,18 @@ + "cny" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Port Aft"; ++ c_tag = "Telecomms External Port Aft"; + dir = 2; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) + "cnz" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Starboard Aft"; ++ c_tag = "Telecomms External Starboard Aft"; + dir = 2; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 1840fb2d80..8e3d678469 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -10338,7 +10338,7 @@ base_state = "rightsecure"; dir = 2; icon_state = "rightsecure"; - name = "Thunderdoom Booth"; + name = "Thunderdome Booth"; req_access_txt = "109" }, /obj/effect/turf_decal/bot, diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm index 7da17da503..c7ccfa97d7 100644 --- a/code/__HELPERS/sorts/__main.dm +++ b/code/__HELPERS/sorts/__main.dm @@ -8,7 +8,7 @@ //When we get into galloping mode, we stay there until both runs win less often than MIN_GALLOP consecutive times. #define MIN_GALLOP 7 - //This is a global instance to allow much of this code to be reused. The interfaces are kept seperately + //This is a global instance to allow much of this code to be reused. The interfaces are kept separately GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) /datum/sortInstance //The array being sorted. diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index b743907982..48787430a0 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -48,7 +48,7 @@ Location where the teleport begins, target that will teleport, distance to go, d Random error in tile placement x, error in tile placement y, and block offset. Block offset tells the proc how to place the box. Behind teleport location, relative to starting location, forward, etc. Negative values for offset are accepted, think of it in relation to North, -x is west, -y is south. Error defaults to positive. -Turf and target are seperate in case you want to teleport some distance from a turf the target is not standing on or something. +Turf and target are separate in case you want to teleport some distance from a turf the target is not standing on or something. */ var/dirx = 0//Generic location finding variable. diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 3f0d6cab80..9ad2d6c969 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(tech_list) //list of all /datum/tech datums indexed by id. GLOBAL_LIST_EMPTY(surgeries_list) //list of all surgeries by name, associated with their path. GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes GLOBAL_LIST_EMPTY(rcd_list) //list of Rapid Construction Devices. -GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, seperate from machines for powernet speeeeeeed. +GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, separate from machines for powernet speeeeeeed. GLOBAL_LIST_EMPTY(tracked_implants) //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented... GLOBAL_LIST_EMPTY(tracked_chem_implants) //list of implants the prisoner console can track and send inject commands too GLOBAL_LIST_EMPTY(poi_list) //list of points of interest for observe/follow diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 401bde5cdb..14b7323ce3 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -281,7 +281,7 @@ to_chat(H, "You are now running on internals from the [H.r_store] in your right pocket.") H.internal = H.r_store - //Seperate so CO2 jetpacks are a little less cumbersome. + //Separate so CO2 jetpacks are a little less cumbersome. if(!C.internal && istype(C.back, /obj/item/weapon/tank)) to_chat(C, "You are now running on internals from the [C.back] on your back.") C.internal = C.back diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 2cee9a192a..ac2b60c67e 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(garbage) // refID's are associated with the time at which they time out and need to be manually del() // we do this so we aren't constantly locating them and preventing them from being gc'd - var/list/tobequeued = list() //We store the references of things to be added to the queue seperately so we can spread out GC overhead over a few ticks + var/list/tobequeued = list() //We store the references of things to be added to the queue separately so we can spread out GC overhead over a few ticks var/list/didntgc = list() // list of all types that have failed to GC associated with the number of times that's happened. // the types are stored as strings @@ -144,7 +144,7 @@ SUBSYSTEM_DEF(garbage) queue[refid] = gctime -//this is purely to seperate things profile wise. +//this is purely to separate things profile wise. /datum/controller/subsystem/garbage/proc/HardDelete(datum/A) var/time = world.timeofday var/tick = world.tick_usage diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index be1ae8bfde..e519cf6af3 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -21,7 +21,7 @@ return debug_variable(var_name, vars[var_name], 0, src) //please call . = ..() first and append to the result, that way parent items are always at the top and child items are further down -//add seperaters by doing . += "---" +//add separaters by doing . += "---" /datum/proc/vv_get_dropdown() . = list() . += "---" diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index d5c0e74839..f6296bc0c9 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -96,7 +96,7 @@ to_chat(src, "[prefix][copytext(pc, 1, min(length(pc), 7))]") else to_chat(src, "Revision unknown") - to_chat(src, "Current Infomational Settings:") + to_chat(src, "Current Informational Settings:") to_chat(src, "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]") to_chat(src, "Protect Assistant Role From Traitor: [config.protect_assistant_from_antagonist]") to_chat(src, "Enforce Human Authority: [config.enforce_human_authority]") diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index a0f268344e..2a139da456 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -429,7 +429,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if(!L.ckey) return - // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch + // Ambience goes down here -- make sure to list each area separately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch if(L.client && !L.client.ambience_playing && L.client.prefs.toggles & SOUND_SHIP_AMBIENCE) L.client.ambience_playing = 1 L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 742ed08cf4..057f9ee34a 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -369,7 +369,7 @@ if(candidates.len < recommended_enemies) for(var/mob/dead/new_player/player in players) if(player.client && player.ready == PLAYER_READY_TO_PLAY) - if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one + if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans drafted += player.mind diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 8b18c3b1bb..ce0ab22373 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -200,7 +200,7 @@ to_chat(world, text) //Landmarks -// TODO: Split into seperate landmarks for prettier ships +// TODO: Split into separate landmarks for prettier ships /obj/effect/landmark/abductor var/team = 1 diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 3f45f69cdd..d6265a8f75 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -469,7 +469,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(ishuman(L)) var/mob/living/carbon/human/H = L - species = "[H.dna.species.name]" + species = "[H.dna.species.name]" if(L.mind && L.mind.changeling) species = "Changeling lifeform" var/obj/item/organ/heart/gland/temp = locate() in H.internal_organs diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 8639544e0a..8ca1a8632c 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -79,7 +79,7 @@ if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, W.usesound, 50, 1) - var/input = stripped_input(user, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") + var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") if(!input) to_chat(user, "No input found, please hang up and try your call again!") return diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index fb2b854ffb..663fed74fc 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -115,7 +115,7 @@ forceMove(P) return P -//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby() +//separated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby() /turf/closed/wall/proc/place_poster(obj/item/weapon/poster/P, mob/user) if(!P.poster_structure) to_chat(user, "[P] has no poster... inside it? Inform a coder!") diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 7b7f1d5423..807756b29e 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -182,7 +182,7 @@ /obj/item/weapon/watertank/atmos name = "backpack firefighter tank" - desc = "A refridgerated and pressurized backpack tank with extinguisher nozzle, intended to fight fires. Swaps between extinguisher, resin launcher and a smaller scale resin foamer." + desc = "A refrigerated and pressurized backpack tank with extinguisher nozzle, intended to fight fires. Swaps between extinguisher, resin launcher and a smaller scale resin foamer." item_state = "waterbackpackatmos" icon_state = "waterbackpackatmos" volume = 200 @@ -215,7 +215,7 @@ precision = 1 cooling_power = 5 w_class = WEIGHT_CLASS_HUGE - flags = NODROP //Necessary to ensure that the nozzle and tank never seperate + flags = NODROP //Necessary to ensure that the nozzle and tank never separate var/obj/item/weapon/watertank/tank var/nozzle_mode = 0 var/metal_synthesis_cooldown = 0 diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 1331a5aeea..2040f86607 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -174,7 +174,7 @@ if(help) dat += "Hide Help
" dat += {" - Lines are a series of chords, separated by commas (,), each with notes seperated by hyphens (-).
+ Lines are a series of chords, separated by commas (,), each with notes separated by hyphens (-).
Every note in a chord will play together, with chord timed by the tempo.

Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index a9e75c6028..73c2d8067e 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -119,7 +119,7 @@ GLOBAL_PROTECT(admin_ranks) if(config.admin_legacy_system) var/previous_rights = 0 - //load text from file and process each line seperately + //load text from file and process each line separately for(var/line in world.file2list("config/admin_ranks.txt")) if(!line) continue @@ -195,7 +195,7 @@ GLOBAL_PROTECT(admin_ranks) //load text from file var/list/lines = world.file2list("config/admins.txt") - //process each line seperately + //process each line separately for(var/line in lines) if(!length(line)) continue diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index fc64eb2cf8..9ac85e49fa 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -233,7 +233,7 @@ . -= "reverting" //storing these can sometimes cause sticky bans to start matching everybody - // and isn't even needed for sticky ban matching, as the hub tracks these seperately + // and isn't even needed for sticky ban matching, as the hub tracks these separately . -= "IP" . -= "computer_id" diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index b1dadcdf32..2bd1f4c13e 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -201,8 +201,8 @@ death = FALSE faction = "syndicate" outfit = /datum/outfit/snowsyndie - flavour_text = {"You are a syndicate operative recently awoken from cyrostatis in an underground outpost. Monitor Nanotrasen communications and record infomation. All intruders should be - disposed of swirfly to assure no gathered infomation is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."} + flavour_text = {"You are a syndicate operative recently awoken from cyrostatis in an underground outpost. Monitor Nanotrasen communications and record information. All intruders should be + disposed of swirfly to assure no gathered information is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."} /datum/outfit/snowsyndie name = "Syndicate Snow Operative" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index af0a4a7518..3c32a49e7d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -6,7 +6,7 @@ var/damaged_clothes = 0 //similar to machine's BROKEN stat and structure's broken var var/flash_protect = 0 //What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect - var/up = 0 //but seperated to allow items to protect but not impair vision, like space helmets + var/up = 0 //but separated to allow items to protect but not impair vision, like space helmets var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv var/visor_flags_cover = 0 //same as above, but for flags_cover diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 1713830c6c..3eabbad438 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -246,7 +246,7 @@ /obj/item/clothing/head/jester name = "jester hat" - desc = "A hat with bells, to add some merryness to the suit." + desc = "A hat with bells, to add some merriness to the suit." icon_state = "jester_hat" /obj/item/clothing/head/rice_hat @@ -296,5 +296,5 @@ /obj/item/clothing/head/jester/alt name = "jester hat" - desc = "A hat with bells, to add some merryness to the suit." + desc = "A hat with bells, to add some merriness to the suit." icon_state = "jester_hat2" \ No newline at end of file diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 3be1bfbbf0..4ae20e1461 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -206,7 +206,7 @@ jumping = TRUE playsound(src.loc, 'sound/effects/stealthoff.ogg', 50, 1, 1) - usr.visible_message("[usr] dashes foward into the air!") + usr.visible_message("[usr] dashes forward into the air!") usr.throw_at(target, jumpdistance, jumpspeed, spin=0, diagonals_first = 1, callback = CALLBACK(src, .proc/hop_end)) /obj/item/clothing/shoes/bhop/proc/hop_end() diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index dfe85c3092..c1c2733b71 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -1219,7 +1219,7 @@ //FLIGHT HELMET---------------------------------------------------------------------------------------------------------------------------------------------------- /obj/item/clothing/head/helmet/space/hardsuit/flightsuit name = "flight helmet" - desc = "A sealed helmet attached to a flight suit for EVA usage scenerios. Its visor contains an information uplink HUD." + desc = "A sealed helmet attached to a flight suit for EVA usage scenarios. Its visor contains an information uplink HUD." icon_state = "flighthelmet" item_state = "flighthelmet" item_color = "flight" diff --git a/code/modules/clothing/spacesuits/flightsuit.dm.rej b/code/modules/clothing/spacesuits/flightsuit.dm.rej new file mode 100644 index 0000000000..a0b426974d --- /dev/null +++ b/code/modules/clothing/spacesuits/flightsuit.dm.rej @@ -0,0 +1,14 @@ +diff a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm (rejected hunks) +@@ -1157,10 +1157,10 @@ + maint_panel = TRUE + else + maint_panel = FALSE +- usermessage("You [maint_panel? "open" : "close"] the maintainence panel.") ++ usermessage("You [maint_panel? "open" : "close"] the maintenance panel.") + return FALSE + else if(!maint_panel) +- usermessage("The maintainence panel is closed!", "boldwarning") ++ usermessage("The maintenance panel is closed!", "boldwarning") + return FALSE + else if(istype(I, /obj/item/weapon/crowbar)) + var/list/inputlist = list() diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 48f3a16830..fea8665ead 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -242,7 +242,7 @@ Contains: /obj/item/clothing/suit/space/freedom name = "eagle suit" - desc = "An advanced, light suit, fabricated from a mixture of synthetic feathers and space-resistant material. A gun holster appears to be intergrated into the suit and the wings appear to be stuck in 'freedom' mode." + desc = "An advanced, light suit, fabricated from a mixture of synthetic feathers and space-resistant material. A gun holster appears to be integrated into the suit and the wings appear to be stuck in 'freedom' mode." icon_state = "freedom" item_state = "freedom" allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank/internals) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 46e953f4d0..1172321a89 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -197,7 +197,7 @@ //When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!) /obj/item/clothing/suit/armor/reactive/teleport name = "reactive teleport armor" - desc = "Someone seperated our Research Director from his own head!" + desc = "Someone separated our Research Director from his own head!" var/tele_range = 6 var/rad_amount= 15 reactivearmor_cooldown_duration = 100 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 71075142c6..d6c019c60a 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -210,7 +210,7 @@ /obj/item/clothing/suit/poncho/ponchoshame name = "poncho of shame" - desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseperable. Literally." + desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally." icon_state = "ponchoshame" item_state = "ponchoshame" flags = NODROP diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 30245589d4..012bfe588f 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -398,7 +398,7 @@ /obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko name = "Thirteen Loko" - desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly." + desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" list_reagents = list("thirteenloko" = 30) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index b8feddfa79..2ca15f7b97 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -34,7 +34,7 @@ // The format for shots is the exact same as iconstates for the drinking glass, except you use a shot glass instead. // // If it's a new drink, remember to add it to Chemistry-Reagents.dm and Chemistry-Recipes.dm as well. // // You can only mix the ported-over drinks in shot glasses for now (they'll mix in a shaker, but the sprite won't change for glasses). // -// This is on a case-by-case basis, and you can even make a seperate sprite for shot glasses if you want. // +// This is on a case-by-case basis, and you can even make a separate sprite for shot glasses if you want. // /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass name = "shot glass" diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index baa804a4de..1b06edc350 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -115,7 +115,7 @@ desc = "Tasty spacey sugar!" list_reagents = list("sugar" = 50) -/obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then +/obj/item/weapon/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 0f4d5915f4..d629be13ee 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -27,7 +27,7 @@ delay_mod = 0.5 /obj/machinery/computer/camera_advanced/base_construction - name = "base contruction console" + name = "base construction console" desc = "An industrial computer integrated with a camera-assisted rapid construction drone." networks = list("SS13") var/obj/item/weapon/construction/rcd/internal/RCD //Internal RCD. The computer passes user commands to this in order to avoid massive copypaste. @@ -267,7 +267,7 @@ datum/action/innate/aux_base/install_turret/Activate() var/turf/turret_turf = get_turf(remote_eye) if(is_blocked_turf(turret_turf)) - to_chat(owner, "Location is obtructed by something. Please clear the location and try again.") + to_chat(owner, "Location is obstructed by something. Please clear the location and try again.") return var/obj/machinery/porta_turret/aux_base/T = new /obj/machinery/porta_turret/aux_base(turret_turf) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index f9e2ee855a..c1cd1b937e 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -785,7 +785,7 @@ switch(random) if(1) - to_chat(user, "Your appearence morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.") + to_chat(user, "Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.") H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "snout" = "Sharp", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade Legs") H.eye_color = "fee5a3" H.set_species(/datum/species/lizard) @@ -814,7 +814,7 @@ severity = BIOHAZARD visibility_flags = 0 stage1 = list("Your bones ache.") - stage2 = list("Your skin feels scaley.") + stage2 = list("Your skin feels scaly.") stage3 = list("You have an overwhelming urge to terrorize some peasants.", "Your teeth feel sharper.") stage4 = list("Your blood burns.") stage5 = list("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat your still human friends for no reason.") diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 14021cc60c..875380aea8 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -143,7 +143,7 @@ SSblackbox.add_details("mining_equipment_bought", "[src.type]|[prize.equipment_path]") // Add src.type to keep track of free golem purchases - // seperately. + // separately. updateUsrDialog() return diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index d902c34584..a8b4eab8d2 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -47,7 +47,7 @@ /datum/map_template/shelter/beta name = "Shelter Beta" shelter_id = "shelter_beta" - description = "An extremly luxurious shelter, containing all \ + description = "An extremely luxurious shelter, containing all \ the amenities of home, including carpeted floors, hot and cold \ running water, a gourmet three course meal, cooking facilities, \ and a deluxe companion to keep you from getting lonely during \ diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 29e82efe6b..69b581995b 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -35,7 +35,7 @@ return pda.owner return if_no_id -//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere +//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a separate proc as it'll be useful elsewhere /mob/living/carbon/human/get_visible_name() var/face_name = get_face_name("") var/id_name = get_id_name("") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 6510b46bf3..6624e5740f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -135,7 +135,7 @@ //the puller can always swap with its victim if on grab intent if(M.pulledby == src && a_intent == INTENT_GRAB) mob_swap = 1 - //restrained people act if they were on 'help' intent to prevent a person being pulled from being seperated from their puller + //restrained people act if they were on 'help' intent to prevent a person being pulled from being separated from their puller else if((M.restrained() || M.a_intent == INTENT_HELP) && (restrained() || a_intent == INTENT_HELP)) mob_swap = 1 if(mob_swap) @@ -412,7 +412,7 @@ if(client) to_chat(src, "[src]'s Metainfo:
[client.prefs.metadata]") else - to_chat(src, "[src] does not have any stored infomation!") + to_chat(src, "[src] does not have any stored information!") else to_chat(src, "OOC Metadata is not supported by this server!") diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index bcd7c77f1d..a3479aac89 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -2,5 +2,5 @@ if(ranged_ability && client) ranged_ability.remove_mousepointer(client) ..() - if(!key && mind) //key and mind have become seperated. + if(!key && mind) //key and mind have become separated. mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7eb7840a59..f083f6c5f5 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1055,7 +1055,7 @@ diag_hud_set_aishell() /mob/living/silicon/robot/proc/deploy_init(var/mob/living/silicon/ai/AI) - real_name = "[AI.real_name] shell [rand(100, 999)] - [designation]" //Randomizing the name so it shows up seperately in the shells list + real_name = "[AI.real_name] shell [rand(100, 999)] - [designation]" //Randomizing the name so it shows up separately in the shells list name = real_name if(camera) camera.c_tag = real_name //update the camera name too diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 45fb411876..2b897bfbcb 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -2,7 +2,7 @@ //If someone can do this in a neater way, be my guest-Kor -//This has to be seperate from the Away Mission corpses, because New() doesn't work for those, and initialize() doesn't work for these. +//This has to be separate from the Away Mission corpses, because New() doesn't work for those, and initialize() doesn't work for these. //To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now). diff --git a/code/modules/mob/say_readme.dm b/code/modules/mob/say_readme.dm index 87c198875a..0c64da1789 100644 --- a/code/modules/mob/say_readme.dm +++ b/code/modules/mob/say_readme.dm @@ -5,7 +5,7 @@ This is a basic explanation of how say() works. Read this if you don't understand something. The basic "flow" of say() is that a speaker says a message, which is heard by hearers. What appears on screen -is constructed by each hearer seperately, and not by the speaker. +is constructed by each hearer separately, and not by the speaker. This rewrite was needed, but is far from perfect. Report any bugs you come across and feel free to fix things up. Radio code, while very much related to saycode, is not something I wanted to touch, so the code related to that may be messy. @@ -122,7 +122,7 @@ global procs Called right before handle_inherent_channels() can_speak_vocal(message) - Checks if the mob can vocalize their message. This is seperate so, for example, muzzles don't block + Checks if the mob can vocalize their message. This is separate so, for example, muzzles don't block hivemind chat. Called right after handle_inherent_channels() diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 468a044bc0..ca77641a9b 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -27,7 +27,7 @@ desc = "A small cabinet with drawers. This one has wheels!" anchored = FALSE -/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete +/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unnecessary map issues, but please don't name stuff like this in the future -Pete icon_state = "tallcabinet" diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 5db3d9c1c5..e36c639eb9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -28,7 +28,7 @@ // the Area Power Controller (APC), formerly Power Distribution Unit (PDU) -// one per area, needs wire conection to power network through a terminal +// one per area, needs wire connection to power network through a terminal // controls power to devices in that area // may be opened to change power cell @@ -256,7 +256,7 @@ O += "apco2-[environ]" add_overlay(O) - // And now, seperately for cleanness, the lighting changing + // And now, separately for cleanness, the lighting changing if(update_state & UPSTATE_ALLGOOD) switch(charging) if(0) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index e80b4cd9b6..816cd97874 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -582,7 +582,7 @@ L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ "The unearthly ringing subsides and you notice you have new radiation burns.", 2) else - L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2) + L.show_message("You hear an unearthly ringing and notice your skin is covered in fresh radiation burns.", 2) // When you wanna make a supermatter shard for the dramatic effect, but // don't want it exploding suddenly diff --git a/code/modules/procedural_mapping/mapGeneratorReadme.dm b/code/modules/procedural_mapping/mapGeneratorReadme.dm index ae656b5b30..c4ced7674b 100644 --- a/code/modules/procedural_mapping/mapGeneratorReadme.dm +++ b/code/modules/procedural_mapping/mapGeneratorReadme.dm @@ -80,7 +80,7 @@ mapGeneratorModule Simple Workflow: 1. Define a/some mapGeneratorModule(s) to your liking, choosing atoms and turfs to spawn - #Note: I chose to split Turfs and Atoms off into seperate modules, but this is NOT required. + #Note: I chose to split Turfs and Atoms off into separate modules, but this is NOT required. #Note: A mapGeneratorModule may have turfs AND atoms, so long as each is in it's appropriate list 2. Define a mapGenerator type who's modules list contains the typepath(s) of all the module(s) you wish to use @@ -98,7 +98,7 @@ Simple Workflow: Option Suggestions: - * Have seperate modules for Turfs and Atoms, this is not enforced, but it is how I have structured my nature example. + * Have separate modules for Turfs and Atoms, this is not enforced, but it is how I have structured my nature example. * If your map doesn't look quite to your liking, simply jiggle with the variables on your modules and the type probabilities * You can mix and map premade areas with the procedural generation, for example mapping an entire flat land but having code generate just the grass tufts diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index e1c6e6fa6e..cdf5a4b817 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -374,7 +374,7 @@ /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/syndicate name = "syndicate sniper rifle" - desc = "An illegally modified .50 cal sniper rifle with supression compatibility. Quickscoping still doesn't work." + desc = "An illegally modified .50 cal sniper rifle with suppression compatibility. Quickscoping still doesn't work." pin = /obj/item/device/firing_pin/implant/pindicate origin_tech = "combat=7;syndicate=6" diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 6c5e4d935c..226652f6d5 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -247,7 +247,7 @@ if(!SS.transfer_soul("FORCE", user)) //Something went wrong qdel(SS) return - user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfiet!") + user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfeit!") ///////////////////////////// // DOUBLE BARRELED SHOTGUN // diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 22b51064af..9c84378586 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -427,7 +427,7 @@ /obj/item/borg/upgrade/modkit/bounty name = "death syphon" - desc = "Killing or assisting in killing a creature permenantly increases your damage against that type of creature." + desc = "Killing or assisting in killing a creature permanently increases your damage against that type of creature." denied_type = /obj/item/borg/upgrade/modkit/bounty modifier = 1.25 cost = 30 @@ -534,7 +534,7 @@ /obj/item/borg/upgrade/modkit/tracer/adjustable name = "adjustable tracer bolts" - desc = "Causes kinetic accelerator bolts to have a adjustably-colored tracer trail and explosion. Use in-hand to change color." + desc = "Causes kinetic accelerator bolts to have a adjustable-colored tracer trail and explosion. Use in-hand to change color." /obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user) bolt_color = input(user,"Choose Color") as color diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index a38ba3773e..a0a328afb0 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -46,7 +46,7 @@ name = "scatter shot laser rifle" icon_state = "lasercannon" item_state = "laser" - desc = "An industrial-grade heavy-duty laser rifle with a modified laser lense to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theorically infinite use." + desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use." origin_tech = "combat=5;materials=4;powerstorage=4" ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser) @@ -107,8 +107,8 @@ transform *= 1 + ((damage/7) * 0.2)//20% larger per tile /obj/item/weapon/gun/energy/xray - name = "xray laser gun" - desc = "A high-power laser gun capable of expelling concentrated xray blasts that pass through multiple soft targets and heavier materials" + name = "x-ray laser gun" + desc = "A high-power laser gun capable of expelling concentrated x-ray blasts that pass through multiple soft targets and heavier materials" icon_state = "xray" item_state = null origin_tech = "combat=6;materials=4;magnets=4;syndicate=1" diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 57d374e3d9..d902ed7b13 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -1,6 +1,6 @@ /obj/machinery/chem_master name = "ChemMaster 3000" - desc = "Used to seperate chemicals and distribute them in a variety of forms." + desc = "Used to separate chemicals and distribute them in a variety of forms." density = TRUE anchored = TRUE icon = 'icons/obj/chemical.dmi' diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index a94b3a80b3..7a078f1891 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -498,7 +498,7 @@ other types of metals and chemistry for reagents). /datum/design/handdrill name = "Hand Drill" - desc = "A small electric hand drill with an interchangable screwdriver and bolt bit" + desc = "A small electric hand drill with an interchangeable screwdriver and bolt bit" id = "handdrill" req_tech = list("materials" = 4, "engineering" = 6) build_type = PROTOLATHE @@ -508,7 +508,7 @@ other types of metals and chemistry for reagents). /datum/design/jawsoflife name = "Jaws of Life" - desc = "A small, compact Jaws of Life with an interchangable pry jaws and cutting jaws" + desc = "A small, compact Jaws of Life with an interchangeable pry jaws and cutting jaws" id = "jawsoflife" req_tech = list("materials" = 4, "engineering" = 6, "magnets" = 6) // added one more requirment since the Jaws of Life are a bit OP build_path = /obj/item/weapon/crowbar/power diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 23b9ad00c8..7e7b4c2b5b 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -653,7 +653,7 @@ warn_admins(user, "Flash") /obj/item/weapon/relic/proc/petSpray(mob/user) - var/message = "[src] begans to shake, and in the distance the sound of rampaging animals arises!" + var/message = "[src] begins to shake, and in the distance the sound of rampaging animals arises!" visible_message(message) to_chat(user, message) var/animals = rand(1,25) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 827cce162f..49584ecb3c 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -219,13 +219,13 @@ research holder datum. /datum/tech/plasmatech name = "Plasma Research" - desc = "Research into the mysterious substance colloqually known as \"plasma\"." + desc = "Research into the mysterious substance colloquially known as \"plasma\"." id = "plasmatech" rare = 3 /datum/tech/powerstorage name = "Power Manipulation Technology" - desc = "The various technologies behind the storage and generation of electicity." + desc = "The various technologies behind the storage and generation of electricity." id = "powerstorage" /datum/tech/bluespace @@ -256,7 +256,7 @@ research holder datum. /datum/tech/syndicate name = "Illegal Technologies Research" - desc = "The study of technologies that violate Nanotrassen regulations." + desc = "The study of technologies that violate Nanotrasen regulations." id = "syndicate" rare = 4 diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 93ac3324ac..9c826f5f5f 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -425,7 +425,7 @@ /obj/item/clothing/suit/golem name = "adamantine shell" - desc = "a golem's thick outter shell" + desc = "a golem's thick outer shell" icon_state = "golem" item_state = "golem" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm index 74490fea28..61330265ab 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -80,7 +80,7 @@ var/obj/item/bodypart/part = X if(item_to_retrieve in part.embedded_objects) part.embedded_objects -= item_to_retrieve - to_chat(C, "The [item_to_retrieve] that was embedded in your [L] has myseriously vanished. How fortunate!") + to_chat(C, "The [item_to_retrieve] that was embedded in your [L] has mysteriously vanished. How fortunate!") if(!C.has_embedded_objects()) C.clear_alert("embeddedobject") break diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 074c206c1f..77a30b1884 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -64,7 +64,7 @@ /obj/machinery/bsa/middle name = "Bluespace Artillery Fusor" - desc = "Contents classifed by Nanotrasen Naval Command. Needs to be linked with the other BSA parts using multitool." + desc = "Contents classified by Nanotrasen Naval Command. Needs to be linked with the other BSA parts using multitool." icon_state = "fuel_chamber" var/obj/machinery/bsa/back/back var/obj/machinery/bsa/front/front diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 55ae1cc2b0..e7a529b2a0 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -85,7 +85,7 @@ if(!H.myseed) return if(!H.harvest)// So it's bit harder. - to_chat(user, "Plant needs to be ready to harvest to perform full data scan.") //Because space dna is actually magic + to_chat(user, "Plant needs to be ready to harvest to perform full data scan.") //Because space dna is actually magic return if(plants[H.myseed.type]) to_chat(user, "Plant data already present in local storage.") diff --git a/code/modules/stock_market/events.dm b/code/modules/stock_market/events.dm index 17a92ea83f..a3d9023f7a 100644 --- a/code/modules/stock_market/events.dm +++ b/code/modules/stock_market/events.dm @@ -4,7 +4,7 @@ var/name = "event" var/next_phase = 0 var/datum/stock/company = null - var/current_title = "A company holding an pangalactic conference in the Seattle Conference Center, Seattle, Earth" + var/current_title = "A company holding a pangalactic conference in the Seattle Conference Center, Seattle, Earth" var/current_desc = "We will continue to monitor their stocks as the situation unfolds." var/phase_id = 0 var/hidden = 0 diff --git a/code/modules/surgery/organ_manipulation.dm.rej b/code/modules/surgery/organ_manipulation.dm.rej new file mode 100644 index 0000000000..8a77b0aade --- /dev/null +++ b/code/modules/surgery/organ_manipulation.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm (rejected hunks) +@@ -78,7 +78,7 @@ + current_type = "extract" + var/list/organs = target.getorganszone(target_zone) + if(!organs.len) +- to_chat(user, "There are no removeable organs in [target]'s [parse_zone(target_zone)]!") ++ to_chat(user, "There are no removable organs in [target]'s [parse_zone(target_zone)]!") + return -1 + else + for(var/obj/item/organ/O in organs) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 5c0e31456e..69cf8aa96b 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -174,7 +174,7 @@ /obj/item/organ/cyberimp/arm/toolset name = "integrated toolset implant" - desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all neccessary tools." + desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools." origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4" contents = newlist(/obj/item/weapon/screwdriver/cyborg, /obj/item/weapon/wrench/cyborg, /obj/item/weapon/weldingtool/largetank/cyborg, /obj/item/weapon/crowbar/cyborg, /obj/item/weapon/wirecutters/cyborg, /obj/item/device/multitool/cyborg) @@ -191,7 +191,7 @@ /obj/item/organ/cyberimp/arm/esword name = "arm-mounted energy blade" - desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated enregy." + desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy." contents = newlist(/obj/item/weapon/melee/transforming/energy/blade/hardlight) origin_tech = "materials=4;combat=5;biotech=3;powerstorage=2;syndicate=5" diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index 3a2a3611db..a281249a12 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -117,7 +117,7 @@ /obj/item/organ/cyberimp/chest/thrusters name = "implantable thrusters set" desc = "An implantable set of thruster ports. They use the gas from environment or subject's internals for propulsion in zero-gravity areas. \ - Unlike regular jetpack, this device has no stablilzation system." + Unlike regular jetpack, this device has no stabilization system." slot = "thrusters" icon_state = "imp_jetpack" origin_tech = "materials=4;magnets=4;biotech=4;engineering=5" diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index b791586e22..e116c23303 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -32,7 +32,7 @@ H.clear_alert("embeddedobject") if(objects > 0) - user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L]!", "You successfully remove [objects] objects from [H]'s [L.name].") + user.visible_message("[user] successfully removes [objects] objects from [H]'s [L]!", "You successfully remove [objects] objects from [H]'s [L.name].") else to_chat(user, "You find no objects embedded in [H]'s [L]!") diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index e977ac4600..d3c30ac285 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -1,6 +1,6 @@ /obj/item/organ/zombie_infection name = "festering ooze" - desc = "A black web of pus and vicera." + desc = "A black web of pus and viscera." zone = "head" slot = "zombie_infection" icon_state = "blacktumor"