Merge branch 'master' into ouerea

code/__DEFINES/ship_weapons.dm

@@ -2,7 +2,7 @@
 #define SHIP_CALIBER_406MM "406mm"
 #define SHIP_CALIBER_40MM "40mm"
 #define SHIP_CALIBER_90MM "90mm"
-#define SHIP_CALIBER_ZTA "zero-point warp beam"
+#define SHIP_CALIBER_ZAT "zero-point warp beam"
 #define SHIP_CALIBER_178MM "178mm"
 #define SHIP_CALIBER_COILGUN "tungsten rod"
 #define SHIP_CALIBER_200MM "200mm"
@@ -25,7 +25,7 @@
 #define SHIP_AMMO_IMPACT_LASER "laser"
 #define SHIP_AMMO_IMPACT_BUNKERBUSTER "bunker-buster"
 #define SHIP_AMMO_IMPACT_PLASMA "plasma"
-#define SHIP_AMMO_IMPACT_ZTA "zero-point warp beam"
+#define SHIP_AMMO_IMPACT_ZAT "zero-point warp beam"
 #define SHIP_AMMO_IMPACT_BLASTER "blaster charge"
 
 #define FIRING_EFFECT_FLAG_THROW_MOBS  1

code/datums/outfits/outfit.dm

@@ -326,6 +326,9 @@
 	if(!H)
 		return
 
+	if(islist(accessory))
+		accessory = pick(accessory)
+
 	var/obj/item/clothing/under/U = H.get_equipped_item(slot_w_uniform)
 	if(U)
 		var/obj/item/clothing/accessory/A = new accessory

code/game/antagonist/station/cultist.dm

@@ -84,8 +84,8 @@ var/datum/antagonist/cultist/cult
 	remove_verb(player.current, /datum/cultist/proc/forget_rune)
 	remove_verb(player.current, /datum/cultist/proc/scribe_rune)
 
-/datum/antagonist/cultist/add_antagonist(var/datum/mind/player)
-	. = ..()
+/datum/antagonist/cultist/add_antagonist(var/datum/mind/player, var/do_not_equip)
+	. = ..(player, do_not_equip=do_not_equip)
 	if(.)
 		to_chat(player, "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back.")
 		if(player.current && !istype(player.current, /mob/living/simple_animal/construct))

code/game/gamemodes/cult/runes/convert.dm

@@ -5,6 +5,10 @@
 
 	var/list/converting
 
+	/// if FALSE, the new converted cultist is equipped as normal
+	/// if TRUE, they still get the languages and antag status, but no cult book or any other gear
+	var/do_not_equip = FALSE
+
 /datum/rune/convert/do_rune_action(mob/living/user, atom/movable/A)
 	LAZYINITLIST(converting)
 	var/mob/living/carbon/target
@@ -83,7 +87,7 @@
 				waiting_for_input[target] = FALSE
 				switch(choice)
 					if("Submit")
-						cult.add_antagonist(target.mind)
+						cult.add_antagonist(target.mind, do_not_equip)
 						converting -= target
 						target.hallucination = 0 //sudden clarity
 						target.setBrainLoss(0) // nar'sie heals you
@@ -105,5 +109,13 @@
 	shade.ghostize(FALSE)
 	target.dust()
 
+/datum/rune/convert/no_equip
+	name = "initiate conversion rune"
+	desc = "A rune used to convert the Unenlightened."
+	do_not_equip = TRUE
+
 /obj/effect/rune/convert/Initialize(mapload)
 	. = ..(mapload, SScult.runes_by_name[/datum/rune/convert::name])
+
+/obj/effect/rune/convert/no_equip/Initialize(mapload)
+	. = ..(mapload, SScult.runes_by_name[/datum/rune/convert/no_equip::name])

code/modules/background/space_sectors/tauceti.dm

