Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-2385
Fluffy-Frontier · May 9, 2024 · 09fada6 · 09fada6
2 parents 4dea600 + b52a124
commit 09fada6
Show file tree

Hide file tree

Showing 190 changed files with 732 additions and 635 deletions.
diff --git a/SQL/skyrat_schema.sql → SQL/nova_schema.sql b/SQL/skyrat_schema.sql → SQL/nova_schema.sql
diff --git a/_maps/ouroboros.json b/_maps/ouroboros.json
@@ -4,9 +4,9 @@
 	"map_path": "map_files/Ouroboros",
 	"map_file": "Ouroboros.dmm",
 	"shuttles": {
-		"emergency": "emergency_skyrat",
-		"ferry": "ferry_skyrat",
-		"mining": "mining_large_skyrat",
+		"emergency": "emergency_nova",
+		"ferry": "ferry_nova",
+		"mining": "mining_nova_large",
 		"cargo": "cargo_ouroboros",
 		"whiteship": "whiteship_ouroboros"
 	},

diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
@@ -59,21 +59,18 @@
 #define DNA_MUSHROOM_CAPS_BLOCK 14
 #define DNA_POD_HAIR_BLOCK 15
 #define DNA_MONKEY_TAIL_BLOCK 16
+*/ //NOVA EDIT REMOVAL END
 
-#define DNA_FEATURE_BLOCKS 16
-*/ //NOVA EDIT CHANGE - ORIGINAL
-#define DNA_FEATURE_BLOCKS GLOB.dna_total_feature_blocks
-
+#define DNA_FEATURE_BLOCKS GLOB.dna_total_feature_blocks // NOVA EDIT CHANGE - ORIGINAL: #define DNA_FEATURE_BLOCKS 16
+// NOVA EDIT ADDITION START
 #define DNA_MANDATORY_COLOR_BLOCKS 5
 #define DNA_MUTANT_COLOR_BLOCK 1
 #define DNA_MUTANT_COLOR_2_BLOCK 2
 #define DNA_MUTANT_COLOR_3_BLOCK 3
 #define DNA_ETHEREAL_COLOR_BLOCK 4
 #define DNA_SKIN_COLOR_BLOCK 5
-
 #define DNA_POD_HAIR_BLOCK 15
-
-// NOVA EDIT CHANGE END
+// NOVA EDIT ADDITION END
 
 #define DNA_SEQUENCE_LENGTH 4
 #define DNA_MUTATION_BLOCKS 8

diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm
@@ -105,7 +105,7 @@ DEFINE_BITFIELD(foodtypes, list(
 #define DRINK_FANTASTIC 5
 
 #define FOOD_AMAZING 6
-#define RACE_DRINK 7 // SKYRAT ADDITION
+#define RACE_DRINK 7 // NOVA EDIT ADDITION
 
 #define FOOD_QUALITY_NORMAL 1
 #define FOOD_QUALITY_NICE 2

diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
@@ -182,7 +182,7 @@ DEFINE_BITFIELD(no_equip_flags, list(
 #define CLOTHING_SNOUTED_BETTER_VOX_VARIATION (1<<8)
 /// The sprite works fine for vox snouts as is.
 #define CLOTHING_SNOUTED_BETTER_VOX_VARIATION_NO_NEW_ICON (1<<9)
-// NOVA EDIT END
+// NOVA EDIT ADDITION END
 
 //flags for covering body parts
 #define GLASSESCOVERSEYES (1<<0)

diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm
@@ -30,9 +30,9 @@
 #define MODE_WHISPER "whisper"
 #define MODE_WHISPER_CRIT "whispercrit"
 
-//SKYRAT custom verb
+//NOVA custom verb
 #define MODE_CUSTOM_SAY "custom_say"
-//SKYRAT custom sayverb end.
+//NOVA custom sayverb end.
 
 #define MODE_DEPARTMENT "department"
 #define MODE_KEY_DEPARTMENT "h"

diff --git a/code/__DEFINES/sprite_accessories.dm b/code/__DEFINES/sprite_accessories.dm
@@ -7,3 +7,9 @@
 #define FACIAL_HAIR_COLOR "facial_hair_color"
 /// Color of the sprite accessory will match the owner's (left) eye color
 #define EYE_COLOR "eye_color"
+
+// ~color source defines for species hair overrides
+/// Uses the species's mutant color for the hair color
+#define USE_MUTANT_COLOR "use_mutant_color"
+/// Uses the species's fixed mutant color for the hair color
+#define USE_FIXED_MUTANT_COLOR "use_fixed_mutant_color"
diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(bio_state_anatomy, list(
 // NOVA EDIT ADDITION BEGIN - MUSCLE AND SYNTH WOUNDS
 // Have to put it here so I can use it in the global list of wound series
 /// See muscle.dm and robotic_blunt.dm
-#define WOUND_SERIES_MUSCLE_DAMAGE "skyrat_wound_series_muscle_damage"
+#define WOUND_SERIES_MUSCLE_DAMAGE "nova_wound_series_muscle_damage"
 
 #define WOUND_SERIES_METAL_BLUNT_BASIC "wound_series_metal_blunt_basic"
 #define WOUND_SERIES_METAL_BURN_OVERHEAT "wound_series_metal_burn_basic"

diff --git a/code/__DEFINES/~nova_defines/barsigns.dm b/code/__DEFINES/~nova_defines/barsigns.dm
@@ -1,2 +1,2 @@
-#define SKYRAT_BARSIGN_FILE 'modular_nova/modules/barsigns/icons/barsigns.dmi'
-#define SKYRAT_LARGE_BARSIGN_FILE 'modular_nova/modules/barsigns/icons/barsigns96x96.dmi'
+#define NOVA_BARSIGN_FILE 'modular_nova/modules/barsigns/icons/barsigns.dmi'
+#define NOVA_LARGE_BARSIGN_FILE 'modular_nova/modules/barsigns/icons/barsigns96x96.dmi'
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
@@ -13,9 +13,9 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
 	//socks
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, GLOB.socks_list)
-	//bodypart accessories (blizzard intensifies)
 	//NOVA EDIT REMOVAL BEGIN - CUSTOMIZATION
 	/*
+	//bodypart accessories (blizzard intensifies)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, GLOB.tails_list_human, add_blank = TRUE)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, GLOB.tails_list_lizard, add_blank = TRUE)
@@ -33,15 +33,14 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae, GLOB.moth_antennae_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list)
-	*/ //NOVA EDIT REMOVAL END
-	//bras
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/bra, GLOB.bra_list, GLOB.bra_m, GLOB.bra_f) // NOVA EDIT ADDITION
-
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/wings/moth, GLOB.moth_wings_list) // NOVA EDIT ADDITION - Customization
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey, add_blank = TRUE) // NOVA EDIT ADDITION - We don't want monkeys getting randomized non-monkey tails
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list, add_blank = TRUE) // NOVA EDIT - Customization - ORIGINAL: init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list)
+*/ //NOVA EDIT REMOVAL END
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list)
+	// NOVA EDIT ADDITION START
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/bra, GLOB.bra_list, GLOB.bra_m, GLOB.bra_f)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey, add_blank = TRUE)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, GLOB.caps_list, add_blank = TRUE)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/wings/moth, GLOB.moth_wings_list)
 
-	//NOVA EDIT ADDITION BEGIN
 	//Scream types
 	for(var/spath in subtypesof(/datum/scream_type))
 		var/datum/scream_type/S = new spath()
@@ -53,7 +52,7 @@
 		var/datum/laugh_type/L = new spath()
 		GLOB.laugh_types[L.name] = spath
 	sort_list(GLOB.laugh_types, GLOBAL_PROC_REF(cmp_typepaths_asc))
-	//NOVA EDIT END
+	// NOVA EDIT ADDITION END
 
 	//THE FLUFFY FRONTIER EDIT ADDITION BEGIN - Blooper
 	for(var/sound_blooper_path in subtypesof(/datum/blooper))
@@ -94,9 +93,7 @@
 	init_species_list()
 	init_hair_gradients()
 	init_keybindings()
-
 	GLOB.emote_list = init_emote_list() // WHY DOES THIS NEED TO GO HERE? IT JUST INITS DATUMS
-
 	make_nova_datum_references() //NOVA EDIT ADDITION - CUSTOMIZATION
 	init_nova_stack_recipes() //NOVA EDIT ADDITION - More sheet recipes
 	init_crafting_recipes()
@@ -108,7 +105,7 @@
 		if(ispath(path, /datum/crafting_recipe/stack))
 			continue
 		var/datum/crafting_recipe/recipe = new path()
