diff --git a/SQL/skyrat_schema.sql b/SQL/nova_schema.sql similarity index 100% rename from SQL/skyrat_schema.sql rename to SQL/nova_schema.sql diff --git a/_maps/ouroboros.json b/_maps/ouroboros.json index a9169bd817d..411872a8753 100644 --- 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 index 15e8e0ace61..6898df4c458 100644 --- 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 index 9b5d23d38eb..7f711836265 100644 --- 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 index dbd2673e418..56df35f851f 100644 --- 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 index 81f5c8bcad8..a9bdc31d90e 100644 --- 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 index 9c9471130e6..a4003a31972 100644 --- 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 index 7d02aa7f3eb..738fe24bd80 100644 --- 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 index 37e40b375ef..4398e25e97a 100644 --- 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 index 729e10be856..ae0db2fb439 100644 --- 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 index a48a80a40cd..3e6424d48be 100644 --- 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 index d6ec01e5912..6134c50e272 100644 --- 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 index a5fe71d88fb..68d7fbbcd30 100644 --- 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 index c3195c05e13..19c29c70f3e 100644 --- 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 index d5c719ece84..01bc349d366 100644 --- 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 index edee8a35e1b..0447431d0f0 100644 --- 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 index 0b86b3cc6bb..bfcdb704482 100644 --- 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 index 9f06fbcdea3..8cc80f5e47c 100644 --- 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 index a8827f53e40..fee05805031 100644 --- 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 index b224c06a122..d598d2edf05 100644 --- 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 index 0cb2d72b316..e8003e6f00e 100644 --- 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 index 9feb5f71f7c..ade17fae0a6 100644 --- 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 index 4fc261fcaea..e18d83ed33d 100644 --- 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 index 21931f34c57..53fc236df06 100644 --- 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 index 540ba707671..1c7d27e7368 100644 --- 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 index bd7a98c68f3..210286112e3 100644 --- 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" diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 243cb8f4116..08d3c910e95 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -1,7 +1,7 @@ /// The light switch. Can have multiple per area. /obj/machinery/light_switch name = "light switch" - icon = 'icons/obj/machines/wallmounts.dmi' //NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/wallmounts.dmi' //NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "light-nopower" base_icon_state = "light" desc = "Make dark." diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 819112d3c5f..5db4041dcf3 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -283,7 +283,7 @@ /obj/machinery/power/shieldwallgen name = "shield wall generator" desc = "A shield generator." - icon ='icons/obj/machines/shield_generator.dmi' //NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon ='icons/obj/machines/shield_generator.dmi' //NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "shield_wall_gen" base_icon_state = "shield_wall_gen" anchored = FALSE diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index f4ad0d5d0ed..e4a620cab8c 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -8,7 +8,7 @@ anchored = FALSE density = TRUE interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN - icon = 'icons/obj/pipes_n_cables/atmos.dmi' // NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/pipes_n_cables/atmos.dmi' // NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "sheater-off" base_icon_state = "sheater" name = "space heater" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 6284b8eef9d..d91920ec529 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -14,7 +14,7 @@ /obj/machinery/status_display name = "status display" desc = null - icon = 'icons/obj/machines/status_display.dmi' //// NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/status_display.dmi' //// NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "frame" verb_say = "beeps" verb_ask = "beeps" diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index e4a9081a6ae..cec7305ec70 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -79,7 +79,7 @@ if(!calibrated && prob(30 - ((accuracy) * 10))) //oh dear a problem if(ishuman(M))//don't remove people from the round randomly you jerks var/mob/living/carbon/human/human = M - /* - SKRYAT EDIT CHANGE ORIGINAL + /* - NOVA EDIT CHANGE ORIGINAL if(!(human.mob_biotypes & (MOB_ROBOTIC|MOB_MINERAL|MOB_UNDEAD|MOB_SPIRIT))) var/datum/species/species_to_transform = /datum/species/fly if(check_holidays(MOTH_WEEK)) @@ -90,23 +90,24 @@ log_game("[human] ([key_name(human)]) was turned into a [initial(species_to_transform.name)] through [src].") */ //NOVA EDIT REMOVAL END - //SKRYAT EDIT CHANGE BEGIN - to_chat(human, span_danger("Your limbs lose molecular cohesion as you teleport!")) - var/list/bodyparts_dismember = list() - var/rad_mod = 0 - for(var/obj/item/bodypart/BP in human.bodyparts) - if(BP.body_zone == BODY_ZONE_CHEST || BP.body_zone== BODY_ZONE_HEAD) - continue - bodyparts_dismember.Add(BP) - for(var/i in 1 to 2) //Removing two bodyparts. - var/obj/item/bodypart/BP = pick(bodyparts_dismember) - if(!istype(BP)) - rad_mod += 300 //Bad snowflake, take more rads! - break - bodyparts_dismember.Remove(BP) //GC optimisation - BP.dismember() - qdel(BP) - //NOVA EDIT CHANGE END + // NOVA EDIT ADDITION BEGIN + if(!HAS_TRAIT(human, TRAIT_NODISMEMBER)) + to_chat(human, span_danger("Your limbs lose molecular cohesion as you teleport!")) + var/list/bodyparts_dismember = list() + var/rad_mod = 0 + for(var/obj/item/bodypart/BP in human.bodyparts) + if(BP.body_zone == BODY_ZONE_CHEST || BP.body_zone== BODY_ZONE_HEAD) + continue + bodyparts_dismember.Add(BP) + for(var/i in 1 to 2) //Removing two bodyparts. + var/obj/item/bodypart/BP = pick(bodyparts_dismember) + if(!istype(BP)) + rad_mod += 300 //Bad snowflake, take more rads! + break + bodyparts_dismember.Remove(BP) //GC optimisation + BP.dismember() + qdel(BP) + //NOVA EDIT ADDITION END calibrated = FALSE return diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 483a1bd563b..1f86c2bf8ed 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -176,7 +176,7 @@ GLOBAL_LIST_INIT(dye_registry, list( /obj/machinery/washing_machine name = "washing machine" desc = "Gets rid of those pesky bloodstains, or your money back!" - icon = 'icons/obj/machines/washing_machine.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/washing_machine.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "wm_1_0" density = TRUE state_open = TRUE diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 091aa263cbe..d7d3eaad6d2 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -266,9 +266,8 @@ /obj/effect/temp_visual/telekinesis name = "telekinetic force" - //icon_state = "empdisable" //Non-Skyrat version - icon_state = "telekinesis_throw" //NOVA EDIT, was "empdisable" - icon = 'modular_nova/master_files/icons/effects/tele_effects.dmi' //Skyrat Addition + icon_state = "telekinesis_throw" // NOVA EDIT CHANGE - ORIGINAL: icon_state = "empdisable" + icon = 'modular_nova/master_files/icons/effects/tele_effects.dmi' // NOVA EDIT ADDITION duration = 5 /obj/effect/temp_visual/emp diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm index 55c1d09fe8d..a0a1e0bd3f4 100644 --- a/code/game/objects/items/AI_modules/_AI_modules.dm +++ b/code/game/objects/items/AI_modules/_AI_modules.dm @@ -104,7 +104,7 @@ affected_cyborgs += owned_borg borg_flw += "[ADMIN_LOOKUPFLW(owned_borg)], " borg_txt += "[owned_borg.name]([owned_borg.key]), " - owned_borg.lawsync() //SKYRAT ADDITION + owned_borg.lawsync() // NOVA EDIT ADDITION borg_txt = borg_txt.Join() GLOB.lawchanges.Add("[time] : [user.name]([user.key]) used [src.name] on [ainame]([aikey]).[law2log ? " The law specified [law2log]" : ""], [length(affected_cyborgs) ? ", impacting synced borgs [borg_txt]" : ""]") diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 2308a566413..add5b95430f 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -1,4 +1,4 @@ -/obj/item/radio/intercom //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +/obj/item/radio/intercom //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE name = "station intercom" desc = "A trusty station intercom, ready to spring into action even when the headsets go silent." icon = 'icons/obj/machines/wallmounts.dmi' diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm index b940ae6471a..ed0b228d598 100644 --- a/code/game/objects/items/emags.dm +++ b/code/game/objects/items/emags.dm @@ -9,7 +9,8 @@ */ /obj/item/card/emag desc = "It's a card with a magnetic strip attached to some circuitry." - name = "cryptographic sequencer" //SKYRAT COMMENT: Everyone knows what an emag is, both IC and OOC, they even make toy lookalikes. + // NOVA EDIT ADDITION COMMENT: Everyone knows what an emag is, both IC and OOC, they even make toy lookalikes. + name = "cryptographic sequencer" icon_state = "emag" item_flags = NO_MAT_REDEMPTION | NOBLUDGEON special_desc_requirement = EXAMINE_CHECK_SYNDICATE // NOVA EDIT ADDITION diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 1a6c16fa4fd..214d5dae2db 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -1,7 +1,7 @@ /obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." - icon = 'icons/obj/tools.dmi' // NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/tools.dmi' // NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "fire_extinguisher0" worn_icon_state = "fire_extinguisher" inhand_icon_state = "fire_extinguisher" diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm index 24123eb7bc4..b39201d54f2 100644 --- a/code/game/objects/items/grenades/emgrenade.dm +++ b/code/game/objects/items/grenades/emgrenade.dm @@ -1,4 +1,4 @@ -/obj/item/grenade/empgrenade //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/grenade/empgrenade //NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "classic EMP grenade" desc = "It is designed to wreak havoc on electronic systems." icon_state = "emp" diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index b209f1eccff..5337a5604b1 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -1,7 +1,7 @@ /** * Item used to store implants. Can be renamed with a pen. Implants are moved between those and implanters when a mob uses an implanter on a case. */ -/obj/item/implantcase//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/implantcase//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "implant case" desc = "A glass case containing an implant." icon = 'icons/obj/medical/syringe.dmi' diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index c03e519f0f4..65db6511ccc 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -1,7 +1,7 @@ /** * Players can use this item to put obj/item/implant's in living mobs. Can be renamed with a pen. */ -/obj/item/implanter//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/implanter//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "implanter" desc = "A sterile automatic implant injector." icon = 'icons/obj/medical/syringe.dmi' diff --git a/code/game/objects/items/implants/implantpad.dm b/code/game/objects/items/implants/implantpad.dm index 028b9140dac..0d75a52894b 100644 --- a/code/game/objects/items/implants/implantpad.dm +++ b/code/game/objects/items/implants/implantpad.dm @@ -1,4 +1,4 @@ -/obj/item/implantpad//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/implantpad//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "implant pad" desc = "Used to modify implants." icon = 'icons/obj/devices/tool.dmi' diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index c8317e914b4..821ebe455c9 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -654,7 +654,7 @@ //R.update_transform(0.5) // Original R.update_transform(0.8) // NOVA EDIT CHANGE -/obj/item/borg/upgrade/rped//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/borg/upgrade/rped//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "engineering cyborg RPED" desc = "A rapid part exchange device for the engineering cyborg." icon = 'icons/obj/storage/storage.dmi' diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 7c0ebae93f5..db5732c94d6 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -63,7 +63,7 @@ playsound(loc, usesound, 50, TRUE, -1) return BRUTELOSS -/obj/item/wirecutters/abductor//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/wirecutters/abductor//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "alien wirecutters" desc = "Extremely sharp wirecutters, made out of a silvery-green metal." icon = 'icons/obj/antags/abductor.dmi' diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index e037043cc91..d194b23cf3f 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -315,7 +315,7 @@ . = ..() AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOLD, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 25) -// Double Beds, for luxurious sleeping, i.e. the captain and maybe heads- if people use this for ERP, send them to skyrat +// Double Beds, for luxurious sleeping, i.e. the captain and maybe heads- if people use this for ERP, send them to nova /obj/structure/bed/double name = "double bed" desc = "A luxurious double bed, for those too important for small dreams." diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 4a31b0cafc3..dc737122e3e 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -1,6 +1,6 @@ //THIS FILE HAS BEEN EDITED BY NOVA EDIT -/obj/structure/dresser//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/dresser//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "dresser" desc = "A nicely-crafted wooden dresser. It's filled with lots of undies." icon = 'icons/obj/fluff/general.dmi' diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index d3d1fef1698..6d25e4a1a33 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -1,7 +1,7 @@ /obj/structure/extinguisher_cabinet name = "extinguisher cabinet" desc = "A small wall mounted cabinet designed to hold a fire extinguisher." - icon = 'icons/obj/wallmounts.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/wallmounts.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "extinguisher_closed" anchored = TRUE density = FALSE diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 2534b9dd98a..dd26696d513 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -1,6 +1,6 @@ #define MEATSPIKE_IRONROD_REQUIREMENT 4 -/obj/structure/kitchenspike_frame//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/kitchenspike_frame//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "meatspike frame" icon = 'icons/obj/service/kitchen.dmi' icon_state = "spikeframe" @@ -64,7 +64,7 @@ return balloon_alert(user, "[MEATSPIKE_IRONROD_REQUIREMENT] rods needed!") -/obj/structure/kitchenspike//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/kitchenspike//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "meat spike" icon = 'icons/obj/service/kitchen.dmi' icon_state = "spike" diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index d9d4f5c6b46..675bf4af9a8 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants and other ghosties. /obj/structure/bodycontainer - icon = 'icons/obj/structures.dmi'//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/structures.dmi'//ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "morgue1" density = TRUE anchored = TRUE diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 71890f72613..744a3e5c316 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -2,7 +2,7 @@ name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps. Definitely can't get past those. No way." gender = PLURAL - icon = 'icons/obj/structures.dmi'//ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/structures.dmi'//ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "plasticflaps" armor_type = /datum/armor/structure_plasticflaps density = FALSE diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 8e31e93a72e..f0c09fef5af 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -644,7 +644,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/fulltile name = "full tile window" desc = "A full tile window." - icon = 'icons/obj/smooth_structures/window.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/smooth_structures/window.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "window-0" base_icon_state = "window" max_integrity = 100 @@ -665,7 +665,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw anchored = FALSE /obj/structure/window/plasma/fulltile - icon = 'icons/obj/smooth_structures/plasma_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/smooth_structures/plasma_window.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "plasma_window-0" base_icon_state = "plasma_window" max_integrity = 400 diff --git a/code/game/sound.dm b/code/game/sound.dm index b49609697db..da01a12e5c5 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -183,7 +183,7 @@ /proc/get_sfx(soundin) if(istext(soundin)) - soundin = get_sfx_skyrat(soundin) //NOVA EDIT ADDITION - This overrides the default sound effects too, so use it to modularly change a sound effect output. + soundin = get_sfx_nova(soundin) // NOVA EDIT ADDITION - This overrides the default sound effects too, so use it to modularly change a sound effect output. switch(soundin) if(SFX_SHATTER) soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg') diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm index 408dc9ee590..f220a9fcfb4 100644 --- a/code/game/turfs/closed/indestructible.dm +++ b/code/game/turfs/closed/indestructible.dm @@ -89,7 +89,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) else if(width == 608) // 608x480 is widescreen pixel_x = -64 // NOVA EDIT START - Wider widescreen - else if(width == 672) // Skyrat's widescreen is slightly wider than /tg/'s, so we need to accomodate that too. + else if(width == 672) // Nova's widescreen is slightly wider than /tg/'s, so we need to accomodate that too. pixel_x = -96 // NOVA EDIT END diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index 20926fe9d32..d972cf577fc 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -1,7 +1,7 @@ /turf/closed/wall/r_wall name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." - icon = 'icons/turf/walls/reinforced_wall.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/turf/walls/reinforced_wall.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "reinforced_wall-0" base_icon_state = "reinforced_wall" opacity = TRUE diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 13bc0a43da6..67abec8dcdd 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -2,7 +2,7 @@ /turf/closed/wall name = "wall" - desc = "A huge chunk of iron used to separate rooms." //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + desc = "A huge chunk of iron used to separate rooms." //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon = 'icons/turf/walls/wall.dmi' icon_state = "wall-0" base_icon_state = "wall" diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 17d9a41b58a..0bb4e4f8f41 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -1,7 +1,7 @@ /// Anything above a lattice should go here. /turf/open/floor name = "floor" - icon = 'icons/turf/floors.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/turf/floors.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE base_icon_state = "floor" baseturfs = /turf/open/floor/plating diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 15180662a33..bd7b117f14c 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -432,10 +432,10 @@ ROLE_SYNDICATE, ROLE_TRAITOR, ROLE_WIZARD, - ROLE_BORER, //NOVA EDIT - ROLE_ASSAULT_OPERATIVE, //NOVA EDIT + ROLE_BORER, // NOVA EDIT ADDITION + ROLE_ASSAULT_OPERATIVE, // NOVA EDIT ADDITION ), - "Skyrat Ban Options" = list( + "Nova Ban Options" = list( BAN_PACIFICATION, BAN_DONOTREVIVE, BAN_RESPAWN, @@ -445,8 +445,8 @@ BAN_EORG, BAN_ANTAGONIST, BAN_OPFOR, - BAN_LOOC, //SKYRAT ADDITION - LOOC muting again - ),//NOVA EDIT ADDITION - EXTRA_BANS + BAN_LOOC, // NOVA EDIT ADDITION - LOOC muting again + ), // NOVA EDIT ADDITION - EXTRA_BANS ) for(var/department in long_job_lists) output += "
" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 137409e573c..f174fc596f4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1766,7 +1766,7 @@ if(!paper_to_show) return paper_to_show.ui_interact(usr) - // SKYRAT ADDITION START + // NOVA EDIT ADDITION START else if(href_list["pass_opfor_candidate"]) if(!check_rights(R_ADMIN)) return @@ -1774,7 +1774,7 @@ if(!SSdynamic.picking_specific_rule(/datum/dynamic_ruleset/midround/from_living/opfor_candidate, forced = TRUE, ignore_cost = TRUE)) message_admins("An OPFOR candidate could not be selected.") - // SKYRAT ADDITION END + // NOVA EDIT ADDITION END else if(href_list["play_internet"]) if(!check_rights(R_SOUND)) return diff --git a/code/modules/admin/verbs/admin.dm b/code/modules/admin/verbs/admin.dm index f6517b13564..9fb12641031 100644 --- a/code/modules/admin/verbs/admin.dm +++ b/code/modules/admin/verbs/admin.dm @@ -181,11 +181,11 @@ ADMIN_VERB(drop_everything, R_ADMIN, "Drop Everything", ADMIN_VERB_NO_DESCRIPTIO if(MUTE_DEADCHAT) mute_string = "deadchat and DSAY" feedback_string = "Deadchat" - //Skyrat Addition Begin - LOOC muting again. + // NOVA EDIT ADDITION START - LOOC muting again. if(MUTE_LOOC) mute_string = "LOOC" feedback_string = "LOOC" - //Skyrat Addition End - LOOC muting again. + // NOVA EDIT ADDITION END - LOOC muting again. if(MUTE_INTERNET_REQUEST) mute_string = "internet sound requests" feedback_string = "Internet Sound Requests" diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm index 89866820e84..6b489a53dd4 100644 --- a/code/modules/admin/verbs/admingame.dm +++ b/code/modules/admin/verbs/admingame.dm @@ -446,6 +446,6 @@ ADMIN_VERB(lag_switch_panel, R_ADMIN, "Show Lag Switches", "Display the controls dat += "Disable examine icons: [SSlag_switch.measures[DISABLE_USR_ICON2HTML] ? "On" : "Off"] - trait applies to examiner
" dat += "Disable parallax: [SSlag_switch.measures[DISABLE_PARALLAX] ? "On" : "Off"] - trait applies to character
" dat += "Disable footsteps: [SSlag_switch.measures[DISABLE_FOOTSTEPS] ? "On" : "Off"] - trait applies to character
" - dat += "Disable character creator: [SSlag_switch.measures[DISABLE_CREATOR] ? "On" : "Off"] - trait applies to all
" // SKRYAT EDIT ADDITION + dat += "Disable character creator: [SSlag_switch.measures[DISABLE_CREATOR] ? "On" : "Off"] - trait applies to all
" // NOVA EDIT ADDITION dat += "" user << browse(dat.Join(), "window=lag_switch_panel;size=420x480") diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 116d19f5164..e6dc2e99c2d 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -35,7 +35,7 @@ forge_objectives() if(equip_ert) equipERT() - owner?.current.faction |= FACTION_ERT //SKYRAT ADDITION + owner?.current.faction |= FACTION_ERT // NOVA EDIT ADDITION . = ..() /datum/antagonist/ert/get_team() diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm index be7c9cad98b..c1613f12753 100644 --- a/code/modules/asset_cache/assets/paper.dm +++ b/code/modules/asset_cache/assets/paper.dm @@ -2,7 +2,7 @@ name = "paper" assets = list( - // SKYRAT ADDITION: START - Donator stamp icons + // NOVA EDIT ADDITION: START - Donator stamp icons "stamp-cat_blue" = 'modular_nova/master_files/icons/stamp_icons/cat_blue.png', "stamp-paw_blue" = 'modular_nova/master_files/icons/stamp_icons/paw_blue.png', "stamp-cat_red" = 'modular_nova/master_files/icons/stamp_icons/cat_red.png', @@ -11,13 +11,10 @@ "stamp-paw_orange" = 'modular_nova/master_files/icons/stamp_icons/paw_orange.png', "stamp-cat_green" = 'modular_nova/master_files/icons/stamp_icons/cat_green.png', "stamp-paw_green" = 'modular_nova/master_files/icons/stamp_icons/paw_green.png', - // SKYRAT ADDITION: END - Donator stamp icons - - // SKYRAT ADDITION: START - Other stamp icons + // Other stamp icons "stamp-nri" = 'modular_nova/master_files/icons/stamp_icons/large_stamp-nri.png', "stamp-solfed" = 'modular_nova/master_files/icons/stamp_icons/large_stamp-solfed.png', - // SKYRAT ADDITION: END - Other stamp icons - + // NOVA EDIT ADDITION: END "stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png', "stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png', "stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png', diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index 1d33f759c44..e78c74ec89e 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -28,7 +28,7 @@ return 1 /atom/movable/screen/buildmode/mode/update_icon_state() - icon = bd.mode.button_icon // SKYRAT ADDITION - remove buildmode duplicate icons, divine tg and skyrat + icon = bd.mode.button_icon // NOVA EDIT ADDITION - remove buildmode duplicate icons, divine tg and skyrat icon_state = bd.mode.get_button_iconstate() return ..() @@ -61,7 +61,7 @@ /atom/movable/screen/buildmode/modeswitch/New(bld, mt) modetype = mt - icon = initial(modetype.button_icon)// SKYRAT ADDITION - remove buildmode duplicate icons, divine tg and skyrat + icon = initial(modetype.button_icon)// NOVA EDIT ADDITION - remove buildmode duplicate icons, divine tg and skyrat icon_state = "buildmode_[initial(modetype.key)]" name = initial(modetype.key) return ..(bld) diff --git a/code/modules/client/preferences/gender.dm b/code/modules/client/preferences/gender.dm index 224522918de..fccf942d973 100644 --- a/code/modules/client/preferences/gender.dm +++ b/code/modules/client/preferences/gender.dm @@ -8,8 +8,8 @@ return list(MALE, FEMALE, PLURAL, NEUTER) /datum/preference/choiced/gender/apply_to_human(mob/living/carbon/human/target, value) - /* SKYRAT REMOVAL START - Did you just assume my gender??? + /* NOVA EDIT REMOVAL START - Did you just assume my gender??? if(!target.dna.species.sexes) value = PLURAL //disregard gender preferences on this species - */ // SKYRAT REMOVAL END + */ // NOVA EDIT REMOVAL END target.gender = value diff --git a/code/modules/client/preferences/species_features/monkey.dm b/code/modules/client/preferences/species_features/monkey.dm index b25d2cdfab8..1927b5cd22e 100644 --- a/code/modules/client/preferences/species_features/monkey.dm +++ b/code/modules/client/preferences/species_features/monkey.dm @@ -1,3 +1,4 @@ +/* NOVA EDIT REMOVAL START /datum/preference/choiced/monkey_tail savefile_key = "feature_monkey_tail" savefile_identifier = PREFERENCE_CHARACTER @@ -13,3 +14,4 @@ /datum/preference/choiced/monkey_tail/create_default_value() var/datum/sprite_accessory/tails/monkey/default/tail = /datum/sprite_accessory/tails/monkey/default return initial(tail.name) +*/ // NOVA EDIT REMOVAL END diff --git a/code/modules/client/preferences/species_features/mushperson.dm b/code/modules/client/preferences/species_features/mushperson.dm new file mode 100644 index 00000000000..b5f8d4d5783 --- /dev/null +++ b/code/modules/client/preferences/species_features/mushperson.dm @@ -0,0 +1,13 @@ +/* NOVA EDIT REMOVAL +/datum/preference/choiced/mushroom_cap + savefile_key = "feature_mushperson_cap" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_SECONDARY_FEATURES + relevant_mutant_bodypart = "cap" + +/datum/preference/choiced/mushroom_cap/init_possible_values() + return assoc_to_keys_features(GLOB.caps_list) + +/datum/preference/choiced/mushroom_cap/apply_to_human(mob/living/carbon/human/target, value) + target.dna.features["caps"] = value +*/ diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 2f8c10ad7c5..00f79c1e5a5 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -301,8 +301,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Quirks all_quirks = save_data?["all_quirks"] - - load_character_skyrat(save_data) //NOVA EDIT ADDITION + load_character_nova(save_data) // NOVA EDIT ADDITION //try to fix any outdated data if necessary //preference updating will handle saving the updated data for us. @@ -361,8 +360,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Quirks save_data["all_quirks"] = all_quirks - - save_character_skyrat(save_data) //NOVA EDIT ADDITION + save_character_nova(save_data) // NOVA EDIT ADDITION return TRUE diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 1e00729c133..1b4f4542db5 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -367,7 +367,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( return FALSE if(src && choice && !user.incapacitated() && in_range(user,src)) - // SKYRAT ADDITION - More mask variations + // NOVA EDIT ADDITION START - More mask variations var/mob/living/carbon/human/human_user = user if(human_user.dna.species.mutant_bodyparts["snout"]) icon = 'modular_nova/master_files/icons/obj/clothing/masks.dmi' @@ -379,7 +379,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( icon = 'icons/obj/clothing/masks.dmi' worn_icon = 'icons/mob/clothing/mask.dmi' icon_state = options[choice] - /* SKYRAT ADDITION END + /* NOVA EDIT ADDITION END icon_state = options[choice] */ user.update_worn_mask() diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm index 419f3bf5693..43c6bd8b89c 100644 --- a/code/modules/food_and_drinks/machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm @@ -15,7 +15,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( /obj/item/reagent_containers/hypospray/medipen, //letting medipens become edible opens them to being injected/drained with IV drip & saltshakers ))) -/obj/machinery/deepfryer//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/deepfryer//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "deep fryer" desc = "Deep fried everything." icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm index f971b21d843..4c37fdf56ba 100644 --- a/code/modules/food_and_drinks/machinery/gibber.dm +++ b/code/modules/food_and_drinks/machinery/gibber.dm @@ -1,4 +1,4 @@ -/obj/machinery/gibber//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/gibber//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "gibber" desc = "The name isn't descriptive enough?" icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm index e1c38fbddb7..2a25f9a2d47 100644 --- a/code/modules/food_and_drinks/machinery/processor.dm +++ b/code/modules/food_and_drinks/machinery/processor.dm @@ -1,6 +1,6 @@ #define PROCESSOR_SELECT_RECIPE(movable_input) LAZYACCESS(processor_inputs[type], movable_input.type) -/obj/machinery/processor //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/processor //NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "food processor" desc = "An industrial grinder used to process meat and other foods. Keep hands clear of intake area while operating." icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index bffeb459cd4..e388892413e 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -72,7 +72,7 @@ product = /obj/item/food/grown/cannabis/ultimate genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green, /datum/plant_gene/trait/modified_volume/omega_weed) mutatelist = null - reagents_add = list(/datum/reagent/drug/thc = 0.3, //NOVA EDIT - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, + reagents_add = list(/datum/reagent/drug/thc = 0.3, //NOVA EDIT CHANGE - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, /datum/reagent/toxin/mindbreaker = 0.3, /datum/reagent/mercury = 0.15, /datum/reagent/lithium = 0.15, @@ -80,7 +80,7 @@ /datum/reagent/drug/methamphetamine = 0.15, /datum/reagent/drug/bath_salts = 0.15, /datum/reagent/drug/krokodil = 0.15, - // /datum/reagent/toxin/lipolicide = 0.15, // SKYRAT REMOVAL - MORE NARCOTICS + // /datum/reagent/toxin/lipolicide = 0.15, // NOVA EDIT REMOVAL - MORE NARCOTICS /datum/reagent/drug/nicotine = 0.1, ) rarity = 69 diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 4d7278eb9e4..926362877d1 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -1,5 +1,5 @@ // Plant analyzer -/obj/item/plant_analyzer//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/plant_analyzer//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "plant analyzer" desc = "A scanner used to evaluate a plant's various areas of growth, and genetic traits. Comes with a growth scanning mode and a chemical scanning mode." icon = 'icons/obj/devices/scanner.dmi' diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index 478e52c2f4b..7905537950a 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -25,13 +25,13 @@ /datum/job/ai/after_spawn(mob/living/spawned, client/player_client) . = ..() - /* SKYRAT REMOVAL START + /* NOVA EDIT REMOVAL START //we may have been created after our borg if(SSticker.current_state == GAME_STATE_SETTING_UP) for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs) if(!R.connected_ai) R.TryConnectToAI() - */ //SKYRAT REMOVAL END + */ // NOVA EDIT REMOVAL END var/mob/living/silicon/ai/ai_spawn = spawned ai_spawn.log_current_laws() // NOVA EDIT ADDITION START diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm index b8f5ee9042b..21c96f0aeaa 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm @@ -44,7 +44,6 @@ consume() spawn_mob() -//PLEASE VIEW SKYRAT ASHWALKER MODULE FOR OVERRIDE /obj/structure/lavaland/ash_walker/proc/consume() for(var/mob/living/offeredmob in view(src, 1)) //Only for corpse right next to/on same tile if(offeredmob.loc == src) @@ -93,7 +92,6 @@ L.add_mood_event("oogabooga", /datum/mood_event/sacrifice_bad) ashies.sacrifices_made++ -// NOVA EDIT ADDITION - PLEASE VIEW SKYRAT ASHWALKER MODULE FOR REPLACEMENT /obj/structure/lavaland/ash_walker/proc/remake_walker(mob/living/carbon/oldmob) var/mob/living/carbon/human/newwalker = new /mob/living/carbon/human(get_step(loc, pick(GLOB.alldirs))) newwalker.set_species(/datum/species/lizard/ashwalker) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index f5568d06309..52b28e7def2 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -80,7 +80,7 @@ show_title_screen() // NOVA EDIT ADDITION return FALSE - hide_title_screen() // NOVA EDIT ADDITION - Skyrat Titlescreen + hide_title_screen() // NOVA EDIT ADDITION - Nova Titlescreen var/mob/dead/observer/observer = new() spawning = TRUE diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index b09b8bb1a7b..1343682d896 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -48,7 +48,7 @@ return TRUE -//NOVA EDIT REMOVAL BEGIN - SKYRAT_XENO_REDO - Moved to: modular_nova\modules\xenos_skyrat_redo\code\xeno_types\larva.dm +//NOVA EDIT REMOVAL BEGIN - NOVA_XENO_REDO - Moved to: modular_nova\modules\xenos_nova_redo\code\xeno_types\larva.dm /* /datum/action/cooldown/alien/larva_evolve/Activate(atom/target) var/mob/living/carbon/alien/larva/larva = owner diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 95e66822dc0..24f7b8c325d 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -32,8 +32,11 @@ GLOBAL_LIST_EMPTY(features_by_species) ///The maximum number of bodyparts this species can have. var/max_bodypart_count = 6 - ///This allows races to have specific hair colors. If null, it uses the H's hair/facial hair colors. If "mutcolor", it uses the H's mutant_color. If "fixedmutcolor", it uses fixedmutcolor - var/hair_color + /// This allows races to have specific hair colors. + /// If null, it uses the mob's hair/facial hair colors. + /// If USE_MUTANT_COLOR, it uses the mob's mutant_color. + /// If USE_FIXED_MUTANT_COLOR, it uses fixedmutcolor + var/hair_color_mode ///The alpha used by the hair. 255 is completely solid, 0 is invisible. var/hair_alpha = 255 ///The alpha used by the facial hair. 255 is completely solid, 0 is invisible. @@ -119,8 +122,6 @@ GLOBAL_LIST_EMPTY(features_by_species) var/siemens_coeff = 1 ///To use MUTCOLOR with a fixed color that's independent of the mcolor feature in DNA. var/fixed_mut_color = "" - ///A fixed hair color that's independent of the mcolor feature in DNA. - var/fixed_hair_color = "" ///Special mutation that can be found in the genepool exclusively in this species. Dont leave empty or changing species will be a headache var/inert_mutation = /datum/mutation/human/dwarfism ///Used to set the mob's death_sound upon species change @@ -665,9 +666,6 @@ GLOBAL_LIST_EMPTY(features_by_species) species_human.apply_overlay(BODY_LAYER) handle_mutant_bodyparts(species_human) -*/ -//NOVA EDIT REMOVAL END - /** * Handles the mutant bodyparts of a human * @@ -677,8 +675,6 @@ GLOBAL_LIST_EMPTY(features_by_species) * * H - Human, whoever we're handling the body for * * forced_colour - The forced color of an accessory. Leave null to use mutant color. */ -//NOVA EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) -/* /datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/source, forced_colour) var/list/bodyparts_to_add = mutant_bodyparts.Copy() var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) @@ -2202,3 +2198,21 @@ GLOBAL_LIST_EMPTY(features_by_species) return harddel_deets_dumped = TRUE return "Gained / Owned: [properly_gained ? "Yes" : "No"]" + +/** + * Get what hair color is used by this species for a mob. + * + * Arguments + * * for_mob - The mob to get the hair color for. Required. + * + * Returns a color string or null. + */ +/datum/species/proc/get_fixed_hair_color(mob/living/carbon/human/for_mob) + ASSERT(!isnull(for_mob)) + switch(hair_color_mode) + if(USE_MUTANT_COLOR) + return for_mob.dna.features["mcolor"] + if(USE_FIXED_MUTANT_COLOR) + return fixed_mut_color + + return null diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index e9df0a6ca41..539f649870e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -687,12 +687,12 @@ visible_message(span_danger("[src] manages to [cuff_break ? "break" : "remove"] [I]!")) to_chat(src, span_notice("You successfully [cuff_break ? "break" : "remove"] [I].")) return TRUE - //SKYRAT ERP UPDATE ADDITION: NOW GLOVES CAN RESTRAIN PLAYERS + // NOVA EDIT ADDITION: NOW GLOVES CAN RESTRAIN PLAYERS if(I == gloves) visible_message(span_danger("[src] manages to [cuff_break ? "break" : "remove"] [I]!")) to_chat(src, span_notice("You successfully [cuff_break ? "break" : "remove"] [I].")) return TRUE - //SKYRAT ERP UPDATE ADDITION END + // NOVA EDIT ADDITION END /mob/living/carbon/human/replace_records_name(oldname, newname) // Only humans have records right now, move this up if changed. var/datum/record/crew/crew_record = find_record(oldname) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 0041406780d..725a60f0e4c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -199,7 +199,7 @@ apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, MELEE)) return TRUE -//NOVA EDIT REMOVAL BEGIN - SKYRAT_XENO_REDO - Moved to: modular_nova\modules\xenos_skyrat_redo\code\human_defense.dm +//NOVA EDIT REMOVAL BEGIN - NOVA_XENO_REDO - Moved to: modular_nova\modules\xenos_nova_redo\code\human_defense.dm /* /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index f86ddae9a10..89b27c1e7bd 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -26,7 +26,7 @@ bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C // Cold temperatures hurt faster as it is harder to move with out the heat energy bodytemp_cold_damage_limit = (T20C - 10) // about 10c - hair_color = "fixedmutcolor" + hair_color_mode = USE_FIXED_MUTANT_COLOR hair_alpha = 140 facial_hair_alpha = 140 @@ -54,7 +54,6 @@ if(!ishuman(new_ethereal)) return default_color = new_ethereal.dna.features["ethcolor"] - fixed_hair_color = default_color RegisterSignal(new_ethereal, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act)) RegisterSignal(new_ethereal, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act)) RegisterSignal(new_ethereal, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur)) @@ -111,7 +110,6 @@ ethereal_light.set_light_range_power_color(1 + (2 * healthpercent), 1 + (1 * healthpercent), current_color) ethereal_light.set_light_on(TRUE) fixed_mut_color = current_color - fixed_hair_color = current_color ethereal.update_body() ethereal.set_facial_haircolor(current_color, override = TRUE, update = FALSE) ethereal.set_haircolor(current_color, override = TRUE, update = TRUE) @@ -119,7 +117,6 @@ ethereal_light.set_light_on(FALSE) var/dead_color = rgb(128,128,128) fixed_mut_color = dead_color - fixed_hair_color = dead_color ethereal.update_body() ethereal.set_facial_haircolor(dead_color, override = TRUE, update = FALSE) ethereal.set_haircolor(dead_color, override = TRUE, update = TRUE) diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 596a7243773..2fc81670004 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -258,14 +258,14 @@ SPECIES_PERK_NAME = "Hydrophobia", SPECIES_PERK_DESC = "Felinids don't like getting soaked with water.", ), -//Skyrat addition begin +// NOVA EDIT ADDITION START list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "paw", SPECIES_PERK_NAME = "Soft Landing", SPECIES_PERK_DESC = "Felinids are unhurt by high falls, and land on their feet.", ), -//Skyrat addition end +// NOVA EDIT ADDITION END ) return to_add diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index b5dbe4ed611..8cf19309f6a 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -30,7 +30,7 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT inherent_factions = list(FACTION_SLIME) species_language_holder = /datum/language_holder/jelly - hair_color = "mutcolor" + hair_color_mode = USE_MUTANT_COLOR hair_alpha = 150 facial_hair_alpha = 150 bodypart_overrides = list( diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index f10c553a4ca..08894e86c75 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -9,7 +9,7 @@ ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG mutant_bodyparts = list("moth_markings" = "None") - // external_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // NOVA EDIT - Fixing moths + // external_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // NOVA EDIT REMOVAL - Fixing moths meat = /obj/item/food/meat/slab/human/mutant/moth mutanttongue = /obj/item/organ/internal/tongue/moth mutanteyes = /obj/item/organ/internal/eyes/moth diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index a16d9e92637..babb9607d57 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -2,11 +2,11 @@ name = "Mushroomperson" plural_form = "Mushroompeople" id = SPECIES_MUSHROOM - mutant_bodyparts = list("caps" = list(MUTANT_INDEX_NAME = "Round", MUTANT_INDEX_COLOR_LIST = list("#FF4B19"))) // NOVA EDIT - Customization - ORIGINAL: mutant_bodyparts = list("caps" = "Round") changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN fixed_mut_color = "#DBBF92" - hair_color = "#FF4B19" //cap color, spot color uses eye color + + external_organs = list(/obj/item/organ/external/mushroom_cap = "Round") inherent_traits = list( TRAIT_MUTANT_COLORS, @@ -41,10 +41,6 @@ /datum/species/mush/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() if(ishuman(C)) - var/mob/living/carbon/human/H = C - if(!H.dna.mutant_bodyparts["caps"] || H.dna.mutant_bodyparts["caps"][MUTANT_INDEX_NAME] != "None") // NOVA EDIT - Customization - ORIGINAL: if(!H.dna.features["caps"]) - H.dna.mutant_bodyparts["caps"] = list(MUTANT_INDEX_NAME = "Round", MUTANT_INDEX_COLOR_LIST = list(H.hair_color)) // NOVA EDIT - Customization - ORIGINAL: H.dna.features["caps"] = "Round" - handle_mutant_bodyparts(H) mush = new() mush.teach(C) mush.allow_temp_override = FALSE @@ -61,6 +57,36 @@ if(chem.type == /datum/reagent/toxin/plantbgone/weedkiller) affected.adjustToxLoss(3 * REM * seconds_per_tick) -/datum/species/mush/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour, force_update = FALSE) //NOVA EDIT - ORIGINAL: /datum/species/mush/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour) (one parameter added) - forced_colour = FALSE - return ..() +/datum/species/mush/get_fixed_hair_color(mob/living/carbon/human/for_mob) + return "#FF4B19" //cap color, spot color uses eye color + +/// A mushpersons mushroom cap organ +/obj/item/organ/external/mushroom_cap + name = "mushroom cap" + desc = "These are yummie, no cap." + + use_mob_sprite_as_obj_sprite = TRUE + + zone = BODY_ZONE_HEAD + slot = ORGAN_SLOT_EXTERNAL_POD_HAIR + + preference = "feature_mushperson_cap" + + //dna_block = DNA_MUSHROOM_CAPS_BLOCK // NOVA EDIT REMOVAL - Customization - We have our own system to handle DNA. + restyle_flags = EXTERNAL_RESTYLE_PLANT + + bodypart_overlay = /datum/bodypart_overlay/mutant/mushroom_cap + +/// Bodypart overlay for the mushroom cap organ +/datum/bodypart_overlay/mutant/mushroom_cap + layers = EXTERNAL_ADJACENT + feature_key = "caps" + +/datum/bodypart_overlay/mutant/mushroom_cap/get_global_feature_list() + return GLOB.caps_list + +/datum/bodypart_overlay/mutant/mushroom_cap/can_draw_on_bodypart(mob/living/carbon/human/human) + if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR)) + return FALSE + + return TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index 7a44382fa04..a1ec5b365a0 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -111,7 +111,8 @@ max_integrity = 200 resistance_flags = FIRE_PROOF | ACID_PROOF -/datum/armor/backpack_snail //SKYRAT COMMENT CLARIFICATION - Roundstart Snails - These armor values don't actually do any protection of the wearer, this is for checking direct damage to the backpack. Damage resistance stuff is in their heart file. +// NOVA EDIT ADDITION - CLARIFICATION - Roundstart Snails - These armor values don't actually do any protection of the wearer, this is for checking direct damage to the backpack. Damage resistance stuff is in their heart file. +/datum/armor/backpack_snail melee = 40 bullet = 30 laser = 30 diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index f8619494206..84dbc6a8457 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -127,8 +127,6 @@ hands_use_check = TRUE var/wing_time = 20 -//NOVA EDIT REMOVAL BEGIN - EMOTES - Not working due to modified mutant code, TODO: Fix this -/* /datum/emote/living/flap/run_emote(mob/user, params, type_override, intentional) . = ..() if(. && ishuman(user)) @@ -148,8 +146,6 @@ // play moth flutter noise if moth wing if(istype(wings, /obj/item/organ/external/wings/moth)) playsound(H, 'sound/voice/moth/moth_flutter.ogg', 50, TRUE) -*/ -//NOVA EDIT REMOVAL END /datum/emote/living/flap/aflap key = "aflap" diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 8bb4d42b3c7..0a1ec901961 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -30,13 +30,13 @@ addtimer(CALLBACK(src, PROC_REF(show_laws)), 0) addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0) last_lawchange_announce = world.time - //SKYRAT ADDITION START: AI LAWSYNC + // NOVA EDIT ADDITION START: AI LAWSYNC if(isAI(src)) var/mob/living/silicon/ai/ai = src for(var/mob/living/silicon/robot/cyborg as anything in ai.connected_robots) if(cyborg.connected_ai && cyborg.lawupdate) cyborg.lawsync() - //SKYRAT ADDITON END + // NOVA EDIT ADDITON END /mob/living/silicon/proc/set_zeroth_law(law, law_borg, announce = TRUE) laws_sanity_check() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index cebdfc99de1..a66373605fc 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -82,11 +82,11 @@ crusher_kill = TRUE if(crusher_loot) // spawn crusher loot, if any spawn_crusher_loot() - //SKYRAT ADDITION START - ASHWALKER TROPHIES + // NOVA EDIT ADDITION START - ASHWALKER TROPHIES var/datum/status_effect/ashwalker_damage/ashie_damage = has_status_effect(/datum/status_effect/ashwalker_damage) if(!crusher_kill && ashie_damage && crusher_loot && ashie_damage.total_damage >= maxHealth * 0.6) spawn_crusher_loot() - //SKYRAT ADDITION END + // NOVA EDIT ADDITION END if(true_spawn && !(flags_1 & ADMIN_SPAWNED_1)) var/tab = "megafauna_kills" if(crusher_kill) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 0ee35559005..91045a26fad 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -306,7 +306,7 @@ playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) return - // SKYRAT ADDITION END + // NOVA EDIT ADDITION END if(!wearer.incapacitated()) var/atom/movable/screen/inventory/hand/ui_hand = over_object diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index 577539a7f5f..8cecea0cc54 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -101,7 +101,7 @@ if(!COOLDOWN_FINISHED(src, cooldown_timer)) balloon_alert(mod.wearer, "on cooldown!") return FALSE - if(((!mod.active || mod.activating) && !(allow_flags & MODULE_ALLOW_INACTIVE)) || !mod.get_charge()) //SKYRAT ADDITION: INACTIVE USE + if(((!mod.active || mod.activating) && !(allow_flags & MODULE_ALLOW_INACTIVE)) || !mod.get_charge()) // NOVA EDIT ADDITION: INACTIVE USE balloon_alert(mod.wearer, "unpowered!") return FALSE diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 528eb1e97ee..9730ddef335 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -3,7 +3,7 @@ /obj/machinery/field/containment name = "containment field" desc = "An energy field." - icon = 'icons/obj/machines/engine/singularity.dmi' // NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/engine/singularity.dmi' // NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "Contain_F" density = FALSE move_resist = INFINITY diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index e44fd47b7fd..86e1235bce1 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,7 +1,7 @@ /obj/machinery/power/emitter name = "emitter" desc = "A heavy-duty industrial laser, often used in containment fields and power generation." - icon = 'icons/obj/machines/engine/singularity.dmi' //NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/engine/singularity.dmi' //NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "emitter" base_icon_state = "emitter" diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index ba9fde43d49..376401bd3a4 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -26,7 +26,7 @@ no power level overlay is currently in the overlays list. /obj/machinery/field/generator name = "field generator" desc = "A large thermal battery that projects a high amount of energy when powered." - icon = 'icons/obj/machines/field_generator.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/field_generator.dmi' //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE icon_state = "Field_Gen" anchored = FALSE density = TRUE diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 360d44b08a4..975ddf29960 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -44,7 +44,7 @@ empty_indicator = TRUE suppressor_x_offset = 12 -/obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +/obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE name = "\improper M1911" desc = "A classic .45 handgun with a small magazine capacity." icon_state = "m1911" diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 5471b20f512..176b5ae65d6 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -54,7 +54,7 @@ ..() rack() -/obj/item/gun/ballistic/shotgun/automatic/combat //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +/obj/item/gun/ballistic/shotgun/automatic/combat //ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE name = "combat shotgun" desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." icon_state = "cshotgun" diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 9477f5e8c64..aa31b214244 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -119,7 +119,7 @@ /obj/item/gun/energy/e_gun/turret/add_seclight_point() return -/obj/item/gun/energy/e_gun/nuclear //NOVA EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE +/obj/item/gun/energy/e_gun/nuclear // NOVA EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE name = "advanced energy gun" desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell." icon_state = "nucgun" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index ab5a5350357..c04c86d7579 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -1,4 +1,4 @@ -/obj/item/gun/energy/ionrifle //NOVA EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE +/obj/item/gun/energy/ionrifle // NOVA EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE name = "ion rifle" desc = "A man-portable anti-armor weapon designed to disable mechanical threats at range." icon_state = "ionrifle" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index b32d58b8dd1..d4475a38e53 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -206,10 +206,10 @@ COMSIG_ATOM_ENTERED = PROC_REF(on_entered), COMSIG_ATOM_ATTACK_HAND = PROC_REF(attempt_parry), ) - //SKYRAT ADDITION START + // NOVA EDIT ADDITION START /// If this should be able to hit the target even on direct firing when `ignored_factions` applies var/ignore_direct_target = FALSE - //SKYRAT ADDITION END + // NOVA EDIT ADDITION END /// If true directly targeted turfs can be hit var/can_hit_turfs = FALSE @@ -306,7 +306,7 @@ else impact_sound = target.impact_sound get_sfx() - playsound(src, get_sfx_skyrat(impact_sound), vol_by_damage(), TRUE, -1) + playsound(src, get_sfx_nova(impact_sound), vol_by_damage(), TRUE, -1) // NOVA EDIT ADDITION END if(damage > 0 && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_turf) && prob(75)) diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm index 2e94083f8cb..728bc969faa 100644 --- a/code/modules/reagents/chem_splash.dm +++ b/code/modules/reagents/chem_splash.dm @@ -112,9 +112,8 @@ var/distance = max(1, get_dist(thing, epicenter)) var/fraction = 0.5 / (2 ** distance) //50/25/12/6... for a 200u splash, 25/12/6/3... for a 100u, 12/6/3/1 for a 50u source.expose(thing, TOUCH, fraction) - - // SKYRAT ADDITION START - Liquids + // NOVA EDIT ADDITION START - Liquids if(isturf(epicenter)) var/turf/center_of_mess = epicenter center_of_mess.add_liquid_from_reagents(source) - // SKYRAT ADDITION END + // NOVA EDIT ADDITION END diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index a072166ab86..e04d65ec881 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -54,10 +54,10 @@ var/obj/item/the_real_food = holder.my_atom if(isitem(the_real_food) && !is_reagent_container(the_real_food)) exposed_mob.add_mob_memory(/datum/memory/good_food, food = the_real_food) - // SKYRAT ADDITION BEGIN - Racial Drinks + // NOVA EDIT ADDITION BEGIN - Racial Drinks if (RACE_DRINK) exposed_mob.add_mood_event("quality_drink", /datum/mood_event/race_drink) - // SKYRAT ADDITION END + // NOVA EDIT ADDITION END /// Gets just how much nutrition this reagent is worth for the passed mob /datum/reagent/consumable/proc/get_nutriment_factor(mob/living/carbon/eater) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 66784e546aa..743e090d5c3 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -246,7 +246,7 @@ icon_state = "water_high" //I was gonna clean my room... tank_volume = 3000 -/obj/structure/reagent_dispensers/foamtank//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/foamtank//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "firefighting foam tank" desc = "A tank full of firefighting foam." icon_state = "foam" @@ -255,7 +255,7 @@ openable = TRUE climbable = TRUE -/obj/structure/reagent_dispensers/fueltank//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/fueltank//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "fuel tank" desc = "A tank full of industrial welding fuel. Do not consume." icon_state = "fuel" @@ -359,7 +359,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/peppertank, 3 desc = "IT'S PEPPER TIME, BITCH!" find_and_hang_on_wall() -/obj/structure/reagent_dispensers/water_cooler//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/water_cooler//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "liquid cooler" desc = "A machine that dispenses liquid to drink." icon = 'icons/obj/machines/vending.dmi' @@ -429,7 +429,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/virusfood, 30 anchored = TRUE reagent_id = /datum/reagent/consumable/nutraslop -/obj/structure/reagent_dispensers/plumbed//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/plumbed//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "stationary water tank" anchored = TRUE icon_state = "water_stationary" diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm index c7977435f4d..8dc10cf0a50 100644 --- a/code/modules/reagents/withdrawal/generic_addictions.dm +++ b/code/modules/reagents/withdrawal/generic_addictions.dm @@ -269,7 +269,7 @@ QDEL_NULL(fake_alert_ref) QDEL_NULL(health_doll_ref) -/* SKYRAT CHANGE, MOVED TO MODULAR. +/* NOVA EDIT REMOVAL START - MOVED TO MODULAR. ///Nicotine /datum/addiction/nicotine name = "nicotine" @@ -294,4 +294,4 @@ affected_carbon.set_jitter_if_lower(30 SECONDS * seconds_per_tick) if(SPT_PROB(5, seconds_per_tick)) affected_carbon.emote("cough") -*/ +*/ // NOVA EDIT REMOVAL END diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index ce3d9f8975e..8c4fe09b378 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -3,7 +3,7 @@ #define SEND_PRESSURE (0.05*ONE_ATMOSPHERE) /obj/machinery/disposal - icon = 'icons/obj/pipes_n_cables/disposal.dmi' //NOVA EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/pipes_n_cables/disposal.dmi' //NOVA EDIT CHANGE - ICON OVERRIDDEN IN NOVA AESTHETICS - SEE MODULE density = TRUE armor_type = /datum/armor/machinery_disposal max_integrity = 200 diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 43f0105720d..306094f134f 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -17,7 +17,7 @@ #define EFFECT_PROB_VERYHIGH 95 #define FAIL 8 -/obj/machinery/rnd/experimentor//NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/rnd/experimentor//NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "\improper E.X.P.E.R.I-MENTOR" desc = "A \"replacement\" for the destructive analyzer with a slight tendency to catastrophically fail." icon = 'icons/obj/machines/experimentator.dmi' diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 5fecc84b417..51e7dd69e81 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -1,7 +1,7 @@ /*Power cells are in code\modules\power\cell.dm If you create T5+ please take a pass at mech_fabricator.dm. The parts being good enough allows it to go into minus values and create materials out of thin air when printing stuff.*/ -/obj/item/storage/part_replacer //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/storage/part_replacer //NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "rapid part exchange device" desc = "Special mechanical module made to store, sort, and apply standard machine parts." icon_state = "RPED" @@ -58,7 +58,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good else playsound(src, pshoom_or_beepboopblorpzingshadashwoosh, 40, TRUE) -/obj/item/storage/part_replacer/bluespace //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/storage/part_replacer/bluespace //NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "bluespace rapid part exchange device" desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts." icon_state = "BS_RPED" @@ -184,7 +184,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good new /obj/item/stock_parts/micro_laser(src) new /obj/item/stock_parts/matter_bin(src) -/obj/item/storage/part_replacer/cyborg //NOVA EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/storage/part_replacer/cyborg //NOVA EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "rapid part exchange device" desc = "Special mechanical module made to store, sort, and apply standard machine parts. This one has an extra large compartment for more parts." icon_state = "borgrped" diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index afbe3f0a8ef..620506a8654 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -3,7 +3,7 @@ desc = "The disk provides instructions on some kind of surgery, but the label has been scratched off..." //NOVA EDIT: Moved to Special Desc. surgeries = list(/datum/surgery/advanced/brainwashing) special_desc_requirement = EXAMINE_CHECK_JOB // NOVA EDIT - special_desc_jobs = list("Medical Doctor, Chief Medical Officer, Roboticist") //SKYRAT CHANGE //You mean to tell me the roles that get this role-exclusive item know what it does? + special_desc_jobs = list("Medical Doctor, Chief Medical Officer, Roboticist") // NOVA EDIT CHANGE //You mean to tell me the roles that get this role-exclusive item know what it does? special_desc = "The disk provides instructions on how to impress an order on a brain, making it the primary objective of the patient." /datum/surgery/advanced/brainwashing diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm index 4341b4b4c69..6efd8296c55 100644 --- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm +++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm @@ -55,7 +55,7 @@ facial_hairstyle = human_head_owner.facial_hairstyle facial_hair_alpha = owner_species.facial_hair_alpha facial_hair_color = human_head_owner.facial_hair_color - fixed_hair_color = owner_species.fixed_hair_color //Can be null + fixed_hair_color = owner_species.get_fixed_hair_color(human_head_owner) //Can be null gradient_styles = human_head_owner.grad_style?.Copy() gradient_colors = human_head_owner.grad_color?.Copy() @@ -110,11 +110,11 @@ hair_overlay = image(hair_sprite_accessory.icon, hair_sprite_accessory.icon_state, -HAIR_LAYER, image_dir) hair_overlay.alpha = hair_alpha hair_overlay.pixel_y = hair_sprite_accessory.y_offset - // SKYRAT ADD - Species hair offset + // NOVA EDIT ADDITION - Species hair offset if(LAZYFIND(owner?.dna?.species?.offset_features, OFFSET_HAIR)) hair_overlay.pixel_x += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_X] hair_overlay.pixel_y += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_Y] - // SKYRAT ADD END + // NOVA EDIT ADDITION END //Emissive blocker if(blocks_emissive != EMISSIVE_BLOCK_NONE) hair_overlay.overlays += emissive_blocker(hair_overlay.icon, hair_overlay.icon_state, location, alpha = hair_alpha) @@ -127,11 +127,11 @@ var/hair_gradient_color = LAZYACCESS(gradient_colors, GRADIENT_HAIR_KEY) var/image/hair_gradient_overlay = get_gradient_overlay(hair_sprite_accessory.icon, hair_sprite_accessory.icon_state, -HAIR_LAYER, GLOB.hair_gradients_list[hair_gradient_style], hair_gradient_color, image_dir) hair_gradient_overlay.pixel_y = hair_sprite_accessory.y_offset - // SKYRAT ADD - Species hair offset + // NOVA EDIT ADDITION - Species hair offset if(LAZYFIND(owner?.dna?.species?.offset_features, OFFSET_HAIR)) hair_gradient_overlay.pixel_x += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_X] hair_gradient_overlay.pixel_y += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_Y] - // SKYRAT ADD END + // NOVA EDIT ADDITION END . += hair_gradient_overlay if(show_debrained && (head_flags & HEAD_DEBRAIN)) diff --git a/code/modules/surgery/organs/external/_external_organ.dm b/code/modules/surgery/organs/external/_external_organ.dm index 645caa630d7..fd885571631 100644 --- a/code/modules/surgery/organs/external/_external_organ.dm +++ b/code/modules/surgery/organs/external/_external_organ.dm @@ -64,6 +64,10 @@ receiver.update_body_parts() /obj/item/organ/external/Remove(mob/living/carbon/organ_owner, special, movement_flags) + // NOVA EDIT ADDITION START + if(mutantpart_key) + transfer_mutantpart_info(organ_owner, special) + // NOVA EDIT ADDITION END . = ..() if(!special) organ_owner.update_body_parts() @@ -77,10 +81,15 @@ if(!.) return + // NOVA EDIT ADDITION START + if(mutantpart_key) + copy_to_mutant_bodyparts(receiver, special) + // NOVA EDIT ADDITION END if(bodypart_overlay.imprint_on_next_insertion) //We only want this set *once* var/feature_name = receiver.dna.features[bodypart_overlay.feature_key] if (isnull(feature_name)) - bodypart_overlay.set_appearance_from_dna(receiver.dna) // NOVA EDIT CHANGE - ORIGINAL: feature_name = receiver.dna.species.external_organs[type] + if(!bodypart_overlay.set_appearance_from_dna(receiver.dna)) // NOVA EDIT CHANGE - ORIGINAL: feature_name = receiver.dna.species.external_organs[type] + bodypart_overlay.set_appearance_from_name(receiver.dna.species.external_organs[type]) // NOVA EDIT ADDITION // NOVA EDIT CHANGE START - Puts the following line in an else block else bodypart_overlay.set_appearance_from_name(feature_name) diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 812e3251063..3968793b4e3 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -58,6 +58,10 @@ tail_spines_overlay = new tail_spines_overlay.tail_spine_key = tail_spine_key + // NOVA EDIT ADDITION START + if(!bodypart.owner.dna.mutant_bodyparts["spines"]) + bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) + // NOVA EDIT ADDITION END var/feature_name = bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] // NOVA EDIT CHANGE - ORIGINAL: var/feature_name = bodypart.owner.dna.features["spines"] //tail spines don't live in DNA, but share feature names with regular spines tail_spines_overlay.set_appearance_from_dna(bodypart.owner.dna, feature_name, feature_key = "spines") // NOVA EDIT CHANGE - ORIGINAL: tail_spines_overlay.set_appearance_from_name(feature_name) bodypart.add_bodypart_overlay(tail_spines_overlay) @@ -167,9 +171,6 @@ feature_key = "tail" // NOVA EDIT - Customization - ORIGINAL: feature_key = "tail_cat" // color_source = ORGAN_COLOR_HAIR // NOVA EDIT REMOVAL -/datum/bodypart_overlay/mutant/tail/cat/get_global_feature_list() - return GLOB.sprite_accessories["tail"] // NOVA EDIT - Customization - ORIGINAL: return GLOB.tails_list_human - /obj/item/organ/external/tail/monkey name = "monkey tail" preference = "feature_monkey_tail" diff --git a/code/modules/unit_tests/barsigns.dm b/code/modules/unit_tests/barsigns.dm index ec4d06b614e..7863aff7827 100644 --- a/code/modules/unit_tests/barsigns.dm +++ b/code/modules/unit_tests/barsigns.dm @@ -2,15 +2,15 @@ * Test if icon states for each datum actually exist in the DMI. */ /datum/unit_test/barsigns_icon - var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/skyrat, /datum/barsign/skyrat/large) // NOVA EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns + var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/nova, /datum/barsign/nova/large) // NOVA EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns /datum/unit_test/barsigns_icon/Run() var/obj/machinery/barsign_type = /obj/machinery/barsign var/icon/barsign_icon = initial(barsign_type.icon) var/list/barsign_icon_states = icon_states(barsign_icon) - barsign_icon_states += icon_states(SKYRAT_BARSIGN_FILE) // NOVA EDIT ADDITION - Need to check modular barsigns + barsign_icon_states += icon_states(NOVA_BARSIGN_FILE) // NOVA EDIT ADDITION - Need to check modular barsigns barsign_icon_states += icon_states(TFF_BARSIGN_FILE) // THE FLUFFY FRONTIER - Need to check modular barsigns - barsign_icon_states += icon_states(SKYRAT_LARGE_BARSIGN_FILE) // NOVA EDIT ADDITION - Need to check modular barsigns + barsign_icon_states += icon_states(NOVA_LARGE_BARSIGN_FILE) // NOVA EDIT ADDITION - Need to check modular barsigns // Check every datum real bar sign for(var/sign_type in (subtypesof(/datum/barsign) - /datum/barsign/hiddensigns)) @@ -27,7 +27,7 @@ * Check that bar signs have a name and desc, and that the name is unique. */ /datum/unit_test/barsigns_name - var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/skyrat, /datum/barsign/skyrat/large) // NOVA EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns + var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/nova, /datum/barsign/nova/large) // NOVA EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns /datum/unit_test/barsigns_name/Run() var/list/existing_names = list() diff --git a/code/modules/unit_tests/inhands.dm b/code/modules/unit_tests/inhands.dm index a10de4aed18..0c64a35a998 100644 --- a/code/modules/unit_tests/inhands.dm +++ b/code/modules/unit_tests/inhands.dm @@ -3,7 +3,7 @@ var/static/list/possible_icon_states = list() var/fallback_log_message var/unset_inhand_var_message - /// additional_inhands_location is for downstream modularity support. as an example, for skyrat's usage, set additional_inhands_location = "modular_nova/master_files/icons/mob/inhands/" + /// additional_inhands_location is for downstream modularity support. as an example, for nova's usage, set additional_inhands_location = "modular_nova/master_files/icons/mob/inhands/" /// Make sure this location is also present in tools/deploy.sh /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/inhands/") below the if(additional_inhands_location) block in Run(), and make sure to add that path to tools/deploy.sh as well. var/additional_inhands_location = null diff --git a/code/modules/unit_tests/screenshot_humanoids.dm b/code/modules/unit_tests/screenshot_humanoids.dm index 44373018a7a..3d09d11a666 100644 --- a/code/modules/unit_tests/screenshot_humanoids.dm +++ b/code/modules/unit_tests/screenshot_humanoids.dm @@ -2,6 +2,8 @@ /datum/unit_test/screenshot_humanoids /datum/unit_test/screenshot_humanoids/Run() + var/list/testable_species = subtypesof(/datum/species) + // Test lizards as their own thing so we can get more coverage on their features var/mob/living/carbon/human/lizard = allocate(/mob/living/carbon/human/dummy/consistent) lizard.dna.features["mcolor"] = "#099" @@ -13,6 +15,7 @@ lizard.set_species(/datum/species/lizard) lizard.equipOutfit(/datum/outfit/job/engineer) test_screenshot("[/datum/species/lizard]", get_flat_icon_for_all_directions(lizard)) + testable_species -= /datum/species/lizard // let me have this var/mob/living/carbon/human/moth = allocate(/mob/living/carbon/human/dummy/consistent) @@ -23,9 +26,21 @@ moth.set_species(/datum/species/moth) moth.equipOutfit(/datum/outfit/job/cmo, visualsOnly = TRUE) test_screenshot("[/datum/species/moth]", get_flat_icon_for_all_directions(moth)) + testable_species -= /datum/species/moth + + // More in depth test for slimes since they have a lot going on + for (var/datum/species/slime_type as anything in typesof(/datum/species/jelly)) + var/mob/living/carbon/human/slime = allocate(/mob/living/carbon/human/dummy/consistent) + slime.dna.features["mcolor"] = COLOR_PINK + slime.hairstyle = "Bob Hair 2" + slime.hair_color = COLOR_RED // Should be forced to pink + slime.set_species(slime_type) + slime.equipOutfit(/datum/outfit/job/scientist/consistent) + test_screenshot("[slime_type]", get_flat_icon_for_all_directions(slime)) + testable_species -= slime_type // The rest of the species - for (var/datum/species/species_type as anything in subtypesof(/datum/species) - /datum/species/moth - /datum/species/lizard) + for (var/datum/species/species_type as anything in testable_species) test_screenshot("[species_type]", get_flat_icon_for_all_directions(make_dummy(species_type, /datum/outfit/job/assistant/consistent))) /datum/unit_test/screenshot_humanoids/proc/make_dummy(species, job_outfit) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png index f2e4780e34b..0c866dc85e8 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_luminescent.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_luminescent.png index 10306f0a123..9f8ad36913a 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_luminescent.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_luminescent.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_roundstartslime.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_roundstartslime.png index 0be9ecb865f..004c99c1cbd 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_roundstartslime.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_roundstartslime.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_slime.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_slime.png index 8d02f059ad0..9567b069d7d 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_slime.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_slime.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png index f2e4780e34b..0c866dc85e8 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png differ diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index 5f5b5ae2f45..1530ff3860b 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -80,8 +80,8 @@ /mob/living/simple_animal/pet/gondola/virtual_domain, /mob/living/simple_animal/soulscythe, - //MODULAR SKYRAT ENTRIES - //PLEASE REFACTOR THESE AS YOU CAN + // MODULAR NOVA ENTRIES + // PLEASE REFACTOR THESE AS YOU CAN /mob/living/simple_animal/hostile/bigcrab, /mob/living/simple_animal/hostile/cazador, /mob/living/simple_animal/hostile/cult, diff --git a/code/modules/uplink/uplink_items/clownops.dm b/code/modules/uplink/uplink_items/clownops.dm index 73dd3d4c876..dd8db8aa041 100644 --- a/code/modules/uplink/uplink_items/clownops.dm +++ b/code/modules/uplink/uplink_items/clownops.dm @@ -141,7 +141,7 @@ cost = 80 purchasable_from = UPLINK_CLOWN_OPS -/* //SKYRAT REMOVAL START +/* // NOVA EDIT REMOVAL START /datum/uplink_item/stealthy_tools/combatbananashoes name = "Combat Banana Shoes" desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \ @@ -151,7 +151,7 @@ cost = 6 surplus = 0 purchasable_from = UPLINK_CLOWN_OPS -*/ //SKYRAT REMOVAL END +*/ // NOVA EDIT REMOVAL END /datum/uplink_item/badass/clownopclumsinessinjector //clowns can buy this too, but it's in the role-restricted items section for them name = "Clumsiness Injector" diff --git a/code/modules/uplink/uplink_items/explosive.dm b/code/modules/uplink/uplink_items/explosive.dm index d09474c3bfe..b2d6d7531f7 100644 --- a/code/modules/uplink/uplink_items/explosive.dm +++ b/code/modules/uplink/uplink_items/explosive.dm @@ -35,7 +35,8 @@ item = /obj/item/storage/backpack/duffelbag/syndie/x4 cost = 4 cant_discount = TRUE -/* //NOVA EDIT REMOVAL START + +/* // NOVA EDIT REMOVAL START /datum/uplink_item/explosives/detomatix name = "Detomatix disk" desc = "When inserted into a tablet, this cartridge gives you four opportunities to \ @@ -44,7 +45,7 @@ item = /obj/item/computer_disk/virus/detomatix cost = 6 restricted = TRUE -*/ //SKYRAT REMOVAL END +*/ // NOVA EDIT REMOVAL END /datum/uplink_item/explosives/emp name = "EMP Grenades and Implanter Kit" desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \ diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm index 817895beb4c..58773a8118c 100644 --- a/code/modules/uplink/uplink_items/job.dm +++ b/code/modules/uplink/uplink_items/job.dm @@ -319,7 +319,7 @@ restricted_roles = list(JOB_ROBOTICIST, JOB_RESEARCH_DIRECTOR) surplus = 15 -/* //SKYRAT REMOVAL START +/* // NOVA EDIT REMOVAL START /datum/uplink_item/role_restricted/spider_injector name = "Australicus Slime Mutator" desc = "Crikey mate, it's been a wild travel from the Australicus sector but we've managed to get \ @@ -333,7 +333,7 @@ surplus = 10 */ -// NOVA EDIT END +// NOVA EDIT REMOVAL END /datum/uplink_item/role_restricted/blastcannon name = "Blast Cannon" desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \ diff --git a/html/admin/banpanel.css b/html/admin/banpanel.css index 84412a775ba..8cdfb4233e3 100644 --- a/html/admin/banpanel.css +++ b/html/admin/banpanel.css @@ -73,9 +73,6 @@ background-color: #6d3f40; } -.skyratbanoptions { - background-color: #00f7ff; - .undefineddepartment { background-color: #111cf7; } diff --git a/html/changelogs/AutoChangeLog-pr-3210.yml b/html/changelogs/AutoChangeLog-pr-3210.yml new file mode 100644 index 00000000000..6a51d031363 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3210.yml @@ -0,0 +1,6 @@ +author: "Time-Green, vinylspiders" +delete-after: True +changes: + - code_imp: "The mushroom cap is now an external organ (jungle station will never happen)" + - bugfix: "Mushpeople caps are no longer solid black" + - bugfix: "you can no longer be dismembered by teleporters if you have TRAIT_NODISMEMBER" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3217.yml b/html/changelogs/AutoChangeLog-pr-3217.yml new file mode 100644 index 00000000000..fd5475ca583 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3217.yml @@ -0,0 +1,4 @@ +author: "Melbert" +delete-after: True +changes: + - bugfix: "Fixed Slimepeople's hair not matching their slimey colors." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3228.yml b/html/changelogs/AutoChangeLog-pr-3228.yml new file mode 100644 index 00000000000..a17eca08475 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3228.yml @@ -0,0 +1,4 @@ +author: "vinylspiders" +delete-after: True +changes: + - bugfix: "using the flap emote with moth wings now makes a sound like it's supposed to" \ No newline at end of file diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index e2d474a485d..9a4d5b85323 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -151,8 +151,8 @@ h1.alert, h2.alert {color: #000000;} 75% {color: #410194;} 100% {color: #3bb5d3;} } +// NOVA EDIT ADDITION BEGIN -// SKYRAT ADDITION BEGIN .velvet {color: #660015; font-weight: bold; animation: velvet 5000ms infinite;} @keyframes velvet { 0% {color: #400020; } @@ -250,9 +250,7 @@ h1.alert, h2.alert {color: #000000;} .cyan { color: #0ea1e6; } - - -// SKYRAT ADDITION END +// NOVA EDIT ADDITION END .phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} @keyframes phobia { diff --git a/modular_nova/master_files/code/_globalvars/configuration.dm b/modular_nova/master_files/code/_globalvars/configuration.dm index f2f60e22a42..142a8e8d8fd 100644 --- a/modular_nova/master_files/code/_globalvars/configuration.dm +++ b/modular_nova/master_files/code/_globalvars/configuration.dm @@ -15,7 +15,7 @@ GLOBAL_VAR_INIT(looc_allowed, TRUE) /datum/config_entry/string/icecats_policy_link config_entry_value = "(It appears we have forgotten to set this link)" // "in config.txt" but the players don't need to see that -/// Whether or not we log game logs to the SQL database. Requires the SQL database to function, as well as our Skyrat-only table, `game_log`. +/// Whether or not we log game logs to the SQL database. Requires the SQL database to function, as well as our Nova-only table, `game_log`. /datum/config_entry/flag/sql_game_log protection = CONFIG_ENTRY_LOCKED diff --git a/modular_nova/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/modular_nova/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index 1a86afbea05..130d1277e45 100644 --- a/modular_nova/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/modular_nova/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -34,12 +34,14 @@ /datum/bodypart_overlay/mutant/proc/set_appearance_from_dna(datum/dna/dna, accessory_name, feature_key) if(isnull(feature_key)) // if not explicitly set, just use the feature_key of the bodypart_overlay feature_key = src.feature_key + if(!dna.mutant_bodyparts[feature_key]) + return FALSE sprite_datum = fetch_sprite_datum_from_name(accessory_name ? accessory_name : dna.mutant_bodyparts[feature_key][MUTANT_INDEX_NAME]) modsuit_affected = sprite_datum.use_custom_mod_icon draw_color = dna.mutant_bodyparts[feature_key][MUTANT_INDEX_COLOR_LIST] build_emissive_eligibility(dna.mutant_bodyparts[feature_key][MUTANT_INDEX_EMISSIVE_LIST]) cache_key = jointext(generate_icon_cache(), "_") - + return TRUE // We do this here like this so that we handle matrixed color bodypart overlays and emissives. /datum/bodypart_overlay/mutant/get_overlay(layer, obj/item/bodypart/limb) diff --git a/modular_nova/master_files/code/datums/traits/good.dm b/modular_nova/master_files/code/datums/traits/good.dm index d9cb17124ea..235ed4b5c19 100644 --- a/modular_nova/master_files/code/datums/traits/good.dm +++ b/modular_nova/master_files/code/datums/traits/good.dm @@ -1,4 +1,4 @@ -// SKYRAT GOOD TRAITS +// NOVA GOOD TRAITS /datum/quirk/hard_soles name = "Hardened Soles" diff --git a/modular_nova/master_files/code/datums/traits/negative.dm b/modular_nova/master_files/code/datums/traits/negative.dm index 7828b4ac7c9..877fbcf32a7 100644 --- a/modular_nova/master_files/code/datums/traits/negative.dm +++ b/modular_nova/master_files/code/datums/traits/negative.dm @@ -1,4 +1,4 @@ -// SKYRAT NEGATIVE TRAITS +// NOVA NEGATIVE TRAITS /datum/quirk/alexithymia name = "Alexithymia" @@ -18,7 +18,7 @@ /datum/quirk_constant_data/fragile associated_typepath = /datum/quirk/fragile customization_options = list( - /datum/preference/numeric/fragile_customization/brute, + /datum/preference/numeric/fragile_customization/brute, /datum/preference/numeric/fragile_customization/burn, ) @@ -26,14 +26,14 @@ abstract_type = /datum/preference/numeric/fragile_customization category = PREFERENCE_CATEGORY_MANUALLY_RENDERED savefile_identifier = PREFERENCE_CHARACTER - - minimum = 1.25 + + minimum = 1.25 maximum = 5 // 5x damage, arbitrary - step = 0.01 + step = 0.01 /datum/preference/numeric/fragile_customization/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) - return FALSE + return FALSE /datum/preference/numeric/fragile_customization/create_default_value() return 1.25 diff --git a/modular_nova/master_files/code/datums/traits/neutral.dm b/modular_nova/master_files/code/datums/traits/neutral.dm index 2544c1f38ef..2a0bef1d7d9 100644 --- a/modular_nova/master_files/code/datums/traits/neutral.dm +++ b/modular_nova/master_files/code/datums/traits/neutral.dm @@ -9,7 +9,7 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay()) return DNR_trait_overlay -// SKYRAT NEUTRAL TRAITS +// NOVA NEUTRAL TRAITS /datum/quirk/excitable name = "Excitable!" desc = "Head patting makes your tail wag! You're very excitable! WAG WAG." diff --git a/modular_nova/master_files/code/game/objects/items/hhmirror.dm b/modular_nova/master_files/code/game/objects/items/hhmirror.dm index cc8d886c7c5..5123b8a2e8d 100644 --- a/modular_nova/master_files/code/game/objects/items/hhmirror.dm +++ b/modular_nova/master_files/code/game/objects/items/hhmirror.dm @@ -84,8 +84,6 @@ #undef MIN_MCOLOR_VALUE human_user.update_body() - human_user.update_body_parts() - human_user.update_body_parts() human_user.update_mutations_overlay() // no hulk lizard if("gender") diff --git a/modular_nova/master_files/code/game/sound.dm b/modular_nova/master_files/code/game/sound.dm index b2842468319..fed93a660f5 100644 --- a/modular_nova/master_files/code/game/sound.dm +++ b/modular_nova/master_files/code/game/sound.dm @@ -1,4 +1,4 @@ -/proc/get_sfx_skyrat(soundin) +/proc/get_sfx_nova(soundin) if(istext(soundin)) switch(soundin) if(SFX_KEYBOARD) diff --git a/modular_nova/master_files/code/modules/antagonists/changeling/changeling.dm b/modular_nova/master_files/code/modules/antagonists/changeling/changeling.dm index 92f0b0786dc..75274897daa 100644 --- a/modular_nova/master_files/code/modules/antagonists/changeling/changeling.dm +++ b/modular_nova/master_files/code/modules/antagonists/changeling/changeling.dm @@ -3,44 +3,44 @@ /datum/changeling_profile - /// The bra worn by the profile source - Skyrats addition + /// The bra worn by the profile source var/bra - /// The color of the underwear used by the profile source - Skyrats addition + /// The color of the underwear used by the profile source var/underwear_color - /// The color of the undershirt used by the profile source - Skyrats addition + /// The color of the undershirt used by the profile source var/undershirt_color - /// The color of the socks used by the profile source - Skyrats addition + /// The color of the socks used by the profile source var/socks_color - /// The color of the bra used by the profile source - Skyrats addition + /// The color of the bra used by the profile source var/bra_color - /// The profile source's left eye color - Skyrats addition + /// The profile source's left eye color var/eye_color_left - /// The profile source's right eye color - Skyrats addition + /// The profile source's right eye color var/eye_color_right - /// Does the profile source's eyes glow - Skyrats addition + /// Does the profile source's eyes glow var/emissive_eyes - /// The profile sorce's gradient styles - Skyrats addition + /// The profile sorce's gradient styles var/list/grad_style = list("None", "None") - /// The colors for the profile source's gradients - Skyrats addition + /// The colors for the profile source's gradients var/list/grad_color = list(null, null) - /// The physique used by the profile source - Skyrats addition + /// The physique used by the profile source var/physique - /// Profile source digi leg icons - Skyrats addition + /// Profile source digi leg icons var/list/worn_icon_digi_list = list() - /// profile source monkey icons - Skyrats addition + /// profile source monkey icons var/list/worn_icon_monkey_list = list() - /// Profile source vox icons - Skyrats addition + /// Profile source vox icons var/list/worn_icon_teshari_list = list() - /// The bra worn by the profile source - Skyrats addition + /// The bra worn by the profile source var/list/worn_icon_vox_list = list() - /// Support variation flags used by the profile source - Skyrats addition + /// Support variation flags used by the profile source var/list/supports_variations_flags_list = list() - /// The profile source scream type - Skyrats addition + /// The profile source scream type var/scream_type - /// The profile source laugh type - Skyrats addition + /// The profile source laugh type var/laugh_type - /// The profile source's age - Skyrats addition + /// The profile source's age var/age - /// The quirks used by the profile source - Skyrats addition + /// The quirks used by the profile source var/list/quirks = list() diff --git a/modular_nova/master_files/code/modules/buildmode/bm_mode.dm b/modular_nova/master_files/code/modules/buildmode/bm_mode.dm index 534bb9cd057..ab8bbf5cc42 100644 --- a/modular_nova/master_files/code/modules/buildmode/bm_mode.dm +++ b/modular_nova/master_files/code/modules/buildmode/bm_mode.dm @@ -1,4 +1,4 @@ /datum/buildmode_mode ///this variable serves to separate icons due to modularity. The default path to button icons is /tg/. - // skyrat path - 'modular_nova/master_files/icons/misc/buildmode.dmi' + // nova path - 'modular_nova/master_files/icons/misc/buildmode.dmi' var/button_icon = 'icons/misc/buildmode.dmi' diff --git a/modular_nova/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm b/modular_nova/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm index 0b4db9245d7..cc88bc9fe56 100644 --- a/modular_nova/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm +++ b/modular_nova/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm @@ -41,5 +41,6 @@ target.dna.features["legs"] = value + target.update_body() target.dna.species.replace_body(target, target.dna.species) // TODO: Replace this with something less stupidly expensive. return TRUE diff --git a/modular_nova/master_files/code/modules/client/preferences/tgui_prefs_migration.dm b/modular_nova/master_files/code/modules/client/preferences/tgui_prefs_migration.dm index 2f0f7cbced4..3f149c2624e 100644 --- a/modular_nova/master_files/code/modules/client/preferences/tgui_prefs_migration.dm +++ b/modular_nova/master_files/code/modules/client/preferences/tgui_prefs_migration.dm @@ -26,11 +26,11 @@ MUTANT_SYNTH_CHASSIS, \ "vagina", \ "breasts",)) -/datum/preferences/proc/migrate_skyrat(list/skyrat_data) +/datum/preferences/proc/migrate_nova(list/nova_data) if(features["flavor_text"]) write_preference(GLOB.preference_entries[/datum/preference/text/flavor_text], features["flavor_text"]) - var/ooc_prefs = skyrat_data["ooc_prefs"] + var/ooc_prefs = nova_data["ooc_prefs"] if(ooc_prefs) write_preference(GLOB.preference_entries[/datum/preference/text/ooc_notes], ooc_prefs) @@ -96,7 +96,7 @@ MUTANT_SYNTH_CHASSIS, \ to_chat(parent, examine_block(span_greentext("Preference migration successful! You may safely interact with the preferences menu."))) tgui_prefs_migration = TRUE - skyrat_data["tgui_prefs_migration"] = tgui_prefs_migration + nova_data["tgui_prefs_migration"] = tgui_prefs_migration /datum/preferences/proc/migrate_mentor() write_preference(GLOB.preference_entries[/datum/preference/toggle/admin/auto_dementor], FALSE) // Someone thought it was a good idea to make it start at true :) diff --git a/modular_nova/master_files/code/modules/client/preferences_savefile.dm b/modular_nova/master_files/code/modules/client/preferences_savefile.dm index 4d9399930c4..ea56c6ec4bd 100644 --- a/modular_nova/master_files/code/modules/client/preferences_savefile.dm +++ b/modular_nova/master_files/code/modules/client/preferences_savefile.dm @@ -18,9 +18,9 @@ /** * Checks if the modular side of the savefile is up to date. - * If the return value is higher than 0, update_character_skyrat() will be called later. + * If the return value is higher than 0, update_character_nova() will be called later. */ -/datum/preferences/proc/savefile_needs_update_skyrat(list/save_data) +/datum/preferences/proc/savefile_needs_update_nova(list/save_data) var/savefile_version = save_data["modular_version"] if(savefile_version < MODULAR_SAVEFILE_VERSION_MAX) @@ -30,7 +30,7 @@ /// Loads the modular customizations of a character from the savefile -/datum/preferences/proc/load_character_skyrat(list/save_data) +/datum/preferences/proc/load_character_nova(list/save_data) if(!save_data) save_data = list() @@ -92,7 +92,7 @@ \nDO NOT INTERACT WITH YOUR PREFERENCES UNTIL THIS PROCESS HAS BEEN COMPLETED.\ \nDO NOT DISCONNECT UNTIL THIS PROCESS HAS BEEN COMPLETED.\ "))) - migrate_skyrat(save_data) + migrate_nova(save_data) addtimer(CALLBACK(src, PROC_REF(check_migration)), 10 SECONDS) headshot = save_data["headshot"] @@ -101,11 +101,11 @@ food_preferences = SANITIZE_LIST(save_data["food_preferences"]) if(needs_update >= 0) - update_character_skyrat(needs_update, save_data) // needs_update == savefile_version if we need an update (positive integer) + update_character_nova(needs_update, save_data) // needs_update == savefile_version if we need an update (positive integer) -/// Brings a savefile up to date with modular preferences. Called if savefile_needs_update_skyrat() returned a value higher than 0 -/datum/preferences/proc/update_character_skyrat(current_version, list/save_data) +/// Brings a savefile up to date with modular preferences. Called if savefile_needs_update_nova() returned a value higher than 0 +/datum/preferences/proc/update_character_nova(current_version, list/save_data) if(current_version < VERSION_GENITAL_TOGGLES) // removed genital toggles, with the new choiced prefs paths as assoc var/static/list/old_toggles @@ -267,7 +267,7 @@ /// Saves the modular customizations of a character on the savefile -/datum/preferences/proc/save_character_skyrat(list/save_data) +/datum/preferences/proc/save_character_nova(list/save_data) save_data["loadout_list"] = loadout_list save_data["augments"] = augments save_data["augment_limb_styles"] = augment_limb_styles diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm index 266ecb594a3..4c9df521e58 100644 --- a/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm +++ b/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm @@ -136,4 +136,3 @@ desc = "A tar black naval suit and a rank badge denoting the Officer of The Internal Security Division. Be careful your underlings don't bump their head on a door." name = "head of security's naval jumpsuit" icon_state = "imphos" - diff --git a/modular_nova/master_files/code/modules/reagents/chemistry/holder.dm b/modular_nova/master_files/code/modules/reagents/chemistry/holder.dm index 7f671b5778f..278a685dbb7 100644 --- a/modular_nova/master_files/code/modules/reagents/chemistry/holder.dm +++ b/modular_nova/master_files/code/modules/reagents/chemistry/holder.dm @@ -5,7 +5,7 @@ * * chemical_flag - The bitflag to search for. * * min_volume - Checks for having a specific amount of reagents matching that `chemical_flag` */ -/datum/reagents/proc/has_chemical_flag_skyrat(chemical_flag, min_volume = 0) +/datum/reagents/proc/has_chemical_flag_nova(chemical_flag, min_volume = 0) var/found_amount = 0 var/list/cached_reagents = reagent_list for(var/datum/reagent/holder_reagent as anything in cached_reagents) diff --git a/modular_nova/modules/aesthetics/computer/code/computer.dm b/modular_nova/modules/aesthetics/computer/code/computer.dm index 5f94ee145fd..e6c6a4d404b 100644 --- a/modular_nova/modules/aesthetics/computer/code/computer.dm +++ b/modular_nova/modules/aesthetics/computer/code/computer.dm @@ -8,5 +8,5 @@ . = ..() if(clicksound && world.time > next_clicksound && isliving(user)) next_clicksound = world.time + 5 - playsound(src, get_sfx_skyrat(clicksound), clickvol) + playsound(src, get_sfx_nova(clicksound), clickvol) diff --git a/modular_nova/modules/aesthetics/kitchen/kitchen.dm b/modular_nova/modules/aesthetics/kitchen/kitchen.dm index 20956aea370..f9dbba1ffd3 100644 --- a/modular_nova/modules/aesthetics/kitchen/kitchen.dm +++ b/modular_nova/modules/aesthetics/kitchen/kitchen.dm @@ -16,14 +16,14 @@ /obj/machinery/gibber icon = 'modular_nova/modules/aesthetics/kitchen/kitchen.dmi' -//Different icon file, but it will still go in the kitchen folder!!! +// Different icon file, but it will still go in the kitchen folder!!! /obj/machinery/microwave icon = 'modular_nova/modules/aesthetics/kitchen/microwave.dmi' /obj/structure/showcase/machinery/microwave icon = 'modular_nova/modules/aesthetics/kitchen/microwave.dmi' -//Skyrat Coffee Maker Icons +// Nova Coffee Maker Icons /obj/machinery/coffeemaker icon = 'modular_nova/modules/aesthetics/kitchen/coffeemaker.dmi' diff --git a/modular_nova/modules/airlock_override/readme.md b/modular_nova/modules/airlock_override/readme.md index 5de1a71a63e..3688870f216 100644 --- a/modular_nova/modules/airlock_override/readme.md +++ b/modular_nova/modules/airlock_override/readme.md @@ -14,8 +14,8 @@ tgui/packages/tgui/interfaces/CommunicationsConsole.js tgui/packages/tgui/interfaces/KeycardAuth.js ### Defines: -AIRLOCK_LIGHT_ENGINEERING in \Skyrat-tg\modular_nova\modules\aesthetics\airlock\code\airlock.dm -AIRLOCK_ENGINEERING_LIGHT_COLOR in \Skyrat-tg\modular_nova\modules\aesthetics\airlock\code\airlock.dm +AIRLOCK_LIGHT_ENGINEERING in modular_nova\modules\aesthetics\airlock\code\airlock.dm +AIRLOCK_ENGINEERING_LIGHT_COLOR in modular_nova\modules\aesthetics\airlock\code\airlock.dm ### Credits: LT3 diff --git a/modular_nova/modules/antag_opt_in/readme.md b/modular_nova/modules/antag_opt_in/readme.md index de41e00958b..e93495e2d06 100644 --- a/modular_nova/modules/antag_opt_in/readme.md +++ b/modular_nova/modules/antag_opt_in/readme.md @@ -21,11 +21,11 @@ Adds functionality to allow players to 'opt-in' to being an antagonist's mechani ### Defines: -- antag_opt_in - lives in ~skyrat_defines located in __DEFINES folder. Defines named OPT_IN_YES_KILL, OPT_IN_YES_TEMP, OPT_IN_YES_ROUND_REMOVE, and OPT_IN_OPT_IN_NOT_TARGET - used for managing opt in stuff. +- antag_opt_in - lives in ~nova_defines located in __DEFINES folder. Defines named OPT_IN_YES_KILL, OPT_IN_YES_TEMP, OPT_IN_YES_ROUND_REMOVE, and OPT_IN_OPT_IN_NOT_TARGET - used for managing opt in stuff. ### Included files that are not contained in this module: -- tgui\packages\tgui\interfaces\PreferencesMenu\preferences\features\character_preferences\skyrat\antag_optin.tsx +- tgui\packages\tgui\interfaces\PreferencesMenu\preferences\features\character_preferences\nova\antag_optin.tsx ### Credits: diff --git a/modular_nova/modules/ashwalkers/code/buildings/ash_tendril.dm b/modular_nova/modules/ashwalkers/code/buildings/ash_tendril.dm index 01056fa6c20..05b65871a41 100644 --- a/modular_nova/modules/ashwalkers/code/buildings/ash_tendril.dm +++ b/modular_nova/modules/ashwalkers/code/buildings/ash_tendril.dm @@ -84,7 +84,7 @@ return ..() -//this is the skyrat override +//this is the nova override /obj/structure/lavaland/ash_walker/consume() for(var/mob/living/viewable_living in view(src, 1)) //Only for corpse right next to/on same tile if(!viewable_living.stat) @@ -131,7 +131,7 @@ /** * Proc that will spawn the egg that will revive the ashwalker - * This is also the Skyrat replacement for /proc/remake_walker + * This is also the Nova replacement for /proc/remake_walker */ /obj/structure/lavaland/ash_walker/proc/revive_ashwalker(mob/living/carbon/human/revived_ashwalker) var/obj/structure/reviving_ashwalker_egg/spawned_egg = new(get_step(loc, pick(GLOB.alldirs))) diff --git a/modular_nova/modules/banning/code/skyrat_bans.dm b/modular_nova/modules/banning/code/nova_bans.dm similarity index 100% rename from modular_nova/modules/banning/code/skyrat_bans.dm rename to modular_nova/modules/banning/code/nova_bans.dm diff --git a/modular_nova/modules/barsigns/code/barsigns.dm b/modular_nova/modules/barsigns/code/barsigns.dm index 87d3da1575d..d0fe759eb38 100644 --- a/modular_nova/modules/barsigns/code/barsigns.dm +++ b/modular_nova/modules/barsigns/code/barsigns.dm @@ -2,286 +2,286 @@ /obj/machinery/barsign/update_icon_state() . = ..() // uses tg icon file - if(!istype(chosen_sign, /datum/barsign/skyrat) || icon_state == "empty") + if(!istype(chosen_sign, /datum/barsign/nova) || icon_state == "empty") icon = initial(icon) return // uses modular icon file - if(istype(chosen_sign, /datum/barsign/skyrat/large)) - icon = SKYRAT_LARGE_BARSIGN_FILE + if(istype(chosen_sign, /datum/barsign/nova/large)) + icon = NOVA_LARGE_BARSIGN_FILE else - icon = SKYRAT_BARSIGN_FILE + icon = NOVA_BARSIGN_FILE -/datum/barsign/skyrat/topmen +/datum/barsign/nova/topmen name = "Top Men" icon_state = "topmen" neon_color = "#C2AACA" -/datum/barsign/skyrat/spaceballgrille +/datum/barsign/nova/spaceballgrille name = "Spaceball Grille" icon_state = "spaceballgrille" neon_color = "#827973" -/datum/barsign/skyrat/clubee +/datum/barsign/nova/clubee name = "Club Bee" icon_state = "clubee" neon_color = "#F2EEEE" -/datum/barsign/skyrat/thesun +/datum/barsign/nova/thesun name = "The Sun" icon_state = "thesun" neon_color = "#F8F0B8" -/datum/barsign/skyrat/limbo +/datum/barsign/nova/limbo name = "The Limbo" icon_state = "limbo" desc = "A popular haunt for lost souls. The mood lighting is killer!" neon_color = "#777777" -/datum/barsign/skyrat/meadbay +/datum/barsign/nova/meadbay name = "Meadbay" icon_state = "meadbay" neon_color = "#EBB823" -/datum/barsign/skyrat/cindikate +/datum/barsign/nova/cindikate name = "Cindi Kate's" icon_state = "cindikate" neon_color = "#FF3403" -/datum/barsign/skyrat/theclownshead +/datum/barsign/nova/theclownshead name = "The Clown's Head" icon_state = "theclownshead" desc = "Home of Headdy, the honking clown head!" neon_color = "#FFD800" -/datum/barsign/skyrat/theorchard +/datum/barsign/nova/theorchard name = "The Orchard" icon_state = "theorchard" neon_color = "#CFFF47" -/datum/barsign/skyrat/thesaucyclown +/datum/barsign/nova/thesaucyclown name = "The Saucy Clown" icon_state = "thesaucyclown" desc = "A known gathering site for the annual clown courtship rituals." neon_color = "#FF66CC" -/datum/barsign/skyrat/thedamnwall +/datum/barsign/nova/thedamnwall name = "The Damn Wall" icon_state = "thedamnwall" desc = "When you're up against a wall, it's best to have stout friends and stout liquor right there beside you." neon_color = "#CC3333" -/datum/barsign/skyrat/whiskeyimplant +/datum/barsign/nova/whiskeyimplant name = "Whiskey Implant" icon_state = "whiskeyimplant" neon_color = "#E9F517" -/datum/barsign/skyrat/carpecarp +/datum/barsign/nova/carpecarp name = "Carpe Carp" icon_state = "carpecarp" neon_color = "#C717FE" -/datum/barsign/skyrat/robustroadhouse +/datum/barsign/nova/robustroadhouse name = "Robust Roadhouse" icon_state = "robustroadhouse" neon_color = "#F7A804" -/datum/barsign/skyrat/theredshirt +/datum/barsign/nova/theredshirt name = "The Redshirt" icon_state = "theredshirt" neon_color = "#FF92E0" -/datum/barsign/skyrat/maltesefalconmk2 +/datum/barsign/nova/maltesefalconmk2 name = "Maltese Falcon MK2" icon_state = "maltesefalconmk2" desc = "The Maltese Falcon mark two, now extra hard boiled." neon_color = "#E30000" -/datum/barsign/skyrat/thecavernmk2 +/datum/barsign/nova/thecavernmk2 name = "The Cavern MK2" icon_state = "thecavernmk2" desc = "Fine drinks while listening to some fine tunes." neon_color = "#AA9393" -/datum/barsign/skyrat/lv426 +/datum/barsign/nova/lv426 name = "LV-426" icon_state = "lv426" desc = "Drinking with fancy facemasks is clearly more important than going to medbay." neon_color = "#00F206" -/datum/barsign/skyrat/zocalo +/datum/barsign/nova/zocalo name = "Zocalo" icon_state = "zocalo" desc = "Anteriormente ubicado en Spessmerica." neon_color = "#E5AF1C" -/datum/barsign/skyrat/fourtheemprah +/datum/barsign/nova/fourtheemprah name = "4 The Emprah" icon_state = "4theemprah" desc = "Enjoyed by fanatics, heretics, and brain-damaged patrons alike." neon_color = "#E5AF1C" -/datum/barsign/skyrat/ishimura +/datum/barsign/nova/ishimura name = "Ishimura" icon_state = "ishimura" desc = "Well known for their quality brownstar and delicious crackers." neon_color = "#FF0000" -/datum/barsign/skyrat/tardis +/datum/barsign/nova/tardis name = "Tardis" icon_state = "tardis" desc = "This establishment has been through at least 5,343 iterations." neon_color = "#2739AA" -/datum/barsign/skyrat/quarks +/datum/barsign/nova/quarks name = "Quark's" icon_state = "quarks" desc = "Frequenters of this establishment are often seen wearing meson scanners; how quaint." neon_color = "#10E500" -/datum/barsign/skyrat/tenforward +/datum/barsign/nova/tenforward name = "Ten Forward" icon_state = "tenforward" neon_color = "#E5AF1C" -/datum/barsign/skyrat/theprancingpony +/datum/barsign/nova/theprancingpony name = "The Prancing Pony" icon_state = "theprancingpony" desc = "Ok, we don't take to kindly to you short folk pokin' round looking for some ranger scum." neon_color = "#FF9100" -/datum/barsign/skyrat/vault13 +/datum/barsign/nova/vault13 name = "Vault 13" icon_state = "vault13" desc = "Coincidence is intentional." neon_color = "#FFA800" -/datum/barsign/skyrat/thehive +/datum/barsign/nova/thehive name = "The Hive" icon_state = "thehive" neon_color = "#FFC62A" -/datum/barsign/skyrat/cantina +/datum/barsign/nova/cantina name = "Chalmun's Cantina" icon_state = "cantina" desc = "The bar was founded on the principles of originality; they have the same music playing 24/7." neon_color = "#0078FF" -/datum/barsign/skyrat/milliways42 +/datum/barsign/nova/milliways42 name = "Milliways 42" icon_state = "milliways42" desc = "It's not really the end; it's the beginning, meaning, and answer for all your beverage needs." neon_color = "#FF00F6" -/datum/barsign/skyrat/timeofeve +/datum/barsign/nova/timeofeve name = "The Time of Eve" icon_state = "thetimeofeve" desc = "Vintage drinks from 2453!." neon_color = "#EB52F8" -/datum/barsign/skyrat/spaceasshole +/datum/barsign/nova/spaceasshole name = "Space Asshole" icon_state = "spaceasshole" desc = "Open since 2125, Not much has changed since then; the engineers still release the singulo and the damn miners still are more likely to cave your face in that deliver ores." neon_color = "#FF0000" -/datum/barsign/skyrat/birdcage +/datum/barsign/nova/birdcage name = "The Bird Cage" icon_state = "birdcage" desc = "Caw." neon_color = "#FFD21E" -/datum/barsign/skyrat/narsie +/datum/barsign/nova/narsie name = "Narsie Bistro" icon_state = "narsiebistro" desc = "The last pub before the World's End." neon_color = "#FF0000" -/datum/barsign/skyrat/fallout +/datum/barsign/nova/fallout name = "The Booze Bunker" icon_state = "boozebunker" desc = "Never duck for cover without a drink!" neon_color = "#FCC41B" -/datum/barsign/skyrat/brokendreams +/datum/barsign/nova/brokendreams name = "The Cafe of Broken Dreams" icon_state = "brokendreams" desc = "Try our new dogmeat sliders!" neon_color = "#E8E8A5" -/datum/barsign/skyrat/toolboxtavern +/datum/barsign/nova/toolboxtavern name = "Toolbox Tavern" icon_state = "toolboxtavern" desc = "Free lodging with every Screwdriver purchased!" neon_color = "" -/datum/barsign/skyrat/blueoyster +/datum/barsign/nova/blueoyster name = "The Blue Oyster" icon_state = "blueoyster" desc = "The totally heterosexual bar for totally heterosexual men, just come inside and see." neon_color = "" -/datum/barsign/skyrat/foreign +/datum/barsign/nova/foreign name = "Foreign Food Sign" icon_state = "foreign" desc = "A sign written in some dead language advertising some non-descript foreign food." neon_color = "" -/datum/barsign/skyrat/commie +/datum/barsign/nova/commie name = "Prole's Preferred" icon_state = "commie" desc = "The only bar you will ever need, comrade!" neon_color = "#E46F6F" -/datum/barsign/skyrat/brokenheros +/datum/barsign/nova/brokenheros name = "The Bar of Broken Heros" icon_state = "brokenheros" desc = "Do you enjoy hurting other people?" neon_color = "" -/datum/barsign/skyrat/sociallubricator +/datum/barsign/nova/sociallubricator name = "The Social Lubricator" icon_state = "sociallubricator" desc = "The perfect thing to make you like people you hate." neon_color = "" -/datum/barsign/skyrat/chemlab +/datum/barsign/nova/chemlab name = "The Chem Lab" icon_state = "chemlab" desc = "Try our new plasma martinis!" neon_color = "" -/datum/barsign/skyrat/mime +/datum/barsign/nova/mime name = "Moonshine Mime" icon_state = "mime" desc = "Silent, not stirred." neon_color = "" -/datum/barsign/skyrat/clown +/datum/barsign/nova/clown name = "Honking Clown" icon_state = "clown" desc = "Bananas not included." neon_color = "" -/datum/barsign/skyrat/progressive +/datum/barsign/nova/progressive name = "A Modern and Progressive Tavern" icon_state = "progressive" desc = "Whatever that means." neon_color = "#DB9B9A" -/datum/barsign/skyrat/va11halla +/datum/barsign/nova/va11halla name = "VA-11 HALL-A" icon_state = "va11halla" desc = "Not as dangerous as N1-RV Ann-A." neon_color = "#FB3F7D" -/datum/barsign/skyrat/squatopia +/datum/barsign/nova/squatopia name = "Squatopia" icon_state = "squatopia" desc = "The crystal belonged to my father. He was murdered." neon_color = "#CC0033" -/datum/barsign/skyrat/bug +/datum/barsign/nova/bug name = "The Hungry Bug" icon_state = "hungrybug" desc = "Stop by and enjoy some of the Hole's famous gyoza!" @@ -289,7 +289,7 @@ // 96x96 signs -/datum/barsign/skyrat/large/cyberslyph +/datum/barsign/nova/large/cyberslyph name = "Cyberslyph" icon_state = "cyberslyph" neon_color = "#00FFFF" diff --git a/modular_nova/modules/blueshield/code/devices/crew.dm b/modular_nova/modules/blueshield/code/devices/crew.dm index fe15297f8f2..05f6f97fb7b 100644 --- a/modular_nova/modules/blueshield/code/devices/crew.dm +++ b/modular_nova/modules/blueshield/code/devices/crew.dm @@ -40,7 +40,7 @@ GLOBAL_DATUM_INIT(blueshield_crewmonitor, /datum/crewmonitor/blueshield, new) /datum/crewmonitor/blueshield/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if (!ui) - ui = new(user, src, "CrewConsoleSkyratBlueshield") + ui = new(user, src, "CrewConsoleNovaBlueshield") ui.open() /* diff --git a/modular_nova/modules/bodyparts/code/human_bodyparts.dm b/modular_nova/modules/bodyparts/code/human_bodyparts.dm index 61ff895e475..971dfd26998 100644 --- a/modular_nova/modules/bodyparts/code/human_bodyparts.dm +++ b/modular_nova/modules/bodyparts/code/human_bodyparts.dm @@ -1,4 +1,4 @@ -//Skyrat's version of basic (human) limbs. +//Nova's version of basic (human) limbs. /obj/item/bodypart/head icon_greyscale = BODYPART_ICON_HUMAN diff --git a/modular_nova/modules/borgs/code/mechafabricator_designs.dm b/modular_nova/modules/borgs/code/mechafabricator_designs.dm index 2a8eb5f3a0f..7dc7e0eb6d5 100644 --- a/modular_nova/modules/borgs/code/mechafabricator_designs.dm +++ b/modular_nova/modules/borgs/code/mechafabricator_designs.dm @@ -105,7 +105,7 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING, ) -//Cyborg Skyrat overrides +//Cyborg Nova overrides /datum/design/borg_suit name = "Cyborg Endoskeleton" id = "borg_suit" diff --git a/modular_nova/modules/bsa_overhaul/code/bsa_computer.dm b/modular_nova/modules/bsa_overhaul/code/bsa_computer.dm index 688377c551f..4db49b1fec8 100644 --- a/modular_nova/modules/bsa_overhaul/code/bsa_computer.dm +++ b/modular_nova/modules/bsa_overhaul/code/bsa_computer.dm @@ -31,7 +31,7 @@ . = ..() ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "BluespaceArtillerySkyrat", name) + ui = new(user, src, "BluespaceArtilleryNova", name) ui.open() /obj/machinery/computer/bsa_control/ui_data() diff --git a/modular_nova/modules/clock_cult/code/outpost_of_cogs.dm b/modular_nova/modules/clock_cult/code/outpost_of_cogs.dm index e2e603b82ef..dd3d4c12c1a 100644 --- a/modular_nova/modules/clock_cult/code/outpost_of_cogs.dm +++ b/modular_nova/modules/clock_cult/code/outpost_of_cogs.dm @@ -1,6 +1,6 @@ /datum/lazy_template/reebe key = LAZY_TEMPLATE_KEY_OUTPOST_OF_COGS - map_dir = "_maps/skyrat/lazy_templates" + map_dir = "_maps/nova/lazy_templates" map_name = "reebe" diff --git a/modular_nova/modules/colony_fabricator/sound/attributions.txt b/modular_nova/modules/colony_fabricator/sound/attributions.txt index be436734b0a..5fb6bb282c7 100644 --- a/modular_nova/modules/colony_fabricator/sound/attributions.txt +++ b/modular_nova/modules/colony_fabricator/sound/attributions.txt @@ -13,4 +13,4 @@ The following sounds are from https://pixabay.com/sound-effects/welder-3-54547/ modular_nova/modules/colony_fabricator/sound/arc_welder/arc_welder.ogg -The sounds at modular_skyrat/modules/colony_fabriactor_event_code/sound/manual_door are from https://pixabay.com/sound-effects/schlonk-107321/ +The sounds at modular_nova/modules/colony_fabriactor_event_code/sound/manual_door are from https://pixabay.com/sound-effects/schlonk-107321/ diff --git a/modular_nova/modules/customization/modules/clothing/under/utility_port/readme.md b/modular_nova/modules/customization/modules/clothing/under/utility_port/readme.md index 2fc4b8fc9de..0d1e45417c7 100644 --- a/modular_nova/modules/customization/modules/clothing/under/utility_port/readme.md +++ b/modular_nova/modules/customization/modules/clothing/under/utility_port/readme.md @@ -10,7 +10,7 @@ It also ports: Japanese and Victorian costumes; Two short dresses; Several departmental/head-of-staff berets; -All items are avaliable through either the Loadout, Vendors, or Both. +All items are avaliable through either the Loadout, Vendors, or Both. PART 2! @@ -30,8 +30,8 @@ To show items in vendors: ### Master file additions To add digitigrade variants: -- Skyrat-tg/modular_nova/master_files/icons/mob/clothing/uniform_digi.dmi -- Skyrat-tg/modular_nova/master_files/icons/mob/clothing/under/uniform_digi.dmi +- modular_nova/master_files/icons/mob/clothing/uniform_digi.dmi +- modular_nova/master_files/icons/mob/clothing/under/uniform_digi.dmi ### Included files that are not contained in this module: diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/preferences_setup.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/preferences_setup.dm index c2bfd6c7d49..18e35f15851 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/preferences_setup.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/preferences_setup.dm @@ -111,7 +111,7 @@ parent.show_character_previews(new /mutable_appearance(mannequin)) unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES) -//SKYRAT SPECIFIC PROCS +// NOVA SPECIFIC PROCS //This proc makes sure that we only have the parts that the species should have, add missing ones, remove extra ones(should any be changed) //Also, this handles missing color keys @@ -225,7 +225,7 @@ ITEM.forceMove(get_turf(H)) //For creating consistent icons for human looking simple animals -/proc/get_flat_human_icon_skyrat(icon_id, datum/job/job, datum/species/species_to_set, dummy_key, showDirs = GLOB.cardinals, outfit_override = null) +/proc/get_flat_human_icon_nova(icon_id, datum/job/job, datum/species/species_to_set, dummy_key, showDirs = GLOB.cardinals, outfit_override = null) var/static/list/humanoid_icon_cache = list() if(icon_id && humanoid_icon_cache[icon_id]) return humanoid_icon_cache[icon_id] diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index bbaa0261dd9..0a42d730e18 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm @@ -41,8 +41,6 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files) var/always_color_customizable ///Special case of whether the accessory should be shifted in the X dimension, check taur genitals for example var/special_x_dimension - ///Special case of whether the accessory should have a different icon, check taur genitals for example - var/special_icon_case ///Special case for MODsuit overlays var/use_custom_mod_icon ///If defined, the accessory will be only available to ckeys inside the list. ITS ASSOCIATIVE, ie. ("ckey" = TRUE). For speed @@ -136,8 +134,27 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files) /datum/sprite_accessory/caps key = "caps" generic = "Caps" + icon = 'icons/mob/human/species/mush_cap.dmi' + relevent_layers = list(BODY_ADJ_LAYER) color_src = USE_ONE_COLOR - organ_type = /obj/item/organ/external/cap + organ_type = /obj/item/organ/external/mushroom_cap + genetic = TRUE + +/datum/sprite_accessory/caps/is_hidden(mob/living/carbon/human/human) + if(((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR)) || (key in human.try_hide_mutant_parts)) + return TRUE + + return FALSE + +/datum/sprite_accessory/caps/none + name = "None" + icon_state = "none" + color_src = null + factual = FALSE + +/datum/sprite_accessory/caps/round + name = "Round" + icon_state = "round" /datum/sprite_accessory/body_markings key = "body_markings" diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm index 2819d0a5199..2e8fd1a1ce3 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm @@ -63,7 +63,6 @@ color_src = USE_MATRIXED_COLORS always_color_customizable = TRUE center = TRUE - special_icon_case = TRUE special_x_dimension = TRUE //default_color = DEFAULT_SKIN_OR_PRIMARY //This is the price we're paying for sheaths relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) @@ -138,7 +137,6 @@ associated_organ_slot = ORGAN_SLOT_TESTICLES key = ORGAN_SLOT_TESTICLES always_color_customizable = TRUE - special_icon_case = TRUE special_x_dimension = TRUE default_color = DEFAULT_SKIN_OR_PRIMARY relevent_layers = list(BODY_ADJ_LAYER, BODY_BEHIND_LAYER) diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm index 00b7bb06531..33c77372958 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -1,669 +1,669 @@ // Hairstyles -/datum/sprite_accessory/hair/skyrat +/datum/sprite_accessory/hair/nova icon = 'modular_nova/master_files/icons/mob/sprite_accessory/hair.dmi' -/datum/sprite_accessory/hair/skyrat/pigtails4 +/datum/sprite_accessory/hair/nova/pigtails4 name = "Pigtails 4" icon_state = "hair_pigtailss" -/datum/sprite_accessory/hair/skyrat/bedhead_long +/datum/sprite_accessory/hair/nova/bedhead_long name = "Longer Bedhead" icon_state = "hair_longer_bedhead" -/datum/sprite_accessory/hair/skyrat/dave +/datum/sprite_accessory/hair/nova/dave name = "Dave" icon_state = "hair_dave" -/datum/sprite_accessory/hair/skyrat/shy +/datum/sprite_accessory/hair/nova/shy name = "Shy" icon_state = "hair_shy" -/datum/sprite_accessory/hair/skyrat/ponytailf +/datum/sprite_accessory/hair/nova/ponytailf name = "Ponytail Feminine" icon_state = "hair_ponytailf" -/datum/sprite_accessory/hair/skyrat/ziegler +/datum/sprite_accessory/hair/nova/ziegler name = "Ziegler" icon_state = "hair_ziegler" -/datum/sprite_accessory/hair/skyrat/hightight +/datum/sprite_accessory/hair/nova/hightight name = "Hightight" icon_state = "hair_hightight" -/datum/sprite_accessory/hair/skyrat/sergeant +/datum/sprite_accessory/hair/nova/sergeant name = "Sergeant" icon_state = "hair_sergeant" -/datum/sprite_accessory/hair/skyrat/grande +/datum/sprite_accessory/hair/nova/grande name = "Grande" icon_state = "hair_grande" -/datum/sprite_accessory/hair/skyrat/scully +/datum/sprite_accessory/hair/nova/scully name = "Scully" icon_state = "hair_scully" -/datum/sprite_accessory/hair/skyrat/beehive2 +/datum/sprite_accessory/hair/nova/beehive2 name = "Beehive 2" icon_state = "hair_beehive2" -/datum/sprite_accessory/hair/skyrat/longeralt +/datum/sprite_accessory/hair/nova/longeralt name = "Longer ALT" icon_state = "hair_longeralt" -/datum/sprite_accessory/hair/skyrat/curly +/datum/sprite_accessory/hair/nova/curly name = "Curly" icon_state = "hair_curly" -/datum/sprite_accessory/hair/skyrat/victory +/datum/sprite_accessory/hair/nova/victory name = "Victory" icon_state = "hair_victory" -/datum/sprite_accessory/hair/skyrat/bobcutalt +/datum/sprite_accessory/hair/nova/bobcutalt name = "Bobcut ALT" icon_state = "hair_bobcutalt" -/datum/sprite_accessory/hair/skyrat/fingerwave +/datum/sprite_accessory/hair/nova/fingerwave name = "Fingerwave" icon_state = "hair_fingerwave" -/datum/sprite_accessory/hair/skyrat/poofy2 +/datum/sprite_accessory/hair/nova/poofy2 name = "Poofy 2" icon_state = "hair_poofy2" -/datum/sprite_accessory/hair/skyrat/bunhead3 +/datum/sprite_accessory/hair/nova/bunhead3 name = "Bunhead 3" icon_state = "hair_bunhead3" -/datum/sprite_accessory/hair/skyrat/rowbun +/datum/sprite_accessory/hair/nova/rowbun name = "Row Bun" icon_state = "hair_rowbun" -/datum/sprite_accessory/hair/skyrat/rowdualtail +/datum/sprite_accessory/hair/nova/rowdualtail name = "Row Dual Tail" icon_state = "hair_rowdualtail" -/datum/sprite_accessory/hair/skyrat/rowbraid +/datum/sprite_accessory/hair/nova/rowbraid name = "Row Braid" icon_state = "hair_rowbraid" -/datum/sprite_accessory/hair/skyrat/ponytailalt +/datum/sprite_accessory/hair/nova/ponytailalt name = "Ponytail ALT" icon_state = "hair_ponytailalt" -/datum/sprite_accessory/hair/skyrat/halfbangalt +/datum/sprite_accessory/hair/nova/halfbangalt name = "Halfbang ALT" icon_state = "hair_halfbangalt" -/datum/sprite_accessory/hair/skyrat/emolong +/datum/sprite_accessory/hair/nova/emolong name = "Emo Long" icon_state = "hair_emolong" -/datum/sprite_accessory/hair/skyrat/sleaze +/datum/sprite_accessory/hair/nova/sleaze name = "Sleaze" icon_state = "hair_sleaze" -/datum/sprite_accessory/hair/skyrat/straight +/datum/sprite_accessory/hair/nova/straight name = "Straight" icon_state = "hair_straight" -/datum/sprite_accessory/hair/skyrat/devillock +/datum/sprite_accessory/hair/nova/devillock name = "Devillock" icon_state = "hair_devillock" -/datum/sprite_accessory/hair/skyrat/clean +/datum/sprite_accessory/hair/nova/clean name = "Clean" icon_state = "hair_clean" -/datum/sprite_accessory/hair/skyrat/shaggy +/datum/sprite_accessory/hair/nova/shaggy name = "Shaggy" icon_state = "hair_shaggy" -/datum/sprite_accessory/hair/skyrat/mohawkshort +/datum/sprite_accessory/hair/nova/mohawkshort name = "Mohawk Short" icon_state = "hair_mohawkshort" -/datum/sprite_accessory/hair/skyrat/volajupompless +/datum/sprite_accessory/hair/nova/volajupompless name = "Volaju Pompless" icon_state = "hair_volajupompless" -/datum/sprite_accessory/hair/skyrat/bunhead4 +/datum/sprite_accessory/hair/nova/bunhead4 name = "Bun Head 4" icon_state = "hair_bunhead4" -/datum/sprite_accessory/hair/skyrat/rows1 +/datum/sprite_accessory/hair/nova/rows1 name = "Rows 1" icon_state = "hair_rows1" -/datum/sprite_accessory/hair/skyrat/rows2 +/datum/sprite_accessory/hair/nova/rows2 name = "Rows 2" icon_state = "hair_rows2" -/datum/sprite_accessory/hair/skyrat/toriyama +/datum/sprite_accessory/hair/nova/toriyama name = "Toriyama" icon_state = "hair_toriyama" -/datum/sprite_accessory/hair/skyrat/thefamilyman +/datum/sprite_accessory/hair/nova/thefamilyman name = "The Family Man" icon_state = "hair_thefamilyman" -/datum/sprite_accessory/hair/skyrat/drillhair +/datum/sprite_accessory/hair/nova/drillhair name = "Drill Hair" icon_state = "hair_drillhair" -/datum/sprite_accessory/hair/skyrat/veryshortovereye +/datum/sprite_accessory/hair/nova/veryshortovereye name = "Very Short Over Eye" icon_state = "hair_veryshortovereye" -/datum/sprite_accessory/hair/skyrat/unkempt +/datum/sprite_accessory/hair/nova/unkempt name = "Unkempt" icon_state = "hair_unkempt" -/datum/sprite_accessory/hair/skyrat/wife +/datum/sprite_accessory/hair/nova/wife name = "Wife" icon_state = "hair_wife" -/datum/sprite_accessory/hair/skyrat/nia +/datum/sprite_accessory/hair/nova/nia name = "Nia" icon_state = "hair_nia" -/datum/sprite_accessory/hair/skyrat/shorthair4 +/datum/sprite_accessory/hair/nova/shorthair4 name = "Short Hair 4" icon_state = "hair_shorthair4" -/datum/sprite_accessory/hair/skyrat/shortovereyealt +/datum/sprite_accessory/hair/nova/shortovereyealt name = "Short Over Eye ALT" icon_state = "hair_shortovereyealt" -/datum/sprite_accessory/hair/skyrat/twintail_floor +/datum/sprite_accessory/hair/nova/twintail_floor name = "Twintail Floor" icon_state = "hair_twintail_floor" -/datum/sprite_accessory/hair/skyrat/viper +/datum/sprite_accessory/hair/nova/viper name = "Viper" icon_state = "hair_viper" -/datum/sprite_accessory/hair/skyrat/long4 +/datum/sprite_accessory/hair/nova/long4 name = "Long 4" icon_state = "hair_long4" -/datum/sprite_accessory/hair/skyrat/fluffy_short +/datum/sprite_accessory/hair/nova/fluffy_short name = "Fluffy Short" icon_state = "hair_fluffy_short" -/datum/sprite_accessory/hair/skyrat/simple_ponytail +/datum/sprite_accessory/hair/nova/simple_ponytail name = "Simple Ponytail" icon_state = "hair_simple_ponytail" -/datum/sprite_accessory/hair/skyrat/loose_slicked +/datum/sprite_accessory/hair/nova/loose_slicked name = "Loose Slicked" icon_state = "hair_loose_slicked" -/datum/sprite_accessory/hair/skyrat/diagonal_bangs +/datum/sprite_accessory/hair/nova/diagonal_bangs name = "Diagonal Bangs" icon_state = "hair_diagonal_bangs" -/datum/sprite_accessory/hair/skyrat/gloomy_medium +/datum/sprite_accessory/hair/nova/gloomy_medium name = "Medium Gloomy Bangs" icon_state = "hair_gloomy_medium" -/datum/sprite_accessory/hair/skyrat/gloomy_long +/datum/sprite_accessory/hair/nova/gloomy_long name = "Long Gloomy Bangs" icon_state = "hair_gloomy_long" -/datum/sprite_accessory/hair/skyrat/gloomy_longer +/datum/sprite_accessory/hair/nova/gloomy_longer name = "Very Long Gloomy Bangs" icon_state = "hair_gloomy_longer" -/datum/sprite_accessory/hair/skyrat/halfshave +/datum/sprite_accessory/hair/nova/halfshave name = "Half-shaved 2" icon_state = "hair_halfshave" -/datum/sprite_accessory/hair/skyrat/halfshave_snout +/datum/sprite_accessory/hair/nova/halfshave_snout name = "Half-shaved 2 (clipped)" icon_state = "hair_halfshave_snout" -/datum/sprite_accessory/hair/skyrat/manbun +/datum/sprite_accessory/hair/nova/manbun name = "Manbun" icon_state = "hair_manbun" -/datum/sprite_accessory/hair/skyrat/baum +/datum/sprite_accessory/hair/nova/baum name = "Baum" icon_state = "hair_baum" -/datum/sprite_accessory/hair/skyrat/bluntbangs +/datum/sprite_accessory/hair/nova/bluntbangs name = "Blunt Bangs" icon_state = "hair_bluntbangs" -/datum/sprite_accessory/hair/skyrat/bluntbangs_alt +/datum/sprite_accessory/hair/nova/bluntbangs_alt name = "Blunt Bangs Alt" icon_state = "hair_bluntbangs_alt" -/datum/sprite_accessory/hair/skyrat/slightlymessy +/datum/sprite_accessory/hair/nova/slightlymessy name = "Slightly Messy" icon_state = "hair_slightlymessy" -/datum/sprite_accessory/hair/skyrat/longsidepartstraight +/datum/sprite_accessory/hair/nova/longsidepartstraight name = "Long Sideparted" icon_state = "hair_longsidepartstraight" -/datum/sprite_accessory/hair/skyrat/amazon +/datum/sprite_accessory/hair/nova/amazon name = "Amazon" icon_state = "hair_amazon" -/datum/sprite_accessory/hair/skyrat/halfshaved +/datum/sprite_accessory/hair/nova/halfshaved name = "Half-shaved Long" icon_state = "hair_halfshaved" -/datum/sprite_accessory/hair/skyrat/fortuneteller +/datum/sprite_accessory/hair/nova/fortuneteller name = "Fortune Teller" icon_state = "hair_fortuneteller" -/datum/sprite_accessory/hair/skyrat/fortuneteller_alt +/datum/sprite_accessory/hair/nova/fortuneteller_alt name = "Fortune Teller Alt" icon_state = "hair_fortuneteller_alt" -/datum/sprite_accessory/hair/skyrat/combed +/datum/sprite_accessory/hair/nova/combed name = "Combed" icon_state = "hair_combed" -/datum/sprite_accessory/hair/skyrat/combedbob +/datum/sprite_accessory/hair/nova/combedbob name = "Combed Bob" icon_state = "hair_combedbob" -/datum/sprite_accessory/hair/skyrat/geisha +/datum/sprite_accessory/hair/nova/geisha name = "Geisha" icon_state = "hair_geisha" -/datum/sprite_accessory/hair/skyrat/cotton +/datum/sprite_accessory/hair/nova/cotton name = "Cotton" icon_state = "hair_cotton" -/datum/sprite_accessory/hair/skyrat/african_pigtails +/datum/sprite_accessory/hair/nova/african_pigtails name = "African Pigtails" icon_state = "hair_africanpigtails" -/datum/sprite_accessory/hair/skyrat/froofylong +/datum/sprite_accessory/hair/nova/froofylong name = "Froofy Long" icon_state = "hair_froofylong" -/datum/sprite_accessory/hair/skyrat/glammetal +/datum/sprite_accessory/hair/nova/glammetal name = "Glam Metal" icon_state = "hair_glammetal" -/datum/sprite_accessory/hair/skyrat/astolfo +/datum/sprite_accessory/hair/nova/astolfo name = "Astolfo" icon_state = "hair_astolfo" -/datum/sprite_accessory/hair/skyrat/afropuffdouble +/datum/sprite_accessory/hair/nova/afropuffdouble name = "Afropuff, Double" icon_state = "hair_afropuffdouble" -/datum/sprite_accessory/hair/skyrat/afropuffleft +/datum/sprite_accessory/hair/nova/afropuffleft name = "Afropuff, Left" icon_state = "hair_afropuffleft" -/datum/sprite_accessory/hair/skyrat/afropuffright +/datum/sprite_accessory/hair/nova/afropuffright name = "Afropuff, Right" icon_state = "hair_afropuffright" -/datum/sprite_accessory/hair/skyrat/longdtails +/datum/sprite_accessory/hair/nova/longdtails name = "Big Tails" icon_state = "hair_longdtails" -/datum/sprite_accessory/hair/skyrat/quadcurls +/datum/sprite_accessory/hair/nova/quadcurls name = "Quad Curls" icon_state = "hair_quadcurls" -/datum/sprite_accessory/hair/skyrat/slime_tendrils +/datum/sprite_accessory/hair/nova/slime_tendrils name = "Slime Tendrils" icon_state = "hair_slimetendrils" -/datum/sprite_accessory/hair/skyrat/slime_tendrils_alt +/datum/sprite_accessory/hair/nova/slime_tendrils_alt name = "Slime Tendrils Alt" icon_state = "hair_slimetendrils_alt" -/datum/sprite_accessory/hair/skyrat/slime_spikes +/datum/sprite_accessory/hair/nova/slime_spikes name = "Slime Spikes" icon_state = "hair_slimespikes" -/datum/sprite_accessory/hair/skyrat/slime_droplet +/datum/sprite_accessory/hair/nova/slime_droplet name = "Slime Droplet" icon_state = "hair_slimedroplet" -/datum/sprite_accessory/hair/skyrat/slime_droplet_alt +/datum/sprite_accessory/hair/nova/slime_droplet_alt name = "Slime Droplet Alt" icon_state = "hair_slimedroplet_alt" -/datum/sprite_accessory/hair/skyrat/newyou +/datum/sprite_accessory/hair/nova/newyou name = "New You" icon_state = "hair_newyou" -/datum/sprite_accessory/hair/skyrat/spicy +/datum/sprite_accessory/hair/nova/spicy name = "Spicy" icon_state = "hair_spicy" -/datum/sprite_accessory/hair/skyrat/sabitsuki +/datum/sprite_accessory/hair/nova/sabitsuki name = "Sabitsuki" icon_state = "hair_sabitsuki" -/datum/sprite_accessory/hair/skyrat/jessica +/datum/sprite_accessory/hair/nova/jessica name = "Jessica" icon_state = "hair_jessica" -/datum/sprite_accessory/hair/skyrat/gentle21 +/datum/sprite_accessory/hair/nova/gentle21 name = "Gently Brushed" icon_state = "hair_gentle21" -/datum/sprite_accessory/hair/skyrat/country_s +/datum/sprite_accessory/hair/nova/country_s name = "Country Side-Braid" icon_state = "hair_country_s" -/datum/sprite_accessory/hair/skyrat/beachwave +/datum/sprite_accessory/hair/nova/beachwave name = "Beachwave" icon_state = "hair_beachwave" -/datum/sprite_accessory/hair/skyrat/hyenamane +/datum/sprite_accessory/hair/nova/hyenamane name = "Hyena mane" icon_state = "hair_hyenamane" -/datum/sprite_accessory/hair/skyrat/halfshavedlong +/datum/sprite_accessory/hair/nova/halfshavedlong name = "Half-shaved long" icon = 'modular_nova/master_files/icons/mob/sprite_accessory/more_hair.dmi' icon_state = "halfshave_long" -/datum/sprite_accessory/hair/skyrat/halfshavedmessy +/datum/sprite_accessory/hair/nova/halfshavedmessy name = "Half-shaved messy" icon = 'modular_nova/master_files/icons/mob/sprite_accessory/more_hair.dmi' icon_state = "halfshave_messy" -/datum/sprite_accessory/hair/skyrat/halfshavedmessylong +/datum/sprite_accessory/hair/nova/halfshavedmessylong name = "Half-shave long messy" icon = 'modular_nova/master_files/icons/mob/sprite_accessory/more_hair.dmi' icon_state = "halfshave_messylong" -/datum/sprite_accessory/hair/skyrat/halfshavedglamorous +/datum/sprite_accessory/hair/nova/halfshavedglamorous name = "Half-shave glamorous" icon = 'modular_nova/master_files/icons/mob/sprite_accessory/more_hair.dmi' icon_state = "halfshave_glamorous" -/datum/sprite_accessory/hair/skyrat/emoshort +/datum/sprite_accessory/hair/nova/emoshort name = "Emo Short" icon_state = "hair_emoshort" -/datum/sprite_accessory/hair/skyrat/mediumbraid +/datum/sprite_accessory/hair/nova/mediumbraid name = "Medium Braid" icon_state = "hair_mediumbraid" -/datum/sprite_accessory/hair/skyrat/long_over_eye_alt +/datum/sprite_accessory/hair/nova/long_over_eye_alt name = "Long Over Eye Alt" icon_state = "hair_longovereye_alt" -/datum/sprite_accessory/hair/skyrat/gentle_bun +/datum/sprite_accessory/hair/nova/gentle_bun name = "Gentle Bun" icon_state = "hair_gentle_bun" -/datum/sprite_accessory/hair/skyrat/stacy +/datum/sprite_accessory/hair/nova/stacy name = "Stacy" icon_state = "hair_stacy" -/datum/sprite_accessory/hair/skyrat/stacy_bun +/datum/sprite_accessory/hair/nova/stacy_bun name = "Stacy Bun" icon_state = "hair_stacy_bun" -/datum/sprite_accessory/hair/skyrat/curly_front +/datum/sprite_accessory/hair/nova/curly_front name = "Curly Front" icon_state = "hair_braided_front" -/datum/sprite_accessory/hair/skyrat/phoenix +/datum/sprite_accessory/hair/nova/phoenix name = "Phoenix" icon_state = "hair_phoenix" -/datum/sprite_accessory/hair/skyrat/spiky4 +/datum/sprite_accessory/hair/nova/spiky4 name = "Spiky 4" icon_state = "hair_spikey" -/datum/sprite_accessory/hair/skyrat/short_tassles +/datum/sprite_accessory/hair/nova/short_tassles name = "Short Tassles" icon_state = "hair_short_tassles" -/datum/sprite_accessory/hair/skyrat/tri_bun +/datum/sprite_accessory/hair/nova/tri_bun name = "Tri Bun" icon_state = "hair_tri_bun" -/datum/sprite_accessory/hair/skyrat/ring_tails +/datum/sprite_accessory/hair/nova/ring_tails name = "Ring Tails" icon_state = "hair_ring_tails" -/datum/sprite_accessory/hair/skyrat/holo_tuber +/datum/sprite_accessory/hair/nova/holo_tuber name = "Holo Tuber" icon_state = "hair_holo_tuber" -/datum/sprite_accessory/hair/skyrat/spikey_long +/datum/sprite_accessory/hair/nova/spikey_long name = "Spikey Long" icon_state = "hair_spikey_long" -/datum/sprite_accessory/hair/skyrat/violet +/datum/sprite_accessory/hair/nova/violet name = "Violet" icon_state = "hair_violet" -/datum/sprite_accessory/hair/skyrat/violet_ponytail +/datum/sprite_accessory/hair/nova/violet_ponytail name = "Violet Ponytail" icon_state = "hair_violet_ponytail" -/datum/sprite_accessory/hair/skyrat/gentle_duo_bun +/datum/sprite_accessory/hair/nova/gentle_duo_bun name = "Gentle Duo Bun" icon_state = "hair_gentle_duo_bun" -/datum/sprite_accessory/hair/skyrat/phoenix_half_shaven +/datum/sprite_accessory/hair/nova/phoenix_half_shaven name = "Phoenix Half-Shaven" icon_state = "hair_phoenix_half_shaven" -/datum/sprite_accessory/hair/skyrat/jay +/datum/sprite_accessory/hair/nova/jay name = "Jay" icon_state = "hair_jay" -/datum/sprite_accessory/hair/skyrat/zoey +/datum/sprite_accessory/hair/nova/zoey name = "Zoey" icon_state = "hair_zoey" -/datum/sprite_accessory/hair/skyrat/runner +/datum/sprite_accessory/hair/nova/runner name = "Runner" icon_state = "hair_runner" -/datum/sprite_accessory/hair/skyrat/runner_bun +/datum/sprite_accessory/hair/nova/runner_bun name = "Runner Bun" icon_state = "hair_runner_bun" -/datum/sprite_accessory/hair/skyrat/tri_bun_long +/datum/sprite_accessory/hair/nova/tri_bun_long name = "Tri Bun Long" icon_state = "hair_tri_bun_long" -/datum/sprite_accessory/hair/skyrat/hairfre // Original sprite from Hyper-Station-13 +/datum/sprite_accessory/hair/nova/hairfre // Original sprite from Hyper-Station-13 name = "Hairfre" icon_state = "hair_hairfre" -/datum/sprite_accessory/hair/skyrat/bobcut_over_eye_1 +/datum/sprite_accessory/hair/nova/bobcut_over_eye_1 name = "Bobcut over eye 1" icon_state = "hair_bobcut_over_eye_1" -/datum/sprite_accessory/hair/skyrat/bobcut_over_eye_2 +/datum/sprite_accessory/hair/nova/bobcut_over_eye_2 name = "Bobcut over eye 2" icon_state = "hair_bobcut_over_eye_2" -/datum/sprite_accessory/hair/skyrat/bobcut_over_eye_3 +/datum/sprite_accessory/hair/nova/bobcut_over_eye_3 name = "Bobcut over eye 3" icon_state = "hair_bobcut_over_eye_3" -/datum/sprite_accessory/hair/skyrat/bonnie +/datum/sprite_accessory/hair/nova/bonnie name = "Bonnie" icon_state = "hair_bonnie" -/datum/sprite_accessory/hair/skyrat/bonnie_short +/datum/sprite_accessory/hair/nova/bonnie_short name = "Bonnie short" icon_state = "hair_bonnie_short" -/datum/sprite_accessory/hair/skyrat/bonnie_long +/datum/sprite_accessory/hair/nova/bonnie_long name = "Bonnie long" icon_state = "hair_bonnie_long" -/datum/sprite_accessory/hair/skyrat/bonnie_2 +/datum/sprite_accessory/hair/nova/bonnie_2 name = "Bonnie 2" icon_state = "hair_bonnie_2" -/datum/sprite_accessory/hair/skyrat/bonnie_2_long +/datum/sprite_accessory/hair/nova/bonnie_2_long name = "Bonnie long 2" icon_state = "hair_bonnie_2_long" -/datum/sprite_accessory/hair/skyrat/bonie_2_short +/datum/sprite_accessory/hair/nova/bonie_2_short name = "Bonnie short 2" icon_state = "hair_bonnie_2_short" -/datum/sprite_accessory/hair/skyrat/dawn +/datum/sprite_accessory/hair/nova/dawn name = "Dawn" icon_state = "hair_dawn" -/datum/sprite_accessory/hair/skyrat/fluffy +/datum/sprite_accessory/hair/nova/fluffy name = "Fluffy" icon_state = "hair_fluffy" -/datum/sprite_accessory/hair/skyrat/fluffy_long +/datum/sprite_accessory/hair/nova/fluffy_long name = "Fluffy long" icon_state = "hair_fluffy_long" -/datum/sprite_accessory/hair/skyrat/kajam +/datum/sprite_accessory/hair/nova/kajam name = "Kajam" icon_state = "hair_kajam" -/datum/sprite_accessory/hair/skyrat/khmuro +/datum/sprite_accessory/hair/nova/khmuro name = "Khmuro" icon_state = "hair_khmuro" -/datum/sprite_accessory/hair/skyrat/kobeni_1 +/datum/sprite_accessory/hair/nova/kobeni_1 name = "Kobeni 1" icon_state = "hair_kobeni_1" -/datum/sprite_accessory/hair/skyrat/kobeni_2 +/datum/sprite_accessory/hair/nova/kobeni_2 name = "Kobeni 2" icon_state = "hair_kobeni_2" -/datum/sprite_accessory/hair/skyrat/low_bun +/datum/sprite_accessory/hair/nova/low_bun name = "Low bun" icon_state = "hair_low_bun" -/datum/sprite_accessory/hair/skyrat/low_ponytail +/datum/sprite_accessory/hair/nova/low_ponytail name = "Low ponytail" icon_state = "hair_low_ponytail" -/datum/sprite_accessory/hair/skyrat/sideways_ponytail +/datum/sprite_accessory/hair/nova/sideways_ponytail name = "Sideways ponytail" icon_state = "hair_sideways_ponytail" -/datum/sprite_accessory/hair/skyrat/morning +/datum/sprite_accessory/hair/nova/morning name = "Morning" icon_state = "hair_morning" -/datum/sprite_accessory/hair/skyrat/over_ear_1 +/datum/sprite_accessory/hair/nova/over_ear_1 name = "Over ear 1" icon_state = "hair_over_ear_1" -/datum/sprite_accessory/hair/skyrat/over_ear_2 +/datum/sprite_accessory/hair/nova/over_ear_2 name = "Over ear 2" icon_state = "hair_over_ear_2" -/datum/sprite_accessory/hair/skyrat/over_eye +/datum/sprite_accessory/hair/nova/over_eye name = "Over eye" icon_state = "hair_over_eye" -/datum/sprite_accessory/hair/skyrat/ponytail +/datum/sprite_accessory/hair/nova/ponytail name = "Fluffy ponytail" icon_state = "hair_ponytail" -/datum/sprite_accessory/hair/skyrat/ponytail_short +/datum/sprite_accessory/hair/nova/ponytail_short name = "Short fluffy ponytail" icon_state = "hair_ponytail_short" -/datum/sprite_accessory/hair/skyrat/simple +/datum/sprite_accessory/hair/nova/simple name = "Simple" icon_state = "hair_simple" -/datum/sprite_accessory/hair/skyrat/simple_long +/datum/sprite_accessory/hair/nova/simple_long name = "Simple long" icon_state = "hair_simple_long" -/datum/sprite_accessory/hair/skyrat/simple_short +/datum/sprite_accessory/hair/nova/simple_short name = "Simple short" icon_state = "hair_simple_short" -/datum/sprite_accessory/hair/skyrat/strict +/datum/sprite_accessory/hair/nova/strict name = "Strict" icon_state = "hair_strict" -/datum/sprite_accessory/hair/skyrat/strict_long +/datum/sprite_accessory/hair/nova/strict_long name = "Strict long" icon_state = "hair_strict_long" -/datum/sprite_accessory/hair/skyrat/strict_short +/datum/sprite_accessory/hair/nova/strict_short name = "Strict short" icon_state = "hair_strict_short" -/datum/sprite_accessory/hair/skyrat/thin_ponytail +/datum/sprite_accessory/hair/nova/thin_ponytail name = "Thin ponytail" icon_state = "hair_thin_ponytail" -/datum/sprite_accessory/hair/skyrat/thin_ponytail_long +/datum/sprite_accessory/hair/nova/thin_ponytail_long name = "Long thin ponytail" icon_state = "hair_thin_ponytail_long" -/datum/sprite_accessory/hair/skyrat/twintails_2 +/datum/sprite_accessory/hair/nova/twintails_2 name = "Twintails 2" icon_state = "hair_twintails_2" -/datum/sprite_accessory/hair/skyrat/twintails_2_long +/datum/sprite_accessory/hair/nova/twintails_2_long name = "Long twintails" icon_state = "hair_twintails_2_long" -/datum/sprite_accessory/hair/skyrat/twintails_2_short +/datum/sprite_accessory/hair/nova/twintails_2_short name = "Short twintails" icon_state = "hair_twintails_2_short" -/datum/sprite_accessory/hair/skyrat/upwards +/datum/sprite_accessory/hair/nova/upwards name = "Upwards" icon_state = "hair_upwards" // Facial hair -/datum/sprite_accessory/facial_hair/skyrat +/datum/sprite_accessory/facial_hair/nova icon = 'modular_nova/master_files/icons/mob/sprite_accessory/facialhair.dmi' -/datum/sprite_accessory/facial_hair/skyrat/sideburns +/datum/sprite_accessory/facial_hair/nova/sideburns name = "Sideburns" icon_state = "facial_sideburns" -/datum/sprite_accessory/facial_hair/skyrat/goatee +/datum/sprite_accessory/facial_hair/nova/goatee name = "Goatee" icon_state = "facial_goatee" -/datum/sprite_accessory/facial_hair/skyrat/fiveoclock +/datum/sprite_accessory/facial_hair/nova/fiveoclock name = "Beard (Five o Clock)" icon_state = "facial_5oclock" -/datum/sprite_accessory/facial_hair/skyrat/hornadorns +/datum/sprite_accessory/facial_hair/nova/hornadorns name = "Hornadorns" icon_state = "facial_hornadorns" -/datum/sprite_accessory/facial_hair/skyrat/chinhorns +/datum/sprite_accessory/facial_hair/nova/chinhorns name = "Chin Horns" icon_state = "facial_chinhorns" -/datum/sprite_accessory/facial_hair/skyrat/tribeard +/datum/sprite_accessory/facial_hair/nova/tribeard name = "Tri-beard" icon_state = "facial_tribeard" -/datum/sprite_accessory/facial_hair/skyrat/neckfluff +/datum/sprite_accessory/facial_hair/nova/neckfluff name = "Neckfluff" icon_state = "facial_neckfluff" -/datum/sprite_accessory/facial_hair/skyrat/squid +/datum/sprite_accessory/facial_hair/nova/squid name = "Tentacle Beard" icon_state = "facial_squid" diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm index bf731c941aa..27c937ef2e4 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm @@ -38,7 +38,7 @@ if(HAS_TRAIT(target_mob, TRAIT_AGEUSIA)) // They don't taste anything, their body shouldn't react strongly to the taste of that stuff. return - if(container.reagents.has_chemical_flag_skyrat(REAGENT_BLOOD_REGENERATING, container.reagents.total_volume * MINIMUM_BLOOD_REGENING_REAGENT_RATIO)) // At least 75% of the content of the cup needs to be something that's counting as blood-regenerating for the tumor not to freak out. + if(container.reagents.has_chemical_flag_nova(REAGENT_BLOOD_REGENERATING, container.reagents.total_volume * MINIMUM_BLOOD_REGENING_REAGENT_RATIO)) // At least 75% of the content of the cup needs to be something that's counting as blood-regenerating for the tumor not to freak out. return var/mob/living/carbon/body = target_mob diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/lizard.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/lizard.dm index 55f20d16e6b..7ca2a6b8e52 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/lizard.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/lizard.dm @@ -16,6 +16,16 @@ "wings" = list("None", FALSE), ) +/datum/species/lizard/ashwalker/get_default_mutant_bodyparts() + var/list/default_parts = ..() + default_parts["spines"] = list("None", TRUE) + return default_parts + +/datum/species/lizard/silverscale/get_default_mutant_bodyparts() + var/list/default_parts = ..() + default_parts["spines"] = list("None", TRUE) + return default_parts + /datum/species/lizard/randomize_features() var/list/features = ..() var/main_color = "#[random_color()]" diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm index 9a707e5225b..f0a2570ba4c 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm @@ -1,3 +1,13 @@ +/datum/species/mush/get_default_mutant_bodyparts() + return list( + "caps" = list("Round", FALSE), // we don't want cap-less mushpeople + ) + +/datum/species/mush/randomize_features() + var/list/features = ..() + features["caps"] = pick(GLOB.caps_list - list("None")) // No tail-less monkeys. // No cap-less mushpeople. + return features + /datum/species/mush/prepare_human_for_preview(mob/living/carbon/human/shrooman) shrooman.dna.mutant_bodyparts["caps"] = list(MUTANT_INDEX_NAME = "Round", MUTANT_INDEX_COLOR_LIST = list("#FF4B19")) regenerate_organs(shrooman, src, visual_only = TRUE) diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index 1e9b02d9722..86ed8fd4f19 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -2,7 +2,6 @@ /datum/species/jelly mutant_bodyparts = list() - hair_color = "mutcolor" hair_alpha = 160 //a notch brighter so it blends better. facial_hair_alpha = 160 @@ -115,7 +114,7 @@ /datum/action/innate/alter_form/New(Target) . = ..() - + generate_radial_icons() if(length(available_choices)) diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/unathi.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/unathi.dm index bbf7f91b08b..8731ff495d1 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/unathi.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/unathi.dm @@ -29,7 +29,7 @@ "snout" = list("Sharp + Light", TRUE), "spines" = list("None", FALSE), "frills" = list("None", FALSE), - "horns" = list("Curled", TRUE), + "horns" = list("Curled", FALSE), "body_markings" = list("Smooth Belly", TRUE), "legs" = list("Normal Legs", FALSE), ) diff --git a/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 469109003ff..4a922baf446 100644 --- a/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -22,7 +22,7 @@ /datum/glass_style/drinking_glass/synthanol required_drink_type = /datum/reagent/consumable/ethanol/synthanol - icon = 'modular_nova/master_files/icons/obj/drinks.dmi' // This should cover anything synthanol related. Will have to individually tag others unless we make an object path for skyrat drinks. + icon = 'modular_nova/master_files/icons/obj/drinks.dmi' // This should cover anything synthanol related. Will have to individually tag others unless we make an object path for Nova drinks. icon_state = "synthanolglass" name = "glass of synthanol" desc = "The equivalent of alcohol for synthetic crewmembers. They'd find it awful if they had tastebuds too." diff --git a/modular_nova/modules/customization/modules/surgery/organs/cap.dm b/modular_nova/modules/customization/modules/surgery/organs/cap.dm index f642a8f0a73..664334aee03 100644 --- a/modular_nova/modules/customization/modules/surgery/organs/cap.dm +++ b/modular_nova/modules/customization/modules/surgery/organs/cap.dm @@ -1,26 +1,30 @@ -/obj/item/organ/external/cap - name = "fungal cap" - desc = "Real. No cap." +/obj/item/organ/external/mushroom_cap icon_state = "random_fly_1" mutantpart_key = "caps" - mutantpart_info = list(MUTANT_INDEX_NAME = "Round", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) - - zone = BODY_ZONE_HEAD + mutantpart_info = list(MUTANT_INDEX_NAME = "Round", MUTANT_INDEX_COLOR_LIST = list("#FF4B19")) slot = ORGAN_SLOT_EXTERNAL_CAP - preference = "feature_caps" - bodypart_overlay = /datum/bodypart_overlay/mutant/cap - use_mob_sprite_as_obj_sprite = TRUE +/obj/item/organ/external/mushroom_cap/Initialize(mapload) + if(!ispath(bodypart_overlay)) + mutantpart_info[MUTANT_INDEX_COLOR_LIST] = bodypart_overlay.draw_color + return ..() -/datum/bodypart_overlay/mutant/cap - feature_key = "caps" - layers = EXTERNAL_FRONT | EXTERNAL_ADJACENT | EXTERNAL_BEHIND +/datum/bodypart_overlay/mutant/mushroom_cap color_source = ORGAN_COLOR_OVERRIDE -/datum/bodypart_overlay/mutant/cap/override_color(rgb_value) +/datum/bodypart_overlay/mutant/mushroom_cap/randomize_appearance() + . = ..() + randomize_cap_color() + +/datum/bodypart_overlay/mutant/mushroom_cap/proc/randomize_cap_color() + draw_color = pick("#FF4B19", "#925858","#e6dfdf", "#E7AB33", "#704923", "#5db847", "#b359ab", "#9039a1", "#533ea0", "#3192af") // mushroom colors I guess + +/datum/bodypart_overlay/mutant/mushroom_cap/override_color(rgb_value) + if(isnull(draw_color)) + randomize_cap_color() return draw_color -/datum/bodypart_overlay/mutant/cap/get_global_feature_list() - return GLOB.sprite_accessories["caps"] +/datum/bodypart_overlay/mutant/mushroom_cap/can_draw_on_bodypart(mob/living/carbon/human/human) + return !sprite_datum.is_hidden(human) diff --git a/modular_nova/modules/customization/modules/surgery/organs/ears.dm b/modular_nova/modules/customization/modules/surgery/organs/ears.dm index 7123f926ba7..db653ddae8f 100644 --- a/modular_nova/modules/customization/modules/surgery/organs/ears.dm +++ b/modular_nova/modules/customization/modules/surgery/organs/ears.dm @@ -2,17 +2,10 @@ name = "fluffy ears" icon = 'icons/obj/clothing/head/costume.dmi' icon_state = "kitty" - mutantpart_key = "ears" - mutantpart_info = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list("#FFAA00")) /obj/item/organ/internal/ears/cat - mutantpart_key = "ears" - mutantpart_info = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list("#FFAA00")) /obj/item/organ/internal/ears/fox - mutantpart_key = "ears" - mutantpart_info = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list("#eebb44")) - /obj/item/organ/external/ears name = "fluffy ears" desc = "Wait, there's two pairs of these?" diff --git a/modular_nova/modules/customization/modules/surgery/organs/organ.dm b/modular_nova/modules/customization/modules/surgery/organs/organ.dm index e1892fc5543..2e07455af7b 100644 --- a/modular_nova/modules/customization/modules/surgery/organs/organ.dm +++ b/modular_nova/modules/customization/modules/surgery/organs/organ.dm @@ -1,7 +1,4 @@ /obj/item/organ - ///This is for associating an organ with a mutant bodypart. Look at tails for examples - var/mutantpart_key - var/list/list/mutantpart_info /// Do we drop when organs are spilling? var/drop_when_organ_spilling = TRUE /// Special flags that need to be passed over from the sprite_accessory to the organ (but not the opposite). @@ -9,31 +6,44 @@ /// Relevant layer flags, as set by the organ's associated sprite_accessory, should there be one. var/relevant_layers -/obj/item/organ/Initialize(mapload) +/obj/item/organ/external + ///This is for associating an organ with a mutant bodypart. Look at tails for examples + var/mutantpart_key + var/list/list/mutantpart_info + +/obj/item/organ/external/Initialize(mapload) . = ..() if(mutantpart_key) color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] -/obj/item/organ/Insert(mob/living/carbon/M, special = FALSE, movement_flags = DELETE_IF_REPLACED) - var/mob/living/carbon/human/H = M - if(mutantpart_key && istype(H)) - H.dna.species.mutant_bodyparts[mutantpart_key] = mutantpart_info.Copy() - if(!special) - H.update_body() - . = ..() +/// Copies the organ's mutantpart_info to the owner's mutant_bodyparts +/obj/item/organ/external/proc/copy_to_mutant_bodyparts(mob/living/carbon/organ_owner, special) + var/mob/living/carbon/human/human_owner = organ_owner + if(!istype(human_owner)) + return -/obj/item/organ/Remove(mob/living/carbon/M, special = FALSE, movement_flags) - var/mob/living/carbon/human/H = M - if(mutantpart_key && istype(H)) - if(H.dna.species.mutant_bodyparts[mutantpart_key]) - mutantpart_info = H.dna.species.mutant_bodyparts[mutantpart_key].Copy() //Update the info in case it was changed on the person - color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] - H.dna.species.mutant_bodyparts -= mutantpart_key - if(!special) - H.update_body() - . = ..() + human_owner.dna.species.mutant_bodyparts[mutantpart_key] = mutantpart_info.Copy() + if(!special) + human_owner.update_body() + +/// Copies the mob's mutant_bodyparts data to an organ's mutantpart_info for consistency e.g. on organ removal +/obj/item/organ/external/proc/transfer_mutantpart_info(mob/living/carbon/organ_owner, special) + var/mob/living/carbon/human/human_owner = organ_owner + if(!istype(human_owner)) + return + + if(human_owner.dna.species.mutant_bodyparts[mutantpart_key]) + mutantpart_info = human_owner.dna.species.mutant_bodyparts[mutantpart_key].Copy() //Update the info in case it was changed on the person + + color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] + human_owner.dna.species.mutant_bodyparts -= mutantpart_key + if(!special) + human_owner.update_body() /obj/item/organ/proc/build_from_dna(datum/dna/DNA, associated_key) + return + +/obj/item/organ/external/build_from_dna(datum/dna/DNA, associated_key) mutantpart_key = associated_key mutantpart_info = DNA.mutant_bodyparts[associated_key].Copy() color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] diff --git a/modular_nova/modules/escape_menu/code/escape_menu_skyrat.dm b/modular_nova/modules/escape_menu/code/escape_menu_nova.dm similarity index 100% rename from modular_nova/modules/escape_menu/code/escape_menu_skyrat.dm rename to modular_nova/modules/escape_menu/code/escape_menu_nova.dm diff --git a/modular_nova/modules/faction/readme.md b/modular_nova/modules/faction/readme.md index 475f995654b..6237fc7836e 100644 --- a/modular_nova/modules/faction/readme.md +++ b/modular_nova/modules/faction/readme.md @@ -8,7 +8,7 @@ This adds a set of content introducing a new faction, including their own access ### TG Proc Changes: -- Please see changed files on PR. Skyrat tags applied. +- Please see changed files on PR. Nova tags applied. ### Defines: diff --git a/modular_nova/modules/goofsec/readme.md b/modular_nova/modules/goofsec/readme.md index 440cef8c794..ec1599fdf28 100644 --- a/modular_nova/modules/goofsec/readme.md +++ b/modular_nova/modules/goofsec/readme.md @@ -4,7 +4,7 @@ MODULE ID: GoofSec ### Description: -Fixing Security for Skyrat. Includes the defines for Security guns, the new Departmental Guards, and the new SSC Sheriff/Deputies. +Fixing Security for Nova. Includes the defines for Security guns, the new Departmental Guards, and the new SSC Sheriff/Deputies. ### TG Proc Changes: diff --git a/modular_nova/modules/icspawning/code/cards_ids.dm b/modular_nova/modules/icspawning/code/cards_ids.dm index 345b5b6f4e6..6624e420e08 100644 --- a/modular_nova/modules/icspawning/code/cards_ids.dm +++ b/modular_nova/modules/icspawning/code/cards_ids.dm @@ -1,4 +1,4 @@ -//SKYRAT MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 +// NOVA MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 /obj/item/card/id/advanced/debug/bst name = "\improper Bluespace ID" desc = "A Bluespace ID card. Has ALL the all access, you really shouldn't have this." diff --git a/modular_nova/modules/icspawning/code/observer.dm b/modular_nova/modules/icspawning/code/observer.dm index 7866f2f05ae..5c499585ba4 100644 --- a/modular_nova/modules/icspawning/code/observer.dm +++ b/modular_nova/modules/icspawning/code/observer.dm @@ -1,4 +1,4 @@ -//SKYRAT MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 +// NOVA MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 /mob/dead/observer/CtrlClickOn(mob/user) quickicspawn(user) diff --git a/modular_nova/modules/icspawning/code/standard.dm b/modular_nova/modules/icspawning/code/standard.dm index c354c83339d..7052786ebad 100644 --- a/modular_nova/modules/icspawning/code/standard.dm +++ b/modular_nova/modules/icspawning/code/standard.dm @@ -1,4 +1,4 @@ -//SKYRAT MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 +// NOVA MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 /obj/item/gun/energy/taser/debug ammo_type = list(/obj/item/ammo_casing/energy/electrode/debug) w_class = WEIGHT_CLASS_TINY diff --git a/modular_nova/modules/kahraman_equipment/sound/attributions.txt b/modular_nova/modules/kahraman_equipment/sound/attributions.txt index 19b7ff0e57e..1a5db124e4a 100644 --- a/modular_nova/modules/kahraman_equipment/sound/attributions.txt +++ b/modular_nova/modules/kahraman_equipment/sound/attributions.txt @@ -1,7 +1,7 @@ -The sounds at modular_skyrat/modules/colony_fabriactor_event_code/sound/thumper_fan are from https://pixabay.com/sound-effects/fan-1-6360/ +The sounds at modular_nova/modules/colony_fabriactor_event_code/sound/thumper_fan are from https://pixabay.com/sound-effects/fan-1-6360/ -The sounds at modular_skyrat/modules/colony_fabriactor_event_code/sound/thumper_thump are from https://pixabay.com/sound-effects/punch-press-10-ton-clip1-104921/ +The sounds at modular_nova/modules/colony_fabriactor_event_code/sound/thumper_thump are from https://pixabay.com/sound-effects/punch-press-10-ton-clip1-104921/ The following sounds are from https://pixabay.com/sound-effects/sos-signal-137144/ -modular_skyrat/modules/colony_fabricator/sound/morse_signal.wav +modular_nova/modules/colony_fabricator/sound/morse_signal.wav diff --git a/modular_nova/modules/mapping/code/static_plaques.dm b/modular_nova/modules/mapping/code/static_plaques.dm index 1b2daf7e98b..e695bf6aa63 100644 --- a/modular_nova/modules/mapping/code/static_plaques.dm +++ b/modular_nova/modules/mapping/code/static_plaques.dm @@ -1,4 +1,4 @@ -//SKYRAT PLAQUES +// NOVA PLAQUES //Current stations diff --git a/modular_nova/modules/medical/readme.md b/modular_nova/modules/medical/readme.md index 9b7b38f80d9..7f1fb4b32ee 100644 --- a/modular_nova/modules/medical/readme.md +++ b/modular_nova/modules/medical/readme.md @@ -19,7 +19,7 @@ Various changes to the medical system, from adding bandage overlays, to new woun - cat2_medicine_reagents.dm: /datum/reagent/medicine/c2/hercuri/on_mob_life, Allowed hercuri to affect synthetics, also changed hercuri process flags for this purpose - quirks.dm: Commented out the quadruple_amputee/frail blacklist as frail can now apply to prosthetics @@ -27,7 +27,7 @@ E.g: - N/A @@ -46,6 +46,6 @@ E.g: Azarak - Original medical update, muscle wounds, bandage overlays Niko - Synthetic wounds -TG coding/Skyrat coding channels and community - Support, ideas, reviews +TG coding/Nova coding channels and community - Support, ideas, reviews diff --git a/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm b/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm index ef19e3a8d9d..6dd15874973 100644 --- a/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm +++ b/modular_nova/modules/player_ranks/code/subsystem/player_ranks.dm @@ -1,5 +1,5 @@ /// The name of the table on the database containing the player ranks. -/// See `skyrat_schema.sql` for the schema of the table. +/// See `nova_schema.sql` for the schema of the table. #define PLAYER_RANK_TABLE_NAME "player_rank" /// The index of the ckey in the items of a given row in a query for player ranks. #define INDEX_CKEY 1 diff --git a/modular_nova/modules/station_traits/readme.md b/modular_nova/modules/station_traits/readme.md index 361854b94b5..acaf46ca5bb 100644 --- a/modular_nova/modules/station_traits/readme.md +++ b/modular_nova/modules/station_traits/readme.md @@ -6,7 +6,7 @@ MODULE ID: STATION_TRAITS ### Description: -Skyrat changes to the roundstart station traits +Nova changes to the roundstart station traits ### TG Proc Changes: diff --git a/modular_nova/modules/wargame_projectors/code/game_kit.dm b/modular_nova/modules/wargame_projectors/code/game_kit.dm index d5d57a09427..aebd53df90d 100644 --- a/modular_nova/modules/wargame_projectors/code/game_kit.dm +++ b/modular_nova/modules/wargame_projectors/code/game_kit.dm @@ -2,7 +2,7 @@ name = "Holodeck - Naval Wargames" template_id = "holodeck_wargame" description = "more than enough space for a quick bout of naval warfare" - mappath = "_maps/skyrat/holodeck_wargame.dmm" + mappath = "_maps/nova/holodeck_wargame.dmm" /obj/item/storage/briefcase/secure/white/wargame_kit name = "DIY Wargaming Kit" diff --git a/strings/names/malf_prefix.txt b/strings/names/malf_prefix.txt index df31c551037..3babb2bb40a 100644 --- a/strings/names/malf_prefix.txt +++ b/strings/names/malf_prefix.txt @@ -3,6 +3,6 @@ Citadel Fulp Hippie Oney -Skyrat +Nova Sseth Yog diff --git a/tgstation.dme b/tgstation.dme index 0233012cba7..2a1815a6b8c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3829,6 +3829,7 @@ #include "code\modules\client\preferences\species_features\lizard.dm" #include "code\modules\client\preferences\species_features\monkey.dm" #include "code\modules\client\preferences\species_features\moth.dm" +#include "code\modules\client\preferences\species_features\mushperson.dm" #include "code\modules\client\preferences\species_features\mutants.dm" #include "code\modules\client\preferences\species_features\pod.dm" #include "code\modules\client\preferences\species_features\vampire.dm" @@ -6839,7 +6840,7 @@ #include "modular_nova\modules\awaymissions_nova\mothership_astrum\mob.dm" #include "modular_nova\modules\awaymissions_nova\mothership_astrum\mob_spawn.dm" #include "modular_nova\modules\awaymissions_nova\mothership_astrum\spawners.dm" -#include "modular_nova\modules\banning\code\skyrat_bans.dm" +#include "modular_nova\modules\banning\code\nova_bans.dm" #include "modular_nova\modules\barricades\code\barricade.dm" #include "modular_nova\modules\barsigns\code\barsigns.dm" #include "modular_nova\modules\basic_mobs\code\bananaspider.dm" @@ -7404,7 +7405,7 @@ #include "modular_nova\modules\encounters\code\nri_raiders.dm" #include "modular_nova\modules\energy_axe\code\energy_fireaxe.dm" #include "modular_nova\modules\energy_axe\code\energy_fireaxe_case.dm" -#include "modular_nova\modules\escape_menu\code\escape_menu_skyrat.dm" +#include "modular_nova\modules\escape_menu\code\escape_menu_nova.dm" #include "modular_nova\modules\events\code\_event_globalvars.dm" #include "modular_nova\modules\events\code\event_spawner.dm" #include "modular_nova\modules\events\code\event_spawner_menu.dm" diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index 69732aac5f9..47257d4ac80 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -820,8 +820,8 @@ em { color: #7adbf3; } } +// NOVA EDIT ADDITION BEGIN -// SKYRAT ADDITION BEGIN .velvet { color: #660015; font-weight: bold; @@ -917,8 +917,7 @@ em { color: #9b6000; } } - -// SKYRAT ADDITION END +// NOVA EDIT ADDITION END .phobia { color: #dd0000; @@ -1279,8 +1278,8 @@ $border-width-px: $border-width * 1px; background-color: darken(map.get($alert-stripe-colors, $color-name), 5); } } +/* NOVA EDIT ADDITION START - DARK MODE CLASSES */ -/* SKYRAT DARK MODE CLASSES */ .mentor { color: #8a2be2; } @@ -1376,3 +1375,4 @@ $border-width-px: $border-width * 1px; font-weight: bold; font-style: italic; } +// NOVA EDIT ADDITION END diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index 1b94d9f7e50..27b0b548bf7 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -1213,8 +1213,8 @@ $border-width-px: $border-width * 1px; ); } } +/* NOVA EDIT ADDITION START - LIGHT MODE CLASSES */ -/* SKYRAT LIGHT MODE CLASSES */ .mentor { color: #8a2be2; } @@ -1329,3 +1329,4 @@ $border-width-px: $border-width * 1px; color: #9b6000; } } +// NOVA EDIT ADDITION END diff --git a/tgui/packages/tgui/index.tsx b/tgui/packages/tgui/index.tsx index 223e532ff79..00f914fa41d 100644 --- a/tgui/packages/tgui/index.tsx +++ b/tgui/packages/tgui/index.tsx @@ -25,10 +25,8 @@ import './styles/themes/retro.scss'; import './styles/themes/syndicate.scss'; import './styles/themes/wizard.scss'; import './styles/themes/admin.scss'; -// SKYRAT ADDITION START -import './styles/themes/clockwork.scss'; +import './styles/themes/clockwork.scss'; // NOVA EDIT ADDITION -// SKYRAT ADDITION END import { perf } from 'common/perf'; import { setupHotReloading } from 'tgui-dev-server/link/client.cjs'; diff --git a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx index dedac234970..1684345103d 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx @@ -54,7 +54,7 @@ type Info = { can_change_objective: BooleanLike; }; -// SKYRAT CHANGE height from 630 to 700 +// NOVA EDIT CHANGE - height from 630 to 700 export const AntagInfoWizard = (props) => { const { data, act } = useBackend(); const { ritual, objectives, can_change_objective } = data; diff --git a/tgui/packages/tgui/interfaces/BluespaceArtillerySkyrat.tsx b/tgui/packages/tgui/interfaces/BluespaceArtilleryNova.tsx similarity index 98% rename from tgui/packages/tgui/interfaces/BluespaceArtillerySkyrat.tsx rename to tgui/packages/tgui/interfaces/BluespaceArtilleryNova.tsx index 5d4d0b7b55c..f19dc932714 100644 --- a/tgui/packages/tgui/interfaces/BluespaceArtillerySkyrat.tsx +++ b/tgui/packages/tgui/interfaces/BluespaceArtilleryNova.tsx @@ -25,7 +25,7 @@ type Data = { status: string; }; -export const BluespaceArtillerySkyrat = (props) => { +export const BluespaceArtilleryNova = (props) => { const { act, data } = useBackend(); const { notice, diff --git a/tgui/packages/tgui/interfaces/CrewConsoleSkyrat.jsx b/tgui/packages/tgui/interfaces/CrewConsoleNova.jsx similarity index 99% rename from tgui/packages/tgui/interfaces/CrewConsoleSkyrat.jsx rename to tgui/packages/tgui/interfaces/CrewConsoleNova.jsx index d8d74bf367f..ff42966a624 100644 --- a/tgui/packages/tgui/interfaces/CrewConsoleSkyrat.jsx +++ b/tgui/packages/tgui/interfaces/CrewConsoleNova.jsx @@ -74,7 +74,7 @@ const statToIcon = (life_status) => { return 'heartbeat'; }; -export const CrewConsoleSkyrat = () => { +export const CrewConsoleNova = () => { return ( diff --git a/tgui/packages/tgui/interfaces/CrewConsoleSkyratBlueshield.jsx b/tgui/packages/tgui/interfaces/CrewConsoleNovaBlueshield.jsx similarity index 98% rename from tgui/packages/tgui/interfaces/CrewConsoleSkyratBlueshield.jsx rename to tgui/packages/tgui/interfaces/CrewConsoleNovaBlueshield.jsx index f831026e8ee..473995a5489 100644 --- a/tgui/packages/tgui/interfaces/CrewConsoleSkyratBlueshield.jsx +++ b/tgui/packages/tgui/interfaces/CrewConsoleNovaBlueshield.jsx @@ -69,7 +69,7 @@ const HealthStat = (props) => { }; // all of this just to change the name -export const CrewConsoleSkyratBlueshield = () => { +export const CrewConsoleNovaBlueshield = () => { return ( diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx index 50fd962d129..8c202b04b5d 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx @@ -266,8 +266,7 @@ export const FeatureShortTextInput = ( /> ); }; - -// SKYRAT FEATURES DOWN HERE +// NOVA EDIT ADDITION START - NOVA FEATURES DOWN HERE export const FeatureTextInput = ( props: FeatureValueProps, @@ -356,3 +355,4 @@ export const FeatureTriBoolInput = (props: FeatureValueProps) => { ); }; +// NOVA EDIT ADDITION END diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index 87715e2ae30..b2d0b4afd12 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -77,10 +77,10 @@ @include meta.load-css('./interfaces/Trophycase.scss'); @include meta.load-css('./interfaces/Uplink.scss'); @include meta.load-css('./interfaces/UtilityModulesPane.scss'); -// SKYRAT ADDITION START +// NOVA EDIT ADDITION START @include meta.load-css('./interfaces/ClockworkResearch.scss'); @include meta.load-css('./interfaces/ClockworkSlab.scss'); -// SKYRAT ADDITION END +// NOVA EDIT ADDITION END // Layouts @include meta.load-css('./layouts/Layout.scss');