mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 15:37:36 +01:00
Removes All CamelCase'd "NanoTrasen" (#22156)
* begone CamelCase * someone did an oopsie and it wasnt me * CI addition (thanks contra) * contra review Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * CI moment --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
co-authored by
Contrabang
parent
9af3ebdc88
commit
ae78b936e5
@@ -618,6 +618,8 @@ in the SQL/updates folder.
|
||||
|
||||
* All new var/proc names should use the American English spelling of words. This is for consistency with BYOND.
|
||||
|
||||
* All mentions of the company "Nanotrasen" should be written as such - 'Nanotrasen'. Use of CamelCase (NanoTrasen) is no longer proper.
|
||||
|
||||
* If you are making a PR that adds a config option to change existing behaviour, said config option must default to as close to as current behaviour as possible.
|
||||
|
||||
### Dream Maker Quirks/Tricks
|
||||
|
||||
@@ -75229,7 +75229,7 @@
|
||||
"plD" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/phone{
|
||||
desc = "Supposedly a direct line to NanoTrasen Central Command. It's not even plugged in.";
|
||||
desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
|
||||
@@ -188,7 +188,7 @@
|
||||
id = "blowntcommsat"
|
||||
suffix = "blowntcommsat.dmm"
|
||||
name = "Blown-out Telecommunications Satellite"
|
||||
description = "The remains of an old telecommunications satellite once utilised by NanoTrasen. It lays derelict, with quite a few pieces missing."
|
||||
description = "The remains of an old telecommunications satellite once utilised by Nanotrasen. It lays derelict, with quite a few pieces missing."
|
||||
cost = 5 // This is a chonky boy
|
||||
allow_duplicates = FALSE // Absolutely huge, also has its own APC and the area isnt set to allow many
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been
|
||||
#define PROMOTIONS_FOR_EVERYONE 2000
|
||||
#define AMBASSADORS_OF_DISCOVERY 3000
|
||||
#define PRIDE_OF_SCIENCE 4000
|
||||
#define NANOTRANSEN_FINEST 5000
|
||||
#define NANOTRASEN_FINEST 5000
|
||||
|
||||
/datum/scoreboard
|
||||
/// Overall combined score for the whole round.
|
||||
@@ -298,8 +298,8 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been
|
||||
if(MACHINE_THIRTEEN to PROMOTIONS_FOR_EVERYONE-1) score_rating = "Lean Mean Machine Thirteen"
|
||||
if(PROMOTIONS_FOR_EVERYONE to AMBASSADORS_OF_DISCOVERY-1) score_rating = "Promotions for Everyone"
|
||||
if(AMBASSADORS_OF_DISCOVERY to PRIDE_OF_SCIENCE-1) score_rating = "Ambassadors of Discovery"
|
||||
if(PRIDE_OF_SCIENCE to NANOTRANSEN_FINEST-1) score_rating = "The Pride of Science Itself"
|
||||
if(NANOTRANSEN_FINEST to INFINITY) score_rating = "Nanotrasen's Finest"
|
||||
if(PRIDE_OF_SCIENCE to NANOTRASEN_FINEST-1) score_rating = "The Pride of Science Itself"
|
||||
if(NANOTRASEN_FINEST to INFINITY) score_rating = "Nanotrasen's Finest"
|
||||
|
||||
dat += "<b><u>RATING:</u></b> [score_rating]"
|
||||
GLOB.scoreboard = jointext(dat, "")
|
||||
@@ -331,4 +331,4 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been
|
||||
#undef PROMOTIONS_FOR_EVERYONE
|
||||
#undef AMBASSADORS_OF_DISCOVERY
|
||||
#undef PRIDE_OF_SCIENCE
|
||||
#undef NANOTRANSEN_FINEST
|
||||
#undef NANOTRASEN_FINEST
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
// MAXIMUM SCIENCE
|
||||
/datum/job_objective/further_research
|
||||
objective_name = "Perform Research for NanoTrasen"
|
||||
objective_name = "Perform Research for Nanotrasen"
|
||||
description = "Utilize the facilities on this research installation to increase half the station's research levels above level 2, have cargo ship the research to centcomm in crates."
|
||||
gives_payout = TRUE
|
||||
completion_payment = 150
|
||||
|
||||
@@ -287,7 +287,7 @@ AI MODULES
|
||||
origin_tech = "programming=3;materials=4"
|
||||
laws = new /datum/ai_laws/quarantine
|
||||
|
||||
/******************** NanoTrasen ********************/
|
||||
/******************** Nanotrasen ********************/
|
||||
/obj/item/aiModule/nanotrasen // -- TLE
|
||||
name = "\improper NT Default Core AI Module"
|
||||
desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'"
|
||||
|
||||
@@ -149,7 +149,7 @@
|
||||
Arc Type: The engine's EER is raised massively several minutes, resulting it a supercritical state.</br>
|
||||
Heat Type: The amount of heat released by the engine is massively increased for several minutes.</br></br>
|
||||
|
||||
In the event that an anomaly NOT on this list presents itself, contact your local NanoTrasen Engineering Officer as soon as possible.</br>
|
||||
In the event that an anomaly NOT on this list presents itself, contact your local Nanotrasen Engineering Officer as soon as possible.</br>
|
||||
-Vroo-Looum-Kloo, Senior Engine Technician."})
|
||||
|
||||
/obj/item/book/manual/atmospipes
|
||||
@@ -731,7 +731,7 @@
|
||||
name = "Chef Recipes"
|
||||
desc = "Knives, Ovens, and You: A guide to cooking."
|
||||
icon_state = "cook_book"
|
||||
author = "NanoTrasen"
|
||||
author = "Nanotrasen"
|
||||
title = "Chef Recipes"
|
||||
wiki_article_title = "Guide_to_Food_and_Drinks#Food"
|
||||
|
||||
@@ -745,7 +745,7 @@
|
||||
|
||||
/obj/item/book/manual/wiki/faxes
|
||||
name = "Guide to Faxes"
|
||||
desc = "NanoTrasen's own manual on how to write faxes."
|
||||
desc = "Nanotrasen's own manual on how to write faxes."
|
||||
icon_state ="bookEngineering"
|
||||
author = "Nanotrasen"
|
||||
title = "Faxes and You!"
|
||||
|
||||
@@ -244,7 +244,7 @@
|
||||
|
||||
/obj/item/clothing/mask/gas/navy_officer
|
||||
name = "nanotrasen navy officer gas mask"
|
||||
desc = "A durable gas mask designed for NanoTrasen Navy Officers."
|
||||
desc = "A durable gas mask designed for Nanotrasen Navy Officers."
|
||||
icon_state = "navy_officer_gasmask"
|
||||
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 10, ACID = 50)
|
||||
strip_delay = 6 SECONDS
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
// at a breakneck pace.
|
||||
/obj/item/gun/syringe/rapidsyringe
|
||||
name = "rapid syringe gun"
|
||||
desc = "A syndicate rapid syringe gun based on an archived NanoTrasen prototype. Capable of storing and filling syringes from an internal reservoir. It has a large flap on the side that you can dump a box or bag of syringes into, and a port for filling it with liquid."
|
||||
desc = "A syndicate rapid syringe gun based on an archived Nanotrasen prototype. Capable of storing and filling syringes from an internal reservoir. It has a large flap on the side that you can dump a box or bag of syringes into, and a port for filling it with liquid."
|
||||
icon_state = "rapidsyringegun"
|
||||
max_syringes = 14 // full two boxes worth
|
||||
/// Maximum size of the internal reservoir
|
||||
|
||||
@@ -89,6 +89,12 @@ def check_proc_args_with_var_prefix(lines):
|
||||
if PROC_ARGS_WITH_VAR_PREFIX_RE.match(line):
|
||||
return Failure(idx + 1, "Changed files contains a proc argument starting with 'var'.")
|
||||
|
||||
NANOTRASEN_CAMEL_CASE = re.compile(r"NanoTrasen")
|
||||
def check_for_nanotrasen_camel_case(lines):
|
||||
for idx, line in enumerate(lines):
|
||||
if NANOTRASEN_CAMEL_CASE.search(line):
|
||||
return Failure(idx + 1, "Nanotrasen should not be spelled in the camel case form.")
|
||||
|
||||
TO_CHAT_WITH_NO_USER_ARG_RE = re.compile(r"to_chat\(\"")
|
||||
def check_to_chats_have_a_user_arguement(lines):
|
||||
for idx, line in enumerate(lines):
|
||||
@@ -101,6 +107,7 @@ CODE_CHECKS = [
|
||||
check_trailing_newlines,
|
||||
check_global_vars,
|
||||
check_proc_args_with_var_prefix,
|
||||
check_for_nanotrasen_camel_case,
|
||||
check_to_chats_have_a_user_arguement,
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user