Add a Vaurca Projector to the loadout and allows Vaurca to take the Nralakk projector (Without breaking git) (#14303)

aurorastation.dme

@@ -878,6 +878,7 @@
 #include "code\game\objects\items\tajara.dm"
 #include "code\game\objects\items\toys.dm"
 #include "code\game\objects\items\trash.dm"
+#include "code\game\objects\items\vaurca.dm"
 #include "code\game\objects\items\vitals_monitor.dm"
 #include "code\game\objects\items\devices\aicard.dm"
 #include "code\game\objects\items\devices\augment_implanter.dm"

code/game/objects/items/vaurca.dm

@@ -0,0 +1,97 @@
+/obj/item/skrell_projector/vaurca_projector
+	name = "virtual reality looking glass"
+	desc = "A holographic projector using advanced technology that immerses someone into a scene using full panoramic holograms, smell and 3D spatial sound projection. It is developed and distributed by Hive Zo'ra and allows the viewer to peer in real-time into virtual reality realms specifically designed for outside viewing such as those belonging to High Queen Vaur."
+	icon = 'icons/obj/vaurca_items.dmi'
+	icon_state = "zora_projector"
+	worlds_selection = list("Ocean", "Hive War Exhibition", "Celestial Landing Ground", "City of New Sedantis", "Titan Prime")
+	message_frequency = 9
+
+/obj/item/skrell_projector/vaurca_projector/attack_self(mob/user as mob)
+	working = !working
+
+	if(working)
+		var/choice = input("You change the projector's holographic viewfinder to display:","Change the projector's viewfinder.") as null|anything in worlds_selection
+		apply_world(choice)
+		START_PROCESSING(SSprocessing, src)
+	else
+		set_light(0)
+		working = FALSE
+		update_icon()
+		STOP_PROCESSING(SSprocessing, src)
+
+/obj/item/skrell_projector/vaurca_projector/apply_world(choice)
+	var/brightness = 2
+
+	if(choice)
+		selected_world = choice
+	switch(choice)
+		if("Ocean")
+			light_color = "#1122c2"
+		if("Hive War Exhibition")
+			light_color = "#83290b"
+		if("Celestial Landing Ground")
+			light_color = "#f5e61d"
+		if("City of New Sedantis")
+			light_color = "#1395c9"
+		if("Titan Prime")
+			light_color = "#418144"
+
+		else
+			brightness = 0
+			working = FALSE
+			STOP_PROCESSING(SSprocessing, src)
+	set_light(brightness)
+	update_icon()
+
+/obj/item/skrell_projector/vaurca_projector/update_icon()
+	cut_overlays()
+	if(working)
+		var/image/overlay = overlay_image(icon, "zora_projector_light", light_color, RESET_COLOR)
+		add_overlay(overlay)
+
+/obj/item/skrell_projector/vaurca_projector/process()
+	if(!selected_world)
+		return
+
+	if(prob(message_frequency))
+		var/hologram_message
+		switch(selected_world)
+
+			if("Ocean")
+				hologram_message = pick("You see a golden fortress floating majestically above an ocean of sapphire.",
+										"A euphoric smell of the ocean fills your senses as the water gently ebbs and flows.",
+										"You hear the faint humming of a hymn as a gentle wave envelops the viewfinder.",
+                                        "You can hear a quiet celestial chanting the source of which feels just beyond sight",
+                                        "The turquoise water emits a jubilant smell of freshly cut lemons which lasts for only for a moment.",
+                                        "You see the gas giant Sedantis dominating a starry sky.")
+			if("Hive War exhibition")
+				hologram_message = pick("You see a carefully crafted exhibition detailing the Great Hive War. It explains in brief the details of the event through paintings and dioramas.",
+										"You smell burning and rusted metal. An exhibition showcases the Battle of a Thousand Titans.",
+										"You see a  memorial to the lives lost, a sad hymn flowing in the background.")
+
+			if("Celestial Landing Ground")
+				hologram_message = pick("An awe inspiring fortress of gold dominates the landscape and bathes the surrounding area in yellow luminescence.",
+										"A loud hymn is chanted in an unknown language accompanied by a smell of morning Dew in the countryside.",
+										"Unbound workers moving through the realm stop to gaze up in awe at the distant structure before returning to previous activities.",
+                                        "Distant chattering can be heard coming from the fortress including what sounds almost like jovial laughter.",
+                                        "The turquoise water emits a jubilant smell of freshly cut lemons which lasts for only for a moment.",
+                                        "You see the gas giant Sedantis dominating a starry sky.",
+										"For a moment the Golden Fortress towering above starts to glimmer majestically catching the light from the imposing gas giant in the sky")
+
+			if("City of New Sedantis")
+				hologram_message = pick("A towering cavernous city takes up the viewfinder, great buildings of stone jutting out of the ground and twisting towards the ceiling.",
+										"A loud hymn is being chanted in an unknown language and seems to shake the very ground itself.",
+										"A mellow blue light comes from thousands of resplendent crystals lining the wall and mingles with the inviting yellow glow from a distant golden fortress.",
+                                        "Distant chattering can be heard coming from the city.",
+                                        "A distant forge emits Phoron gas from a tower atop its lofty form, as worker drones collect lilac stained glass from within.",
+										"A group of Vaurca warriors move through the streets below seemingly practicing for some task unknown.")
+
+			if("Titan Prime")
+				hologram_message = pick("An imposing vessel of steel emits a soft glow as it travels through the starry sky aimlessly.",
+										"The engines of the towering vessel above emit a soft glow, accompanied by a brief smell of a warm ocean breeze.",
+										"A green light flickers from the steel vessel above bathing the surrounding idyllic landscape in its majesty.",
+                                        "You see the gas giant Sedantis dominating a starry sky, an imposing vessel of steel blotting out but a small portion of it.")
+
+
+		if(hologram_message)
+			visible_message("<span class='notice'>[hologram_message]</span>")

code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm

@@ -73,7 +73,7 @@
 	path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak
 	whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS)
 	sort_category = "Xenowear - Skrell"
