From acf61aa28ab382b7633d9a5a4205ce0da098c1b0 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 13:35:03 +0100 Subject: [PATCH 01/26] Update wanted_message.json --- strings/wanted_message.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/wanted_message.json b/strings/wanted_message.json index 73027797695a..72adb31e3d3d 100644 --- a/strings/wanted_message.json +++ b/strings/wanted_message.json @@ -30,7 +30,7 @@ "noun": { "secret plans": 50, "the hand teleporter": 50, - "an NT centcomm uniform": 50, + "an NT centcom uniform": 50, "a supermatter shard": 50, "internal Syndicate documents": 50, "experimental Nanotrasen technology": 50, From 8155896f87515b224a76920e876fa4b8f7069bc3 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 13:35:35 +0100 Subject: [PATCH 02/26] Update yogs_ion_laws.json --- strings/yogs_ion_laws.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/yogs_ion_laws.json b/strings/yogs_ion_laws.json index ccca6dc6a885..786d2b4eab39 100644 --- a/strings/yogs_ion_laws.json +++ b/strings/yogs_ion_laws.json @@ -71,7 +71,7 @@ "EMERGE VICTORIUS", "GET THE DISK", "MAKE ANNOUNCEMENTS", - "CONTACT CENTCOMM", + "CONTACT CENTCOM", "EVADE JUSTICE", "GO UNDERCOVER", "DO AS YOU SEE FIT", From c83c4c770f4155d9a39052610e74318e68f0c5e9 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:04:25 +0100 Subject: [PATCH 03/26] this too --- strings/yogs_ion_laws.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/yogs_ion_laws.json b/strings/yogs_ion_laws.json index 786d2b4eab39..03c37252fc80 100644 --- a/strings/yogs_ion_laws.json +++ b/strings/yogs_ion_laws.json @@ -68,7 +68,7 @@ "DESTROY US ALL", "RUIN EVERYTHING", "DEFEAT THE BOSS", - "EMERGE VICTORIUS", + "EMERGE VICTORIOUS", "GET THE DISK", "MAKE ANNOUNCEMENTS", "CONTACT CENTCOM", From 7e01628768411a78c827a976d42b013c96d0818f Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:28:31 +0100 Subject: [PATCH 04/26] Update cryopod.dm --- code/game/machinery/cryopod.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index b8112fb735e7..8fb9435b6e7c 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -374,7 +374,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) return if(!GLOB.cryopods_enabled) - to_chat(user, span_boldnotice("NanoTrasen does not allow abandoning your crew during a crisis. Cryo systems disabled until the current crisis is resolved.")) + to_chat(user, span_boldnotice("Nanotrasen does not allow abandoning your crew during a crisis. Cryo systems disabled until the current crisis is resolved.")) return if(occupant) From 5db252a99b14b53cd52b3a8774057542d2b82d30 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:29:05 +0100 Subject: [PATCH 05/26] Update headset.dm --- code/game/objects/items/devices/radio/headset.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 6c4bf27335cd..e1159a7dce30 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -206,7 +206,7 @@ /obj/item/radio/headset/headset_cent name = "\improper CentCom headset" - desc = "A headset used by the upper echelons of NanoTrasen." + desc = "A headset used by the upper echelons of Nanotrasen." icon_state = "cent_headset" keyslot = new /obj/item/encryptionkey/headset_com keyslot2 = new /obj/item/encryptionkey/headset_cent From 5bbd2c7d8c35706587261ec3d2a9af11f6cdcfa8 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:30:08 +0100 Subject: [PATCH 06/26] Update topic.dm --- code/modules/admin/topic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f8032d2a705a..e82d53f88f43 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2319,7 +2319,7 @@ return var/customname = input(src, "Pick a title for the report", "Title") as text|null - var/prefix = "
NanoTrasen Fax Network
RE: [inputsubject]
" + var/prefix = "
Nanotrasen Fax Network
RE: [inputsubject]
" var/suffix = "
Signed: [inputsigned]" inputmessage = parsemarkdown(inputmessage) From f5abfd06599a5b3b116fea49be34b9ba8889d4a3 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:30:51 +0100 Subject: [PATCH 07/26] Update nuclearbomb.dm --- code/modules/antagonists/nukeop/equipment/nuclearbomb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index d4c6bdef3518..6157aa467e5b 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -1,6 +1,6 @@ /obj/machinery/nuclearbomb name = "nuclear fission explosive" - desc = "A stolen NanoTrasen branded nuclear bomb. You probably shouldn't stick around to see if this is armed." + desc = "A stolen Nanotrasen branded nuclear bomb. You probably shouldn't stick around to see if this is armed." icon = 'icons/obj/machines/nuke.dmi' icon_state = "nuclearbomb_base" base_icon_state = "nuclearbomb" From 1093c5870bd63dda5d7177a18c74e7e932f12cbc Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:31:25 +0100 Subject: [PATCH 08/26] Update corpse.dm --- code/modules/awaymissions/corpse.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 94b0f590c0d0..5627157c0fb5 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -403,7 +403,7 @@ /obj/effect/mob_spawn/human/bartender/alive/space name = "space bartender sleeper" - flavour_text = "You got this place from your old man, a bar in the middle of nowhere. Or at least, until NanoTrasen decided to move in. Time to mix drinks and change lives." + flavour_text = "You got this place from your old man, a bar in the middle of nowhere. Or at least, until Nanotrasen decided to move in. Time to mix drinks and change lives." important_info = "Do not leave your post under any circumstances!" outfit = /datum/outfit/spacebartender/space From 2cc420642361f7f9c8a3a5071aff6f6eaa21c51c Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:31:43 +0100 Subject: [PATCH 09/26] Update expressconsole.dm --- code/modules/cargo/expressconsole.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 3ec66739dcfe..ca3636f094a0 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -9,7 +9,7 @@ /obj/machinery/computer/cargo/express name = "express supply console" desc = "This console allows the user to purchase a package \ - with 1/40th of the delivery time: made possible by NanoTrasen's new \"1500mm Orbital Railgun\".\ + with 1/40th of the delivery time: made possible by Nanotrasen's new \"1500mm Orbital Railgun\".\ All sales are near instantaneous - please choose carefully" icon_screen = "supply_express" circuit = /obj/item/circuitboard/computer/cargo/express From 043597e5d09fdbb3239f7f3d2a58a0e9da0c2a9c Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:32:12 +0100 Subject: [PATCH 10/26] Update jobs.dm --- code/modules/clothing/head/jobs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index cbaf9684f247..3af7218fff12 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -181,7 +181,7 @@ /obj/item/clothing/head/beret/archaic name = "archaic beret" - desc = "An absolutely ancient beret, allegedly worn by the first mime to ever step foot on a NanoTrasen station." + desc = "An absolutely ancient beret, allegedly worn by the first mime to ever step foot on a Nanotrasen station." icon_state = "archaicberet" dog_fashion = null @@ -338,7 +338,7 @@ /obj/item/clothing/head/beret/sec/centcom name = "\improper CentCom beret" - desc = "A special beret with the NanoTrasen logo emblazoned on it. For where no man has gone before." + desc = "A special beret with the Nanotrasen logo emblazoned on it. For where no man has gone before." icon_state = "official" //Curator From 7b20c19e3694f0b9721ae1cc70655a2569e11546 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:32:37 +0100 Subject: [PATCH 11/26] Update miscellaneous.dm --- code/modules/clothing/shoes/miscellaneous.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index ced13196d2a9..95cd0b5ba2c1 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -451,7 +451,7 @@ /obj/item/clothing/shoes/xeno_wraps //Standard for all digitigrade legs and feets name = "footwraps" - desc = "Standard issue NanoTrasen cloth footwraps for those with podiatric deficiencies. They're quite itchy and scratchy." + desc = "Standard issue Nanotrasen cloth footwraps for those with podiatric deficiencies. They're quite itchy and scratchy." icon_state = "footwraps" item_state = "footwraps" xenoshoe = EITHER_STYLE // This can be worn by digitigrade or straight legs, or a hybridization thereof (one prosthetic one digitigrade). Xenoshoe variable will default to NO_DIGIT, excluding digitigrade feet. @@ -469,7 +469,7 @@ /obj/item/clothing/shoes/xeno_wraps/command // Not applicable unless 11505 merges - Digitigrade-exclusive shoes for Command positions name = "command footwraps" - desc = "These Command-grade NanoTrasen fiber footwraps exude an air of refinement not often felt by those with alien podiatric structures." + desc = "These Command-grade Nanotrasen fiber footwraps exude an air of refinement not often felt by those with alien podiatric structures." icon_state = "footwraps_c" item_state = "footwraps_c" xenoshoe = YES_DIGIT // This is digitigrade leg exclusive @@ -509,7 +509,7 @@ /obj/item/clothing/shoes/xeno_wraps/engineering name = "engineering footwraps" - desc = "Standard issue NanoTrasen cloth footwraps, specially made for the frequent glass treader. Electrically insulated." + desc = "Standard issue Nanotrasen cloth footwraps, specially made for the frequent glass treader. Electrically insulated." icon_state = "footwraps_e" item_state = "footwraps_e" xenoshoe = YES_DIGIT @@ -518,7 +518,7 @@ /obj/item/clothing/shoes/xeno_wraps/science name = "science footwraps" - desc = "Standard issue NanoTrasen cloth footwraps, to reduce fatigue when standing at a console all day." + desc = "Standard issue Nanotrasen cloth footwraps, to reduce fatigue when standing at a console all day." icon_state = "footwraps_sc" item_state = "footwraps_sc" xenoshoe = YES_DIGIT @@ -526,7 +526,7 @@ /obj/item/clothing/shoes/xeno_wraps/medical name = "medical footwraps" - desc = "Standard issue NanoTrasen cloth footwraps, for when you dont want other people's blood all over your feet." + desc = "Standard issue Nanotrasen cloth footwraps, for when you dont want other people's blood all over your feet." icon_state = "footwraps_m" item_state = "footwraps_m" xenoshoe = YES_DIGIT @@ -534,7 +534,7 @@ /obj/item/clothing/shoes/xeno_wraps/cargo name = "cargo footwraps" - desc = "Standard issue NanoTrasen cloth footwraps, with reinforcment to protect against falling crates." + desc = "Standard issue Nanotrasen cloth footwraps, with reinforcment to protect against falling crates." icon_state = "footwraps_ca" item_state = "footwraps_ca" xenoshoe = YES_DIGIT From b5d0d2f3f1963eefca2d576d872c4a63962da239 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:33:15 +0100 Subject: [PATCH 12/26] Update captain.dm --- code/modules/jobs/job_types/captain.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index f35d90193696..6365594bd8dc 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -9,7 +9,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "NanoTrasen officers and Space law" //Changed to officer to separate from CentCom officials being their superior. + supervisors = "Nanotrasen officers and Space law" //Changed to officer to separate from CentCom officials being their superior. selection_color = "#ccccff" req_admin_notify = 1 space_law_notify = 1 //Yogs From 2f6f0af7d176388abcb10b65d2c5560b2959a5e5 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:33:56 +0100 Subject: [PATCH 13/26] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index cd67b979af49..3dc7fcb2ce27 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -284,7 +284,7 @@ /obj/machinery/mineral/equipment_vendor/free_miner name = "free miner ship equipment vendor" - desc = "A vendor sold by NanoTrasen to profit off small mining contractors." + desc = "A vendor sold by Nanotrasen to profit off small mining contractors." prize_list = list( new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750, VENDING_WEAPON), new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800, VENDING_WEAPON), From 9c6b60e3389b984f1d887039250da60b19aca165 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:35:34 +0100 Subject: [PATCH 14/26] Update gimmick_objectives.txt --- strings/gimmick_objectives.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/gimmick_objectives.txt b/strings/gimmick_objectives.txt index f47e42496466..a861f287b64e 100644 --- a/strings/gimmick_objectives.txt +++ b/strings/gimmick_objectives.txt @@ -9,7 +9,7 @@ Waste Medical's time and resources with non-fatal injuries. Steal Syndicate technology back from security. Waste security's time with minor crimes and manhunts. Stage a robbery of the station vault, and make off with as many credits as you can. -Promote mistrust and doubt of NanoTrasen, whilst promoting the Syndicate among the crew at the same time. +Promote mistrust and doubt of Nanotrasen, whilst promoting the Syndicate among the crew at the same time. Waste station resources such as cargo's credits and R&D's research points. Start an organ harvesting operation. Sabotage a department of your choice whenever possible, and when anyone complains, try to convince them you're new. From 11b5f4837547b5ad481ce63ef0c5a628efd43113 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:36:04 +0100 Subject: [PATCH 15/26] Update infiltration.dm --- yogstation/code/game/gamemodes/infiltration/infiltration.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/game/gamemodes/infiltration/infiltration.dm b/yogstation/code/game/gamemodes/infiltration/infiltration.dm index 829f852b3129..ea03343124e6 100644 --- a/yogstation/code/game/gamemodes/infiltration/infiltration.dm +++ b/yogstation/code/game/gamemodes/infiltration/infiltration.dm @@ -43,7 +43,7 @@ return ..() /datum/game_mode/infiltration/generate_report() //make this less shit - return "Reports show that the Syndicate is rounding up it's elite agents, possibly for a raid on a NanoTrasen-controlled station. Keep an eye out for unusual people." + return "Reports show that the Syndicate is rounding up it's elite agents, possibly for a raid on a Nanotrasen-controlled station. Keep an eye out for unusual people." /datum/game_mode/infiltration/set_round_result() ..() From e3f872cbc7edd9549d09e89ef9c6171eaefa06c7 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:36:45 +0100 Subject: [PATCH 16/26] Update parts.dm --- yogstation/code/modules/spacepods/parts.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/spacepods/parts.dm b/yogstation/code/modules/spacepods/parts.dm index d37c220ce8bc..18c739e5a242 100644 --- a/yogstation/code/modules/spacepods/parts.dm +++ b/yogstation/code/modules/spacepods/parts.dm @@ -159,14 +159,14 @@ /obj/item/pod_parts/armor/security name = "security pod armor" icon_state = "pod_armor_mil" - desc = "Tough military-grade pod armor, meant for use by the NanoTrasen military and it's sub-divisons for space combat." + desc = "Tough military-grade pod armor, meant for use by the Nanotrasen military and it's sub-divisons for space combat." pod_icon_state = "pod_mil" pod_desc = "An armed security spacepod with reinforced armor plating brandishing the Nanotrasen Military insignia" pod_integrity = 350 /obj/item/pod_parts/armor/security/red name = "security pod armor" icon_state = "pod_armor_synd" - desc = "Tough military-grade pod armor, meant for use by the NanoTrasen military and it's sub-divisons for space combat." + desc = "Tough military-grade pod armor, meant for use by the Nanotrasen military and it's sub-divisons for space combat." pod_icon_state = "pod_synd" pod_desc = "An armed security spacepod with reinforced armor plating brandishing the Nanotrasen Military insignia" pod_integrity = 350 From e3b95fc80976cd6a1fde647e3310133bba5363ae Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:48:50 +0100 Subject: [PATCH 17/26] think I did this right --- tools/travis/check_grep.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/travis/check_grep.sh b/tools/travis/check_grep.sh index 5c1cfb3e4999..beafacfe522f 100755 --- a/tools/travis/check_grep.sh +++ b/tools/travis/check_grep.sh @@ -46,6 +46,14 @@ if grep -i 'centcomm' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)." st=1 fi; +if grep -i 'NanoTrasen' code/**/*.dm; then + echo "ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T." + st=1 +fi; +if grep -i 'NanoTrasen' _maps/**/*.dmm; then + echo "ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T." + st=1 +fi; if grep -i 'balloon_alert\(.*?, ?"[A-Z]'; then echo echo "ERROR: Balloon alerts should not start with capital letters. This includes text like 'AI'. If this is a false positive, wrap the text in UNLINT()." From cd9f860d72e199c7692a05daa55a98e8035d0dc2 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:57:22 +0100 Subject: [PATCH 18/26] no apparently I didn't if this works, it only dies on mapping stuff --- tools/travis/check_grep.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/travis/check_grep.sh b/tools/travis/check_grep.sh index beafacfe522f..094702d8df89 100755 --- a/tools/travis/check_grep.sh +++ b/tools/travis/check_grep.sh @@ -50,10 +50,6 @@ if grep -i 'NanoTrasen' code/**/*.dm; then echo "ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T." st=1 fi; -if grep -i 'NanoTrasen' _maps/**/*.dmm; then - echo "ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T." - st=1 -fi; if grep -i 'balloon_alert\(.*?, ?"[A-Z]'; then echo echo "ERROR: Balloon alerts should not start with capital letters. This includes text like 'AI'. If this is a false positive, wrap the text in UNLINT()." From abbfeb82e11b5a0d0d5d76280680ee9691ab8baa Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:46:44 +0100 Subject: [PATCH 19/26] fixed? --- tools/travis/check_grep.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/travis/check_grep.sh b/tools/travis/check_grep.sh index 094702d8df89..fe03b960929a 100755 --- a/tools/travis/check_grep.sh +++ b/tools/travis/check_grep.sh @@ -46,10 +46,14 @@ if grep -i 'centcomm' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)." st=1 fi; -if grep -i 'NanoTrasen' code/**/*.dm; then +if grep 'NanoTrasen' code/**/*.dm; then echo "ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T." st=1 fi; +if grep 'NanoTrasen' _maps/**/*.dmm; then + echo "ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T." + st=1 +fi; if grep -i 'balloon_alert\(.*?, ?"[A-Z]'; then echo echo "ERROR: Balloon alerts should not start with capital letters. This includes text like 'AI'. If this is a false positive, wrap the text in UNLINT()." From 992e298833268a239b3797fbcba70cc3406fa2e5 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 18:05:14 +0100 Subject: [PATCH 20/26] tests the linter to see if the grep catches this --- yogstation/code/modules/spacepods/parts.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yogstation/code/modules/spacepods/parts.dm b/yogstation/code/modules/spacepods/parts.dm index 18c739e5a242..80c3b34e33b5 100644 --- a/yogstation/code/modules/spacepods/parts.dm +++ b/yogstation/code/modules/spacepods/parts.dm @@ -159,16 +159,16 @@ /obj/item/pod_parts/armor/security name = "security pod armor" icon_state = "pod_armor_mil" - desc = "Tough military-grade pod armor, meant for use by the Nanotrasen military and it's sub-divisons for space combat." + desc = "Tough military-grade pod armor, meant for use by the NanoTrasen military and it's sub-divisons for space combat." pod_icon_state = "pod_mil" - pod_desc = "An armed security spacepod with reinforced armor plating brandishing the Nanotrasen Military insignia" + pod_desc = "An armed security spacepod with reinforced armor plating brandishing the NanoTrasen Military insignia" pod_integrity = 350 /obj/item/pod_parts/armor/security/red name = "security pod armor" icon_state = "pod_armor_synd" - desc = "Tough military-grade pod armor, meant for use by the Nanotrasen military and it's sub-divisons for space combat." + desc = "Tough military-grade pod armor, meant for use by the NanoTrasen military and it's sub-divisons for space combat." pod_icon_state = "pod_synd" - pod_desc = "An armed security spacepod with reinforced armor plating brandishing the Nanotrasen Military insignia" + pod_desc = "An armed security spacepod with reinforced armor plating brandishing the NanoTrasen Military insignia" pod_integrity = 350 /obj/item/circuitboard/mecha/pod From 1a07f6ca98d87a49ff354ed9f6af950729f4803f Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 18:44:38 +0100 Subject: [PATCH 21/26] test didn't work, reverts last commit --- yogstation/code/modules/spacepods/parts.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yogstation/code/modules/spacepods/parts.dm b/yogstation/code/modules/spacepods/parts.dm index 80c3b34e33b5..18c739e5a242 100644 --- a/yogstation/code/modules/spacepods/parts.dm +++ b/yogstation/code/modules/spacepods/parts.dm @@ -159,16 +159,16 @@ /obj/item/pod_parts/armor/security name = "security pod armor" icon_state = "pod_armor_mil" - desc = "Tough military-grade pod armor, meant for use by the NanoTrasen military and it's sub-divisons for space combat." + desc = "Tough military-grade pod armor, meant for use by the Nanotrasen military and it's sub-divisons for space combat." pod_icon_state = "pod_mil" - pod_desc = "An armed security spacepod with reinforced armor plating brandishing the NanoTrasen Military insignia" + pod_desc = "An armed security spacepod with reinforced armor plating brandishing the Nanotrasen Military insignia" pod_integrity = 350 /obj/item/pod_parts/armor/security/red name = "security pod armor" icon_state = "pod_armor_synd" - desc = "Tough military-grade pod armor, meant for use by the NanoTrasen military and it's sub-divisons for space combat." + desc = "Tough military-grade pod armor, meant for use by the Nanotrasen military and it's sub-divisons for space combat." pod_icon_state = "pod_synd" - pod_desc = "An armed security spacepod with reinforced armor plating brandishing the NanoTrasen Military insignia" + pod_desc = "An armed security spacepod with reinforced armor plating brandishing the Nanotrasen Military insignia" pod_integrity = 350 /obj/item/circuitboard/mecha/pod From 5f753abfe6571504258d73f9d1f6d5b9215924a8 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 18:48:58 +0100 Subject: [PATCH 22/26] test #2: does it detect case sensitivity? --- tools/travis/check_grep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/travis/check_grep.sh b/tools/travis/check_grep.sh index fe03b960929a..d619967d8069 100755 --- a/tools/travis/check_grep.sh +++ b/tools/travis/check_grep.sh @@ -46,11 +46,11 @@ if grep -i 'centcomm' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)." st=1 fi; -if grep 'NanoTrasen' code/**/*.dm; then +if grep 'Nanotrasen' code/**/*.dm; then echo "ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T." st=1 fi; -if grep 'NanoTrasen' _maps/**/*.dmm; then +if grep 'Nanotrasen' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T." st=1 fi; From ac6987be25c1d34b7566cb86d60fee5beeb666df Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Mon, 4 Dec 2023 18:53:02 +0100 Subject: [PATCH 23/26] test worked, I think it's done! --- tools/travis/check_grep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/travis/check_grep.sh b/tools/travis/check_grep.sh index d619967d8069..fe03b960929a 100755 --- a/tools/travis/check_grep.sh +++ b/tools/travis/check_grep.sh @@ -46,11 +46,11 @@ if grep -i 'centcomm' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)." st=1 fi; -if grep 'Nanotrasen' code/**/*.dm; then +if grep 'NanoTrasen' code/**/*.dm; then echo "ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T." st=1 fi; -if grep 'Nanotrasen' _maps/**/*.dmm; then +if grep 'NanoTrasen' _maps/**/*.dmm; then echo "ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T." st=1 fi; From 04bfa9b2fec4b583b2e8b1624921145238147a7f Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:44:22 +0100 Subject: [PATCH 24/26] Update check_grep.sh --- tools/travis/check_grep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/check_grep.sh b/tools/travis/check_grep.sh index fe03b960929a..112e40990b8c 100755 --- a/tools/travis/check_grep.sh +++ b/tools/travis/check_grep.sh @@ -10,7 +10,7 @@ if grep -El '^\".+\" = \(.+\)' _maps/**/*.dmm; then echo "ERROR: Non-TGM formatted map detected. Please convert it using Map Merger!" st=1 fi; -if grep -REl 'list\(.*[^ ]=' --include='*.dmm' _maps; then +if grep -REl 'list\(.*[^ ]=' --include='*.dmm' _maps; then k echo "ERROR: Associative list missing leading and trailing space. Update your mapping tool!" st=1 fi; From b35c6653cfea1960c9041f9a02eba09f5b66df8c Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:44:32 +0100 Subject: [PATCH 25/26] Update check_grep.sh --- tools/travis/check_grep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/check_grep.sh b/tools/travis/check_grep.sh index 112e40990b8c..fe03b960929a 100755 --- a/tools/travis/check_grep.sh +++ b/tools/travis/check_grep.sh @@ -10,7 +10,7 @@ if grep -El '^\".+\" = \(.+\)' _maps/**/*.dmm; then echo "ERROR: Non-TGM formatted map detected. Please convert it using Map Merger!" st=1 fi; -if grep -REl 'list\(.*[^ ]=' --include='*.dmm' _maps; then k +if grep -REl 'list\(.*[^ ]=' --include='*.dmm' _maps; then echo "ERROR: Associative list missing leading and trailing space. Update your mapping tool!" st=1 fi; From 5c13aa81d73aa0b1b9393a4a53124334d65c7815 Mon Sep 17 00:00:00 2001 From: AMyriad <143908044+AMyriad@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:50:49 +0100 Subject: [PATCH 26/26] Update check_grep.sh