From ae3a8acb8e70dc316b12a99f7cd23c769909cdfd Mon Sep 17 00:00:00 2001 From: vinylspiders <13398309+vinylspiders@users.noreply.github.com> Date: Thu, 23 May 2024 02:37:43 +0200 Subject: [PATCH] * Turns mush cap into an extorgan * Trimming the fat * Trimming the fat * Update mushpeople.dm * Adds colorblindness as a mild brain trauma (#76527) What the title says. The brain trauma makes the whole screen monochrome until cured. ![image](https://github.com/tgstation/tgstation/assets/82850673/442d24a8-6625-454c-bc28-64b786b03f49) I feel like the current pool for mild brain traumas is quite lame, this helps spice it up a bit with something that is quite annoying and distracting but not game breaking (as mild brain traumas should generally be). :cl: add: Added colorblindness as a mild brain trauma. /:cl: --------- Co-authored-by: san7890 * Fix species `var/hair_color` not being used for, well, hair color (#82168) `var/hair_color` for species was intended to be used as a "this species uses this type of hair color thing" But at some point that got completely lost and now it's only used for sprite accessories This fixes that. That means Slimepeople now have properly slimey hair. And Ethereals are less snowflake once more. :cl: Melbert fix: Fixed Slimepeople's hair not matching their slimey colors. /:cl: * Revert "Fix species `var/hair_color` not being used for, well, hair color (#82168)" This reverts commit c4cb756. * Revert "Adds colorblindness as a mild brain trauma (#76527)" This reverts commit eb815f5. * Update _species.dm * unused var * Caps list.. * Update mushpeople.dm * Update mushpeople.dm * Update mushpeople.dm * Update mushpeople.dm * Update mushpeople.dm * Attempts to fix CI errors * Update cap.dm * Update _external_organ.dm * Update monkey.dm * Revert "Update monkey.dm" This reverts commit 29f54c8. * Revert "Update _external_organ.dm" This reverts commit 8de5ea7. * Update _external_organ.dm * Revert "Update _external_organ.dm" This reverts commit 644cc56. * Fix CI maybe? * Update cap.dm * Update DNA.dm * Some cleanup/updating to upstream * Update global_lists.dm * Mush * Update mushpeople.dm * Hopefully the last fix * Doing this differently * Update organ.dm * Update organ.dm * Update organ.dm * Update organ.dm * Update organ.dm * OK * Update organ.dm * Update podpeople.dm * maybe * Hm * Hm * Will this break things? * Revert "Will this break things?" This reverts commit bd288c6. * Test * Update organ.dm * Update organ.dm * Revert "Update organ.dm" This reverts commit ca77ff9. * Update organ.dm * . * . * . * Update snail.dm * Monkeys now use height offset (and monkey tail works) (#81598) This PR adds the ability for monkeys to wear any jumpsuit in the game, and adds support for them to wear things like coats, gloves, and shoes (though this cannot be obtained in-game and is solely achieved through admins, which I also improved a bit upon by adding a defined bitfield for no equip flags). This reverts a lot of changes from tgstation/tgstation#73325 - We no longer check height from limbs and such to bring sprites down, instead monkeys now work more similarly to humans, so the entire PR was made irrelevant, and I didn't really want to leave around dead code for the sake of having a human with longer legs. I've now also added support for Dwarfism, which makes monkeys look even smaller. Very minor change but at least now the mutation doesn't feel like it does literally nothing to monkeys (since they can already walk over tables). Here's a few examples of how it can appear in game (purely for demonstration, as it is currently intentionally made impossible to obtain in-game, though if someone wants to change that post-this PR now that support is added, feel free): Tails have been broken for a while now, the only reason you see them in-game is because they are baked into the monkey sprites. This fixes that, which means humans can now get monkey tails implanted into them (hell yeah) and monkeys can have their tails removed (also hell yeah) * Removes unneeded files * Revert "Removes unneeded files" This reverts commit 6469d37. * . * ok * Update tails.dm * Update monkey.dm * Fix monkey screenshot test * Update species.dm * Update reinf_walls.dm * Maintenance --------- Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com> Co-authored-by: Mal <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: ChungusGamer666 <82850673+ChungusGamer666@users.noreply.github.com> Co-authored-by: san7890 Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: vinylspiders <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/DNA.dm | 11 ++- code/__DEFINES/food.dm | 2 +- code/__DEFINES/inventory.dm | 2 +- code/__HELPERS/global_lists.dm | 23 +++--- code/_globalvars/lists/flavor_misc.dm | 4 +- code/_onclick/hud/hud.dm | 4 +- code/datums/components/food/decomposition.dm | 6 +- code/datums/mutations/telekinesis.dm | 3 +- code/datums/shuttles/emergency.dm | 2 +- code/datums/sprite_accessories.dm | 23 +----- code/game/gamemodes/objective_items.dm | 4 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/doors/airlock.dm | 4 +- code/game/machinery/doors/firedoor.dm | 4 +- code/game/machinery/doors/poddoor.dm | 2 +- .../embedded_controller/access_controller.dm | 2 +- .../embedded_controller/airlock_controller.dm | 2 +- code/game/machinery/lightswitch.dm | 2 +- code/game/machinery/shieldgen.dm | 2 +- code/game/machinery/spaceheater.dm | 2 +- code/game/machinery/status_display.dm | 2 +- code/game/machinery/teleporter.dm | 76 +++++++++---------- code/game/machinery/washing_machine.dm | 2 +- .../temporary_visuals/miscellaneous.dm | 5 +- .../objects/items/AI_modules/_AI_modules.dm | 2 +- .../objects/items/devices/radio/intercom.dm | 2 +- code/game/objects/items/emags.dm | 3 +- code/game/objects/items/extinguisher.dm | 2 +- code/game/objects/items/grenades/emgrenade.dm | 2 +- .../objects/items/implants/implantcase.dm | 2 +- code/game/objects/items/implants/implanter.dm | 2 +- .../game/objects/items/implants/implantpad.dm | 2 +- .../objects/items/robot/robot_upgrades.dm | 2 +- code/game/objects/items/tools/wirecutters.dm | 2 +- code/game/objects/structures/dresser.dm | 2 +- code/game/objects/structures/extinguisher.dm | 2 +- code/game/objects/structures/kitchen_spike.dm | 4 +- code/game/objects/structures/morgue.dm | 2 +- code/game/objects/structures/plasticflaps.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/game/sound.dm | 2 +- code/game/turfs/closed/wall/reinf_walls.dm | 2 +- code/game/turfs/closed/walls.dm | 2 +- code/game/turfs/open/floor.dm | 2 +- code/modules/admin/sql_ban_system.dm | 8 +- code/modules/admin/topic.dm | 4 +- code/modules/admin/verbs/admin.dm | 4 +- code/modules/admin/verbs/admingame.dm | 2 +- code/modules/antagonists/ert/ert.dm | 2 +- code/modules/asset_cache/assets/paper.dm | 9 +-- code/modules/buildmode/buttons.dm | 4 +- code/modules/client/preferences/gender.dm | 4 +- .../preferences/species_features/monkey.dm | 17 +++++ .../species_features/mushperson.dm | 13 ++++ code/modules/client/preferences_savefile.dm | 6 +- code/modules/clothing/masks/gasmask.dm | 4 +- .../food_and_drinks/machinery/deep_fryer.dm | 2 +- .../food_and_drinks/machinery/gibber.dm | 2 +- .../food_and_drinks/machinery/processor.dm | 2 +- code/modules/hydroponics/grown/cannabis.dm | 4 +- code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/jobs/job_types/ai.dm | 4 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 2 - .../mob/living/carbon/human/_species.dm | 4 - code/modules/mob/living/carbon/human/human.dm | 4 +- .../carbon/human/species_types/felinid.dm | 4 +- .../carbon/human/species_types/mothmen.dm | 2 +- .../carbon/human/species_types/mushpeople.dm | 40 ++++++++-- .../carbon/human/species_types/snail.dm | 3 +- code/modules/mob/living/silicon/laws.dm | 4 +- .../hostile/megafauna/_megafauna.dm | 4 +- code/modules/mod/mod_control.dm | 2 +- code/modules/mod/modules/_module.dm | 2 +- .../power/singularity/containment_field.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- .../power/singularity/field_generator.dm | 2 +- .../projectiles/guns/ballistic/pistol.dm | 2 +- .../projectiles/guns/ballistic/shotgun.dm | 2 +- .../projectiles/guns/energy/energy_gun.dm | 2 +- .../projectiles/guns/energy/special.dm | 2 +- code/modules/projectiles/projectile.dm | 4 +- code/modules/reagents/chem_splash.dm | 5 +- .../chemistry/reagents/food_reagents.dm | 4 +- code/modules/reagents/reagent_dispenser.dm | 8 +- .../reagents/withdrawal/generic_addictions.dm | 4 +- code/modules/recycling/disposal/bin.dm | 2 +- code/modules/research/experimentor.dm | 2 +- code/modules/research/stock_parts.dm | 6 +- code/modules/surgery/advanced/brainwashing.dm | 6 +- .../surgery/bodyparts/head_hair_and_lips.dm | 8 +- .../organs/external/_external_organ.dm | 11 ++- code/modules/surgery/organs/external/tails.dm | 7 +- .../unit_tests/simple_animal_freeze.dm | 4 +- code/modules/uplink/uplink_items/clownops.dm | 4 +- code/modules/uplink/uplink_items/explosive.dm | 5 +- code/modules/uplink/uplink_items/job.dm | 4 +- html/admin/banpanel.css | 3 - interface/stylesheet.dm | 6 +- .../mutant_bodypart_overlay.dm | 4 +- .../code/game/objects/items/hhmirror.dm | 2 - .../antagonists/changeling/changeling.dm | 29 +++---- .../species_features/digitigrade_legs.dm | 1 + .../modules/clothing/under/jobs/security.dm | 7 -- .../modules/aesthetics/kitchen/kitchen.dm | 4 +- .../mob/dead/new_player/preferences_setup.dm | 2 +- .../mob/dead/new_player/sprite_accessories.dm | 23 +++++- .../new_player/sprite_accessories/genitals.dm | 2 - .../mob/living/carbon/human/species/lizard.dm | 10 +++ .../living/carbon/human/species/mushpeople.dm | 10 +++ .../mob/living/carbon/human/species/unathi.dm | 2 +- .../chemistry/reagents/alcohol_reagents.dm | 2 +- .../modules/surgery/organs/cap.dm | 34 +++++---- .../modules/surgery/organs/ears.dm | 7 -- .../modules/surgery/organs/organ.dm | 52 ++++++++----- .../modules/icspawning/code/cards_ids.dm | 2 +- .../modules/icspawning/code/observer.dm | 2 +- .../modules/icspawning/code/standard.dm | 2 +- .../modules/mapping/code/static_plaques.dm | 2 +- tgstation.dme | 2 + .../tgui-panel/styles/tgchat/chat-dark.scss | 8 +- .../tgui-panel/styles/tgchat/chat-light.scss | 3 +- tgui/packages/tgui/index.tsx | 4 +- .../tgui/interfaces/AntagInfoWizard.tsx | 2 +- .../preferences/features/base.tsx | 4 +- tgui/packages/tgui/styles/main.scss | 4 +- 125 files changed, 396 insertions(+), 335 deletions(-) create mode 100644 code/modules/client/preferences/species_features/monkey.dm create mode 100644 code/modules/client/preferences/species_features/mushperson.dm diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 8f797c62aa5..6a91ed9ae01 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -58,21 +58,20 @@ #define DNA_MOTH_MARKINGS_BLOCK 13 #define DNA_MUSHROOM_CAPS_BLOCK 14 #define DNA_POD_HAIR_BLOCK 15 +#define DNA_MONKEY_TAIL_BLOCK 16 +*/ //SKYRAT EDIT REMOVAL END -#define DNA_FEATURE_BLOCKS 15 -*/ //SKYRAT EDIT CHANGE - ORIGINAL -#define DNA_FEATURE_BLOCKS GLOB.dna_total_feature_blocks - +#define DNA_FEATURE_BLOCKS GLOB.dna_total_feature_blocks // SKYRAT EDIT CHANGE - ORIGINAL: #define DNA_FEATURE_BLOCKS 16 +// SKYRAT 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 +// SKYRAT EDIT ADDITION END -// SKYRAT EDIT CHANGE END #define DNA_SEQUENCE_LENGTH 4 #define DNA_MUTATION_BLOCKS 8 diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index f3a21b41c77..906a622550d 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 // SKYRAT 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 6f1c9512b39..11def884c6f 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -168,7 +168,7 @@ #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) -// SKYRAT EDIT END +// SKYRAT EDIT ADDITION END //flags for covering body parts #define GLASSESCOVERSEYES (1<<0) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index d16b91ee4c8..b170e84c37d 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) //SKYRAT 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) - */ //SKYRAT EDIT REMOVAL END - //bras - init_sprite_accessory_subtypes(/datum/sprite_accessory/bra, GLOB.bra_list, GLOB.bra_m, GLOB.bra_f) // SKYRAT EDIT ADDITION +*/ //SKYRAT EDIT REMOVAL END + init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list) + // SKYRAT 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) - init_sprite_accessory_subtypes(/datum/sprite_accessory/wings/moth, GLOB.moth_wings_list) // SKYRAT EDIT ADDITION - Customization - init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, GLOB.tails_list_monkey, add_blank = TRUE) // SKYRAT 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) // SKYRAT EDIT - Customization - ORIGINAL: init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list) - - //SKYRAT 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)) - //SKYRAT EDIT END + // SKYRAT EDIT ADDITION END /// Inits GLOB.species_list. Not using GLOBAL_LIST_INIT b/c it depends on GLOB.string_lists /proc/init_species_list() @@ -86,9 +85,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_skyrat_datum_references() //SKYRAT EDIT ADDITION - CUSTOMIZATION init_crafting_recipes() init_crafting_recipes_atoms() @@ -99,7 +96,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_skyrat)) // SKYRAT EDIT - Add skyrat food crafting category + var/is_cooking = ((recipe.category in GLOB.crafting_category_food) || (recipe.category in GLOB.crafting_category_food_skyrat)) // SKYRAT 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/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 9f82f792039..4981880d5ff 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) */ //SKYRAT EDIT REMOVAL END +GLOBAL_LIST_EMPTY(caps_list) +GLOBAL_LIST_EMPTY(pod_hair_list) GLOBAL_LIST_EMPTY(moth_wings_list) // SKYRAT EDIT ADDITION - Customization GLOBAL_LIST_EMPTY(tails_list_monkey) // SKYRAT 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 53d339d4269..2a2b28d7ebe 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -271,9 +271,9 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( alien_queen_finder = null combo_display = null - //SKYRAT EDIT START - SKYRAT HUD + //SKYRAT EDIT ADDITION START - SKYRAT HUD wanted_lvl = null - // SKYRAT EDIT END - SKYRAT HUD + // SKYRAT EDIT ADDITION END - SKYRAT 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..acb44d4c9e9 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) // SKYRAT EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME (10 MINUTES) +#define DECOMPOSITION_TIME_RAW (15 MINUTES) // SKYRAT EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME_RAW (5 MINUTES) +#define DECOMPOSITION_TIME_GROSS (10 MINUTES) // SKYRAT 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 956b266dd65..effe2763bd7 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_skyrat/master_files/icons/effects/tele_effects.dmi', "telekinesishead", -MUTATIONS_LAYER)) //SKYRAT 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_skyrat/master_files/icons/effects/tele_effects.dmi', "telekinesishead", -MUTATIONS_LAYER)) //SKYRAT 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 984c0b34ea9..aabb144b5a1 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 // SKYRAT EDIT OVERRIDE - OVERRIDEN IN ADVANCED_SHUTTLES - shuttles.dm +/datum/map_template/shuttle/emergency // SKYRAT 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 2c31b61ea1a..202471d620f 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -1167,8 +1167,6 @@ gender = MALE use_static = TRUE - - /* SKYRAT 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 + /* SKYRAT 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 */ // SKYRAT EDIT END + /datum/sprite_accessory/undershirt/blueshirtsport name = "Sports Shirt (Blue)" icon_state = "blueshirtsport" @@ -1890,18 +1890,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 @@ -2178,17 +2166,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/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 448e43893b8..b6563d3bc5f 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 + // SKYRAT 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 + */ // SKYRAT 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/crew.dm b/code/game/machinery/computer/crew.dm index 9939330990b..90b08d01d6d 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. + /* SKYRAT EDIT REMOVAL - We need those slots for our own jobs, these jobs aren't on Skyrat anymore anyway. JOB_SECURITY_OFFICER_MEDICAL = 13, JOB_SECURITY_OFFICER_ENGINEERING = 14, JOB_SECURITY_OFFICER_SCIENCE = 15, diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 661e9035f01..8bdbb34100e 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 SKYRAT AESTHETICS - SEE MODULE + var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //OVERRIDDEN IN SKYRAT 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 SKYRAT AESTHETICS - SEE MODULE + var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'//OVERRIDDEN IN SKYRAT 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 13d3b8714be..a707853452a 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -755,7 +755,7 @@ /obj/machinery/door/firedoor/heavy name = "heavy firelock" - icon = 'icons/obj/doors/Doorfire.dmi' //SKYRAT EDIT - ICON OVERRIDEN IN AESTHETICS MODULE + icon = 'icons/obj/doors/Doorfire.dmi' // SKYRAT EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE glass = FALSE explosion_block = 2 assemblytype = /obj/structure/firelock_frame/heavy @@ -770,7 +770,7 @@ /obj/structure/firelock_frame name = "firelock frame" desc = "A partially completed firelock." - icon = 'icons/obj/doors/Doorfire.dmi' //SKYRAT EDIT - ICON OVERRIDEN IN AESTHETICS MODULE + icon = 'icons/obj/doors/Doorfire.dmi' // SKYRAT 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 deb8341b0ba..1d92cd69d07 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 SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/doors/blastdoor.dmi' //ICON OVERRIDDEN IN SKYRAT 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 dc3b917705f..be3730fd57c 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' // SKYRAT EDIT CHANGE - ICON OVERRIDEN BY AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/wallmounts.dmi' // SKYRAT 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 359ab48945b..fe0ca05c760 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' // SKYRAT EDIT CHANGE - ICON OVERRIDEN BY AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/wallmounts.dmi' // SKYRAT 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 f02a3eb1759..03ee57eb389 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' //SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/wallmounts.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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 1e641f02460..a28f9600dc9 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' //SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon ='icons/obj/machines/shield_generator.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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 3f2bb0b0c9e..d5a36824fce 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' // SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/pipes_n_cables/atmos.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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 7ba8b9fda2d..277af76c56e 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -14,7 +14,7 @@ GLOBAL_DATUM_INIT(status_font, /datum/font, new /datum/font/tiny_unicode/size_12 /obj/machinery/status_display name = "status display" desc = null - icon = 'icons/obj/machines/status_display.dmi' //// SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/status_display.dmi' //// SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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 e59732b6fc0..4a6151c94f4 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -74,45 +74,43 @@ com.target_ref = null visible_message(span_alert("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.")) return - if(!ismovable(M)) - return - var/turf/start_turf = get_turf(M) - if(!do_teleport(M, target, channel = TELEPORT_CHANNEL_BLUESPACE)) - return - use_energy(active_power_usage) - new /obj/effect/temp_visual/portal_animation(start_turf, src, M) - if(!calibrated && ishuman(M) && prob(30 - ((accuracy) * 10))) //oh dear a problem - var/mob/living/carbon/human/human = M - /*SKYRAT EDIT REMOVAL START - 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)) - species_to_transform = /datum/species/moth - if(human.dna && human.dna.species.id != initial(species_to_transform.id)) - to_chat(M, span_hear("You hear a buzzing in your ears.")) - human.set_species(species_to_transform) - human.log_message("was turned into a [initial(species_to_transform.name)] through [src].", LOG_GAME) - SKYRAT EDIT REMOVAL END*/ - // SKYRAT EDIT ADDITION START - 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 - human.log_message("lost a [initial(BP.name)] to the [src].", LOG_GAME) - BP.dismember() - qdel(BP) - // SKYRAT ADDITION END - calibrated = FALSE + if (ismovable(M)) + if(do_teleport(M, target, channel = TELEPORT_CHANNEL_BLUESPACE)) + use_energy(active_power_usage) + 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 + /* - SKYRAT 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)) + species_to_transform = /datum/species/moth + if(human.dna && human.dna.species.id != initial(species_to_transform.id)) + to_chat(M, span_hear("You hear a buzzing in your ears.")) + human.set_species(species_to_transform) + log_game("[human] ([key_name(human)]) was turned into a [initial(species_to_transform.name)] through [src].") + + */ //SKYRAT EDIT REMOVAL END + // SKYRAT 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) + //SKYRAT EDIT ADDITION END + calibrated = FALSE + return /obj/machinery/teleport/hub/update_icon_state() icon_state = "[base_icon_state][panel_open ? "-o" : (is_ready() ? 1 : 0)]" diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 483a1bd563b..08675597f13 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 SKYRAT 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 b99b5817699..ffd2f61541c 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" //Skyrat edit, was "empdisable" - icon = 'modular_skyrat/master_files/icons/effects/tele_effects.dmi' //Skyrat Addition + icon_state = "telekinesis_throw" // SKYRAT EDIT CHANGE - ORIGINAL: icon_state = "empdisable" + icon = 'modular_skyrat/master_files/icons/effects/tele_effects.dmi' // SKYRAT 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..1405dc6880c 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() // SKYRAT 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..40b6740590b 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 SKYRAT 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 f197a9b5fdb..37c5c6698a2 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. + // SKYRAT 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 // SKYRAT EDIT ADDITION diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index f7a177f322c..ecf6ebd4dbe 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' // SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/tools.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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 30e73dfe5ef..f1173e45513 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/grenade/empgrenade //SKYRAT 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 56a16f3058c..6e320514a17 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/implantcase//SKYRAT 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 d44b42d7a9f..feaa6f324b4 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/implanter//SKYRAT 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 dffd7aa77a4..add6a12ae51 100644 --- a/code/game/objects/items/implants/implantpad.dm +++ b/code/game/objects/items/implants/implantpad.dm @@ -1,4 +1,4 @@ -/obj/item/implantpad//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/implantpad//SKYRAT 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 666ae97105f..9ba922cabc1 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -656,7 +656,7 @@ //R.update_transform(0.5) // Original R.update_transform(0.8) // SKYRAT EDIT CHANGE -/obj/item/borg/upgrade/rped//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/borg/upgrade/rped//SKYRAT 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 e7e4dbe699a..46b33edc79a 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/wirecutters/abductor//SKYRAT 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/dresser.dm b/code/game/objects/structures/dresser.dm index 18332de296d..1f8f3a69903 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 SKYRAT EDIT -/obj/structure/dresser//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/dresser//SKYRAT 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 f218f4d77f7..1791d72aa12 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 SKYRAT 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 7f3e4195810..c13e8f7e4ae 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/kitchenspike_frame//SKYRAT 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/kitchenspike//SKYRAT 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 af1bdb28062..08f47a09776 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 SKYRAT 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..090de37aef9 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 SKYRAT 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 818e3c43499..9c6c2307fca 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -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 SKYRAT 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 ebf4151313c..83931d213e6 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -203,7 +203,7 @@ ///Used to convert a SFX define into a .ogg so we can add some variance to sounds. If soundin is already a .ogg, we simply return it /proc/get_sfx(soundin) - soundin = get_sfx_skyrat(soundin) //SKYRAT EDIT ADDITION - This overrides the default sound effects too, so use it to modularly change a sound effect output. + soundin = get_sfx_skyrat(soundin) // SKYRAT EDIT ADDITION - This overrides the default sound effects too, so use it to modularly change a sound effect output. if(!istext(soundin)) return soundin switch(soundin) diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index 34d3c879008..06bc0ebe02b 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 SKYRAT 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 91344bb9a33..00b00ef6178 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 SKYRAT 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 8c754c5d8a6..0c8a3f47aa6 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 SKYRAT 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 1d4d2f2f2a1..59244982da4 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -432,8 +432,8 @@ ROLE_SYNDICATE, ROLE_TRAITOR, ROLE_WIZARD, - ROLE_BORER, //SKYRAT EDIT - ROLE_ASSAULT_OPERATIVE, //SKYRAT EDIT + ROLE_BORER, // SKYRAT EDIT ADDITION + ROLE_ASSAULT_OPERATIVE, // SKYRAT EDIT ADDITION ), "Skyrat Ban Options" = list( BAN_PACIFICATION, @@ -445,8 +445,8 @@ BAN_EORG, BAN_ANTAGONIST, BAN_OPFOR, - BAN_LOOC, //SKYRAT ADDITION - LOOC muting again - ),//SKYRAT EDIT ADDITION - EXTRA_BANS + BAN_LOOC, // SKYRAT EDIT ADDITION - LOOC muting again + ), // SKYRAT 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 6c18d4dc0f7..5291805609f 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1764,7 +1764,7 @@ if(!paper_to_show) return paper_to_show.ui_interact(usr) - // SKYRAT ADDITION START + // SKYRAT EDIT ADDITION START else if(href_list["pass_opfor_candidate"]) if(!check_rights(R_ADMIN)) return @@ -1772,7 +1772,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 + // SKYRAT 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..3aaab5bae58 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. + // SKYRAT EDIT ADDITION START - LOOC muting again. if(MUTE_LOOC) mute_string = "LOOC" feedback_string = "LOOC" - //Skyrat Addition End - LOOC muting again. + // SKYRAT 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 7764bb5594a..fd339a1e098 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
" // SKYRAT 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..ee6adea0c3e 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 // SKYRAT 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 8653cff0dd1..9842e21ec21 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 + // SKYRAT EDIT ADDITION: START - Donator stamp icons "stamp-cat_blue" = 'modular_skyrat/master_files/icons/stamp_icons/cat_blue.png', "stamp-paw_blue" = 'modular_skyrat/master_files/icons/stamp_icons/paw_blue.png', "stamp-cat_red" = 'modular_skyrat/master_files/icons/stamp_icons/cat_red.png', @@ -11,13 +11,10 @@ "stamp-paw_orange" = 'modular_skyrat/master_files/icons/stamp_icons/paw_orange.png', "stamp-cat_green" = 'modular_skyrat/master_files/icons/stamp_icons/cat_green.png', "stamp-paw_green" = 'modular_skyrat/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_skyrat/master_files/icons/stamp_icons/large_stamp-nri.png', "stamp-solfed" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-solfed.png', - // SKYRAT ADDITION: END - Other stamp icons - + // SKYRAT 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..cbe473185bb 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 // SKYRAT 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)// SKYRAT 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..38c9342449b 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??? + /* SKYRAT 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 + */ // SKYRAT 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 new file mode 100644 index 00000000000..74d9343a695 --- /dev/null +++ b/code/modules/client/preferences/species_features/monkey.dm @@ -0,0 +1,17 @@ +/* SKYRAT EDIT REMOVAL START +/datum/preference/choiced/monkey_tail + savefile_key = "feature_monkey_tail" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_SECONDARY_FEATURES + relevant_external_organ = /obj/item/organ/external/tail/monkey + +/datum/preference/choiced/monkey_tail/init_possible_values() + return assoc_to_keys_features(GLOB.tails_list_monkey) + +/datum/preference/choiced/monkey_tail/apply_to_human(mob/living/carbon/human/target, value) + target.dna.features["tail_monkey"] = value + +/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) +*/ // SKYRAT 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..9b77ed72f19 --- /dev/null +++ b/code/modules/client/preferences/species_features/mushperson.dm @@ -0,0 +1,13 @@ +/* SKYRAT 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 0fa517cd248..e9eb42c3551 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) //SKYRAT EDIT ADDITION + load_character_skyrat(save_data) // SKYRAT 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) //SKYRAT EDIT ADDITION + save_character_skyrat(save_data) // SKYRAT EDIT ADDITION return TRUE diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index a258eea7775..3693cc7c9de 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 + // SKYRAT EDIT ADDITION START - More mask variations var/mob/living/carbon/human/human_user = user if(human_user.dna.species.mutant_bodyparts["snout"]) icon = 'modular_skyrat/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 + /* SKYRAT 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 68cfddcf5f1..60efe0627ae 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/deepfryer//SKYRAT 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 c8ddefc43b9..da09450bf1a 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/gibber//SKYRAT 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 10f80d2d301..88ae75015bf 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 //SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/processor //SKYRAT 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 4ac0e396b9d..b4cd35899d2 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, //SKYRAT EDIT - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, + reagents_add = list(/datum/reagent/drug/thc = 0.3, //SKYRAT 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, // SKYRAT 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 fb16d8428c9..80f02328008 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -1,5 +1,5 @@ // Plant analyzer -/obj/item/plant_analyzer//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/plant_analyzer//SKYRAT 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 5268c128a8e..b8c0e00bdad 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 + /* SKYRAT 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 + */ // SKYRAT EDIT REMOVAL END var/mob/living/silicon/ai/ai_spawn = spawned ai_spawn.log_current_laws() // SKYRAT 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 4bfcd97e464..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++ -// SKYRAT 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/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index c3f47633341..c63689caf35 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -700,8 +700,6 @@ GLOBAL_LIST_EMPTY(features_by_species) species_human.apply_overlay(BODY_LAYER) handle_mutant_bodyparts(species_human) -*/ -//SKYRAT EDIT REMOVAL END /** * Handles the mutant bodyparts of a human @@ -712,8 +710,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. */ -//SKYRAT 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) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4febca81d67..40403c7c1bc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -675,12 +675,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 + // SKYRAT 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 + // SKYRAT 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/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 2b6ab9f7a29..28874842470 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -260,14 +260,14 @@ SPECIES_PERK_NAME = "Hydrophobia", SPECIES_PERK_DESC = "Felinids don't like getting soaked with water.", ), -//Skyrat addition begin +// SKYRAT 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 +// SKYRAT EDIT ADDITION END ) return to_add 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 e8f323e1911..4c0430352a8 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") // SKYRAT EDIT - Fixing moths + // external_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // SKYRAT 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 046cbc165aa..991b0497468 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -2,12 +2,13 @@ name = "Mushroomperson" plural_form = "Mushroompeople" id = SPECIES_MUSHROOM - mutant_bodyparts = list("caps" = list(MUTANT_INDEX_NAME = "Round", MUTANT_INDEX_COLOR_LIST = list("#FF4B19"))) // SKYRAT 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, TRAIT_NOBREATH, @@ -41,10 +42,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") // SKYRAT 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)) // SKYRAT EDIT - Customization - ORIGINAL: H.dna.features["caps"] = "Round" - handle_mutant_bodyparts(H) mush = new() mush.teach(C) mush.allow_temp_override = FALSE @@ -61,6 +58,33 @@ 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) //SKYRAT EDIT - ORIGINAL: /datum/species/mush/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour) (one parameter added) - forced_colour = FALSE - return ..() +/// 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 // SKYRAT 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 ba77ba720c0..f0f526a1489 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -116,7 +116,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. +// SKYRAT 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/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 8bb4d42b3c7..7a6b4c5f207 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 + // SKYRAT 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 + // SKYRAT 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..99a327d8e7b 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 + // SKYRAT 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 + // SKYRAT 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 24bae497cab..aaee4713413 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 + // SKYRAT 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 aeab9fbb43c..7856233a219 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()) // SKYRAT 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 932aef0e8e5..52f40537144 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' // SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/engine/singularity.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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 38f18d7d627..d0b40c1b498 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' //SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/machines/engine/singularity.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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..1d982c98b5c 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 SKYRAT 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 3c0500ac219..5034ac96e82 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -105,7 +105,7 @@ simulated_hit.firer = throwingdatum.get_thrower() simulated_hit.on_hit(hit_atom) -/obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE +/obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDDEN IN SKYRAT 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 7481443bade..4b7b8e261fd 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 SKYRAT 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 f64437e3579..e54cb3d75d4 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 //SKYRAT EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE +/obj/item/gun/energy/e_gun/nuclear // SKYRAT 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 b9c8b7de41f..2179e31c395 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 //SKYRAT EDIT - ICON OVERRIDDEN IN AESTHETICS MODULE +/obj/item/gun/energy/ionrifle // SKYRAT 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 08530405338..14b043def5c 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 + // SKYRAT 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 + // SKYRAT EDIT ADDITION END /// If true directly targeted turfs can be hit var/can_hit_turfs = FALSE diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm index 2e94083f8cb..af3c11ce210 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 + // SKYRAT EDIT ADDITION START - Liquids if(isturf(epicenter)) var/turf/center_of_mess = epicenter center_of_mess.add_liquid_from_reagents(source) - // SKYRAT ADDITION END + // SKYRAT 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..d87ff89bff7 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 + // SKYRAT EDIT ADDITION BEGIN - Racial Drinks if (RACE_DRINK) exposed_mob.add_mood_event("quality_drink", /datum/mood_event/race_drink) - // SKYRAT ADDITION END + // SKYRAT 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 a25b3936a35..4d9cf6dffa4 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/foamtank//SKYRAT 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/fueltank//SKYRAT 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/water_cooler//SKYRAT 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/structure/reagent_dispensers/plumbed//SKYRAT 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..f38d4e27680 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. +/* SKYRAT 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") -*/ +*/ // SKYRAT EDIT REMOVAL END diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index bc40b1d0394..431945783de 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' //SKYRAT EDIT CHANGE - ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE + icon = 'icons/obj/pipes_n_cables/disposal.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT 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 98d3943d4f9..67f309a5f3c 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/machinery/rnd/experimentor//SKYRAT 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 92adbc7f818..c680abcae0a 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/storage/part_replacer //SKYRAT 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//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/storage/part_replacer/bluespace //SKYRAT 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 //SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE +/obj/item/storage/part_replacer/cyborg //SKYRAT 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 4c5efe367fe..85fa694181b 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -1,9 +1,9 @@ /obj/item/disk/surgery/brainwashing name = "Surgery Disk" //SKYRAT EDIT: Formerly "Brainwashing Surgery Disk" //Finally I can upload the funny surgery disk without letting everyone in the room know about it! - desc = "The disk provides instructions on some kind of surgery, but the label has been scratched off..." //Skyrat edit: Moved to Special Desc. + desc = "The disk provides instructions on some kind of surgery, but the label has been scratched off..." //Skyrat edit: Moved to Special Desc. surgeries = list(/datum/surgery/advanced/brainwashing) - special_desc_requirement = EXAMINE_CHECK_JOB // Skyrat 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_requirement = EXAMINE_CHECK_JOB // SKYRAT EDIT + special_desc_jobs = list("Medical Doctor, Chief Medical Officer, Roboticist") // SKYRAT 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 bfe70f0f574..c1970e89f00 100644 --- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm +++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm @@ -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 + // SKYRAT 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 + // SKYRAT 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 + // SKYRAT 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 + // SKYRAT 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 3156667ac09..a29d69af19e 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) + // SKYRAT EDIT ADDITION START + if(mutantpart_key) + transfer_mutantpart_info(organ_owner, special) + // SKYRAT EDIT ADDITION END . = ..() if(!special) organ_owner.update_body_parts() @@ -77,10 +81,15 @@ if(!.) return + // SKYRAT EDIT ADDITION START + if(mutantpart_key) + copy_to_mutant_bodyparts(receiver, special) + // SKYRAT 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) // SKYRAT EDIT CHANGE - ORIGINAL: feature_name = receiver.dna.species.external_organs[type] + if(!bodypart_overlay.set_appearance_from_dna(receiver.dna)) // SKYRAT EDIT CHANGE - ORIGINAL: feature_name = receiver.dna.species.external_organs[type] + bodypart_overlay.set_appearance_from_name(receiver.dna.species.external_organs[type]) // SKYRAT EDIT ADDITION // SKYRAT 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 e1de62308f0..d9dfbf7b9dd 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 + // SKYRAT 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")) + // SKYRAT EDIT ADDITION END var/feature_name = bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] // SKYRAT 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") // SKYRAT EDIT CHANGE - ORIGINAL: tail_spines_overlay.set_appearance_from_name(feature_name) bodypart.add_bodypart_overlay(tail_spines_overlay) @@ -164,9 +168,6 @@ feature_key = "tail" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "tail_cat" // color_source = ORGAN_COLOR_HAIR // SKYRAT EDIT REMOVAL -/datum/bodypart_overlay/mutant/tail/cat/get_global_feature_list() - return GLOB.sprite_accessories["tail"] // SKYRAT EDIT - Customization - ORIGINAL: return GLOB.tails_list_human - /obj/item/organ/external/tail/monkey bodypart_overlay = /datum/bodypart_overlay/mutant/tail/monkey diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index 1061f6dc585..e10cd2636cf 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 SKYRAT ENTRIES + // PLEASE REFACTOR THESE AS YOU CAN /mob/living/simple_animal/hostile/bigcrab, /mob/living/simple_animal/hostile/blackmesa, /mob/living/simple_animal/hostile/blackmesa/blackops, diff --git a/code/modules/uplink/uplink_items/clownops.dm b/code/modules/uplink/uplink_items/clownops.dm index 73dd3d4c876..8d607cb0d5c 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 +/* // SKYRAT 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 +*/ // SKYRAT 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 bde168876ff..0ecea6a5b60 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 -/* //SKYRAT EDIT REMOVAL START + +/* // SKYRAT 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 +*/ // SKYRAT 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 22528937ebf..12627d1fb54 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 +/* // SKYRAT 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 */ -// SKYRAT EDIT END +// SKYRAT 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/interface/stylesheet.dm b/interface/stylesheet.dm index e2d474a485d..37f85e24dab 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;} } +// SKYRAT 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 +// SKYRAT EDIT ADDITION END .phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} @keyframes phobia { diff --git a/modular_skyrat/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/modular_skyrat/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index 1a86afbea05..130d1277e45 100644 --- a/modular_skyrat/master_files/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/modular_skyrat/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_skyrat/master_files/code/game/objects/items/hhmirror.dm b/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm index 27561067b6a..598cace44c2 100644 --- a/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm +++ b/modular_skyrat/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_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm b/modular_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm index e911e8aeabb..db1afad786f 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm @@ -3,33 +3,34 @@ /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 + /// 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 diff --git a/modular_skyrat/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm b/modular_skyrat/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm index 0b4db9245d7..cc88bc9fe56 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/species_features/digitigrade_legs.dm +++ b/modular_skyrat/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_skyrat/master_files/code/modules/clothing/under/jobs/security.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm index 4a9b047d963..f6e14cadaea 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm @@ -156,10 +156,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" - -/* -* PRISONER -*/ - -/obj/item/clothing/under/rank/prisoner - greyscale_config_worn_monkey = /datum/greyscale_config/jumpsuit/prison/worn/monkey diff --git a/modular_skyrat/modules/aesthetics/kitchen/kitchen.dm b/modular_skyrat/modules/aesthetics/kitchen/kitchen.dm index 4324487db65..e26b690e975 100644 --- a/modular_skyrat/modules/aesthetics/kitchen/kitchen.dm +++ b/modular_skyrat/modules/aesthetics/kitchen/kitchen.dm @@ -16,14 +16,14 @@ /obj/machinery/gibber icon = 'modular_skyrat/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_skyrat/modules/aesthetics/kitchen/microwave.dmi' /obj/structure/showcase/machinery/microwave icon = 'modular_skyrat/modules/aesthetics/kitchen/microwave.dmi' -//Skyrat Coffee Maker Icons +// Skyrat Coffee Maker Icons /obj/machinery/coffeemaker icon = 'modular_skyrat/modules/aesthetics/kitchen/coffeemaker.dmi' diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/preferences_setup.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/preferences_setup.dm index c2bfd6c7d49..7246999236c 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/preferences_setup.dm +++ b/modular_skyrat/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 +// SKYRAT 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 diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index 27c82614cfb..2efc9ab9f3f 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_skyrat/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 @@ -139,8 +137,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_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm index 6fa8c6ab2d0..9c080a96621 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm +++ b/modular_skyrat/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_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm index 55f20d16e6b..7ca2a6b8e52 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/lizard.dm +++ b/modular_skyrat/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_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm index 9a707e5225b..f0a2570ba4c 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm +++ b/modular_skyrat/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_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm index bbf7f91b08b..8731ff495d1 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm +++ b/modular_skyrat/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_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 8c4ba3dfe84..d1eb5cbc3f1 100644 --- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/modular_skyrat/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_skyrat/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_skyrat/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_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_skyrat/modules/customization/modules/surgery/organs/cap.dm b/modular_skyrat/modules/customization/modules/surgery/organs/cap.dm index f642a8f0a73..664334aee03 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/cap.dm +++ b/modular_skyrat/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_skyrat/modules/customization/modules/surgery/organs/ears.dm b/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm index 7123f926ba7..db653ddae8f 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm +++ b/modular_skyrat/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_skyrat/modules/customization/modules/surgery/organs/organ.dm b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm index e1892fc5543..2e07455af7b 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm +++ b/modular_skyrat/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_skyrat/modules/icspawning/code/cards_ids.dm b/modular_skyrat/modules/icspawning/code/cards_ids.dm index 345b5b6f4e6..2d8600585a0 100644 --- a/modular_skyrat/modules/icspawning/code/cards_ids.dm +++ b/modular_skyrat/modules/icspawning/code/cards_ids.dm @@ -1,4 +1,4 @@ -//SKYRAT MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 +// SKYRAT 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_skyrat/modules/icspawning/code/observer.dm b/modular_skyrat/modules/icspawning/code/observer.dm index 900a73746ab..00320433468 100644 --- a/modular_skyrat/modules/icspawning/code/observer.dm +++ b/modular_skyrat/modules/icspawning/code/observer.dm @@ -1,4 +1,4 @@ -//SKYRAT MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 +// SKYRAT MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 /mob/dead/observer/CtrlClickOn(mob/user) quickicspawn(user) diff --git a/modular_skyrat/modules/icspawning/code/standard.dm b/modular_skyrat/modules/icspawning/code/standard.dm index 3f15b6662a0..5c891d5b6ce 100644 --- a/modular_skyrat/modules/icspawning/code/standard.dm +++ b/modular_skyrat/modules/icspawning/code/standard.dm @@ -1,4 +1,4 @@ -//SKYRAT MODULE IC-SPAWNING https://github.com/Skyrat-SS13/Skyrat-tg/pull/104 +// SKYRAT 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_skyrat/modules/mapping/code/static_plaques.dm b/modular_skyrat/modules/mapping/code/static_plaques.dm index 65fac01b183..3f87e960373 100644 --- a/modular_skyrat/modules/mapping/code/static_plaques.dm +++ b/modular_skyrat/modules/mapping/code/static_plaques.dm @@ -1,4 +1,4 @@ -//SKYRAT PLAQUES +// SKYRAT PLAQUES //Current stations diff --git a/tgstation.dme b/tgstation.dme index b166bd60007..909d38307d6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3824,7 +3824,9 @@ #include "code\modules\client\preferences\species_features\ethereal.dm" #include "code\modules\client\preferences\species_features\felinid.dm" #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" diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index 64a0db0b681..049126d684f 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; } } +// SKYRAT EDIT ADDITION BEGIN -// SKYRAT ADDITION BEGIN .velvet { color: #660015; font-weight: bold; @@ -917,8 +917,7 @@ em { color: #9b6000; } } - -// SKYRAT ADDITION END +// SKYRAT EDIT ADDITION END .phobia { color: #dd0000; @@ -1227,8 +1226,8 @@ $border-width-px: $border-width * 1px; background-color: darken(map.get($alert-stripe-colors, $color-name), 5); } } +/* SKYRAT EDIT ADDITION START - DARK MODE CLASSES */ -/* SKYRAT DARK MODE CLASSES */ .mentor { color: #8a2be2; } @@ -1324,3 +1323,4 @@ $border-width-px: $border-width * 1px; font-weight: bold; font-style: italic; } +// SKYRAT 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 0818d48d77e..36a741520da 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -1161,8 +1161,8 @@ $border-width-px: $border-width * 1px; ); } } +/* SKYRAT EDIT ADDITION START - LIGHT MODE CLASSES */ -/* SKYRAT LIGHT MODE CLASSES */ .mentor { color: #8a2be2; } @@ -1277,3 +1277,4 @@ $border-width-px: $border-width * 1px; color: #9b6000; } } +// SKYRAT EDIT ADDITION END diff --git a/tgui/packages/tgui/index.tsx b/tgui/packages/tgui/index.tsx index 223e532ff79..14600cc2f00 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'; // SKYRAT 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 c726bf9bee8..1eee2fd37c7 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 +// SKYRAT 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/PreferencesMenu/preferences/features/base.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx index 26a05dfbad6..8dbe75ccc4b 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 +// SKYRAT EDIT ADDITION START - SKYRAT FEATURES DOWN HERE export const FeatureTextInput = ( props: FeatureValueProps, @@ -355,3 +354,4 @@ export const FeatureTriBoolInput = (props: FeatureValueProps) => { ); }; +// SKYRAT EDIT ADDITION END diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index 07e9fec725e..47f7b5d621c 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -78,10 +78,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 +// SKYRAT EDIT ADDITION START @include meta.load-css('./interfaces/ClockworkResearch.scss'); @include meta.load-css('./interfaces/ClockworkSlab.scss'); -// SKYRAT ADDITION END +// SKYRAT EDIT ADDITION END // Layouts @include meta.load-css('./layouts/Layout.scss');