Merge pull request #114 from Artemchik542/fix-remove-pin

Оффы ТГ добавили Loadout меню, они смогли вернуть свое непотребсвто. Возвращаем как было!
Huz2e · Jun 23, 2024 · 292da88 · 292da88
2 parents e6c37aa + 1128216
commit 292da88
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 73 deletions.
diff --git 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 - ORIGINAL - "pride's mirror"
+	desc = "You look a little different in this mirror" //MASSMETA EDIT - ORIGINAL - "Pride cometh before the..."
 	race_flags = MIRROR_PRIDE
 	mirror_options = PRIDE_MIRROR_OPTIONS
 

diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm
@@ -64,7 +64,7 @@
 
 /obj/item/clothing/shoes/sneakers/rainbow
 	name = "rainbow shoes"
-	desc = "Very gay shoes."
+	desc = "Very rainbow shoes." //MASSMETA EDIT - ORIGINAL - "Very gay shoes."
 	icon_state = "rain_bow"
 	inhand_icon_state = "rainbow_sneakers"
 

diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
@@ -93,11 +93,13 @@
 	switch(pattern)
 		if(PATTERN_RANDOM)
 			return "#[random_short_color()]"
-		/*   MASSMETA EDIT REMOVAL
+		//MASSMETA EDIT REMOVAL BEGIN - gay removal
+		/*
 		if(PATTERN_RAINBOW)
 			var/datum/holiday/pride_week/rainbow_datum = new()
 			return rainbow_datum.get_holiday_colors(thing_to_color, PATTERN_DEFAULT)
 		*/
+		//MASSMETA EDIT REMOVAL END
 	if(!length(GLOB.holidays))
 		return
 	for(var/holiday_key in GLOB.holidays)
@@ -382,6 +384,8 @@
 	begin_month = JUNE
 	holiday_hat = /obj/item/clothing/head/costume/garland
 
+//MASSMETA EDIT REMOVAL BEGIN - gay removal
+/*
 /datum/holiday/pride_week
 	name = PRIDE_WEEK
 	begin_month = JUNE
@@ -396,6 +400,8 @@
 		COLOR_PRIDE_ORANGE,
 		COLOR_PRIDE_RED,
 	)
+*/
+//MASSMETA EDIT REMOVAL END
 
 // JULY
 

diff --git a/code/modules/loadout/categories/accessories.dm b/code/modules/loadout/categories/accessories.dm
@@ -87,6 +87,6 @@
 	additional_displayed_text = list("Contains pens")
 
 /datum/loadout_item/accessory/pride
-	name = "Pride Pin"
+	name = "Patriotic Pin" //MASSMETA EDIT - ORIGINAL - "Pride Pin"
 	item_path = /obj/item/clothing/accessory/pride
 	can_be_reskinned = TRUE
diff --git a/massmeta/code/datums/quirks/neutral_quirks/pride_pin.dm b/massmeta/code/datums/quirks/neutral_quirks/pride_pin.dm
diff --git a/massmeta/code/modules/client/preferences/pride_pin.dm b/massmeta/code/modules/client/preferences/pride_pin.dm
diff --git a/massmeta/code/modules/clothing/shoes/sneakers.dm b/massmeta/code/modules/clothing/shoes/sneakers.dm
diff --git a/massmeta/code/modules/clothing/under/accessories/badges.dm b/massmeta/code/modules/clothing/under/accessories/badges.dm
@@ -1,25 +1,22 @@
-/// 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
+/obj/item/clothing/accessory/pride // actually patriotic (override)
 	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
+	unique_reskin = 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/setup_reskinning()
-	unique_reskin = GLOB.patriotic_flag_reskins
+/obj/item/clothing/accessory/pride/setup_reskinning()
 	if(!check_setup_reskinning())
 		return
 

diff --git a/massmeta/game/objects/structures/mirror.dm b/massmeta/game/objects/structures/mirror.dm
diff --git a/massmeta/modular_meta.dm b/massmeta/modular_meta.dm
@@ -97,9 +97,6 @@
 
 //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"
 
 //oguzok in kitchen, huh?
 #include "code\modules\clothing\under\undersuit.dm"