From 9c7cf5ebaf3c404ae24b6a446acdf66e4e3f419f Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:27:58 -0500
Subject: [PATCH] Bubber Edits for mutant bodypart PR #2903
This is all the edits done squashed together.
---
code/__DEFINES/surgery.dm | 5 ----
code/__DEFINES/~~bubber_defines/chat.dm | 1 +
code/__DEFINES/~~bubber_defines/span.dm | 2 ++
code/_globalvars/lists/ambience.dm | 1 +
code/controllers/subsystem/pai.dm | 12 ++++-----
.../mutant_bodypart_overlay.dm | 12 ++++-----
.../debuffs/dna_transformation.dm | 8 +++---
.../machinery/computer/records/medical.dm | 4 ++-
.../machinery/computer/records/records.dm | 6 ++---
.../antagonists/changeling/changeling.dm | 6 ++---
code/modules/client/preferences.dm | 2 +-
.../modules/client/preferences/_preference.dm | 2 +-
code/modules/mob/dead/new_player/login.dm | 2 +-
.../mob/living/carbon/human/_species.dm | 8 +++---
.../human/species_types/lizardpeople.dm | 2 +-
.../carbon/human/species_types/mothmen.dm | 4 +--
.../carbon/human/species_types/podpeople.dm | 2 +-
code/modules/power/supermatter/supermatter.dm | 2 +-
code/modules/surgery/bodyparts/_bodyparts.dm | 2 +-
code/modules/surgery/organs/external/tails.dm | 6 ++---
.../surgery/organs/internal/ears/_ears.dm | 4 +--
.../surgery/organs/internal/eyes/_eyes.dm | 4 +--
code/modules/unit_tests/dna_infusion.dm | 4 +--
html/changelogs/AutoChangeLog-pr-2898.yml | 4 ---
html/changelogs/AutoChangeLog-pr-2901.yml | 4 ---
html/changelogs/AutoChangeLog-pr-2912.yml | 4 +++
html/changelogs/AutoChangeLog-pr-2913.yml | 4 +++
html/changelogs/archive/2025-01.yml | 16 ++++++++++++
.../client/preferences/erp_preferences.dm | 14 +++++++----
.../client/preferences/mutant_parts.dm | 2 +-
.../modules/client/preferences_savefile.dm | 2 +-
.../new_player/sprite_accessories/ears.dm | 2 +-
.../carbon/human/species/roundstartslime.dm | 4 +--
.../modules/surgery/organs/organ.dm | 4 +--
.../code/nifsofts/hypnosis.dm | 2 +-
.../lewd_items/code/lewd_arousal/climax.dm | 4 +--
.../lewd_arousal/status_effects/climax.dm | 4 +--
.../status_effects/fluid_generation.dm | 6 ++---
.../code/lewd_clothing/hypnogoggles.dm | 2 +-
.../lewd_items/code/lewd_helpers/human.dm | 2 +-
.../lewd_items/code/lewd_helpers/organs.dm | 2 +-
.../lewd_items/code/lewd_helpers/species.dm | 2 +-
.../lewd_items/code/lewd_items/condom.dm | 2 +-
.../modular_vending/code/clothesmate.dm | 1 +
.../modules/synths/code/species/synthetic.dm | 1 -
modular_skyrat/modules/verbs/code/subtle.dm | 17 ++++++++-----
.../antagonists/bloodsucker/powers/veil.dm | 2 +-
.../code/modules/clothing/neck/neck.dm | 23 ++++++++++++++++++
.../code/modules/loadout/categories/neck.dm | 5 ++++
.../icons/mob/clothing/neck/neck.dmi | Bin 5800 -> 7410 bytes
.../icons/obj/clothing/neck/neck.dmi | Bin 6148 -> 7852 bytes
.../sound/ambiance/bangle-freezer.ogg | Bin 0 -> 3553976 bytes
tgui/packages/tgui-panel/chat/constants.ts | 7 ++++++
.../tgui-panel/styles/tgchat/chat-dark.scss | 10 +++++---
.../tgui-panel/styles/tgchat/chat-light.scss | 8 ++++++
.../game_preferences/bubber/subtle_sound.tsx | 4 +--
56 files changed, 169 insertions(+), 96 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-2898.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-2901.yml
create mode 100644 html/changelogs/AutoChangeLog-pr-2912.yml
create mode 100644 html/changelogs/AutoChangeLog-pr-2913.yml
create mode 100644 modular_zubbers/sound/ambiance/bangle-freezer.ogg
diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm
index 48d1117241f..b930c3711de 100644
--- a/code/__DEFINES/surgery.dm
+++ b/code/__DEFINES/surgery.dm
@@ -36,11 +36,6 @@
/// Scarring on the left eye
#define LEFT_EYE_SCAR (1<<1)
-/// Scarring on the right eye
-#define RIGHT_EYE_SCAR (1<<0)
-/// Scarring on the left eye
-#define LEFT_EYE_SCAR (1<<1)
-
/// Helper to figure out if a limb is organic
#define IS_ORGANIC_LIMB(limb) (limb.bodytype & BODYTYPE_ORGANIC)
/// Helper to figure out if a limb is robotic
diff --git a/code/__DEFINES/~~bubber_defines/chat.dm b/code/__DEFINES/~~bubber_defines/chat.dm
index dbfa4540563..aed899b5bd4 100644
--- a/code/__DEFINES/~~bubber_defines/chat.dm
+++ b/code/__DEFINES/~~bubber_defines/chat.dm
@@ -1,3 +1,4 @@
// Additional message types for TGUI chat panel filtering
#define MESSAGE_TYPE_LOOC "looc"
#define MESSAGE_TYPE_REMOTE_LOOC "rlooc"
+#define MESSAGE_TYPE_SUBTLE "subtle"
diff --git a/code/__DEFINES/~~bubber_defines/span.dm b/code/__DEFINES/~~bubber_defines/span.dm
index 1970f8254ea..ae88cc47010 100644
--- a/code/__DEFINES/~~bubber_defines/span.dm
+++ b/code/__DEFINES/~~bubber_defines/span.dm
@@ -1,4 +1,6 @@
+#define span_subtle(str) ("" + str + "")
#define span_subtlepda(str) ("" + str + "")
+#define span_subtler(str) ("" + str + "")
#define span_velvet(str) ("" + str + "")
#define vote_font(str) ("" + str + "")
diff --git a/code/_globalvars/lists/ambience.dm b/code/_globalvars/lists/ambience.dm
index 6cc984adf1c..ed3409da940 100644
--- a/code/_globalvars/lists/ambience.dm
+++ b/code/_globalvars/lists/ambience.dm
@@ -89,6 +89,7 @@ GLOBAL_LIST_INIT(icemoon_ambience,list(
'sound/ambience/icemoon/ambiicesting3.ogg',
'sound/ambience/icemoon/ambiicesting4.ogg',
'sound/ambience/icemoon/ambiicesting5.ogg',
+ 'modular_zubbers/sound/ambiance/bangle-freezer.ogg', // Bubber Edit - Credit: Bangle
))
GLOBAL_LIST_INIT(medical_ambience,list(
diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm
index e3d47a5c0cd..c5754115a6e 100644
--- a/code/controllers/subsystem/pai.dm
+++ b/code/controllers/subsystem/pai.dm
@@ -52,18 +52,18 @@ SUBSYSTEM_DEF(pai)
return FALSE
switch(action)
if("submit")
- candidate.comments = trim(params["comments"], MAX_BROADCAST_LEN)
- candidate.description = trim(params["description"], MAX_BROADCAST_LEN)
- candidate.name = trim(params["name"], MAX_NAME_LEN)
+ candidate.comments = reject_bad_name(params["comments"], allow_numbers = TRUE, max_length = MAX_BROADCAST_LEN, strict = TRUE, cap_after_symbols = FALSE) || "Unknown"
+ candidate.description = reject_bad_name(params["description"], allow_numbers = TRUE, max_length = MAX_BROADCAST_LEN, strict = TRUE, cap_after_symbols = FALSE) || "Unknown"
+ candidate.name = reject_bad_name(params["name"], allow_numbers = TRUE, max_length = MAX_NAME_LEN, strict = TRUE, cap_after_symbols = FALSE) || "Unknown"
candidate.ckey = user.ckey
candidate.ready = TRUE
ui.close()
submit_alert(user)
return TRUE
if("save")
- candidate.comments = params["comments"]
- candidate.description = params["description"]
- candidate.name = params["name"]
+ candidate.comments = reject_bad_name(params["comments"], allow_numbers = TRUE, max_length = MAX_BROADCAST_LEN, strict = TRUE, cap_after_symbols = FALSE) || "Unknown"
+ candidate.description = reject_bad_name(params["description"], allow_numbers = TRUE, max_length = MAX_BROADCAST_LEN, strict = TRUE, cap_after_symbols = FALSE) || "Unknown"
+ candidate.name = reject_bad_name(params["name"], allow_numbers = TRUE, max_length = MAX_NAME_LEN, strict = TRUE, cap_after_symbols = FALSE) || "Unknown"
candidate.savefile_save(user)
return TRUE
if("load")
diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
index 1dfb765d970..87ae6f2bbe7 100644
--- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
@@ -27,16 +27,16 @@
if(imprint_on_next_insertion) //We only want this set *once*
var/feature_name = receiver.dna.features[feature_key]
if (isnull(feature_name))
- /* NOVA EDIT - Customization - ORIGINAL:
+ /* SKYRAT EDIT - Customization - ORIGINAL:
feature_name = receiver.dna.species.mutant_organs[parent.type]
- */ // NOVA EDIT START
+ */ // SKYRAT EDIT START
if(!set_appearance_from_dna(receiver.dna))
- set_appearance_from_name(receiver.dna.species.mutant_organs[parent.type])
- // NOVA EDIT END
- // NOVA EDIT START - Puts the following line in an else block
+ set_appearance_from_name(receiver.dna.species.mutant_organs[parent.type] || pick(get_global_feature_list()))
+ // SKYRAT EDIT END
+ // SKYRAT EDIT START - Puts the following line in an else block
else
set_appearance_from_name(feature_name)
- // NOVA EDIT END
+ // SKYRAT EDIT END
imprint_on_next_insertion = FALSE
/datum/bodypart_overlay/mutant/get_overlay(layer, obj/item/bodypart/limb)
diff --git a/code/datums/status_effects/debuffs/dna_transformation.dm b/code/datums/status_effects/debuffs/dna_transformation.dm
index 243d20b1917..7504977e98f 100644
--- a/code/datums/status_effects/debuffs/dna_transformation.dm
+++ b/code/datums/status_effects/debuffs/dna_transformation.dm
@@ -33,9 +33,9 @@
// Save the old DNA
transforming.dna.copy_dna(old_dna)
// Makes them into the new DNA
- transforming.visual_only_organs = TRUE // NOVA EDIT ADDITION - Customization
+ transforming.visual_only_organs = TRUE // SKYRAT EDIT ADDITION - Customization
new_dna.transfer_identity(transforming)
- transforming.visual_only_organs = FALSE // NOVA EDIT ADDITION - Customization
+ transforming.visual_only_organs = FALSE // SKYRAT EDIT ADDITION - Customization
transforming.real_name = new_dna.real_name
transforming.name = transforming.get_visible_name()
transforming.updateappearance(mutcolor_update = TRUE)
@@ -46,9 +46,9 @@
var/mob/living/carbon/transforming = owner
if(!QDELING(owner)) // Don't really need to do appearance stuff if we're being deleted
- transforming.visual_only_organs = TRUE // NOVA EDIT ADDITION - Customization
+ transforming.visual_only_organs = TRUE // SKYRAT EDIT ADDITION - Customization
old_dna.transfer_identity(transforming)
- transforming.visual_only_organs = FALSE // NOVA EDIT ADDITION - Customization
+ transforming.visual_only_organs = FALSE // SKYRAT EDIT ADDITION - Customization
transforming.updateappearance(mutcolor_update = TRUE)
transforming.domutcheck()
diff --git a/code/game/machinery/computer/records/medical.dm b/code/game/machinery/computer/records/medical.dm
index 2043e129da3..1073c845375 100644
--- a/code/game/machinery/computer/records/medical.dm
+++ b/code/game/machinery/computer/records/medical.dm
@@ -101,7 +101,9 @@
if("add_note")
if(!params["content"])
return FALSE
- var/content = trim(params["content"], MAX_MESSAGE_LEN)
+ var/content = reject_bad_name(params["content"], allow_numbers = TRUE, max_length = MAX_MESSAGE_LEN, strict = TRUE, cap_after_symbols = FALSE)
+ if(!content)
+ return FALSE
var/datum/medical_note/new_note = new(usr.name, content)
while(length(target.medical_notes) > 2)
diff --git a/code/game/machinery/computer/records/records.dm b/code/game/machinery/computer/records/records.dm
index 7d01d973549..30fe231d101 100644
--- a/code/game/machinery/computer/records/records.dm
+++ b/code/game/machinery/computer/records/records.dm
@@ -41,9 +41,9 @@
if(!field || !(field in target?.vars))
return FALSE
- var/value = trim(params["value"], MAX_BROADCAST_LEN)
- investigate_log("[key_name(user)] changed the field: \"[field]\" with value: \"[target.vars[field]]\" to new value: \"[value || "Unknown"]\"", INVESTIGATE_RECORDS)
- target.vars[field] = value || "Unknown"
+ var/value = reject_bad_name(params["value"], allow_numbers = TRUE, max_length = MAX_BROADCAST_LEN, strict = TRUE, cap_after_symbols = FALSE) || "Unknown"
+ investigate_log("[key_name(user)] changed the field: \"[field]\" with value: \"[target.vars[field]]\" to new value: \"[value]\"", INVESTIGATE_RECORDS)
+ target.vars[field] = value
return TRUE
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index 244694c7dcc..1bde98e582f 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -953,10 +953,10 @@
user.regenerate_icons()
user.name = user.get_visible_name()
current_profile = chosen_profile
- // NOVA EDIT START
- user.visual_only_organs = TRUE // NOVA EDIT ADDITION - Customization
+ // SKYRAT EDIT START
+ user.visual_only_organs = TRUE // SKYRAT EDIT ADDITION - Customization
chosen_dna.transfer_identity(user, TRUE)
- user.visual_only_organs = FALSE // NOVA EDIT ADDITION - Customization
+ user.visual_only_organs = FALSE // SKYRAT EDIT ADDITION - Customization
user.updateappearance(mutcolor_update = TRUE, eyeorgancolor_update = TRUE)
user.regenerate_icons()
user.name = user.get_visible_name()
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 0d458f723af..aee974ce57b 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -276,7 +276,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if (istype(requested_preference, /datum/preference/name))
tainted_character_profiles = TRUE
//SKYRAT EDIT
- update_mutant_bodyparts(requested_preference)
+ update_body_parts(requested_preference)
for (var/datum/preference_middleware/preference_middleware as anything in middleware)
if (preference_middleware.post_set_preference(usr, requested_preference_key, value))
return TRUE
diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm
index 9e3b24e0f69..cfba821725f 100644
--- a/code/modules/client/preferences/_preference.dm
+++ b/code/modules/client/preferences/_preference.dm
@@ -333,7 +333,7 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key())
if ( \
!isnull(relevant_inherent_trait) \
- || !isnull(relevant_mutant_bodypart) /* NOVA EDIT ADDITION - Since we still use relevant_mutant_bodypart, we need it here. */ \
+ || !isnull(relevant_mutant_bodypart) /* SKYRAT EDIT ADDITION - Since we still use relevant_mutant_bodypart, we need it here. */ \
|| !isnull(relevant_external_organ) \
|| !isnull(relevant_head_flag) \
|| !isnull(relevant_body_markings) \
diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm
index 91aa6b932e9..440292b7a4f 100644
--- a/code/modules/mob/dead/new_player/login.dm
+++ b/code/modules/mob/dead/new_player/login.dm
@@ -34,7 +34,7 @@
//SKYRAT EDIT ADDITION
var/soft_player_cap = CONFIG_GET(number/player_soft_cap)
- if(soft_player_cap >= TGS_CLIENT_COUNT)
+ if(soft_player_cap && TGS_CLIENT_COUNT >= soft_player_cap)
INVOKE_ASYNC(src, PROC_REF(connect_to_second_server))
//SKYRAT EDIT END
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index 8483767912b..ef035165614 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -311,7 +311,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
qdel(existing_organ)
continue
- if(existing_organ && !disallow_customizable_dna_features) // NOVA EDIT CHANGE - Though sometimes we might want to do that. - ORIGINAL: if(existing_organ)
+ if(existing_organ) // SKYRAT EDIT CHANGE - Though sometimes we might want to do that. - ORIGINAL: if(existing_organ)
// we dont want to remove organs that were not from the old species (such as from freak surgery or prosthetics)
if(existing_organ.type != old_organ_type && !replace_current)
continue
@@ -387,7 +387,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(old_species.type != type)
replace_body(human_who_gained_species, src)
- regenerate_organs(human_who_gained_species, old_species, replace_current = human_who_gained_species.visual_only_organs, visual_only = human_who_gained_species.visual_only_organs) // NOVA EDIT - Allows existing organs to be properly removed when regenerating organs - ORIGINAL: regenerate_organs(human_who_gained_species, old_species, replace_current = FALSE, visual_only = human_who_gained_species.visual_only_organs)
+ regenerate_organs(human_who_gained_species, old_species, replace_current = human_who_gained_species.visual_only_organs, visual_only = human_who_gained_species.visual_only_organs) // SKYRAT EDIT - Allows existing organs to be properly removed when regenerating organs - ORIGINAL: regenerate_organs(human_who_gained_species, old_species, replace_current = FALSE, visual_only = human_who_gained_species.visual_only_organs)
// Update locked slots AFTER all organ and body stuff is handled
human_who_gained_species.hud_used?.update_locked_slots()
// Drop the items the new species can't wear
@@ -404,7 +404,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
//Resets blood if it is excessively high so they don't gib
normalize_blood(human_who_gained_species)
- //add_body_markings(human_who_gained_species) // NOVA EDIT REMOVAL - We do this differently
+ //add_body_markings(human_who_gained_species) // SKYRAT EDIT REMOVAL - We do this differently
if(length(inherent_traits))
human_who_gained_species.add_traits(inherent_traits, SPECIES_TRAIT)
@@ -532,7 +532,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
species_human.apply_overlay(BODY_LAYER)
update_body_markings(species_human)
*/
-//NOVA EDIT REMOVAL END
+//SKYRAT EDIT REMOVAL END
//This exists so sprite accessories can still be per-layer without having to include that layer's
//number in their sprite name, which causes issues when those numbers change.
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 1f720451982..fe3412245cd 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -7,7 +7,7 @@
TRAIT_MUTANT_COLORS,
)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
- mutant_bodyparts = list("body_markings" = "None", "legs" = "Normal Legs") // NOVA EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None")
+ mutant_bodyparts = list("body_markings" = "None", "legs" = "Normal Legs") // SKYRAT EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None")
mutant_organs = list(
/obj/item/organ/external/horns = "None",
/obj/item/organ/external/frills = "None",
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 b2da4ab759e..2045b9b0643 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -3,8 +3,8 @@
plural_form = "Mothmen"
id = SPECIES_MOTH
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
- mutant_bodyparts = list("moth_markings" = "None") // NOVA EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None")
- //mutant_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // NOVA EDIT REMOVAL - Fixing moths
+ mutant_bodyparts = list("moth_markings" = "None") // SKYRAT EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None")
+ //mutant_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/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 577e80c9124..83ce525ec83 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -8,7 +8,7 @@
TRAIT_PLANT_SAFE,
)
mutant_organs = list(
- // /obj/item/organ/external/pod_hair = "None", // NOVA EDIT REMOVAL - Customization (it messes up unit tests.)
+ // /obj/item/organ/external/pod_hair = "None", // SKYRAT EDIT REMOVAL - Customization (it messes up unit tests.)
)
inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_PLANT
inherent_factions = list(FACTION_PLANTS, FACTION_VINES)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index c9dc7fd9c76..5d594986a69 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -254,7 +254,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
QDEL_NULL(radio)
QDEL_NULL(countdown)
if(is_main_engine && GLOB.main_supermatter_engine == src)
- SSpersistence.reset_delam_counter() // NOVA EDIT ADDITION BEGIN - DELAM SCRAM
+ SSpersistence.reset_delam_counter() // SKYRAT EDIT ADDITION BEGIN - DELAM SCRAM
GLOB.main_supermatter_engine = null
QDEL_NULL(soundloop)
return ..()
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index dcfda6e31ac..b8883c8b97b 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -994,7 +994,7 @@
markings_alpha = owner_species.markings_alpha
else
markings = list()
- // NOVA EDIT END
+ // SKYRAT EDIT END
recolor_bodypart_overlays()
return TRUE
diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm
index 8944e7474c3..2e8b5a04072 100644
--- a/code/modules/surgery/organs/external/tails.dm
+++ b/code/modules/surgery/organs/external/tails.dm
@@ -67,9 +67,9 @@
// SKYRAT EDIT ADDITION START
if(!bodypart.owner.dna.mutant_bodyparts["spines"])
bodypart.owner.dna.mutant_bodyparts["spines"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600"))
- // NOVA EDIT ADDITION END
- var/feature_name = bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] // NOVA EDIT CHANGE - ORIGINAL: var/feature_name = bodypart.owner.dna.features["spines"] //tail spines don't live in DNA, but share feature names with regular spines
- tail_spines_overlay.set_appearance_from_dna(bodypart.owner.dna, feature_name, feature_key = "spines") // NOVA EDIT CHANGE - ORIGINAL: tail_spines_overlay.set_appearance_from_name(feature_name)
+ // 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)
/// If we have a tail spines overlay, delete it
diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm
index 3ff6c5daf65..6f6210ba90b 100644
--- a/code/modules/surgery/organs/internal/ears/_ears.dm
+++ b/code/modules/surgery/organs/internal/ears/_ears.dm
@@ -155,7 +155,7 @@
preference = "feature_human_ears"
- //dna_block = DNA_EARS_BLOCK // NOVA EDIT REMOVAL - Customization - We have our own system to handle DNA.
+ //dna_block = DNA_EARS_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA.
bodypart_overlay = /datum/bodypart_overlay/mutant/cat_ears
@@ -169,7 +169,7 @@
var/inner_layer = EXTERNAL_FRONT
/datum/bodypart_overlay/mutant/cat_ears/get_global_feature_list()
- return SSaccessories.sprite_accessories["ears"] // NOVA EDIT - Customization - ORIGINAL: return SSaccessories.ears_list
+ return SSaccessories.sprite_accessories["ears"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.ears_list
/datum/bodypart_overlay/mutant/cat_ears/can_draw_on_bodypart(mob/living/carbon/human/human)
if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm
index 798e0a26691..4c593a1f975 100644
--- a/code/modules/surgery/organs/internal/eyes/_eyes.dm
+++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm
@@ -50,7 +50,7 @@
/// indication that the eyes are undergoing some negative effect
var/damaged = FALSE
/// Native FOV that will be applied if a config is enabled
- var/native_fov = NONE //NOVA EDIT CHANGE - ORIGINAL: var/native_fov = FOV_90_DEGREES
+ var/native_fov = NONE //SKYRAT EDIT CHANGE - ORIGINAL: var/native_fov = FOV_90_DEGREES
/// Scarring on this organ
var/scarring = NONE
@@ -125,7 +125,7 @@
organ_owner.update_tint()
organ_owner.update_sight()
- is_emissive = FALSE // NOVA EDIT ADDITION
+ is_emissive = FALSE // SKYRAT EDIT ADDITION
UnregisterSignal(organ_owner, COMSIG_ATOM_BULLET_ACT)
/obj/item/organ/internal/eyes/proc/on_bullet_act(datum/source, obj/projectile/proj, def_zone)
diff --git a/code/modules/unit_tests/dna_infusion.dm b/code/modules/unit_tests/dna_infusion.dm
index 0fd898e00de..4bd0469ca1d 100644
--- a/code/modules/unit_tests/dna_infusion.dm
+++ b/code/modules/unit_tests/dna_infusion.dm
@@ -38,13 +38,13 @@
for(var/datum/infuser_entry/infuser_entry as anything in flatten_list(GLOB.infuser_entries))
var/output_organs = infuser_entry.output_organs
var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent)
- // NOVA EDIT ADDITION START - Customization
+ // SKYRAT EDIT ADDITION START - Customization
lab_rat.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF"), MUTANT_INDEX_EMISSIVE_LIST = list(FALSE))
lab_rat.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Light Tiger", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF"))
lab_rat.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF"))
lab_rat.dna.mutant_bodyparts["horns"] = list(MUTANT_INDEX_NAME = "Simple", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF"))
lab_rat.dna.mutant_bodyparts["frills"] = list(MUTANT_INDEX_NAME = "Aquatic", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF"))
- // NOVA EDIT END
+ // SKYRAT EDIT END
var/list/obj/item/organ/inserted_organs = list()
// Attempt to insert entire list of mutant organs for the given infusion_entry.
diff --git a/html/changelogs/AutoChangeLog-pr-2898.yml b/html/changelogs/AutoChangeLog-pr-2898.yml
deleted file mode 100644
index 70c1fea25b5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2898.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LT3"
-delete-after: True
-changes:
- - rscdel: "Pun Pun's suit sensors are off by default"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2901.yml b/html/changelogs/AutoChangeLog-pr-2901.yml
deleted file mode 100644
index a82180ac30a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-2901.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "StrangeWeirdKitten"
-delete-after: True
-changes:
- - bugfix: "Subtler will now filter out clientless mobs"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2912.yml b/html/changelogs/AutoChangeLog-pr-2912.yml
new file mode 100644
index 00000000000..d5b8d9c75aa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2912.yml
@@ -0,0 +1,4 @@
+author: "StrangeWeirdKitten, Bangle"
+delete-after: True
+changes:
+ - rscadd: "Adds another ambiance track to Icebox called Freezer, by Bangle."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-2913.yml b/html/changelogs/AutoChangeLog-pr-2913.yml
new file mode 100644
index 00000000000..50587e820ff
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2913.yml
@@ -0,0 +1,4 @@
+author: "MosleyTheMalO"
+delete-after: True
+changes:
+ - bugfix: "makes the softcap config disableable again"
\ No newline at end of file
diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml
index bb22311204f..af3cfb91236 100644
--- a/html/changelogs/archive/2025-01.yml
+++ b/html/changelogs/archive/2025-01.yml
@@ -143,3 +143,19 @@
- rscadd: 911 responder budget increased; they now have PDAs, holoprojectors, an
inducer, and... the marshal and SWAT teams no longer go in literally bare-handed
(the government finally paid for their gloves).
+2025-01-13:
+ Cephalopod222:
+ - rscadd: Congratulations Homosexuals, Pride Scarves are now available to all crew!
+ LT3:
+ - rscdel: Pun Pun's suit sensors are off by default
+ - sound: Subtle now has a sound notification alongside subtler
+ - qol: Subtle/subtler now has a TG chat filter
+ - qol: Subtle and subtler messages are brighter when using dark mode
+ MosleyTheMalO:
+ - bugfix: Makes condoms work
+ - bugfix: fixes some lewd checks using the sex toy preference instead of the preference
+ they should
+ - bugfix: fixes all erp toggles resetting arousal.
+ - bugfix: makes toggling off sex toys actually remove the sex toys from your inventory.
+ StrangeWeirdKitten:
+ - bugfix: Subtler will now filter out clientless mobs
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm b/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm
index 905e5a4f678..c77508b6594 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm
@@ -56,7 +56,7 @@
/datum/preference/toggle/erp/apply_to_client_updated(client/client, value)
. = ..()
var/mob/living/carbon/human/target = client?.mob
- if(!value && istype(target))
+ if(!value && istype(target) && (src.type == /datum/preference/toggle/erp))
target.arousal = 0
target.pain = 0
target.pleasure = 0
@@ -74,13 +74,17 @@
if(ishuman(client.mob))
var/mob/living/carbon/human/target = client.mob
if(target.vagina != null)
- target.dropItemToGround(target.vagina, TRUE, target.loc, TRUE, FALSE, TRUE)
+ target.dropItemToGround(target.vagina, TRUE, TRUE, FALSE)
+ target.vagina = null
if(target.anus != null)
- target.dropItemToGround(target.anus, TRUE, target.loc, TRUE, FALSE, TRUE)
+ target.dropItemToGround(target.anus, TRUE, TRUE, FALSE)
+ target.anus = null
if(target.nipples != null)
- target.dropItemToGround(target.nipples, TRUE, target.loc, TRUE, FALSE, TRUE)
+ target.dropItemToGround(target.nipples, TRUE, TRUE, FALSE)
+ target.nipples = null
if(target.penis != null)
- target.dropItemToGround(target.penis, TRUE, target.loc, TRUE, FALSE, TRUE)
+ target.dropItemToGround(target.penis, TRUE, TRUE, FALSE)
+ target.penis = null
client.mob.hud_used.hidden_inventory_update(client.mob)
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm
index 1806e0cc3a9..5727a6f51e2 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm
@@ -239,7 +239,7 @@
savefile_key = "feature_ears"
relevant_mutant_bodypart = "ears"
type_to_check = /datum/preference/toggle/mutant_toggle/ears
- default_accessory_type = /datum/sprite_accessory/ears
+ default_accessory_type = /datum/sprite_accessory/ears/none
/datum/preference/tri_color/ears
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
diff --git a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
index ebb0a8b370c..4b5402ea9ab 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
@@ -288,7 +288,7 @@
save_data["modular_version"] = MODULAR_SAVEFILE_VERSION_MAX
-/datum/preferences/proc/update_mutant_bodyparts(datum/preference/preference)
+/datum/preferences/proc/update_body_parts(datum/preference/preference)
if (!preference.relevant_mutant_bodypart)
return
var/part = preference.relevant_mutant_bodypart
diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm
index 38a107bb2cc..37bbbb0b44e 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm
@@ -41,7 +41,7 @@
has_inner = TRUE
/datum/sprite_accessory/ears/mutant
- icon = 'modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi'
+ icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi'
organ_type = /obj/item/organ/internal/ears/mutant
color_src = USE_MATRIXED_COLORS
recommended_species = list(SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_HUMANOID, SPECIES_GHOUL)
diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm
index fa23e6a40b5..a59bc755648 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm
@@ -328,7 +328,7 @@
alter_parts(alterer)
alterer.mutant_renderkey = "" //Just in case
- alterer.update_mutant_bodyparts()
+ alterer.update_body_parts()
/**
* Alter parts lets you adjust mutant bodyparts
@@ -401,7 +401,7 @@
alterer.dna.species.mutant_bodyparts[chosen_key] = new_acc_list
alterer.dna.mutant_bodyparts[chosen_key] = new_acc_list.Copy()
alterer.dna.update_uf_block(SSaccessories.dna_mutant_bodypart_blocks[chosen_key])
- alterer.update_mutant_bodyparts()
+ alterer.update_body_parts()
alterer.update_clothing(ALL) // for any clothing that has alternate versions (e.g. muzzled masks)
/**
diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm
index f15b09e9a77..2f47b2edb7f 100644
--- a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm
+++ b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm
@@ -17,10 +17,10 @@
color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1]
/obj/item/organ/external/Remove(mob/living/carbon/organ_owner, special, movement_flags)
- // NOVA EDIT ADDITION START
+ // SKYRAT EDIT ADDITION START
if(mutantpart_key)
transfer_mutantpart_info(organ_owner, special)
- // NOVA EDIT ADDITION END
+ // SKYRAT EDIT ADDITION END
return ..()
/// Copies the organ's mutantpart_info to the owner's mutant_bodyparts
diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/hypnosis.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/hypnosis.dm
index be88ad77cd8..13d9c177b27 100644
--- a/modular_skyrat/modules/modular_implants/code/nifsofts/hypnosis.dm
+++ b/modular_skyrat/modules/modular_implants/code/nifsofts/hypnosis.dm
@@ -30,7 +30,7 @@
to_chat(user, span_warning("You need to aggressively grab someone to hypnotize them."))
return FALSE
- if(!target_human.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ if(!target_human.client?.prefs?.read_preference(/datum/preference/toggle/erp/hypnosis))
to_chat(user, span_warning("[target_human] doesn't want to be hypnotized."))
return FALSE
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
index e980f1c9c0f..8b296ff2ebf 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
@@ -18,7 +18,7 @@
if(refractory_period > REALTIMEOFDAY)
return
refractory_period = REALTIMEOFDAY + 30 SECONDS
- if(has_status_effect(/datum/status_effect/climax_cooldown) || !client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ if(has_status_effect(/datum/status_effect/climax_cooldown) || !client?.prefs?.read_preference(/datum/preference/toggle/erp))
return
if(HAS_TRAIT(src, TRAIT_NEVERBONER) || has_status_effect(/datum/status_effect/climax_cooldown) || (!has_vagina() && !has_penis()))
@@ -60,7 +60,7 @@
span_userlove("You orgasm, it feels great, but nothing comes out of your penis!"))
else if(is_wearing_condom())
- var/obj/item/clothing/sextoy/condom/condom = get_item_by_slot(LEWD_SLOT_PENIS)
+ var/obj/item/clothing/sextoy/condom/condom = src.penis // bruh 💀⚰️💀⚰️💀⚰️💀⚰️💀
condom.condom_use()
visible_message(span_userlove("[src] shoots [self_their] load into the [condom], filling it up!"), \
span_userlove("You shoot your thick load into the [condom] and it catches it all!"))
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm
index 0afaaecb580..c1a5cbd978d 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm
@@ -11,7 +11,7 @@
alert_type = null
/datum/status_effect/climax/tick(seconds_between_ticks)
- if(!owner.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ if(!owner.client?.prefs?.read_preference(/datum/preference/toggle/erp))
return
var/mob/living/carbon/human/affected_mob = owner
@@ -30,7 +30,7 @@
// This one should not leave decals on the floor. Used in case if character cumming in beaker.
/datum/status_effect/masturbation_climax/tick(seconds_between_ticks)
- if(!owner.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ if(!owner.client?.prefs?.read_preference(/datum/preference/toggle/erp))
return
var/mob/living/carbon/human/affected_mob = owner
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm
index a75205bb528..c4a5bc5f83c 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm
@@ -20,7 +20,7 @@
/datum/status_effect/body_fluid_regen/vagina/tick(seconds_between_ticks)
var/mob/living/carbon/human/affected_human = owner
- if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy) || !istype(affected_human))
+ if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp) || !istype(affected_human))
return FALSE
var/obj/item/organ/external/genital/vagina/vagina = owner.get_organ_slot(ORGAN_SLOT_VAGINA)
@@ -38,7 +38,7 @@
/datum/status_effect/body_fluid_regen/testes/tick(seconds_between_ticks)
var/mob/living/carbon/human/affected_human = owner
- if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy) || !istype(affected_human))
+ if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp) || !istype(affected_human))
return FALSE
var/obj/item/organ/external/genital/testicles/testes = owner.get_organ_slot(ORGAN_SLOT_TESTICLES)
@@ -53,7 +53,7 @@
/datum/status_effect/body_fluid_regen/breasts/tick(seconds_between_ticks)
var/mob/living/carbon/human/affected_human = owner
- if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy) || !istype(affected_human))
+ if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp) || !istype(affected_human))
return FALSE
var/obj/item/organ/external/genital/breasts/breasts = owner.get_organ_slot(ORGAN_SLOT_BREASTS)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm
index efeef0229b0..d84dd0c3cb8 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm
@@ -24,7 +24,7 @@
victim = user
if(!(slot & ITEM_SLOT_EYES))
return
- if(!(iscarbon(victim) && victim.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)))
+ if(!(iscarbon(victim) && victim.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy) && victim.client?.prefs?.read_preference(/datum/preference/toggle/erp/hypnosis)))
return
if(codephrase != "")
victim.gain_trauma(new /datum/brain_trauma/very_special/induced_hypnosis(codephrase), TRAUMA_RESILIENCE_MAGIC)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm
index 2bdeb8b5974..01ef376b03e 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm
@@ -371,7 +371,7 @@
return FALSE
var/obj/item/clothing/sextoy/condom/condom = penis
- return condom.condom_state == TRAIT_CONDOM_BROKEN
+ return condom.condom_state != TRAIT_CONDOM_BROKEN
// For handling things that don't already have handcuff handlers.
/mob/living/carbon/human/set_handcuffed(new_value)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm
index 1730e8f121a..bbc1610e6ef 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm
@@ -1,6 +1,6 @@
/obj/item/organ/internal/brain/on_life(seconds_per_tick, times_fired) //All your horny is here *points to the head*
. = ..()
var/mob/living/carbon/human/brain_owner = owner
- if(istype(brain_owner, /mob/living/carbon/human) && brain_owner.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ if(istype(brain_owner, /mob/living/carbon/human) && brain_owner.client?.prefs?.read_preference(/datum/preference/toggle/erp))
if(!(organ_flags & ORGAN_FAILING))
brain_owner.dna.species.handle_arousal(brain_owner, seconds_per_tick, times_fired)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/species.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/species.dm
index 69a63d89d15..a651b421bb2 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/species.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/species.dm
@@ -28,7 +28,7 @@
/// Handles throwing the arousal alerts to screen.
/datum/species/proc/handle_arousal(mob/living/carbon/human/target_human, atom/movable/screen/alert/aroused)
- if(!target_human.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ if(!target_human.client?.prefs?.read_preference(/datum/preference/toggle/erp))
return
var/atom/movable/screen/alert/aroused/arousal_alert = target_human.alerts[AROUSED_ALERT]
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm
index 80499fad288..9186bdf76a4 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm
@@ -89,7 +89,7 @@
//When condom equipped we doing stuff
/obj/item/clothing/sextoy/condom/lewd_equipped(mob/user, slot, initial)
. = ..()
- if((slot == LEWD_SLOT_PENIS) && condom_state == "unused")
+ if((slot == ORGAN_SLOT_PENIS) && condom_state == "unused")
condom_state = "used"
update_icon_state()
update_icon()
diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm
index 9173369a527..96a3cd4aa92 100644
--- a/modular_skyrat/modules/modular_vending/code/clothesmate.dm
+++ b/modular_skyrat/modules/modular_vending/code/clothesmate.dm
@@ -45,6 +45,7 @@
/obj/item/clothing/glasses/thin = 5,
/obj/item/clothing/glasses/hud/ar/projector = 5,
/obj/item/clothing/neck/face_scarf = 5,
+ /obj/item/clothing/neck/scarf/pride = 5, //BUBBER EDIT: ADDS PRIDE SCARVES
/obj/item/clothing/gloves/bracer/wraps,
),
),
diff --git a/modular_skyrat/modules/synths/code/species/synthetic.dm b/modular_skyrat/modules/synths/code/species/synthetic.dm
index 6d526b07f36..766f14387de 100644
--- a/modular_skyrat/modules/synths/code/species/synthetic.dm
+++ b/modular_skyrat/modules/synths/code/species/synthetic.dm
@@ -23,7 +23,6 @@
reagent_flags = PROCESS_SYNTHETIC
payday_modifier = 1.0 // Matches the rest of the pay penalties the non-human crew have
species_language_holder = /datum/language_holder/machine
- mutant_organs = list(/obj/item/organ/internal/cyberimp/arm/power_cord/left_arm)
mutantbrain = /obj/item/organ/internal/brain/synth
mutantstomach = /obj/item/organ/internal/stomach/synth
mutantears = /obj/item/organ/internal/ears/synth
diff --git a/modular_skyrat/modules/verbs/code/subtle.dm b/modular_skyrat/modules/verbs/code/subtle.dm
index d542e279836..211eb005a0d 100644
--- a/modular_skyrat/modules/verbs/code/subtle.dm
+++ b/modular_skyrat/modules/verbs/code/subtle.dm
@@ -41,7 +41,7 @@
var/space = should_have_space_before_emote(html_decode(subtle_emote)[1]) ? " " : ""
- subtle_message = span_emote("[user][space][user.say_emphasis(subtle_message)]")
+ subtle_message = span_subtle("[user][space][user.say_emphasis(subtle_message)]")
var/list/viewers = get_hearers_in_view(SUBTLE_ONE_TILE, user)
@@ -55,10 +55,15 @@
for(var/mob/ghost as anything in GLOB.dead_mob_list)
if((ghost.client?.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(ghost in viewers))
- ghost.show_message(subtle_message)
+ to_chat(ghost, "[FOLLOW_LINK(ghost, user)] [subtle_message]")
for(var/mob/receiver in viewers)
receiver.show_message(subtle_message, alt_msg = subtle_message)
+ // Optional sound notification
+ if(!isobserver(receiver))
+ var/datum/preferences/prefs = receiver.client?.prefs
+ if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound))
+ receiver.playsound_local(get_turf(receiver), 'sound/effects/achievement/glockenspiel_ping.ogg', 50)
return TRUE
@@ -132,7 +137,7 @@
var/space = should_have_space_before_emote(html_decode(subtler_emote)[1]) ? " " : ""
- subtler_message = span_emote("[user][space][user.say_emphasis(subtler_message)]")
+ subtler_message = span_subtler("[user][space][user.say_emphasis(subtler_message)]")
if(istype(target, /mob))
var/mob/target_mob = target
@@ -140,7 +145,7 @@
var/obj/effect/overlay/holo_pad_hologram/hologram = GLOB.hologram_impersonators[user]
if((get_dist(user.loc, target_mob.loc) <= subtler_range) || (hologram && get_dist(hologram.loc, target_mob.loc) <= subtler_range))
target_mob.show_message(subtler_message, alt_msg = subtler_message)
- // Subtler sounds
+ // Optional sound notification
var/datum/preferences/prefs = target_mob.client?.prefs
if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound))
target_mob.playsound_local(get_turf(target_mob), 'sound/effects/achievement/glockenspiel_ping.ogg', 50)
@@ -150,7 +155,7 @@
var/obj/effect/overlay/holo_pad_hologram/hologram = target
if(hologram.Impersonation?.client)
hologram.Impersonation.show_message(subtler_message, alt_msg = subtler_message)
- // Subtler sounds
+ // Optional sound notification
var/datum/preferences/prefs = hologram.Impersonation.client?.prefs
if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound))
hologram.Impersonation.playsound_local(get_turf(hologram.Impersonation), 'sound/effects/achievement/glockenspiel_ping.ogg', 50)
@@ -167,7 +172,7 @@
for(var/mob/receiver in ghostless)
receiver.show_message(subtler_message, alt_msg = subtler_message)
- // Subtler sounds
+ // Optional sound notification
var/datum/preferences/prefs = receiver.client?.prefs
if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound))
receiver.playsound_local(get_turf(receiver), 'sound/effects/achievement/glockenspiel_ping.ogg', 50)
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm
index 18f064b3f07..4312eb0cc05 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm
@@ -96,7 +96,7 @@
// Apply Appearance
user.regenerate_organs() // Actually regenerates the mutant_bodyparts.
user.update_body(TRUE) // Outfit and underware, also body.
- user.update_mutant_bodyparts(TRUE) // Lizard tails etc
+ user.update_body_parts(TRUE) // Lizard tails etc
RegisterSignal(user, COMSIG_HUMAN_GET_VISIBLE_NAME, PROC_REF(return_disguise_name))
diff --git a/modular_zubbers/code/modules/clothing/neck/neck.dm b/modular_zubbers/code/modules/clothing/neck/neck.dm
index 938e05ea7cc..2a8452fac85 100644
--- a/modular_zubbers/code/modules/clothing/neck/neck.dm
+++ b/modular_zubbers/code/modules/clothing/neck/neck.dm
@@ -559,3 +559,26 @@
greyscale_colors = null
is_tied = TRUE
clip_on = TRUE
+
+//PRIDE SCARVES, SPRITES BY Cephalopod222 OF BUBBERSTATION
+/obj/item/clothing/neck/scarf/pride
+ name = "pride scarf"
+ desc = "A Nanotrasen made nano-weave scarf to show off your favourite flavour of gay and keep you nice and warm! Congratulations!"
+ icon = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi'
+ icon_preview = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi'
+ icon_state = "scarf_rainbow"
+ icon_state_preview = "scarf_rainbow"
+ greyscale_colors = null
+ greyscale_config = null
+ greyscale_config_worn = null
+ obj_flags = UNIQUE_RENAME | INFINITE_RESKIN
+ unique_reskin = list(
+ "Rainbow Scarf" = "scarf_rainbow",
+ "Bisexual Scarf" = "scarf_bi",
+ "Pansexual Scarf" = "scarf_pan",
+ "Asexual Scarf" = "scarf_ace",
+ "Gay Scarf" = "scarf_gay",
+ "Transgender Scarf" = "scarf_trans",
+ "Lesbian Scarf" = "scarf_lesbian",
+ )
diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm
index b9641c098fc..958e5f4dd74 100644
--- a/modular_zubbers/code/modules/loadout/categories/neck.dm
+++ b/modular_zubbers/code/modules/loadout/categories/neck.dm
@@ -18,3 +18,8 @@
/datum/loadout_item/neck/bunnypendant
name = "Rabbit Pendant"
item_path = /obj/item/clothing/neck/bunny_pendant
+
+/datum/loadout_item/neck/scarf/pride
+ name = "Pride Scarf"
+ item_path = /obj/item/clothing/neck/scarf/pride
+ can_be_reskinned = TRUE
diff --git a/modular_zubbers/icons/mob/clothing/neck/neck.dmi b/modular_zubbers/icons/mob/clothing/neck/neck.dmi
index d6fa6c5c7e50bdc7a0ccec59da6deffbdff33bcc..88fc9957569a3b71454d3648ff8efab82ae1b7e7 100644
GIT binary patch
literal 7410
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
diff --git a/modular_zubbers/icons/obj/clothing/neck/neck.dmi b/modular_zubbers/icons/obj/clothing/neck/neck.dmi
index 901994807e0cc03d915b2ecefb781ee89ee43c49..07d78b95af79739aa330662f0a94a0e98ab35e84 100644
GIT binary patch
literal 7852
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
C=fqtA
literal 6148
zcmZX22{@GB`~FxP49312l&ob$24Rf7vS%w^m-Tur(jG*05&%_tE7b>LTBszWl5_c
zvTj#;`Ub=3IhB;)tK;E|4O}`6I@~;hA-Xc>&dE*Hs&dJRYNeXX$;q*>ut-Qq@bmM3
zdkdTIv*>;xx;YkFqRnn#U=XJ(0_5``eR<%+$j^%`PqLBXb9*ePT*`3agxjc3GbLQ=LW6$SZ;R;2w&plJkQ|7Bje`$_;HScj{W(J
z^S1T%;&KK|OiX9aoS{+&iWpqJtb0>KLqj(y6$*vwMpZ*C{UX~IulVMv-Hu}tP_!%T
z6}TD1Chug;5vN?$T&&wFcGgq@ovA|WscVy`s_7pj@jN&d3saS^y3FoyH&#Yg=BW&A
z*TleO7M_P5NGs)gq+lC(_fa@T|asvf*T{>mW^
z44(2TX03Nbpl9Xiu5+l}j``7xk(JR^&o~b=LM;|(BP^fEfcOA%0AXQao)8`~b_^h9
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�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
GANGIyMz%8m
diff --git a/modular_zubbers/sound/ambiance/bangle-freezer.ogg b/modular_zubbers/sound/ambiance/bangle-freezer.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..359ab342e9a522252f00950e609f4cb4159208a3
GIT binary patch
literal 3553976
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