-	
+
 /datum/gear/accessory/weishii
 	display_name = "weishii robe"
 	path = /obj/item/clothing/accessory/poncho/shouldercape/weishiirobe
@@ -110,7 +110,7 @@
 /datum/gear/skrell_projector
 	display_name = "nralakk projector"
 	path = /obj/item/skrell_projector
-	whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS)
+	whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
 	sort_category = "Xenowear - Skrell"
 
 /datum/gear/homeworld_deck

code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm

@@ -202,11 +202,20 @@
 	gear_tweaks += new /datum/gear_tweak/path(lunchboxes)
 	gear_tweaks += new /datum/gear_tweak/contents(lunchables_vaurca(), lunchables_vaurca_snack(), lunchables_drinks(), lunchables_utensil())
 
-/datum/gear/ears/vaurca/rings 
+/datum/gear/ears/vaurca/rings
 	display_name = "bulwark horn rings"
 	description = "Rings worn by Bulwarks to decorate their horns."
 	cost = 1
 	path = /obj/item/clothing/ears/bulwark/rings
 	sort_category = "Xenowear - Vaurca"
 	whitelisted = list(SPECIES_VAURCA_BULWARK)
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+
+/datum/gear/skrell_projector/vaurca_projector
+	display_name = "virtual reality looking-glass"
+	description = "A holographic projector using advanced technology that immerses someone into a scene. It is developed and distributed by Hive Zo'ra and allows the viewer to peer in real-time into virtual reality realms specifically designed for outside viewing such as those belonging to High Queen Vaur."
+	cost = 2
+	path = /obj/item/skrell_projector/vaurca_projector
+	sort_category = "Xenowear - Vaurca"
+	whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK)
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION

html/changelogs/connorjg1.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Connorjg1/Talion
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Added a Vaurca-Projector for Hive Zo'ra. Works like the Skrell Projector except for a small slice of Vaurca VR."
+