cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes some miscapitalization of Nanotrasen [MDB IGNORE] (#20846)

Browse Source 
* Fixes some miscapitalization of Nanotrasen  (#75026)

## About The Pull Request

Fixes #75019

Also fixes it in a drink, the ethereal lore, and some photocopier
paperwork.

And also adds "NanoTrasen" to common spelling mistakes

## Why It's Good For The Game

Nanotrasen is the correct capitalization
## Changelog
🆑
spellcheck: Fixed Nanotrasen being miscapitalized in traitor posters, a
drink, the ethereal lore, and some photocopier paperwork
/🆑

* Fixes some miscapitalization of Nanotrasen

* Fixes the linters

---------

Co-authored-by: BlueMemesauce <47338680+BlueMemesauce@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2023-05-03 01:35:18 +01:00
committed by GitHub
co-authored by BlueMemesauce GoldenAlpharex
parent 05a56c79c4
commit f5e769dfcd
7 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/CentCom_skyrat_z2.dmm
+3 -3
View File
@@ -70,7 +70,7 @@
"aeG" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/indestructible{
name = "NanoTrasen Consultant's Shutters";
name = "Nanotrasen Consultant's Shutters";
id = "ntrep_shutters"
},
/turf/open/floor/plating,
@@ -9360,7 +9360,7 @@
/area/centcom/interlink)
"nOb" = (
/obj/machinery/door/airlock/centcom{
name = "NanoTrasen Consultant's Office"
name = "Nanotrasen Consultant's Office"
},
/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door,
/obj/effect/turf_decal/siding/white{
@@ -11994,7 +11994,7 @@
/area/centcom/holding/cafepark)
"uqJ" = (
/obj/machinery/door/airlock/centcom{
name = "NanoTrasen Consultant's Office"
name = "Nanotrasen Consultant's Office"
},
/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door,
/obj/effect/turf_decal/siding/white{
code/modules/antagonists/traitor/objectives/demoralise_poster.dm
+4 -4
View File
@@ -88,7 +88,7 @@
/obj/structure/sign/poster/traitor
poster_item_name = "seditious poster"
poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its seditious themes are likely to demoralise NanoTrasen employees."
poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its seditious themes are likely to demoralise Nanotrasen employees."
poster_item_icon_state = "rolled_traitor"
// This stops people hiding their sneaky posters behind signs
layer = CORGI_ASS_PIN_LAYER
@@ -122,8 +122,8 @@
random_basetype = /obj/structure/sign/poster/traitor
/obj/structure/sign/poster/traitor/small_brain
name = "NanoTrasen Neural Statistics"
desc = "Statistics on this poster indicate that the brains of NanoTrasen employees are on average 20% smaller than the galactic standard."
name = "Nanotrasen Neural Statistics"
desc = "Statistics on this poster indicate that the brains of Nanotrasen employees are on average 20% smaller than the galactic standard."
icon_state = "traitor_small_brain"
/obj/structure/sign/poster/traitor/lick_supermatter
@@ -148,7 +148,7 @@
/obj/structure/sign/poster/traitor/low_pay
name = "All these hours, for what?"
desc = "This poster displays a comparison of NanoTrasen standard wages to common luxury items. If this is accurate, it takes upwards of 20,000 hours of work just to buy a simple bicycle."
desc = "This poster displays a comparison of Nanotrasen standard wages to common luxury items. If this is accurate, it takes upwards of 20,000 hours of work just to buy a simple bicycle."
icon_state = "traitor_cash"
/obj/structure/sign/poster/traitor/look_up
code/modules/mob/living/carbon/human/species_types/ethereal.dm
+1 -1
View File
@@ -210,7 +210,7 @@
return list(
"Ethereals are a species native to the planet Sprout. \
When they were originally discovered, they were at a medieval level of technological progression, \
but due to their natural acclimation with electricity, they felt easy among the large NanoTrasen installations.",
but due to their natural acclimation with electricity, they felt easy among the large Nanotrasen installations.",
)
/datum/species/ethereal/create_pref_unique_perks()
code/modules/paperwork/photocopier.dm
+2 -2
View File
@@ -533,7 +533,7 @@
*/
/obj/item/toner
name = "toner cartridge"
desc = "A small, lightweight cartridge of NanoTrasen ValueBrand toner. Fits photocopiers and autopainters alike."
desc = "A small, lightweight cartridge of Nanotrasen ValueBrand toner. Fits photocopiers and autopainters alike."
icon = 'icons/obj/device.dmi'
icon_state = "tonercartridge"
grind_results = list(/datum/reagent/iodine = 40, /datum/reagent/iron = 10)
@@ -546,7 +546,7 @@
/obj/item/toner/large
name = "large toner cartridge"
desc = "A hefty cartridge of NanoTrasen ValueBrand toner. Fits photocopiers and autopainters alike."
desc = "A hefty cartridge of Nanotrasen ValueBrand toner. Fits photocopiers and autopainters alike."
grind_results = list(/datum/reagent/iodine = 90, /datum/reagent/iron = 10)
charges = 25
max_charges = 25
code/modules/reagents/reagent_containers/cups/drinks.dm
+2 -2
View File
@@ -438,8 +438,8 @@
/obj/item/reagent_containers/cup/glass/shaker/Initialize(mapload)
. = ..()
if(prob(10))
name = "\improper NanoTrasen 20th Anniversary Shaker"
desc += " It has an emblazoned NanoTrasen logo on it."
name = "\improper Nanotrasen 20th Anniversary Shaker"
desc += " It has an emblazoned Nanotrasen logo on it."
icon_state = "shaker_n"
/obj/item/reagent_containers/cup/glass/flask
config/blanks.json
+2 -2
View File
@@ -844,7 +844,7 @@
"<p>[___].[___].[___]</p>",
"<p>[___]:[___]</p>",
"<hr />",
"<font color=\"grey\"><div align=\"justify\">This payment document is the property of NanoTrasen. You must deliver this document to the head of the NanoTrasen facility staff within 24 hours of service for independent tax accounting.</div></font></p>",
"<font color=\"grey\"><div align=\"justify\">This payment document is the property of Nanotrasen. You must deliver this document to the head of the Nanotrasen facility staff within 24 hours of service for independent tax accounting.</div></font></p>",
"<div style=\"all: initial;\" class=\"notranslate\"></div>"
]
},
@@ -876,7 +876,7 @@
"<p>[___].[___].[___]</p>",
"<p>[___]:[___]</p>",
"<hr />",
"<font color=\"grey\"><div align=\"justify\">This payment document is the property of NanoTrasen. You must deliver this document to the head of the NanoTrasen facility staff within 24 hours of service for independent tax accounting.</div></font></p>",
"<font color=\"grey\"><div align=\"justify\">This payment document is the property of Nanotrasen. You must deliver this document to the head of the Nanotrasen facility staff within 24 hours of service for independent tax accounting.</div></font></p>",
"<div style=\"all: initial;\" class=\"notranslate\"></div>"
]
}
tools/ci/check_grep.sh
+11 -1
View File
@@ -79,7 +79,12 @@ fi;
part "common spelling mistakes"
if $grep -i 'nanotransen' $map_files; then
echo
echo -e "${RED}ERROR: Misspelling of Nanotrasen detected in maps, please remove the extra N(s).${NC}"
echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in maps, please remove the extra N(s).${NC}"
st=1
fi;
if $grep 'NanoTrasen' $map_files; then
echo
echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in maps, please uncapitalize the T(s).${NC}"
st=1
fi;
if $grep -i'centcomm' $map_files; then
@@ -166,6 +171,11 @@ if $grep -ni 'nanotransen' $code_files; then
echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please remove the extra N(s).${NC}"
st=1
fi;
if $grep 'NanoTrasen' $code_files; then
echo
echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T(s).${NC}"
st=1
fi;
part "map json naming"
if ls _maps/*.json | $grep "[A-Z]"; then
echo