From 40a4ee310b6e5cb146b2e40536885110c4e3732d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 May 2024 21:24:49 +0700 Subject: [PATCH 1/3] removed 95% of all shit --- .../datums/quirks/neutral_quirks/pride_pin.dm | 16 +++++------ code/datums/sprite_accessories.dm | 24 ++++++++-------- code/game/objects/structures/mirror.dm | 4 +-- code/modules/client/preferences/pride_pin.dm | 2 +- code/modules/clothing/shoes/sneakers.dm | 2 +- code/modules/holiday/holidays.dm | 2 ++ .../clothing/under/accessories/badges.dm | 27 ++++++++++++++++++ massmeta/icons/mob/clothing/accessories.dmi | Bin 0 -> 2483 bytes massmeta/icons/obj/clothing/accessories.dmi | Bin 0 -> 1690 bytes massmeta/includes.dm | 2 ++ 10 files changed, 55 insertions(+), 24 deletions(-) create mode 100644 massmeta/code/modules/clothing/under/accessories/badges.dm create mode 100644 massmeta/icons/mob/clothing/accessories.dmi create mode 100644 massmeta/icons/obj/clothing/accessories.dmi diff --git a/code/datums/quirks/neutral_quirks/pride_pin.dm b/code/datums/quirks/neutral_quirks/pride_pin.dm index 488c0a2bccb58..b2d5574d60cc8 100644 --- a/code/datums/quirks/neutral_quirks/pride_pin.dm +++ b/code/datums/quirks/neutral_quirks/pride_pin.dm @@ -1,17 +1,17 @@ /datum/quirk/item_quirk/pride_pin - name = "Pride Pin" - desc = "Show off your pride with this changing pride pin!" + name = "Patriotic Pin" // MASSMETA EDIT everythere replace [pride -> patriotic] + desc = "Show off your patriotic with this changing patriotic pin!" icon = FA_ICON_RAINBOW value = 0 - gain_text = span_notice("You feel fruity.") - lose_text = span_danger("You feel only slightly less fruity than before.") - medical_record_text = "Patient appears to be fruity." + gain_text = span_notice("You feel patriotic.") // EDIT + lose_text = span_danger("You feel only slightly less patriotic than before.") // EDIT + medical_record_text = "Patient appears to be patriotic." /datum/quirk/item_quirk/pride_pin/add_unique(client/client_source) - var/obj/item/clothing/accessory/pride/pin = new(get_turf(quirk_holder)) + var/obj/item/clothing/accessory/patriotic/pin = new(get_turf(quirk_holder)) // EDIT - var/pride_choice = client_source?.prefs?.read_preference(/datum/preference/choiced/pride_pin) || assoc_to_keys(GLOB.pride_pin_reskins)[1] - var/pride_reskin = GLOB.pride_pin_reskins[pride_choice] + var/pride_choice = client_source?.prefs?.read_preference(/datum/preference/choiced/pride_pin) || assoc_to_keys(GLOB.patriotic_flag_reskins)[1] // EDIT + var/pride_reskin = GLOB.patriotic_flag_reskins[pride_choice] pin.current_skin = pride_choice pin.icon_state = pride_reskin diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index e6e8b956e6568..a2c197453d770 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -1539,11 +1539,11 @@ icon_state = null // please make sure they're sorted alphabetically and categorized - +/* MASSMETA EDIT REMOVAL /datum/sprite_accessory/socks/ace_knee name = "Knee-high (Ace)" icon_state = "ace_knee" - +*/ /datum/sprite_accessory/socks/bee_knee name = "Knee-high (Bee)" icon_state = "bee_knee" @@ -1559,11 +1559,11 @@ /datum/sprite_accessory/socks/usa_knee name = "Knee-High (Freedom)" icon_state = "assblastusa_knee" - +/* MASSMETA EDIT REMOVAL /datum/sprite_accessory/socks/rainbow_knee name = "Knee-high (Rainbow)" icon_state = "rainbow_knee" - +*/ /datum/sprite_accessory/socks/striped_knee name = "Knee-high (Striped)" icon_state = "striped_knee" @@ -1571,11 +1571,11 @@ /datum/sprite_accessory/socks/thin_knee name = "Knee-high (Thin)" icon_state = "thin_knee" - +/* MASSMETA EDIT REMOVAL /datum/sprite_accessory/socks/trans_knee name = "Knee-high (Trans)" icon_state = "trans_knee" - +*/ /datum/sprite_accessory/socks/uk_knee name = "Knee-High (UK)" icon_state = "uk_knee" @@ -1643,11 +1643,11 @@ /datum/sprite_accessory/socks/stockings_fishnet name = "Stockings (Fishnet)" icon_state = "fishnet_full" - +/* MASSMETA EDIT REMOVAL /datum/sprite_accessory/socks/ace_thigh name = "Thigh-high (Ace)" icon_state = "ace_thigh" - +*/ /datum/sprite_accessory/socks/bee_thigh name = "Thigh-high (Bee)" icon_state = "bee_thigh" @@ -1663,11 +1663,11 @@ /datum/sprite_accessory/socks/usa_thigh name = "Thigh-high (Freedom)" icon_state = "assblastusa_thigh" - +/* MASSMETA EDIT REMOVAL /datum/sprite_accessory/socks/rainbow_thigh name = "Thigh-high (Rainbow)" icon_state = "rainbow_thigh" - +*/ /datum/sprite_accessory/socks/striped_thigh name = "Thigh-high (Striped)" icon_state = "striped_thigh" @@ -1675,11 +1675,11 @@ /datum/sprite_accessory/socks/thin_thigh name = "Thigh-high (Thin)" icon_state = "thin_thigh" - +/* MASSMETA EDIT REMOVAL /datum/sprite_accessory/socks/trans_thigh name = "Thigh-high (Trans)" icon_state = "trans_thigh" - +*/ /datum/sprite_accessory/socks/uk_thigh name = "Thigh-high (UK)" icon_state = "uk_thigh" diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 7ea2330281413..fa774d3f040b2 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -378,8 +378,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) race_flags = MIRROR_BADMIN /obj/structure/mirror/magic/pride - name = "pride's mirror" - desc = "Pride cometh before the..." + name = "strange mirror" // MASSMETA EDIT + desc = "You look a little different in this mirror" // MASSMETA EDIT race_flags = MIRROR_PRIDE mirror_options = PRIDE_MIRROR_OPTIONS diff --git a/code/modules/client/preferences/pride_pin.dm b/code/modules/client/preferences/pride_pin.dm index 326dad69979b4..db365805fd071 100644 --- a/code/modules/client/preferences/pride_pin.dm +++ b/code/modules/client/preferences/pride_pin.dm @@ -4,7 +4,7 @@ savefile_identifier = PREFERENCE_CHARACTER /datum/preference/choiced/pride_pin/init_possible_values() - return assoc_to_keys(GLOB.pride_pin_reskins) + return assoc_to_keys(GLOB.patriotic_flag_reskins) // MASSMETA EDIT /datum/preference/choiced/pride_pin/is_accessible(datum/preferences/preferences) if (!..(preferences)) diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index 8d3d9f1764564..1075242c9a6fd 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -63,7 +63,7 @@ /obj/item/clothing/shoes/sneakers/rainbow name = "rainbow shoes" - desc = "Very gay shoes." + desc = "Rainbow shoes." // MASSMETA EDIT icon_state = "rain_bow" inhand_icon_state = "rainbow_sneakers" diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 24e5274f7fbfe..4dd3078372560 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -93,9 +93,11 @@ switch(pattern) if(PATTERN_RANDOM) return "#[random_short_color()]" + /* MASSMETA EDIT REMOVAL if(PATTERN_RAINBOW) var/datum/holiday/pride_week/rainbow_datum = new() return rainbow_datum.get_holiday_colors(thing_to_color, PATTERN_DEFAULT) + */ if(!length(GLOB.holidays)) return for(var/holiday_key in GLOB.holidays) diff --git a/massmeta/code/modules/clothing/under/accessories/badges.dm b/massmeta/code/modules/clothing/under/accessories/badges.dm new file mode 100644 index 0000000000000..aaba23be7e7e1 --- /dev/null +++ b/massmeta/code/modules/clothing/under/accessories/badges.dm @@ -0,0 +1,27 @@ +/// Reskins for the patriotic flag accessory, mapped by display name to icon state +GLOBAL_LIST_INIT(patriotic_flag_reskins, list( + "Russian flag" = "flag_russ", + "Imperial flag" = "flag_imper", + "China flag" = "flag_china", + "German flag" = "flag_germ", + "Serbian flag" = "flag_serb", + "Kazakh flag" = "flag_kaz", + "Iranian flag" = "flag_iran", + "Cuban Pete" = "flag_cuba", +)) + +/obj/item/clothing/accessory/patriotic + name = "patriotic pin" + desc = "A Nanotrasen holographic pin to show off your patriotic." + icon = 'massmeta/icons/obj/clothing/accessories.dmi' + worn_icon = 'massmeta/icons/mob/clothing/accessories.dmi' + icon_state = "flag_russ" + obj_flags = UNIQUE_RENAME | INFINITE_RESKIN + +/obj/item/clothing/accessory/patriotic/setup_reskinning() + unique_reskin = GLOB.patriotic_flag_reskins + if(!check_setup_reskinning()) + return + + // We already register context regardless in Initialize. + RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(on_click_alt_reskin)) diff --git a/massmeta/icons/mob/clothing/accessories.dmi b/massmeta/icons/mob/clothing/accessories.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8b9e72608c91b9b1d9c6afa08fe2d49460ce3943 GIT binary patch literal 2483 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 Date: Mon, 27 May 2024 23:37:34 +0700 Subject: [PATCH 2/3] made more modularization --- .../datums/quirks/neutral_quirks/pride_pin.dm | 16 ++++++++-------- code/modules/client/preferences/pride_pin.dm | 2 +- code/modules/clothing/shoes/sneakers.dm | 2 +- .../datums/quirks/neutral_quirks/pride_pin.dm | 19 +++++++++++++++++++ .../modules/client/preferences/pride_pin.dm | 16 ++++++++++++++++ .../code/modules/clothing/shoes/sneakers.dm | 12 ++++++++++++ massmeta/includes.dm | 5 ++++- 7 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 massmeta/code/datums/quirks/neutral_quirks/pride_pin.dm create mode 100644 massmeta/code/modules/client/preferences/pride_pin.dm create mode 100644 massmeta/code/modules/clothing/shoes/sneakers.dm diff --git a/code/datums/quirks/neutral_quirks/pride_pin.dm b/code/datums/quirks/neutral_quirks/pride_pin.dm index b2d5574d60cc8..488c0a2bccb58 100644 --- a/code/datums/quirks/neutral_quirks/pride_pin.dm +++ b/code/datums/quirks/neutral_quirks/pride_pin.dm @@ -1,17 +1,17 @@ /datum/quirk/item_quirk/pride_pin - name = "Patriotic Pin" // MASSMETA EDIT everythere replace [pride -> patriotic] - desc = "Show off your patriotic with this changing patriotic pin!" + name = "Pride Pin" + desc = "Show off your pride with this changing pride pin!" icon = FA_ICON_RAINBOW value = 0 - gain_text = span_notice("You feel patriotic.") // EDIT - lose_text = span_danger("You feel only slightly less patriotic than before.") // EDIT - medical_record_text = "Patient appears to be patriotic." + gain_text = span_notice("You feel fruity.") + lose_text = span_danger("You feel only slightly less fruity than before.") + medical_record_text = "Patient appears to be fruity." /datum/quirk/item_quirk/pride_pin/add_unique(client/client_source) - var/obj/item/clothing/accessory/patriotic/pin = new(get_turf(quirk_holder)) // EDIT + var/obj/item/clothing/accessory/pride/pin = new(get_turf(quirk_holder)) - var/pride_choice = client_source?.prefs?.read_preference(/datum/preference/choiced/pride_pin) || assoc_to_keys(GLOB.patriotic_flag_reskins)[1] // EDIT - var/pride_reskin = GLOB.patriotic_flag_reskins[pride_choice] + var/pride_choice = client_source?.prefs?.read_preference(/datum/preference/choiced/pride_pin) || assoc_to_keys(GLOB.pride_pin_reskins)[1] + var/pride_reskin = GLOB.pride_pin_reskins[pride_choice] pin.current_skin = pride_choice pin.icon_state = pride_reskin diff --git a/code/modules/client/preferences/pride_pin.dm b/code/modules/client/preferences/pride_pin.dm index db365805fd071..326dad69979b4 100644 --- a/code/modules/client/preferences/pride_pin.dm +++ b/code/modules/client/preferences/pride_pin.dm @@ -4,7 +4,7 @@ savefile_identifier = PREFERENCE_CHARACTER /datum/preference/choiced/pride_pin/init_possible_values() - return assoc_to_keys(GLOB.patriotic_flag_reskins) // MASSMETA EDIT + return assoc_to_keys(GLOB.pride_pin_reskins) /datum/preference/choiced/pride_pin/is_accessible(datum/preferences/preferences) if (!..(preferences)) diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index 1075242c9a6fd..8d3d9f1764564 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -63,7 +63,7 @@ /obj/item/clothing/shoes/sneakers/rainbow name = "rainbow shoes" - desc = "Rainbow shoes." // MASSMETA EDIT + desc = "Very gay shoes." icon_state = "rain_bow" inhand_icon_state = "rainbow_sneakers" diff --git a/massmeta/code/datums/quirks/neutral_quirks/pride_pin.dm b/massmeta/code/datums/quirks/neutral_quirks/pride_pin.dm new file mode 100644 index 0000000000000..b2d5574d60cc8 --- /dev/null +++ b/massmeta/code/datums/quirks/neutral_quirks/pride_pin.dm @@ -0,0 +1,19 @@ +/datum/quirk/item_quirk/pride_pin + name = "Patriotic Pin" // MASSMETA EDIT everythere replace [pride -> patriotic] + desc = "Show off your patriotic with this changing patriotic pin!" + icon = FA_ICON_RAINBOW + value = 0 + gain_text = span_notice("You feel patriotic.") // EDIT + lose_text = span_danger("You feel only slightly less patriotic than before.") // EDIT + medical_record_text = "Patient appears to be patriotic." + +/datum/quirk/item_quirk/pride_pin/add_unique(client/client_source) + var/obj/item/clothing/accessory/patriotic/pin = new(get_turf(quirk_holder)) // EDIT + + var/pride_choice = client_source?.prefs?.read_preference(/datum/preference/choiced/pride_pin) || assoc_to_keys(GLOB.patriotic_flag_reskins)[1] // EDIT + var/pride_reskin = GLOB.patriotic_flag_reskins[pride_choice] + + pin.current_skin = pride_choice + pin.icon_state = pride_reskin + + give_item_to_holder(pin, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS)) diff --git a/massmeta/code/modules/client/preferences/pride_pin.dm b/massmeta/code/modules/client/preferences/pride_pin.dm new file mode 100644 index 0000000000000..db365805fd071 --- /dev/null +++ b/massmeta/code/modules/client/preferences/pride_pin.dm @@ -0,0 +1,16 @@ +/datum/preference/choiced/pride_pin + category = PREFERENCE_CATEGORY_SECONDARY_FEATURES + savefile_key = "pride_pin" + savefile_identifier = PREFERENCE_CHARACTER + +/datum/preference/choiced/pride_pin/init_possible_values() + return assoc_to_keys(GLOB.patriotic_flag_reskins) // MASSMETA EDIT + +/datum/preference/choiced/pride_pin/is_accessible(datum/preferences/preferences) + if (!..(preferences)) + return FALSE + + return "Pride Pin" in preferences.all_quirks + +/datum/preference/choiced/pride_pin/apply_to_human(mob/living/carbon/human/target, value) + return diff --git a/massmeta/code/modules/clothing/shoes/sneakers.dm b/massmeta/code/modules/clothing/shoes/sneakers.dm new file mode 100644 index 0000000000000..0aafdeff3b13c --- /dev/null +++ b/massmeta/code/modules/clothing/shoes/sneakers.dm @@ -0,0 +1,12 @@ +/obj/item/clothing/shoes/sneakers/rainbow + name = "rainbow shoes" + desc = "Rainbow shoes." // MASSMETA EDIT + icon_state = "rain_bow" + inhand_icon_state = "rainbow_sneakers" + + greyscale_colors = null + greyscale_config = null + greyscale_config_inhand_left = null + greyscale_config_inhand_right = null + greyscale_config_worn = null + flags_1 = NONE diff --git a/massmeta/includes.dm b/massmeta/includes.dm index b0c276d75da88..5b0bd9e0e8174 100644 --- a/massmeta/includes.dm +++ b/massmeta/includes.dm @@ -91,4 +91,7 @@ #include "code\modules\surgery\organs\internal\butts\butts.dm" #include "code\modules\surgery\organs\internal\butts\butts_init.dm" //gay removal (6.21 КоАП РФ) -#include "code\modules\clothing\under\accessories\badges.dm" \ No newline at end of file +#include "code\modules\clothing\under\accessories\badges.dm" +#include "code\modules\clothing\shoes\sneakers.dm" +#include "code\modules\client\preferences\pride_pin.dm" +#include "code\datums\quirks\neutral_quirks\pride_pin.dm" From e3af3c9c02b35ebfda7c81d64ac111cc9aa58a36 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 May 2024 00:13:32 +0700 Subject: [PATCH 3/3] mooore modularization --- code/game/objects/structures/mirror.dm | 4 ++-- massmeta/game/objects/structures/mirror.dm | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 massmeta/game/objects/structures/mirror.dm diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index fa774d3f040b2..7ea2330281413 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -378,8 +378,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) race_flags = MIRROR_BADMIN /obj/structure/mirror/magic/pride - name = "strange mirror" // MASSMETA EDIT - desc = "You look a little different in this mirror" // MASSMETA EDIT + name = "pride's mirror" + desc = "Pride cometh before the..." race_flags = MIRROR_PRIDE mirror_options = PRIDE_MIRROR_OPTIONS diff --git a/massmeta/game/objects/structures/mirror.dm b/massmeta/game/objects/structures/mirror.dm new file mode 100644 index 0000000000000..2002c1e4ce50c --- /dev/null +++ b/massmeta/game/objects/structures/mirror.dm @@ -0,0 +1,3 @@ +/obj/structure/mirror/magic/pride + name = "strange mirror" + desc = "You look a little different in this mirror" \ No newline at end of file