Disable Onyx loadout

SierraBay · Feb 1, 2024 · 6131823 · 6131823
1 parent 2b27238
commit 6131823
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 37 deletions.
diff --git a/code/__defines/~mods/~master_defines.dm b/code/__defines/~mods/~master_defines.dm
@@ -23,6 +23,8 @@
 // UTF8 - End
 
 // DON_LOADOUT - Start
+// Не открывать до Рождества
+/*
 #define DONATION_TIER_NONE   null
 #define DONATION_TIER_ONE    "Tier 1"
 #define DONATION_TIER_TWO    "Tier 2"
@@ -41,6 +43,7 @@
 	DONATION_TIER_NONE, DONATION_TIER_ONE, \
 	DONATION_TIER_TWO, DONATION_TIER_THREE, \
 	DONATION_TIER_FOUR, DONATION_TIER_ADMIN)
+*/
 // DON_LOADOUT - End
 
 // GLIDING - Start

diff --git a/code/controllers/subsystems/jobs.dm b/code/controllers/subsystems/jobs.dm
@@ -397,7 +397,7 @@ SUBSYSTEM_DEF(jobs)
 					for(var/required in G.allowed_skills)
 						if(!H.skill_check(required,G.allowed_skills[required]))
 							permitted = 0
-							
+
 				// [SIERRA-ADD] - LOADOUT_ITEMS - Поддержка фракционных предметов в лодауте
 				if(permitted && G.allowed_factions)
 					var/singleton/cultural_info/faction = H.get_cultural_value(TAG_FACTION)

diff --git a/code/datums/communication/ooc.dm b/code/datums/communication/ooc.dm
@@ -35,14 +35,16 @@
 	var/ooc_color = C.prefs.ooccolor
 
 	// [SIERRA-ADD] - DON_LOADOUT
-	var/ckey_prefix = C.donator_info.get_decorated_message(C, "<EM>[C.key]:</EM>")
+	// Не открывать до Рождества
+	// var/ckey_prefix = C.donator_info.get_decorated_message(C, "<EM>[C.key]:</EM>")
 	// [/SIERRA-ADD]
 	for(var/client/target in GLOB.clients)
 		if(target.is_key_ignored(C.key)) // If we're ignored by this person, then do nothing.
 			continue
 		// [SIERRA-EDIT] - DON_LOADOUT
-		// var/sent_message = "[create_text_tag("ooc", "OOC:", target)] <EM>[C.key]:</EM> [SPAN_CLASS("message linkify", "[message]")]" // SIERRA-EDIT - ORIGINAL
-		var/sent_message = "[create_text_tag("ooc", "OOC:", target)] [ckey_prefix] [SPAN_CLASS("message linkify", "[message]")]"
+		// Не открывать до Рождества
+		var/sent_message = "[create_text_tag("ooc", "OOC:", target)] <EM>[C.key]:</EM> [SPAN_CLASS("message linkify", "[message]")]" // SIERRA-EDIT - ORIGINAL
+		// var/sent_message = "[create_text_tag("ooc", "OOC:", target)] [ckey_prefix] [SPAN_CLASS("message linkify", "[message]")]"
 		// [/SIERRA-EDIT]
 		if(can_badmin)
 			receive_communication(C, target, SPAN_COLOR(ooc_color, SPAN_CLASS("ooc", sent_message)))

diff --git a/code/modules/client/preference_setup/general/05_preview.dm b/code/modules/client/preference_setup/general/05_preview.dm
@@ -17,8 +17,9 @@
 
 /datum/preferences/proc/dress_preview_mob(mob/living/carbon/human/mannequin)
 	// [SIERRA-ADD] - DON_LOADOUT - Mob preview
-	if(!mannequin)
-		return
+	// Не открывать до Рождества
+	// if(!mannequin)
+	// 	return
 	// [/SIERRA-ADD]
 	var/update_icon = FALSE
 	copy_to(mannequin, TRUE)
