diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index edc8ef9fd6..0a04e3135d 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -7075,7 +7075,7 @@
/area/maintenance/fore/secondary)
"apv" = (
/obj/machinery/door/airlock/maintenance{
- name = "Fitness Maitenance";
+ name = "Fitness Maintenance";
req_access_txt = "12"
},
/obj/structure/cable{
@@ -11164,7 +11164,7 @@
/area/crew_quarters/fitness)
"azi" = (
/obj/machinery/door/airlock/maintenance{
- name = "Garden Maintenace";
+ name = "Garden Maintenance";
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -39148,7 +39148,7 @@
/area/science/xenobiology)
"bKY" = (
/obj/machinery/computer/security/telescreen{
- name = "Test Chamber Moniter";
+ name = "Test Chamber Monitor";
network = list("Xeno");
pixel_y = 2
},
@@ -40551,7 +40551,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,
@@ -42302,7 +42302,7 @@
"bSt" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera{
- c_tag = "Telecoms Monitoring";
+ c_tag = "Telecomms Monitoring";
dir = 8;
network = list("SS13")
},
@@ -42690,7 +42690,7 @@
/obj/item/weapon/wrench,
/obj/item/weapon/crowbar,
/obj/machinery/computer/security/telescreen{
- name = "Test Chamber Moniter";
+ name = "Test Chamber Monitor";
network = list("Test");
pixel_y = -30
},
@@ -43073,9 +43073,9 @@
"bUc" = (
/obj/machinery/requests_console{
announcementConsole = 1;
- department = "Telecoms Admin";
+ department = "Telecomms Admin";
departmentType = 5;
- name = "Telecoms RC";
+ name = "Telecomms RC";
pixel_x = 30
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -43339,7 +43339,7 @@
"bUB" = (
/obj/machinery/power/apc{
dir = 2;
- name = "Telecoms Monitoring APC";
+ name = "Telecomms Monitoring APC";
pixel_y = -24
},
/obj/structure/cable{
@@ -44176,7 +44176,7 @@
/obj/machinery/power/apc{
cell_type = 5000;
dir = 1;
- name = "Telecoms Server APC";
+ name = "Telecomms Server APC";
pixel_y = 25
},
/obj/structure/cable{
@@ -46375,7 +46375,7 @@
/area/maintenance/port/aft)
"cbl" = (
/obj/machinery/camera{
- c_tag = "Telecoms Server Room";
+ c_tag = "Telecomms Server Room";
dir = 4;
network = list("SS13")
},
@@ -57912,7 +57912,7 @@
/obj/machinery/conveyor_switch/oneway{
convdir = -1;
id = "garbage";
- name = "disposal coveyor"
+ name = "disposal conveyor"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
@@ -63095,7 +63095,7 @@
"cNS" = (
/obj/machinery/power/apc{
dir = 4;
- name = "Starboard Maintenace APC";
+ name = "Starboard Maintenance APC";
pixel_x = 26
},
/obj/structure/cable{
diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm
index e6b4fd59ea..a679b2a111 100644
--- a/_maps/map_files/Cerestation/cerestation.dmm
+++ b/_maps/map_files/Cerestation/cerestation.dmm
@@ -700,7 +700,7 @@
},
/obj/machinery/power/apc{
dir = 2;
- name = "Northen External Waste Belt APC";
+ name = "Northern External Waste Belt APC";
pixel_y = -24
},
/obj/effect/turf_decal/stripes/end{
@@ -1636,7 +1636,7 @@
/obj/machinery/power/apc{
cell_type = 5000;
dir = 1;
- name = "Telecoms Server APC";
+ name = "Telecomms Server APC";
pixel_y = 25
},
/obj/structure/cable{
@@ -2388,7 +2388,7 @@
},
/obj/machinery/ntnet_relay,
/obj/machinery/camera{
- c_tag = "Telecoms Server Room";
+ c_tag = "Telecomms Server Room";
dir = 4;
network = list("SS13")
},
@@ -3892,7 +3892,7 @@
"aif" = (
/obj/machinery/power/apc{
dir = 2;
- name = "Telecoms Control Room APC";
+ name = "Telecomms Control Room APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -20322,7 +20322,7 @@
"aNC" = (
/obj/machinery/power/apc{
dir = 1;
- name = "Fore Asteroid Maintenace APC";
+ name = "Fore Asteroid Maintenance APC";
pixel_y = 24
},
/obj/effect/turf_decal/stripes/end,
@@ -27392,7 +27392,7 @@
"bae" = (
/obj/machinery/power/apc{
dir = 1;
- name = "Port Asteroid Maintence APC";
+ name = "Port Asteroid Maintenance APC";
pixel_y = 24
},
/obj/structure/cable{
@@ -28502,7 +28502,7 @@
/area/maintenance/asteroid/port/west)
"bcl" = (
/obj/machinery/door/airlock/maintenance{
- name = "Serivce SMES Access";
+ name = "Service SMES Access";
req_access_txt = "10;11;12"
},
/obj/structure/cable/orange{
@@ -38753,7 +38753,7 @@
/area/awaymission/research/interior/gateway)
"bur" = (
/obj/item/weapon/paper{
- info = "
Nanotrasen Exploration and Colonization Program
Due to recent shutdowns of the Exploration and Colonization department shortly after this gateway was delievered on-site during station construction, this room has been condemmed and an engineering team will be on-site within the next few months to recollect the gate. Thank you for your cooperation.";
+ info = "Nanotrasen Exploration and Colonization Program
Due to recent shutdowns of the Exploration and Colonization department shortly after this gateway was delivered on-site during station construction, this room has been condemmed and an engineering team will be on-site within the next few months to recollect the gate. Thank you for your cooperation.";
name = "NOTICE - GATEWAY STATUS"
},
/obj/effect/turf_decal/stripes/asteroid/line{
@@ -41022,7 +41022,7 @@
/obj/machinery/door/window{
dir = 8;
icon_state = "right";
- name = "Hydroponics Delievery Chute";
+ name = "Hydroponics Delivery Chute";
opacity = 1;
req_access_txt = "33"
},
@@ -51217,7 +51217,7 @@
/obj/machinery/door/window{
dir = 8;
icon_state = "right";
- name = "Engineering Delievery Chute";
+ name = "Engineering Delivery Chute";
opacity = 1;
req_access_txt = "10"
},
@@ -70539,7 +70539,7 @@
/obj/machinery/door/window{
dir = 8;
icon_state = "right";
- name = "Research Delievery Chute";
+ name = "Research Delivery Chute";
opacity = 1;
req_access_txt = "55"
},
@@ -73662,7 +73662,7 @@
"cHq" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/deliveryChute{
- desc = "A chute for big and small crimnals alike!";
+ desc = "A chute for big and small criminals alike!";
dir = 1;
name = "Criminal Delivery Chute"
},
@@ -75076,7 +75076,7 @@
dir = 8
},
/obj/machinery/disposal/deliveryChute{
- desc = "A chute for big and small crimnals alike!";
+ desc = "A chute for big and small criminals alike!";
dir = 1;
name = "Criminal Delivery Chute"
},
@@ -76283,7 +76283,7 @@
"cMw" = (
/obj/machinery/power/apc{
dir = 1;
- name = "Port Asteroid Maintence APC";
+ name = "Port Asteroid Maintenance APC";
pixel_y = 24
},
/obj/structure/cable/orange{
@@ -84549,7 +84549,7 @@
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "n2";
- name = "nitogren filter";
+ name = "nitrogen filter";
on = 1
},
/obj/structure/window/reinforced{
diff --git a/_maps/map_files/Cerestation/cerestation.dmm.rej b/_maps/map_files/Cerestation/cerestation.dmm.rej
new file mode 100644
index 0000000000..b003bc1f30
--- /dev/null
+++ b/_maps/map_files/Cerestation/cerestation.dmm.rej
@@ -0,0 +1,10 @@
+diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm (rejected hunks)
+@@ -94667,7 +94667,7 @@
+ "dzo" = (
+ /obj/machinery/power/apc{
+ dir = 2;
+- name = "Starboard Asteroid Maintenace APC";
++ name = "Starboard Asteroid Maintenance APC";
+ pixel_y = -24
+ },
+ /obj/effect/turf_decal/stripes/end{
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 53e4296134..25444b30df 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -6245,7 +6245,7 @@
/obj/machinery/conveyor_switch/oneway{
convdir = -1;
id = "garbage";
- name = "disposal coveyor"
+ name = "disposal conveyor"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -15501,7 +15501,7 @@
/obj/machinery/conveyor_switch/oneway{
convdir = -1;
id = "cargodeliver";
- name = "delivery coveyor";
+ name = "delivery conveyor";
pixel_x = -12
},
/turf/open/floor/plasteel/loadingarea,
@@ -24362,7 +24362,7 @@
icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Hydroponic's Maintenance";
+ name = "Hydroponics Maintenance";
req_access_txt = "35"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -28752,7 +28752,7 @@
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1;
filter_type = "n2";
- name = "nitogren filter";
+ name = "nitrogen filter";
on = 1
},
/turf/open/floor/plasteel/red/side{
@@ -33965,7 +33965,7 @@
icon_state = "2-8"
},
/obj/machinery/door/airlock/glass_security{
- name = "Security Transfering Control";
+ name = "Security Transferring Control";
req_access_txt = "63"
},
/obj/structure/disposalpipe/segment{
@@ -35473,7 +35473,7 @@
/obj/structure/cable/white,
/obj/machinery/power/apc{
dir = 2;
- name = "Security Transfering APC";
+ name = "Security Transferring APC";
pixel_y = -26
},
/turf/open/floor/plasteel/red/side,
@@ -36206,7 +36206,7 @@
icon_state = "2-4"
},
/obj/machinery/door/airlock/glass_security{
- name = "Security Transfering Control";
+ name = "Security Transferring Control";
req_access_txt = "63"
},
/obj/structure/disposalpipe/segment,
@@ -37255,7 +37255,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/bonfire,
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice{
- desc = "For the weary spacemen on their quest to rekindle the first plasmafire.";
+ desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
name = "Carton of Estus"
},
/obj/item/weapon/nullrod/claymore/glowing{
@@ -37921,7 +37921,7 @@
"bwk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
- name = "Security Transfering Center";
+ name = "Security Transferring Center";
req_access_txt = "63"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -41242,7 +41242,7 @@
},
/obj/machinery/door/airlock/glass_security{
id_tag = "gulagdoor";
- name = "Security Transfering Center";
+ name = "Security Transferring Center";
req_access_txt = "63"
},
/turf/open/floor/plasteel/red/side{
@@ -43899,7 +43899,7 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
- name = "Telecoms Control Room";
+ name = "Telecomms Control Room";
req_access = null;
req_access_txt = "19; 61"
},
@@ -44936,7 +44936,7 @@
/obj/machinery/power/apc{
cell_type = 10000;
dir = 1;
- name = "Telecoms Monitoring APC";
+ name = "Telecomms Monitoring APC";
pixel_y = 28
},
/obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -49258,7 +49258,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
cyclelinkeddir = 2;
- name = "Telecoms Server Room";
+ name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
@@ -51819,7 +51819,7 @@
},
/obj/machinery/door/airlock/command{
cyclelinkeddir = 1;
- name = "Telecoms Server Room";
+ name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
@@ -54540,7 +54540,7 @@
"bZV" = (
/obj/machinery/power/apc{
dir = 8;
- name = "Telecoms Server Room APC";
+ name = "Telecomms Server Room APC";
pixel_x = -26
},
/obj/structure/cable/white,
@@ -57404,7 +57404,7 @@
},
/obj/machinery/door/airlock/command{
cyclelinkeddir = 2;
- name = "Telecoms Server Room";
+ name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
@@ -58818,7 +58818,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
cyclelinkeddir = 1;
- name = "Telecoms Server Room";
+ name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
@@ -61055,7 +61055,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
cyclelinkeddir = 0;
- name = "Telecoms Foyer";
+ name = "Telecomms Foyer";
req_access = null;
req_access_txt = "61"
},
@@ -78298,7 +78298,7 @@
/obj/structure/window/reinforced/fulltile,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemisttop";
- name = "Chemisty Lobby Shutters"
+ name = "Chemistry Lobby Shutters"
},
/turf/open/floor/plating,
/area/medical/medbay/central)
@@ -78306,7 +78306,7 @@
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemisttop";
- name = "Chemisty Lobby Shutters"
+ name = "Chemistry Lobby Shutters"
},
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
@@ -78316,7 +78316,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemisttop";
- name = "Chemisty Lobby Shutters"
+ name = "Chemistry Lobby Shutters"
},
/obj/machinery/door/window/southleft{
name = "Chemistry Desk";
@@ -79205,7 +79205,7 @@
/obj/structure/window/reinforced/fulltile,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemistbot";
- name = "Chemisty Side Shutters"
+ name = "Chemistry Side Shutters"
},
/turf/open/floor/plating,
/area/medical/chemistry)
@@ -82119,7 +82119,7 @@
/obj/structure/window/reinforced/fulltile,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemistbot";
- name = "Chemisty Side Shutters"
+ name = "Chemistry Side Shutters"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -82703,7 +82703,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemistbot";
- name = "Chemisty Side Shutters"
+ name = "Chemistry Side Shutters"
},
/obj/machinery/door/window/southleft{
dir = 4;
@@ -109053,7 +109053,7 @@
/obj/structure/table/reinforced,
/obj/machinery/microwave{
desc = "It looks really dirty.";
- name = "maint microwave";
+ name = "maintenance microwave";
pixel_y = 5
},
/obj/structure/sign/poster/official/help_others{
@@ -110517,7 +110517,7 @@
},
/obj/machinery/power/apc{
dir = 4;
- name = "Starboard Quarter Maintenace APC";
+ name = "Starboard Quarter Maintenance APC";
pixel_x = 26
},
/turf/open/floor/plating,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 46c0a7b2fe..70059179c2 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -4282,7 +4282,7 @@
/obj/machinery/conveyor_switch/oneway{
convdir = -1;
id = "garbage";
- name = "disposal coveyor"
+ name = "disposal conveyor"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
@@ -33814,7 +33814,7 @@
/area/quartermaster/office)
"bmj" = (
/obj/structure/sign/directions/engineering{
- desc = "A direction sign, pointing out which way the Suuply department is.";
+ desc = "A direction sign, pointing out which way the Supply department is.";
dir = 1;
icon_state = "direction_supply";
name = "cargo department";
@@ -38103,7 +38103,7 @@
/area/tcommsat/computer)
"btN" = (
/obj/machinery/door/airlock/hatch{
- name = "Telecoms Control Room";
+ name = "Telecomms Control Room";
req_one_access_txt = "19; 61"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -38985,7 +38985,7 @@
/obj/item/device/radio/intercom{
dir = 8;
freerange = 1;
- name = "Station Intercom (Telecoms)";
+ name = "Station Intercom (Telecomms)";
pixel_y = 30
},
/obj/structure/table/wood,
@@ -39934,7 +39934,7 @@
"bxs" = (
/obj/machinery/computer/security/telescreen{
dir = 8;
- name = "Telecoms Camera Monitor";
+ name = "Telecomms Camera Monitor";
network = list("tcomm");
pixel_x = 26
},
@@ -41028,7 +41028,7 @@
/obj/machinery/power/apc{
cell_type = 5000;
dir = 4;
- name = "Telecoms Control Room APC";
+ name = "Telecomms Control Room APC";
pixel_x = 26
},
/obj/machinery/computer/telecomms/server{
@@ -41766,9 +41766,9 @@
"bBa" = (
/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/firealarm{
@@ -42544,7 +42544,7 @@
/area/tcommsat/server)
"bCF" = (
/obj/machinery/door/airlock/hatch{
- name = "Telecoms Server Room"
+ name = "Telecomms Server Room"
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -43260,7 +43260,7 @@
"bEf" = (
/obj/machinery/telecomms/processor/preset_one,
/obj/machinery/camera{
- c_tag = "Telecoms - Server Room - Fore-Port";
+ c_tag = "Telecomms - Server Room - Fore-Port";
dir = 2;
network = list("SS13","tcomm")
},
@@ -43310,7 +43310,7 @@
"bEk" = (
/obj/machinery/telecomms/processor/preset_three,
/obj/machinery/camera{
- c_tag = "Telecoms - Server Room - Fore-Starboard";
+ c_tag = "Telecomms - Server Room - Fore-Starboard";
dir = 2;
network = list("SS13","tcomm")
},
@@ -45972,7 +45972,7 @@
/obj/item/weapon/folder,
/obj/item/weapon/folder,
/obj/machinery/camera{
- c_tag = "Telecoms - Control Room";
+ c_tag = "Telecomms - Control Room";
dir = 1;
network = list("SS13","tcomm")
},
@@ -46607,7 +46607,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/airlock/engineering{
- name = "Telecoms Storage";
+ name = "Telecomms Storage";
req_access_txt = "61"
},
/obj/structure/cable/yellow{
@@ -47374,7 +47374,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Telecoms - Storage";
+ c_tag = "Telecomms - Storage";
dir = 4;
network = list("SS13")
},
@@ -47548,7 +47548,7 @@
dir = 8
},
/obj/machinery/camera{
- c_tag = "Telecoms - Server Room - Aft-Port";
+ c_tag = "Telecomms - Server Room - Aft-Port";
dir = 4;
network = list("SS13","tcomm")
},
@@ -47595,14 +47595,14 @@
/obj/machinery/power/apc{
cell_type = 5000;
dir = 4;
- name = "Telecoms Server Room APC";
+ name = "Telecomms Server Room APC";
pixel_x = 25
},
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/camera{
- c_tag = "Telecoms - Server Room - Aft-Starboard";
+ c_tag = "Telecomms - Server Room - Aft-Starboard";
dir = 8;
network = list("SS13","tcomm")
},
@@ -47970,7 +47970,7 @@
/area/bridge/showroom/corporate)
"bNb" = (
/obj/structure/sign/atmosplaque{
- desc = "A guide to the exhibit, 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 exhibit, 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
@@ -48358,7 +48358,7 @@
},
/obj/machinery/power/apc{
dir = 8;
- name = "Telecoms Storage APC";
+ name = "Telecomms Storage APC";
pixel_x = -28
},
/obj/structure/cable/yellow{
@@ -48496,7 +48496,7 @@
"bNZ" = (
/obj/machinery/light/small,
/obj/machinery/camera{
- c_tag = "Telecoms - Server Room - Aft";
+ c_tag = "Telecomms - Server Room - Aft";
dir = 1;
network = list("SS13","tcomm")
},
@@ -49557,7 +49557,7 @@
"bQj" = (
/obj/machinery/cell_charger,
/obj/item/weapon/stock_parts/cell/crap{
- name = "\improper NanoTrasen-brand rechargable AA battery"
+ name = "\improper NanoTrasen-brand rechargeable AA battery"
},
/obj/structure/table/wood,
/turf/open/floor/carpet,
@@ -50230,9 +50230,7 @@
pixel_x = -4;
pixel_y = 1
},
-/obj/item/clothing/mask/cigarette/cigar/cohiba{
- name = "cohiba robusto cigar"
- },
+/obj/item/clothing/mask/cigarette/cigar/cohiba,
/obj/structure/table/wood,
/turf/open/floor/carpet,
/area/bridge/showroom/corporate)
@@ -50243,7 +50241,7 @@
icon_state = "4-8"
},
/obj/structure/showcase{
- desc = "A slightly battered looking TV. Vaious Nanotrasen infomercials play on a loop, accompanied by a jaunty tune.";
+ desc = "A slightly battered looking TV. Various Nanotrasen infomercials play on a loop, accompanied by a jaunty tune.";
dir = 1;
icon = 'icons/obj/computer.dmi';
icon_state = "television";
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index f54273c0a0..50c08a15c9 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -11607,7 +11607,7 @@
/obj/machinery/atmospherics/components/trinary/filter{
dir = 2;
filter_type = "n2";
- name = "nitogren filter";
+ name = "nitrogen filter";
on = 1
},
/obj/structure/window/reinforced{
@@ -15258,7 +15258,7 @@
/obj/machinery/power/apc{
cell_type = 5000;
dir = 1;
- name = "Central Starborad Maintenance APC";
+ name = "Central Starboard Maintenance APC";
pixel_y = 25
},
/obj/effect/turf_decal/stripes/line,
@@ -23283,7 +23283,7 @@
"aML" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
- name = "Telecoms Control Room";
+ name = "Telecomms Control Room";
req_access = null;
req_access_txt = "19; 61"
},
@@ -25210,7 +25210,7 @@
"aPH" = (
/obj/machinery/door/airlock/command{
cyclelinkeddir = 2;
- name = "Telecoms Server Room";
+ name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
@@ -25770,7 +25770,7 @@
},
/obj/machinery/door/airlock/command{
cyclelinkeddir = 2;
- name = "Telecoms Server Room";
+ name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
@@ -25994,7 +25994,7 @@
/obj/structure/window/reinforced/fulltile,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemistbot";
- name = "Chemisty Privacy Shutters"
+ name = "Chemistry Privacy Shutters"
},
/turf/open/floor/plating,
/area/medical/chemistry)
@@ -26007,7 +26007,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemistbot";
- name = "Chemisty Privacy Shutters"
+ name = "Chemistry Privacy Shutters"
},
/obj/machinery/door/window/southleft{
name = "Chemistry Desk";
@@ -26023,7 +26023,7 @@
/obj/structure/window/reinforced/fulltile,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemisttop";
- name = "Chemisty Lobby Shutters"
+ name = "Chemistry Lobby Shutters"
},
/turf/open/floor/plating,
/area/medical/chemistry)
@@ -26804,7 +26804,7 @@
"aSM" = (
/obj/machinery/door/airlock/command{
cyclelinkeddir = 2;
- name = "Telecoms Server Room";
+ name = "Telecomms Server Room";
req_access = null;
req_access_txt = "61"
},
@@ -27131,7 +27131,7 @@
/obj/item/weapon/pen,
/obj/machinery/door/poddoor/shutters/preopen{
id = "chemistbot";
- name = "Chemisty Privacy Shutters"
+ name = "Chemistry Privacy Shutters"
},
/obj/machinery/door/window/southleft{
dir = 8;
@@ -33609,7 +33609,7 @@
"bfw" = (
/obj/structure/bonfire,
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice{
- desc = "For the weary spacemen on their quest to rekindle the first plasmafire.";
+ desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
name = "Carton of Estus"
},
/obj/item/weapon/nullrod/claymore/glowing{
@@ -39634,7 +39634,7 @@
/obj/machinery/telecomms/bus/preset_one/birdstation,
/obj/machinery/power/apc{
dir = 8;
- name = "Telecoms Server Room APC";
+ name = "Telecomms Server Room APC";
pixel_x = -26
},
/obj/structure/cable{
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 86ef84e751..9d5192484f 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -15796,7 +15796,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{
@@ -17805,7 +17805,7 @@
/obj/machinery/conveyor_switch/oneway{
convdir = -1;
id = "garbage";
- name = "disposal coveyor"
+ name = "disposal conveyor"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -26266,7 +26266,7 @@
/area/science/explab)
"bft" = (
/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
@@ -29039,7 +29039,7 @@
/area/science/xenobiology)
"ble" = (
/obj/machinery/computer/security/telescreen{
- name = "Test Chamber Moniter";
+ name = "Test Chamber Monitor";
network = list("Xeno");
pixel_y = 2
},
@@ -34756,7 +34756,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/red/side,
@@ -35990,7 +35990,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/whitegreen/side{
@@ -37937,7 +37937,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,
@@ -41797,9 +41797,9 @@
/area/engine/atmos)
"bLN" = (
/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,
@@ -41994,9 +41994,9 @@
/area/engine/atmos)
"bMm" = (
/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)
@@ -42037,9 +42037,9 @@
"bMs" = (
/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)
@@ -42061,9 +42061,9 @@
"bMv" = (
/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)
@@ -43989,7 +43989,7 @@
/area/engine/engineering)
"bQD" = (
/obj/machinery/camera{
- c_tag = "Engineering Telecoms Access";
+ c_tag = "Engineering Telecomms Access";
dir = 8;
network = list("Labor")
},
@@ -43997,11 +43997,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,
@@ -44078,18 +44078,18 @@
"bQL" = (
/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)
"bQM" = (
/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)
@@ -44935,9 +44935,9 @@
"bSS" = (
/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{
@@ -44968,9 +44968,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
@@ -44996,7 +44996,7 @@
"bSW" = (
/obj/machinery/power/apc{
dir = 1;
- name = "Telecoms Monitoring APC";
+ name = "Telecomms Monitoring APC";
pixel_y = 25
},
/obj/structure/cable{
@@ -45211,7 +45211,7 @@
cell_type = 5000;
dir = 1;
layer = 4;
- name = "Telecoms Server APC";
+ name = "Telecomms Server APC";
pixel_y = 24
},
/obj/structure/cable,
@@ -45500,9 +45500,9 @@
/area/tcommsat/server)
"bUe" = (
/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"
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index f23f01d068..180b8bb040 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -13,7 +13,7 @@
mind.transfer_to(new_mob)
- You must not assign key= or ckey= after transfer_to() since the transfer_to transfers the client for you.
- By setting key or ckey explicitly after transfering the mind with transfer_to you will cause bugs like DCing
+ By setting key or ckey explicitly after transferring the mind with transfer_to you will cause bugs like DCing
the player.
- IMPORTANT NOTE 2, if you want a player to become a ghost, use mob.ghostize() It does all the hard work for you.
@@ -97,7 +97,7 @@
language_holder = mob_holder.copy(src)
if(key)
- if(new_character.key != key) //if we're transfering into a body with a key associated which is not ours
+ if(new_character.key != key) //if we're transferring into a body with a key associated which is not ours
new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless.
else
key = new_character.key
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 9c9fb8f4cb..aaa6d39bfc 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -1240,7 +1240,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
valid_territory = FALSE
/area/storage/tcom
- name = "Telecoms Storage"
+ name = "Telecomms Storage"
icon_state = "green"
valid_territory = FALSE
@@ -1416,7 +1416,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/tcommsat/entrance
- name = "Telecoms Teleporter"
+ name = "Telecomms Teleporter"
icon_state = "tcomsatentrance"
/area/tcommsat/chamber
@@ -1424,12 +1424,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "tcomsatcham"
/area/ai_monitored/turret_protected/tcomsat
- name = "Telecoms Satellite"
+ name = "Telecomms Satellite"
icon_state = "tcomsatlob"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/ai_monitored/turret_protected/tcomfoyer
- name = "Telecoms Foyer"
+ name = "Telecomms Foyer"
icon_state = "tcomsatentrance"
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
@@ -1444,11 +1444,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
/area/tcommsat/computer
- name = "Telecoms Control Room"
+ name = "Telecomms Control Room"
icon_state = "tcomsatcomp"
/area/tcommsat/server
- name = "Telecoms Server Room"
+ name = "Telecomms Server Room"
icon_state = "tcomsatcham"
/area/tcommsat/lounge
diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm
index a9f5214f72..a095840b09 100644
--- a/code/modules/VR/vr_sleeper.dm
+++ b/code/modules/VR/vr_sleeper.dm
@@ -95,7 +95,7 @@
if("vr_connect")
var/mob/living/carbon/human/human_occupant = occupant
if(human_occupant && human_occupant.mind)
- to_chat(occupant, "Transfering to virtual reality...")
+ to_chat(occupant, "Transferring to virtual reality...")
if(vr_human)
vr_human.revert_to_reality(FALSE, FALSE)
human_occupant.mind.transfer_to(vr_human)
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 75766c011a..d733dfc3fb 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -437,7 +437,7 @@
if("eject")
if(holding)
if(valve_open)
- investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transfering into the air
", INVESTIGATE_ATMOS)
+ investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the air
", INVESTIGATE_ATMOS)
holding.forceMove(get_turf(src))
holding = null
. = TRUE
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 5b6c91bccd..6be065d552 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -375,7 +375,7 @@
pocell.maxcharge *= CG.rate*1000
pocell.charge = pocell.maxcharge
pocell.name = "[G.name] battery"
- pocell.desc = "A rechargable plant based power cell. This one has a power rating of [pocell.maxcharge], and you should not swallow it."
+ pocell.desc = "A rechargeable plant based power cell. This one has a power rating of [pocell.maxcharge], and you should not swallow it."
if(G.reagents.has_reagent("plasma", 2))
pocell.rigged = 1
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 4522cb0b66..9d9db88ee3 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -417,7 +417,7 @@
/obj/item/weapon/paper/jobs
name = "paper- 'Job Information'"
- info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.
\n1. Research plasma
\n2. Make sure all plasma is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n"
+ info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.
\n1. Research plasma
\n2. Make sure all plasma is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Monitor usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n"
/obj/item/weapon/paper/sop
name = "paper- 'Standard Operating Procedure'"
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 83483c89d2..fb3a96162e 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/stock_parts/cell
name = "power cell"
- desc = "A rechargable electrochemical power cell."
+ desc = "A rechargeable electrochemical power cell."
icon = 'icons/obj/power.dmi'
icon_state = "cell"
item_state = "cell"
@@ -164,7 +164,7 @@
/* Cell variants*/
/obj/item/weapon/stock_parts/cell/crap
- name = "\improper Nanotrasen brand rechargable AA battery"
+ name = "\improper Nanotrasen brand rechargeable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
maxcharge = 500
materials = list(MAT_GLASS=40)
@@ -175,7 +175,7 @@
charge = 0
/obj/item/weapon/stock_parts/cell/secborg
- name = "security borg rechargable D battery"
+ name = "security borg rechargeable D battery"
origin_tech = null
maxcharge = 600 //600 max charge / 100 charge per shot = six shots
materials = list(MAT_GLASS=40)
@@ -247,7 +247,7 @@
/obj/item/weapon/stock_parts/cell/bluespace
name = "bluespace power cell"
- desc = "A rechargable transdimensional power cell."
+ desc = "A rechargeable transdimensional power cell."
origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
icon_state = "bscell"
maxcharge = 40000
@@ -287,7 +287,7 @@
/obj/item/weapon/stock_parts/cell/potato
name = "potato battery"
- desc = "A rechargable starch based power cell."
+ desc = "A rechargeable starch based power cell."
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "potato"
origin_tech = "powerstorage=1;biotech=1"
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index e5edf19e0c..e1c6e6fa6e 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -412,7 +412,7 @@
/obj/item/weapon/gun/ballistic/automatic/laser
name = "laser rifle"
- desc = "Though sometimes mocked for the relatively weak firepower of their energy weapons, the logistic miracle of rechargable ammunition has given Nanotrasen a decisive edge over many a foe."
+ desc = "Though sometimes mocked for the relatively weak firepower of their energy weapons, the logistic miracle of rechargeable ammunition has given Nanotrasen a decisive edge over many a foe."
icon_state = "oldrifle"
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/recharge
diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm
index a30c77b637..fafb8afde6 100644
--- a/code/modules/spells/spell_types/mind_transfer.dm
+++ b/code/modules/spells/spell_types/mind_transfer.dm
@@ -17,7 +17,7 @@
/*
Urist: I don't feel like figuring out how you store object spells so I'm leaving this for you to do.
-Make sure spells that are removed from spell_list are actually removed and deleted when mind transfering.
+Make sure spells that are removed from spell_list are actually removed and deleted when mind transferring.
Also, you never added distance checking after target is selected. I've went ahead and did that.
*/
/obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets, mob/living/user = usr, distanceoverride)
diff --git a/code/modules/tgui/subsystem.dm b/code/modules/tgui/subsystem.dm
index c82936bf5d..c44c91c92b 100644
--- a/code/modules/tgui/subsystem.dm
+++ b/code/modules/tgui/subsystem.dm
@@ -225,7 +225,7 @@
/**
* private
*
- * Handle clients switching mobs, by transfering their UIs.
+ * Handle clients switching mobs, by transferring their UIs.
*
* required user source The client's original mob.
* required user target The client's new mob.