-		var/is_cooking = ((recipe.category in GLOB.crafting_category_food) || (recipe.category in GLOB.crafting_category_food_nova)) // NOVA EDIT - Add nova food crafting category
+		var/is_cooking = ((recipe.category in GLOB.crafting_category_food) || (recipe.category in GLOB.crafting_category_food_nova)) // NOVA EDIT CHANGE - ORIGINAL: var/is_cooking = (recipe.category in GLOB.crafting_category_food)
 		recipe.reqs = sort_list(recipe.reqs, GLOBAL_PROC_REF(cmp_crafting_req_priority))
 		if(recipe.name != "" && recipe.result)
 			if(is_cooking)

diff --git a/code/__HELPERS/~nova_helpers/logging.dm b/code/__HELPERS/~nova_helpers/logging.dm
@@ -2,7 +2,7 @@
 /proc/log_subtle(text, list/data)
 	logger.Log(LOG_CATEGORY_GAME_SUBTLE, text, data)
 
-/// This logs subtler emotes in game.log, if the conflig flag in config\skyrat\skyrat_config.txt is true.
+/// This logs subtler emotes in game.log, if the conflig flag in config\nova\config_nova.txt is true.
 /proc/log_subtler(text, list/data)
 	logger.Log(LOG_CATEGORY_GAME_SUBTLER, text, data)
 

diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
@@ -39,12 +39,12 @@ GLOBAL_LIST_EMPTY(wings_open_list)
 GLOBAL_LIST_EMPTY(moth_wings_list)
 GLOBAL_LIST_EMPTY(moth_antennae_list)
 GLOBAL_LIST_EMPTY(moth_markings_list)
-GLOBAL_LIST_EMPTY(caps_list)
 */
 //NOVA EDIT REMOVAL END
+GLOBAL_LIST_EMPTY(caps_list)
+GLOBAL_LIST_EMPTY(pod_hair_list)
 GLOBAL_LIST_EMPTY(moth_wings_list) // NOVA EDIT ADDITION - Customization
 GLOBAL_LIST_EMPTY(tails_list_monkey) // NOVA EDIT ADDITION - Customization