@@ -32,8 +33,9 @@
 	else
 		return
 	// [SIERRA-ADD] - DON_LOADOUT - Mob preview
-	if(!previewJob && mannequin.icon)
-		update_icon = TRUE // So we don't end up stuck with a borg/AI icon after setting their priority to non-high
+	// Не открывать до Рождества
+	// if(!previewJob && mannequin.icon)
+	// 	update_icon = TRUE // So we don't end up stuck with a borg/AI icon after setting their priority to non-high
 	// [/SIERRA-ADD]
 	if(preview_job && previewJob)
 		mannequin.job = previewJob.title
@@ -48,15 +50,15 @@
 		// Equip custom gear loadout, replacing any job items
 		var/list/loadout_taken_slots = list()
 		// [SIERRA-EDIT] - DON_LOADOUT - Trying gears
-		// for(var/thing in Gear()) // SIERRA-EDIT - ORIGINAL
-		var/list/accessories = list()
-
-		var/list/orig_gears = Gear()
-		var/list/gears = orig_gears.Copy()
-		if(trying_on_gear)
-			gears[trying_on_gear] = trying_on_tweaks.Copy()
-
-		for(var/thing in gears)
+		for(var/thing in Gear()) // SIERRA-EDIT - ORIGINAL
+		// var/list/accessories = list()
+		//
+		// var/list/orig_gears = Gear()
+		// var/list/gears = orig_gears.Copy()
+		// if(trying_on_gear)
+		// 	gears[trying_on_gear] = trying_on_tweaks.Copy()
+		//
+		// for(var/thing in gears)
 		// [/SIERRA-EDIT]
 			var/datum/gear/G = gear_datums[thing]
 			if(G)
@@ -73,19 +75,21 @@
 				if(!permitted)
 					continue
 				// [SIERRA-ADD] - DON_LOADOUT - Accessories preview
-				if(G.slot == slot_tie)
-					accessories.Add(G)
-					continue
+				// Не открывать до Рождества
+				// if(G.slot == slot_tie)
+				// 	accessories.Add(G)
+				// 	continue
 				// [/SIERRA-ADD]
 				if(G.slot && G.slot != slot_tie && !(G.slot in loadout_taken_slots) && G.spawn_on_mob(mannequin, gear_list[gear_slot][G.display_name]))
 					loadout_taken_slots.Add(G.slot)
 					update_icon = TRUE
 		// [SIERRA-ADD] - DON_LOADOUT - Accessories preview
 		// equip accessories after other slots so they don't attach to a suit which will be replaced
-		for(var/datum/gear/G in accessories)
-			G.spawn_as_accessory_on_mob(mannequin, gears[G.display_name])
-		if(length(accessories))
-			update_icon = TRUE
+		// Не открывать до Рождества
+		// for(var/datum/gear/G in accessories)
+		// 	G.spawn_as_accessory_on_mob(mannequin, gears[G.display_name])
+		// if(length(accessories))
+		// 	update_icon = TRUE
 		// [/SIERRA-ADD]
 	if(update_icon)
 		mannequin.update_icons()

diff --git a/maps/sierra/loadout/loadout.dm b/maps/sierra/loadout/loadout.dm
@@ -3,14 +3,14 @@
 	description = "With additional light armor plate"
 	path = /obj/item/clothing/suit/armor/pcarrier/light
 	cost = 25
-	donation_tier = DONATION_TIER_TWO
+	// donation_tier = DONATION_TIER_TWO // Не открывать до Рождества
 
 /datum/gear/pmp_w_tape
 	display_name = "music player"
 	description = "With custom tape"
 	path = /obj/item/music_player
 	cost = 0
-	donation_tier = DONATION_TIER_TWO
+	// donation_tier = DONATION_TIER_TWO // Не открывать до Рождества
 
 /datum/gear/pmp_w_tape/New()
 	. = ..()