@@ -15,10 +15,15 @@
 	starlight_range = 2
 
 	lore_radio_stations = list(
-		"87.5 Mendell City Bugle Radio" = "config/example/lore_radio/tauceti/87.5_Mendell_City_Bugle.txt",
-		"90.7 Hi-Fi Sports FM" = "config/example/lore_radio/tauceti/90.7_Hi_Fi_Sports.txt",
-		"93.1 Phoenix FM" = "config/example/lore_radio/tauceti/93.1_PhoenixFM.txt",
-		"103.1 Nightingale Radio" = "config/example/lore_radio/tauceti/93.1_PhoenixFM.txt",
+		"87.5 Mendell City Bugle Radio" = "config/lore_radio/tauceti/87.5_Mendell_City_Bugle.txt",
+		"90.7 Hi-Fi Sports FM" = "config/lore_radio/tauceti/90.7_Hi_Fi_Sports.txt",
+		"93.1 Phoenix FM" = "config/lore_radio/tauceti/93.1_PhoenixFM.txt",
+		"17.9 Adhomai Ceti-Connection" = "config/lore_radio/tauceti/17.9_Adhomai_Ceti-Connection.txt",
+		"28.1 D6 Citizen Radio" = "config/lore_radio/tauceti/28.1_D6_Citizen_Radio.txt",
+		"95.3 QRCC" = "config/lore_radio/tauceti/95.3_QRCC.txt",
+		"93.8 Biesellian Song Broadcast" = "config/lore_radio/tauceti/93.8_Biesellian_Song_Broadcast.txt",
+		"113.7 ZOTH-FM Vaurca Radio Station" = "config/lore_radio/tauceti/113.7_ZOTH_F_Vaurca_Radio_Station.txt",
+		"52.4 Raging Tides" = "config/lore_radio/tauceti/52.4_Raging_Tides.txt"
 	)
 
 /datum/space_sector/romanovich

code/modules/overmap/ship_weaponry/weaponry/leviathan.dm

@@ -9,7 +9,7 @@
 	projectile_type = /obj/item/projectile/ship_ammo/leviathan
 	use_ammunition = FALSE
 	heavy_firing_sound = 'sound/weapons/gunshot/ship_weapons/leviathan_fire.ogg'
-	caliber = SHIP_CALIBER_ZTA
+	caliber = SHIP_CALIBER_ZAT
 	firing_effects = FIRING_EFFECT_FLAG_THROW_MOBS|FIRING_EFFECT_FLAG_EXTREMELY_LOUD
 	screenshake_type = SHIP_GUN_SCREENSHAKE_ALL_MOBS
 	layer = ABOVE_HUMAN_LAYER
@@ -125,8 +125,8 @@
 	name = "zero-point artillery beam"
 	desc = "A beam of pure energy."
 	range = OVERMAP_PROJECTILE_RANGE_ULTRAHIGH
-	caliber = SHIP_CALIBER_ZTA
-	impact_type = SHIP_AMMO_IMPACT_ZTA
+	caliber = SHIP_CALIBER_ZAT
+	impact_type = SHIP_AMMO_IMPACT_ZAT
 	overmap_icon_state = "heavy_pulse"
 
 /obj/item/ship_ammunition/leviathan/Initialize()
@@ -166,42 +166,42 @@
 	on_hit(A)
 	return TRUE
 
-/obj/machinery/zta_lever
+/obj/machinery/zat_lever
 	name = "activation lever"
 	desc = "An old-style lever that couples the Leviathan's capacitors. <span class='danger'>Flicking this will result in extreme power usage!</span>"
 	icon = 'icons/obj/power.dmi'
 	icon_state = "lever1"
-	var/obj/machinery/ship_weapon/leviathan/ZTA
+	var/obj/machinery/ship_weapon/leviathan/ZAT
 	var/toggled = FALSE
 	var/cooldown = 0
 
-/obj/machinery/zta_lever/Initialize(mapload, d, populate_components, is_internal)
+/obj/machinery/zat_lever/Initialize(mapload, d, populate_components, is_internal)
 	..()
 	return INITIALIZE_HINT_LATELOAD
 
-/obj/machinery/zta_lever/LateInitialize()
+/obj/machinery/zat_lever/LateInitialize()
 	for(var/obj/machinery/ship_weapon/leviathan/cannon in get_area(src))
-		ZTA = cannon
+		ZAT = cannon
 		break
 
-/obj/machinery/zta_lever/Destroy()
-	ZTA = null
+/obj/machinery/zat_lever/Destroy()
+	ZAT = null
 	return..()
 
