TGS Test Merge (#1562)

BlueMoon-Labs · Jan 8, 2025 · dd5a0d9 · dd5a0d9
2 parents bcf5f96 + 6455995
commit dd5a0d9
Show file tree

Hide file tree

Showing 11 changed files with 244 additions and 60 deletions.
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
@@ -24,6 +24,7 @@
 		this["short_desc"] = ""
 		this["flavor_text"] = ""
 		this["important_warning"] = ""
+		this["category"] = ""
 		this["refs"] = list()
 		for(var/spawner_obj in GLOB.mob_spawners[spawner])
 			this["refs"] += "[REF(spawner_obj)]"
@@ -33,6 +34,7 @@
 					this["short_desc"] = MS.short_desc
 					this["flavor_text"] = MS.flavour_text
 					this["important_info"] = MS.important_info
+					this["category"] = MS.category
 					this["can_load_appearance"] = MS.can_load_appearance
 				else
 					var/obj/O = spawner_obj

diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
@@ -43,6 +43,7 @@
 	Your goal is to cultivate and spread life wherever it will go while waiting for contact from your creators. \
 	Estimated time of last contact: Deployment, 5000 millennia ago."
 	assignedrole = "Lifebringer"
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/seed_vault/Destroy()
 	new/obj/structure/fluff/empty_terrarium(get_turf(src))
@@ -126,6 +127,7 @@
 	assignedrole = "Ash Walker"
 	var/datum/team/ashwalkers/team
 	var/obj/structure/ash_walker_eggshell/eggshell
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/ash_walker/Destroy()
 	eggshell = null
@@ -233,6 +235,7 @@
 	путешествовать по звездам с одним единственным заявлением: \ 'Да, делай что хочешь.'\ Хотя вы связаны с тем, кто вас создал, в вашем обществе принято повторять эти же слова новорожденным \
 	големам, чтобы ни один голем никогда не был вынужден служить снова."
 	important_info = "Вы не антагонист."
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
 	if(species) //spawners list uses object name to register so this goes before ..()
@@ -322,6 +325,7 @@
 	can_load_appearance = TRUE
 	loadout_enabled = TRUE
 	antagonist_type = /datum/antagonist/ghost_role/hermit
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/hermit/Initialize(mapload)
 	. = ..()
@@ -376,6 +380,7 @@
 	important_info = "Вы не антагонист."
 	assignedrole = "Translocated Vet"
 	can_load_appearance = TRUE
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/doctor/alive/lavaland/Destroy()
 	var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
@@ -442,6 +447,7 @@
 	can_load_appearance = TRUE
 	loadout_enabled = TRUE
 	antagonist_type = /datum/antagonist/ghost_role/space_hotel
+	category = "offstation"
 
 /datum/outfit/hotelstaff
 	name = "Hotel Staff"
@@ -546,6 +552,7 @@
 	outfit = /datum/outfit/syndicate_empty
 	assignedrole = "Space Syndicate"	//I know this is really dumb, but Syndicate operative is nuke ops
 	can_load_appearance = TRUE
+	category = "syndicate"
 
 /obj/effect/mob_spawn/human/solfed
 	name = "Solar Federation Marine"
@@ -557,6 +564,7 @@
 	assignedrole = "Solar Federation Operative"
 	can_load_appearance = TRUE
 	loadout_enabled = TRUE
+	category = "sol"
 
 /obj/effect/mob_spawn/human/solfed/demoman
 	name = "Solar Federation Support"
@@ -694,6 +702,7 @@
 	job_description = "Oldstation Crew"
 	assignedrole = "Ancient Crew"
 	can_load_appearance = TRUE
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/oldsec/Destroy()
 	new/obj/structure/showcase/machinery/oldpod/used(drop_location())
@@ -774,6 +783,7 @@
 	assignedrole = "Space Pirate"
 	var/rank = "Mate"
 	can_load_appearance = FALSE
+	category = "midround"
 
 /obj/effect/mob_spawn/human/pirate/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = ..()
@@ -1039,6 +1049,7 @@
 	give_cooler_to_mob_if_synth = TRUE
 
 	antagonist_type = /datum/antagonist/ghost_role/tarkov
+	category = "offstation"
 
 /datum/outfit/tarkoff
 	name = "Default Port Tarkov Outfit"
@@ -1215,6 +1226,7 @@
 	can_load_appearance = TRUE
 	loadout_enabled = TRUE
 	antagonist_type = /datum/antagonist/ghost_role/centcom_intern
+	category = "offstation"
 
 /datum/outfit/centcom_syndicate
 	name = "Special Ops Syndicate Intern"
@@ -1270,6 +1282,7 @@
 	can_load_appearance = TRUE
 	loadout_enabled = TRUE
 	antagonist_type = /datum/antagonist/ghost_role/centcom_intern
+	category = "offstation"
 
 /datum/outfit/centcom_nanotrasen
 	name = "Special Ops Nanotrasen Intern"
@@ -1324,6 +1337,7 @@
 	computer_area = /area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms
 	antagonist_type = /datum/antagonist/ghost_role/ds2
 	make_bank_account = TRUE // BLUEMOON ADD
+	category = "syndicate"
 
 /obj/effect/mob_spawn/human/ds2/prisoner
 	name = "Syndicate Prisoner"

diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
@@ -29,6 +29,7 @@
 	2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable.
 	3. Biological resources will be harvested at a later date; do not harm them.
 	"}
+	category = "midround"
 
 /obj/effect/mob_spawn/swarmer/Initialize(mapload)
 	. = ..()

diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
@@ -36,6 +36,7 @@
 	var/can_load_appearance = FALSE
 	var/make_bank_account = FALSE // BLUEMOON ADD
 	var/starting_money = 0 // BLUEMOON ADD работает только при make_bank_account = TRUE
+	var/category = "misc" // BLUEMOON ADD - категоризация для отображения по спискам
 
 ///override this to add special spawn conditions to a ghost role
 /obj/effect/mob_spawn/proc/allow_spawn(mob/user, silent = FALSE)
@@ -533,6 +534,7 @@
 	flavour_text = "Вы посетитель пляжа и вы уже не помните, сколько вы здесь пробыли! Какое же это приятное место."
 	assignedrole = "Beach Bum"
 	can_load_appearance = TRUE
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/beach/alive/lifeguard
 	flavour_text = "Вы - пляжный спасатель! Присматривай за посетителями пляжа, чтобы никто не утонул, не был съеден акулами и так далее."
@@ -542,6 +544,7 @@
 	job_description = "Beach Biodome Lifeguard"
 	uniform = /obj/item/clothing/under/shorts/red
 	can_load_appearance = TRUE
+	category = "offstation"
 
 /datum/outfit/beachbum
 	name = "Beach Bum"

diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
@@ -133,6 +133,7 @@
 	assignedrole = "Lavaland Syndicate"
 	can_load_appearance = TRUE
 	loadout_enabled = TRUE
+	category = "syndicate"
 
 /obj/effect/mob_spawn/human/lavaland_syndicate/special(mob/living/new_spawn)
 	. = ..()

diff --git a/modular_bluemoon/Gardelin0/code/antagonists/ghost_spawner.dm b/modular_bluemoon/Gardelin0/code/antagonists/ghost_spawner.dm
@@ -18,6 +18,7 @@
 	roundstart = FALSE
 	random = FALSE
 	uses = 1
+	category = "special"
 
 /obj/effect/mob_spawn/qareen/wendigo //not grief antag u little shits
 	name = "Woman Wendigo - The Horny Creature"
@@ -51,7 +52,6 @@
 	short_desc = "Вы таинственное нечто и абсолютно идеальный организм, который питается возбуждением своих жертв!"
 	desc = "Генокрад."
 	icon = 'icons/obj/machines/sleeper.dmi'
-
 	icon_state = "sleeper_clockwork"
 	mob_name = "Changeling"
 	flavour_text = "Вы Генокрад."
@@ -62,6 +62,7 @@
 	loadout_enabled = TRUE
 	use_outfit_name = TRUE
 	outfit = /datum/outfit/job/stowaway/syndicate
+	category = "special"
 
 /obj/effect/mob_spawn/human/changeling_extended/attack_ghost(mob/user, latejoinercalling)
 	if(GLOB.master_mode == "Extended")

diff --git a/modular_bluemoon/Ren/Code/FTU/FTU.dm b/modular_bluemoon/Ren/Code/FTU/FTU.dm
@@ -18,6 +18,7 @@
 	important_info = "Вам запрещено использовать товар или присваивать товар корабля себе. Не нападайте и не грабьте станцию, вы здесь для ведения торговли. Если на вас совершили нападение или украли товар, то вы можете применить силу в ответ."
 	assignedrole = "FTU worker"
 	antagonist_type = /datum/antagonist/ghost_role/traders
+	category = "midround"
 
 /obj/effect/mob_spawn/human/ftu_crew/qm
 	name = "Trade ship QM"

diff --git a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/raiders.dm b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/raiders.dm
@@ -91,6 +91,7 @@
 	short_desc = "You are an InteQ raider."
 	flavour_text = "Капитан станции отказался платить в ответ на требование наёмников InteQ. Атакуйте её: похищайте ресурсы, берите заложников. Избегайте ненужных жертв. Не забывайте следить за своим корабль."
 	assignedrole = "InteQ Raider"
+	category = "midround"
 
 /obj/effect/mob_spawn/human/raider/vanguard
 	outfit = /datum/outfit/inteq_raider/vanguard

diff --git a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers.dm b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers.dm
@@ -93,6 +93,7 @@
 	short_desc = "You are a Vox Scavenger."
 	flavour_text = "Самое время поживиться чем-то полезным на просторах космической станции. Не начинайте конфликтов первыми и избегайте их: ваша философия не допускает напрасной потери жизней с обеих сторон. Кроме того, никто из воксов не должен оказаться за бортом."
 	assignedrole = "Vox Scavenger"
+	category = "midround"
 
 /obj/effect/mob_spawn/human/vox_scavenger/special(mob/living/new_spawn)
 	new_spawn.fully_replace_character_name(new_spawn.real_name,generate_scavenger_name())

diff --git a/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm b/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm
@@ -49,6 +49,7 @@
 	random = TRUE
 	can_load_appearance = TRUE
 	loadout_enabled = FALSE
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/ash_walkers_slave/special_post_appearance(mob/living/new_spawn)
 	. = ..()
@@ -81,6 +82,7 @@
 	Only you know how you got to this planetoid, whether this place in which you woke up was one of your shelters, or you just stumbled upon it."
 	can_load_appearance = TRUE
 	antagonist_type = /datum/antagonist/ghost_role/hermit
+	category = "offstation"
 
 /obj/effect/mob_spawn/human/wandering_hermit/Destroy()
 	var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
@@ -196,6 +198,7 @@
 	assignedrole = ROLE_GHOSTROLE_INTEQ
 	antagonist_type = /datum/antagonist/ghost_role/inteq
 	loadout_enabled = TRUE
+	category = "inteq"
 
 /datum/outfit/inteqspace/inteq_crew/post_equip(mob/living/carbon/human/H)
 	H.faction |= ROLE_INTEQ
@@ -224,7 +227,8 @@
 	. = ..()
 	if(GLOB.master_mode == "Extended")
 		important_info = "Запрещено пытаться сбежать и сопротивляться без веских причин как серьёзная угроза жизни от сотрудников Космической Полиции и Солнечной. Побег только с разрешения администрации."
-
+		category = "sol"
+
 /obj/effect/mob_spawn/human/inteqspace/captain
 	name = "InteQ Ship Captain"
 	short_desc = "Вы - Лидер Авангарда ИнтеКью на старом корабле, застрявшем во враждебном космосе."