Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/cryopod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2319,7 +2319,7 @@
return

var/customname = input(src, "Pick a title for the report", "Title") as text|null
var/prefix = "<center><b>NanoTrasen Fax Network</b></center><hr><center>RE: [inputsubject]</center><hr>"
var/prefix = "<center><b>Nanotrasen Fax Network</b></center><hr><center>RE: [inputsubject]</center><hr>"
var/suffix = "<hr><b>Signed:</b> <font face=\"[SIGNFONT]\"><i>[inputsigned]</i></font>"

inputmessage = parsemarkdown(inputmessage)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/expressconsole.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/head/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -518,23 +518,23 @@

/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
mutantrace_variation = MUTANTRACE_VARIATION

/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
mutantrace_variation = MUTANTRACE_VARIATION

/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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/captain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/machine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion strings/gimmick_objectives.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion strings/wanted_message.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions strings/yogs_ion_laws.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
"DESTROY US ALL",
"RUIN EVERYTHING",
"DEFEAT THE BOSS",
"EMERGE VICTORIUS",
"EMERGE VICTORIOUS",
"GET THE DISK",
"MAKE ANNOUNCEMENTS",
"CONTACT CENTCOMM",
"CONTACT CENTCOM",
"EVADE JUSTICE",
"GO UNDERCOVER",
"DO AS YOU SEE FIT",
Expand Down
8 changes: 8 additions & 0 deletions tools/travis/check_grep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 '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()."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
..()
Expand Down
4 changes: 2 additions & 2 deletions yogstation/code/modules/spacepods/parts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down