@@ -26,28 +26,28 @@
 	description = "With custom tape"
 	path = /obj/item/music_player/boombox/custom_tape
 	cost = 0
-	donation_tier = DONATION_TIER_FOUR
+	// donation_tier = DONATION_TIER_FOUR // Не открывать до Рождества
 
 /datum/gear/bikehorn
 	display_name = "bike horn"
 	description = "for real aesthetes"
 	path = /obj/item/bikehorn
 	cost = 0
-	donation_tier = DONATION_TIER_ONE
+	// donation_tier = DONATION_TIER_ONE // Не открывать до Рождества
 
 /datum/gear/bikehorn/rubberducky
 	display_name = "rubber duck"
 	description = "QUACK"
 	path = /obj/item/bikehorn/rubberducky
 	cost = 0
-	donation_tier = DONATION_TIER_ONE
+	// donation_tier = DONATION_TIER_ONE // Не открывать до Рождества
 
 /datum/gear/premium_alcohol
 	display_name = "expensive alcohol"
 	description = "sometimes it turns out that the bar is closed, but you want a drink."
 	path = /obj/item/reagent_containers/food/drinks/bottle
 	cost = 0
-	donation_tier = DONATION_TIER_ONE
+	// donation_tier = DONATION_TIER_ONE // Не открывать до Рождества
 
 /datum/gear/premium_alcohol/New()
 	. = ..()
@@ -65,7 +65,7 @@
 	description = "pizza time"
 	path = /obj/item/pizzabox
 	cost = 0
-	donation_tier = DONATION_TIER_ONE
+	// donation_tier = DONATION_TIER_ONE // Не открывать до Рождества
 
 /datum/gear/pizzabox/New()
 	. = ..()
@@ -82,7 +82,7 @@
 	description = "let's DOOT"
 	path = /obj/item/device/synthesized_instrument
 	cost = 0
-	donation_tier = DONATION_TIER_ONE
+	// donation_tier = DONATION_TIER_ONE // Не открывать до Рождества
 
 /datum/gear/musical_instruments/New()
 	. = ..()
@@ -102,21 +102,21 @@
 	description = "Admit it, you invested so much money just for one clown costume."
 	path = /obj/item/clothing/mask/gas/sexyclown
 	cost = 0
-	donation_tier = DONATION_TIER_THREE
+	// donation_tier = DONATION_TIER_THREE // Не открывать до Рождества
 
 /datum/gear/head/kittyears
 	display_name = "kitty ears"
 	path = /obj/item/clothing/head/kitty/fake
 	sort_category = "Earwear"
 	allowed_roles = null
 	cost = 0
-	donation_tier = DONATION_TIER_TWO
+	// donation_tier = DONATION_TIER_TWO // Не открывать до Рождества
 
 /datum/gear/mre
 	display_name = "MRE"
 	path = /obj/item/storage/mre
 	cost = 0
-	donation_tier = DONATION_TIER_ONE
+	// donation_tier = DONATION_TIER_ONE // Не открывать до Рождества
 
 /datum/gear/mre/New()
 	. = ..()
@@ -138,4 +138,4 @@
 	description = "Ah, I see you're a man of culture as well."
 	path = /obj/item/material/sword/katana/replica
 	cost = 0
-	donation_tier = DONATION_TIER_TWO
+	// donation_tier = DONATION_TIER_TWO // Не открывать до Рождества
diff --git a/mods/global_modpacks.dm b/mods/global_modpacks.dm
@@ -2,7 +2,7 @@
 #include "ai/_ai.dme"
 #include "body_markings/_body_markings.dme"
 #include "client_verbs/_client_verbs.dme"
-#include "don_loadout/_don_loadout.dme"
+// #include "don_loadout/_don_loadout.dme" // Не открывать до Рождества
 #include "eris_announcer/_eris_announcer.dme"
 #include "emote_panel/_emote_panel.dme"
 #include "ex666_ecosystem/_ex666_ecosystem.dme"