-/obj/machinery/zta_lever/attack_hand(mob/user)
+/obj/machinery/zat_lever/attack_hand(mob/user)
 	if(!use_check_and_message(user, USE_DISALLOW_SILICONS) && !stat && (cooldown + 10 SECONDS < world.time))
 		if(do_after(user, 1 SECOND))
 			visible_message(SPAN_DANGER("[user] pulls \the [src] [toggled ? "up" : "down"]!"))
 			toggled = !toggled
 			switch(toggled)
 				if(FALSE)
 					flick("lever3", src)
-					ZTA.disable()
+					ZAT.disable()
 					sleep(2)
 					icon_state = "lever1"
 				if(TRUE)
 					flick("lever2", src)
-					ZTA.enable()
+					ZAT.enable()
 					sleep(2)
 					icon_state = "lever_down"
 			playsound(src, 'sound/effects/spring.ogg', 100)

code/modules/paperwork/folders.dm

@@ -191,11 +191,11 @@
 	else
 		..()
 
-/obj/item/folder/envelope/zta
+/obj/item/folder/envelope/zat
 	name = "leviathan zero-point artillery instructions"
 	desc = "A small envelope with \"SCC CONFIDENTIAL\" written in bold text on the front."
 
-/obj/item/folder/envelope/zta/Initialize()
+/obj/item/folder/envelope/zat/Initialize()
 	. = ..()
 	var/obj/item/paper/R = new(src)
 	R.set_content("leviathan zero-point artillery instructions", "<table><cell><hr><small><center><img src=scclogo.png><br><b>Stellar Corporate Conglomerate<br> \

config/example/lore_radio/tauceti/113.7_ZOTH_F_Vaurca_Radio_Station.txt

@@ -0,0 +1,103 @@
+[RANDOMNOTE]/You are now listening to 113.7 ZOTH-FM. Broadcasting live from Belle Cote, reaching all the way to Vaur’s Tower in Caprice./[RANDOMNOTE]
+[RANDOMNOTE]/The sound of a stainless steel guiro is mixed with a traditional Vaurca instrument and some rock motifs./[RANDOMNOTE]
+Hey Brood Squad! It’s Anita Sinclair, back to blow your minds on Broodcast! Your absolute FAVE source for all the Vaurca hotness!  Today, we’re packing our bags and teleporting to the most oh-em-gee-worthy Vaurca destinations! Imagine the picture-perfect moments in Veii’ktown, the unreal energy of New Sedantis, and maybe even catching some gnarly waves in Diulszi! Think you know the Vaurcae? Nope—they’ve got the coolest places out there.  Buckle up, Brood Squad, this is about to get epic!
+[RANDOMNOTE]/A male voice rapidly says, “Broodcast is an official transmission, certified by the Court of Queens order one-five-seven-dash-five. Broodcast is not affiliated to any Vaurca Hive and is financed by Vaurca Equality.”/[RANDOMNOTE]
+Okay, Brood Squad, let’s ditch the formalities and get down to business! I’m holo-calling my bestie Natalie Lindquist, a freelance reporter who’s currently visiting Diulszi. I think only Natalie can do justice to the marvelous beaches of Diulszi while she’s standing there. 
+[RANDOMNOTE]/A loud phone ringing./[RANDOMNOTE]
+Hello, Anita?
+Hi, Natalie! You’re live on Broodcast as we speak. I wanted to hear, straight out of your mouth, just how you’re feeling in Diulszi.
+Well, Anita, I’m currently chilling under the sun with two leis on my neck, sipping a pina colada, all while a Bulwark in a floral shirt is fanning me with a huge leaf. Am I in heaven? Abso-lute-ly.
+Natalie, you’re just making me so jealous now! Would you say hospitality has been totes on par with what you’d expect?
+For sure! The Vaurcae are probably the most warm and welcoming species in the Spur. I almost feel like I’m one of their Queens with how well they’ve treated me! /(chuckles)/ I’m staying in this nice bungalow that’s completely run by Vytel Workers, the latest in eco-tourism too. Everything is sustainable and like, totally guilt-free! Makes me sad to even think about returning home after this holiday!
+Well, Natalie, I think you haven’t told us the best part of your trip. Tell our listeners just how much your bungalow costs for the night, go on.
+Okay! It costed me… 80 credits!
+Gush! That REALLY does make me jealous. 80 credits for being treated like a queen? Sign me up! Okay, Natalie, I think that’ll be all today. Thank you so much for your time, bestie! Continue enjoying paradise, I send you all my love!
+Bye, Anita! I’ll remember to bring you a souvenir!
+[RANDOMNOTE]/The call cuts off./[RANDOMNOTE]
+There you have it! If you’re ever thinking about leaving the system and visiting an exotic paradise, don’t hesitate and choose Diulszi! There’s just so much more that we didn’t even cover, like the nice surf communities the planet has. And the best? It’s all C’thur running the place! They really know how to make a resort. 
+Before we continue, Brood Squad, we’ll play a song. This is New Gibson’s Njöva with her hit song, “Lovers Apart”!
+[RANDOMNOTE]Orion’s belt, a map across your sky.[RANDOMNOTE]
+[RANDOMNOTE]My world spins in shadows, where constellations lie.[RANDOMNOTE]
+[RANDOMNOTE]Cold vacuum whispers of the space between.[RANDOMNOTE]
+[RANDOMNOTE]Yet my heart transmits a signal, unseen.[RANDOMNOTE]
+[RANDOMNOTE]Meteor trails mark your flight.[RANDOMNOTE]
+[RANDOMNOTE]Across the galaxy, a pixelated light.[RANDOMNOTE]
+[RANDOMNOTE]My pulse a whisper, your signal so strong.[RANDOMNOTE]
+[RANDOMNOTE]Can this cosmic echo bridge where we belong?[RANDOMNOTE]
+[RANDOMNOTE]Your touch like stardust, a shimmer on my skin.[RANDOMNOTE]
+[RANDOMNOTE]Your eyes, twin nebulae, pull my gravity in.[RANDOMNOTE]
+[RANDOMNOTE]Skin like polished metal, circuits beneath.[RANDOMNOTE]
+[RANDOMNOTE]Is this love, or a program I cannot delete?[RANDOMNOTE]
+[RANDOMNOTE]/ZOTH! FM!…/ [RANDOMNOTE]
+Wow. That song...deep stuff, right Brood Squad? Love across the cosmos—who knew, huh? And hey, speaking of deep dives, remember: you’re vibing along with me, Anita, right here on Broodcast, ZOTH FM! But enough with the feels—let’s get back to the Vaurca vibes! Because the next stop on our itinerary is Veiik’town!
+Now, picture this: You land in Belle Cote, the amazing city I live in. But nestled right in the heart of the city is this incredible neighborhood called Veii’ktown. Think of it as, like, a Vaurca community—a place that’s bursting with Vaurca culture! But Veii’tkown isn’t just about history and tradition. This place is a HIVE of creativity!
+So quick story: I wasn’t actually born in Belle Cote! Shocker, right? I’m a Greensville girl; you know, that small town /near/ Mendell? I came to Belle Cote about like… four-ish years ago? That’s about when Vaurcae were moving in! And let me tell you: from the start, their treatment was superb. I felt super welcomed by then. Flash forward a year later and guess what? Vaurcae are building this super-chic place called Veii’ktown. 
+Now, let me tell you all about Veii’ktown. When you visit, you HAVE to try the fried k’ois fish. Don’t worry! They’re not really k’ois, or fish. They’re these tiny fried ice cream in the shape of a fish… colored yellow as well! They’re ultra cool and ULTRA delicious! They’re like my favorite treat whenever I visit, and I always love snapping pics of my food! You really have to try them, they’re that good!
+They’ve also got these mega cute houses, modeled after what traditional Vaurca houses looked like! They’re like, really tiny, but also, REALLY adorable! I don’t even have words to describe them… they look like they have. Some of them are also like… these mega cool restaurants where you get to try what k’ois would taste like for humans and more. I’m telling you, if you want the FULL Vaurca experience, Veii’ktown is the best place for you to visit!
+Now, before we take our amazing trip to New Sedantis, let’s hear another song. This one’s from Mictlani Cadu Silva, topping the techno-samba charts with his joy anthem, “Techno-samba is my freedom”!
+[RANDOMNOTE]The rhythm calls, my spirit takes flight.[RANDOMNOTE]
+[RANDOMNOTE]Neon city hums, dreams shimmer in the night.[RANDOMNOTE]
+[RANDOMNOTE]Each step a pulse, can’t hold this feeling down.[RANDOMNOTE]
+[RANDOMNOTE]Techno-samba surge, my soul breaks free of the ground![RANDOMNOTE]
+[RANDOMNOTE]This dance-a, speaks for me, where my spirit finds its light.[RANDOMNOTE]
+[RANDOMNOTE]Techno-samba power, stardust in the endless night.[RANDOMNOTE]
+[RANDOMNOTE]No limits to this feeling, my heart transcends the strain.[RANDOMNOTE]
+[RANDOMNOTE]Techno-samba is my freedom, where joy ignites again.[RANDOMNOTE]
+[RANDOMNOTE]The beat unites us, a symphony unbound.[RANDOMNOTE] 
+[RANDOMNOTE]Strangers turn to kin, on this electric, spinning ground.[RANDOMNOTE]
+[RANDOMNOTE] Worries fade to echoes, troubles drift away.[RANDOMNOTE]
+[RANDOMNOTE]This music is our haven, where spirits come to play.[RANDOMNOTE]
+[RANDOMNOTE]This dance-a, speaks for me, where my spirit finds its light.[RANDOMNOTE]
+[RANDOMNOTE]Techno-samba power, stardust in the endless night.[RANDOMNOTE]
+[RANDOMNOTE]No limits to this feeling, my heart transcends the strain.[RANDOMNOTE]
+[RANDOMNOTE]Techno-samba is my freedom, where joy ignites again.[RANDOMNOTE]
+[RANDOMNOTE]/ZOTH! FM!…/ [RANDOMNOTE]
+Whoa, Brood Squad, did you feel that? That techno-samba surge was pure FIRE! Cadu Silva bringing those beats that make you want to break free and dance until the stars align! And hey, speaking of stars, remember you’re tuned into the brightest one in the Spur: Broodcast, on ZOTH-FM! Now, get ready, because we’re about to launch into the next segment. Hold onto your spaceships, this ride's gonna be stellar!
+For our trip to New Sedantis, we’ll be holo-calling our good friend Emily Kapl- oh? Oops! Made a teeny tiny mistake there, this next segement will be covered by Mike Fern, my BFF—brood friend forever! 
+[RANDOMNOTE]/A loud phone ringing./[RANDOMNOTE]
+Heyy, Anita!
+Hii, Mike! How’s New Sedantis treating you?
+Well, you caught me with my mouth full. I’m enjoying a nice V’krexi Meat Special Burger from the new Up!Burger.
+Woah, and like, what does it taste like? Is it AMAZING?
+Amazing? You bet! Though it still falls short compared to the sights of the Ta’raii Square. It’s really something else to behold! You wouldn’t believe just how… cosmopolitan an underground city can feel like. It’s truly something unique.
+Oh, Mike. Don’t tell me. Now you’re making me really envious!
+Anita, but you haven’t heard the best. There are traditional Vaurca medicine centers here. They have workshops and, best of all, they even have a spa for humans! I feel like I have baby skin now. They’re just THAT good.
+And how much did it cost you, Mike?
+Well, Anita, that’s the good part! If you’ve made a donation to Vaurca Equality in the past, then you get one spa session for FREE!
+For free, Mike? Really?
+You heard me right, Anita! Totally free!
+[RANDOMNOTE]/A male voice rapidly says, “This promotion is valid for donors of over 100 credits to Vaurca Equality. It applies only to first-time spa visitors. The promotional 30-minute session is an introductory offer and does not include additional services such as hot-rock massage. Please visit vaurcaequality.en-tee/freespa for a full list of terms and conditions.”/[RANDOMNOTE]
+Wow, Mike, I better go check it out! But quick question about folks like me. I have a Vaurca Equality membership card. Do I like, get any extra cool perks or something?
+Well, Anita, now that you ask… yes! You actually get a special discount in hotels here at New Sedantis. Also, Anita, did you know that if you have a Phoron-Star membership, you actually don’t have to pay for the trolley?
+Woah, are you like, being serious now or just joking around?
+I’m serious, Anita! If you’re a phoron-star member, public transport in New Sedantis is free!
+[RANDOMNOTE]/A male voice rapidly says, “Important Note:  The 10% hotel discount applies exclusively to the initial visit at participating Vaurca-sponsored hotels. Standard rates are in effect after the third night.  This promotion may not be combined with other offers.  Furthermore, the Phoron-Star membership program, including free public transport, necessitates an annual donation exceeding 1000 credits. Vaurca Equality reserves the right to modify or terminate the Phoron-Star program at its sole discretion. Please visit vaurcaequality.en-tee/phoronstar for a comprehensive list of terms and conditions.”/[RANDOMNOTE]
+Well, that’s amazing! Thank you very much for your time, Mike. This has been highly informative!
+No prob, Anita! I’ll see you up ahead.
+Well, Brood Squad, that’s it for this week’s Broodcast. Remember to tune in next time, where we’ll interview various people who have just made their first Vaurca friend and are like, super excited to share everything about it! I can’t wait to tell you everything about it, it’ll be AMAZING! We’ll cut off with the latest song by Skrell pop star and streamer, Alqaana. It’s their hit single in Basic, “Cosmic Heartbeat”! Byee, friends! Remember: this was Broodcast on ZOTH-FM! Your go-to station for all-things Vaurcae!
+[RANDOMNOTE]Across the dance floor, a neon blur.[RANDOMNOTE]
+[RANDOMNOTE]Suddenly, it’s just you and me, for sure.[RANDOMNOTE]
+[RANDOMNOTE]The music fades, everything’s on mute.[RANDOMNOTE]
+[RANDOMNOTE] Except my heart, humming a cosmic loot.[RANDOMNOTE]
+[RANDOMNOTE]Everywhere I look, I see your name.[RANDOMNOTE]
+[RANDOMNOTE]Written in stardust, fueling this flame.[RANDOMNOTE] 
+[RANDOMNOTE]Maybe it’s crazy, a little out of this world.[RANDOMNOTE] 
+[RANDOMNOTE]My skin catches the light, my headtails unfurl.[RANDOMNOTE]
+[RANDOMNOTE]This feeling’s electric, can’t deny the spark![RANDOMNOTE]
+[RANDOMNOTE]It’s like the universe knew, right from the start.[RANDOMNOTE] 
+[RANDOMNOTE]Our orbits aligned, a sweet cosmic scheme.[RANDOMNOTE]
+[RANDOMNOTE]You’re my missing puzzle piece, a gravity dream.[RANDOMNOTE]
+[RANDOMNOTE]Baby, can you feel it too?[RANDOMNOTE]
+[RANDOMNOTE]This cosmic heartbeat, pulling me to you.[RANDOMNOTE]
+[RANDOMNOTE]Like constellations locked in the night![RANDOMNOTE]
+[RANDOMNOTE]We’re gonna ignite, everything feels so right![RANDOMNOTE]
+[RANDOMNOTE]Forget the rules and what they say.[RANDOMNOTE]
+[RANDOMNOTE]Let’s rewrite the script, our own cosmic way.[RANDOMNOTE]
+[RANDOMNOTE]My skin shines bright, reflecting your gaze.[RANDOMNOTE]
+[RANDOMNOTE]Come closer now, let’s rewrite the maze.[RANDOMNOTE]
+[RANDOMNOTE]Baby, can you feel it too?[RANDOMNOTE]
+[RANDOMNOTE]This cosmic heartbeat, pulling me to you.[RANDOMNOTE]
+[RANDOMNOTE]Like constellations locked in the night![RANDOMNOTE]
+[RANDOMNOTE]We’re gonna ignite, everything feels so right![RANDOMNOTE]
+[RANDOMNOTE]Cosmic heartbeat, yeah, you and I.[RANDOMNOTE]
+[RANDOMNOTE]Our love will shimmer across the sky…[RANDOMNOTE]