Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Принудительное удаление 95% контента попадающего под 6.21 КоАП #89

Merged
merged 3 commits into from
Jun 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions code/datums/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -1559,23 +1559,23 @@
/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"

/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"
Expand Down Expand Up @@ -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"
Expand All @@ -1663,23 +1663,23 @@
/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"

/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"
Expand Down
2 changes: 2 additions & 0 deletions code/modules/holiday/holidays.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
19 changes: 19 additions & 0 deletions massmeta/code/datums/quirks/neutral_quirks/pride_pin.dm
Original file line number Diff line number Diff line change
@@ -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))
16 changes: 16 additions & 0 deletions massmeta/code/modules/client/preferences/pride_pin.dm
Original file line number Diff line number Diff line change
@@ -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
12 changes: 12 additions & 0 deletions massmeta/code/modules/clothing/shoes/sneakers.dm
Original file line number Diff line number Diff line change
@@ -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
27 changes: 27 additions & 0 deletions massmeta/code/modules/clothing/under/accessories/badges.dm
Original file line number Diff line number Diff line change
@@ -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))
3 changes: 3 additions & 0 deletions massmeta/game/objects/structures/mirror.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/obj/structure/mirror/magic/pride
name = "strange mirror"
desc = "You look a little different in this mirror"
Binary file added massmeta/icons/mob/clothing/accessories.dmi
Binary file not shown.
Binary file added massmeta/icons/obj/clothing/accessories.dmi
Binary file not shown.
5 changes: 5 additions & 0 deletions massmeta/includes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,8 @@
//buts
#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"
#include "code\modules\clothing\shoes\sneakers.dm"
#include "code\modules\client\preferences\pride_pin.dm"
#include "code\datums\quirks\neutral_quirks\pride_pin.dm"
Loading