-GLOBAL_LIST_EMPTY(pod_hair_list)
 
 GLOBAL_LIST_INIT(color_list_ethereal, list(
 	"Blue" = "#3399ff",

diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
@@ -270,11 +270,10 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list(
 	alien_plasma_display = null
 	alien_queen_finder = null
 	combo_display = null
-
-	//NOVA EDIT START - SKYRAT HUD
+	//NOVA EDIT ADDITION START - NOVA HUD
 	ammo_counter = null
 	wanted_lvl = null
-	// NOVA EDIT END - SKYRAT HUD
+	// NOVA EDIT ADDITION END - NOVA HUD
 
 	QDEL_LIST_ASSOC_VAL(master_groups)
 	QDEL_LIST_ASSOC_VAL(plane_master_controllers)

diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm
@@ -1,8 +1,8 @@
 //"Don't leave food on the floor, that's how we get ants"
 
-#define DECOMPOSITION_TIME (20 MINUTES) //SKYRAT CHANGE, INCREASED TIME
-#define DECOMPOSITION_TIME_RAW (15 MINUTES) //SKYRAT CHANGE, INCREASED TIME
-#define DECOMPOSITION_TIME_GROSS (10 MINUTES) //SKYRAT CHANGE, INCREASED TIME
+#define DECOMPOSITION_TIME (20 MINUTES) // NOVA EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME (10 MINUTES)
+#define DECOMPOSITION_TIME_RAW (15 MINUTES) // NOVA EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME_RAW (5 MINUTES)
+#define DECOMPOSITION_TIME_GROSS (10 MINUTES) // NOVA EDIT CHANGE, - ORIGINAL: #define DECOMPOSITION_TIME_GROSS (7 MINUTES)
 
 ///Makes things decompose when exposed to germs. Requires /datum/component/germ_sensitive to detect exposure.
 /datum/component/decomposition

diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm
@@ -13,8 +13,7 @@
 /datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
 	..()
 	if(!(type in visual_indicators))
-		visual_indicators[type] = list(mutable_appearance('modular_nova/master_files/icons/effects/tele_effects.dmi', "telekinesishead", -MUTATIONS_LAYER)) //NOVA EDIT, Old icon location: "icons/effects/genetics.dmi"
-		//visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER)) //non Skyrat version
+		visual_indicators[type] = list(mutable_appearance('modular_nova/master_files/icons/effects/tele_effects.dmi', "telekinesishead", -MUTATIONS_LAYER)) //NOVA EDIT CHANGE - ORIGINAL: visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER))
 
 /datum/mutation/human/telekinesis/on_acquiring(mob/living/carbon/human/H)
 	. = ..()

diff --git a/code/datums/shuttles/emergency.dm b/code/datums/shuttles/emergency.dm
@@ -1,6 +1,6 @@
 #define EMAG_LOCKED_SHUTTLE_COST (CARGO_CRATE_VALUE * 50)
 
-/datum/map_template/shuttle/emergency // NOVA EDIT OVERRIDE - OVERRIDEN IN ADVANCED_SHUTTLES - shuttles.dm
+/datum/map_template/shuttle/emergency // NOVA EDIT OVERRIDE - OVERRIDDEN IN ADVANCED_SHUTTLES - shuttles.dm
 	port_id = "emergency"
 	name = "Base Shuttle Template (Emergency)"
 	///assoc list of shuttle events to add to this shuttle on spawn (typepath = weight)

diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm
@@ -1167,8 +1167,6 @@
 	gender = MALE
 	use_static = TRUE
 
-
-
 /* NOVA EDIT REMOVAL START - Underwear and bra split
 //FEMALE UNDERWEAR
 /datum/sprite_accessory/underwear/female_bikini
@@ -1467,6 +1465,7 @@
 	name = "Short-sleeved Shirt (White)"
 	icon_state = "whiteshortsleeve"
 	gender = NEUTER
+
 /* NOVA EDIT REMOVAL START - Underwear and bra split
 /datum/sprite_accessory/undershirt/sports_bra
 	name = "Sports Bra"
@@ -1478,6 +1477,7 @@
 	icon_state = "sports_bra_alt"
 	gender = NEUTER
 */ // NOVA EDIT END
+
 /datum/sprite_accessory/undershirt/blueshirtsport
 	name = "Sports Shirt (Blue)"
 	icon_state = "blueshirtsport"
@@ -1888,18 +1888,6 @@
 	name = "Angeler"
 	icon_state = "angler"
 
-/datum/sprite_accessory/horns/broken
-	name = "Broken"
-	icon_state = "broken"
-
-/datum/sprite_accessory/horns/broken_right
-	name = "Broken(right)"
-	icon_state = "rbroken"
-
-/datum/sprite_accessory/horns/broken_left
-	name = "Broken(left)"
-	icon_state = "lbroken"
-
 /datum/sprite_accessory/ears
 	icon = 'icons/mob/human/cat_features.dmi'
 	em_block = TRUE
@@ -2176,17 +2164,10 @@
 	color_src = HAIR_COLOR
 	em_block = TRUE
 
-/datum/sprite_accessory/caps/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/caps/round
 	name = "Round"
 	icon_state = "round"
 
-
-
-
 /datum/sprite_accessory/moth_wings
 	icon = 'icons/mob/human/species/moth/moth_wings.dmi'
 	color_src = null

diff --git a/code/game/atom/atom_tool_acts.dm b/code/game/atom/atom_tool_acts.dm
@@ -65,7 +65,7 @@
 			act_result = is_left_clicking ? welder_act(user, tool) : welder_act_secondary(user, tool)
 		if(TOOL_ANALYZER)
 			act_result = is_left_clicking ? analyzer_act(user, tool) : analyzer_act_secondary(user, tool)
-		// NOVA EDIT ADDITION START - SKYRAT TOOLS
+		// NOVA EDIT ADDITION START - NOVA TOOLS
 		if(TOOL_BILLOW)
 			act_result = is_left_clicking ? billow_act(user, tool) : billow_act_secondary(user, tool)
 		if(TOOL_TONG)

diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
@@ -514,12 +514,12 @@
 	if(istype(potential_storage, /obj/item/aicard))
 		var/obj/item/aicard/card = potential_storage
 		being = card.AI // why is this one capitalized and the other one not? i wish i knew.
-	// SKYRAT REMOVAL START - MOD PAI
+	// NOVA EDIT REMOVAL START - MOD PAI
 	/*else if(istype(potential_storage, /obj/item/mod/control))
 		var/obj/item/mod/control/suit = potential_storage
 		if(isAI(suit.ai_assistant))
 			being = suit.ai_assistant
-	*/ // SKYRAT REMOVAL END
+	*/ // NOVA EDIT REMOVAL END
 	else
 		stack_trace("check_special_completion() called on [src] with [potential_storage] ([potential_storage.type])! That's not supposed to happen!")
 		return FALSE

diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
@@ -135,7 +135,7 @@
 	//NOVA EDIT ADDITON BEGIN - AESTHETICS
 	if(clicksound && world.time > next_clicksound && isliving(user))
 		next_clicksound = world.time + rand(50, 150)
-		playsound(src, get_sfx_skyrat(clicksound), clickvol)
+		playsound(src, get_sfx_nova(clicksound), clickvol)
 	//NOVA EDIT END
 	. = ..()
 	update_use_power(ACTIVE_POWER_USE)

diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
@@ -103,7 +103,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		JOB_HEAD_OF_SECURITY = 10,
 		JOB_WARDEN = 11,
 		JOB_SECURITY_OFFICER = 12,
-		/* SKYRAT REMOVAL - We need those slots for our own jobs, these jobs aren't on Skyrat anymore anyway.
+		/* NOVA EDIT REMOVAL - We need those slots for our own jobs, these jobs aren't on Nova anymore anyway.
 		JOB_SECURITY_OFFICER_MEDICAL = 13,
 		JOB_SECURITY_OFFICER_ENGINEERING = 14,
 		JOB_SECURITY_OFFICER_SCIENCE = 15,
@@ -178,7 +178,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 /datum/crewmonitor/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if (!ui)
-		ui = new(user, src, "CrewConsoleSkyrat")
+		ui = new(user, src, "CrewConsoleNova")
 		ui.open()
 
 /datum/crewmonitor/proc/show(mob/M, source)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -147,9 +147,9 @@
 	var/previous_airlock = /obj/structure/door_assembly
 	/// Material of inner filling; if its an airlock with glass, this should be set to "glass"
 	var/airlock_material
-	var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //OVERRIDEN IN NOVA AESTHETICS - SEE MODULE
+	var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE
 	/// Used for papers and photos pinned to the airlock
-	var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'//OVERRIDEN IN NOVA AESTHETICS - SEE MODULE
+	var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'//OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE
 
 	var/cyclelinkeddir = 0
 	var/obj/machinery/door/airlock/cyclelinkedairlock

diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
@@ -758,7 +758,7 @@
 
 /obj/machinery/door/firedoor/heavy
 	name = "heavy firelock"
-	icon = 'icons/obj/doors/Doorfire.dmi'  //NOVA EDIT - ICON OVERRIDEN IN AESTHETICS MODULE
+	icon = 'icons/obj/doors/Doorfire.dmi'  // NOVA EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE
 	glass = FALSE
 	explosion_block = 2
 	assemblytype = /obj/structure/firelock_frame/heavy
@@ -773,7 +773,7 @@
 /obj/structure/firelock_frame
 	name = "firelock frame"
 	desc = "A partially completed firelock."
-	icon = 'icons/obj/doors/Doorfire.dmi' //NOVA EDIT - ICON OVERRIDEN IN AESTHETICS MODULE
+	icon = 'icons/obj/doors/Doorfire.dmi' // NOVA EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE
 	icon_state = "frame1"
 	base_icon_state = "frame"
 	anchored = FALSE

diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
@@ -1,7 +1,7 @@
 /obj/machinery/door/poddoor
 	name = "blast door"
 	desc = "A heavy duty blast door that opens mechanically."
-	icon = 'icons/obj/doors/blastdoor.dmi' //ICON OVERRIDEN IN NOVA AESTHETICS - SEE MODULE
+	icon = 'icons/obj/doors/blastdoor.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE
 	icon_state = "closed"
 	layer = BLASTDOOR_LAYER
 	closingLayer = CLOSED_BLASTDOOR_LAYER

diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm
@@ -31,7 +31,7 @@
 	return TRUE
 
 /obj/machinery/door_buttons/access_button
-	icon = 'icons/obj/machines/wallmounts.dmi' // NOVA EDIT CHANGE - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
+	icon = 'icons/obj/machines/wallmounts.dmi' // NOVA EDIT CHANGE - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
 	icon_state = "access_button_standby"
 	base_icon_state = "access_button"
 	name = "access button"

diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm
@@ -6,7 +6,7 @@
 #define AIRLOCK_STATE_OUTOPEN "outopen"
 
 /obj/machinery/airlock_controller
-	icon = 'icons/obj/machines/wallmounts.dmi' // NOVA EDIT CHANGE - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
+	icon = 'icons/obj/machines/wallmounts.dmi' // NOVA EDIT CHANGE - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
 	icon_state = "airlock_control_standby"
 	base_icon_state = "airlock_control"