Merge pull request #378 from TS-Rogue-Star/master

6/16/24 - Map swap

code/modules/client/preference_setup/loadout/loadout_fluffitems_RS.dm

@@ -0,0 +1,49 @@
+//RS CUSTOM FLUFF ITEMS BEGIN
+
+/datum/gear/fluff/dulahan_fire
+	path = /obj/item/clothing/head/fluff/dulahan_fire
+	display_name = "Dulahan's Fire"
+	slot = slot_head
+	ckeywhitelist = list("hiddenname1702")
+	character_name = list("Ena")
+
+/datum/gear/fluff/dulahan_flame/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/fluff/ena_head
+	path = /obj/item/weapon/fluff/ena_head
+	display_name = "Ena's Head"
+	ckeywhitelist = list("hiddenname1702")
+	character_name = list("Ena")
+
+/datum/gear/fluff/vivid_river
+	path = /obj/item/toy/plushie/snakeplushie/fluff/river
+	display_name = "Vivid's River"
+	ckeywhitelist = list("megamitchel")
+	character_name = list("Vivid")
+
+/datum/gear/fluff/vivid_jyen
+	path = /obj/item/toy/plushie/snakeplushie/fluff/jyen
+	display_name = "Vivid's Jyen"
+	ckeywhitelist = list("megamitchel")
+	character_name = list("Vivid")
+
+/datum/gear/fluff/vivid_raye
+	path = /obj/item/toy/plushie/snakeplushie/fluff/raye
+	display_name = "Vivid's Raye"
+	ckeywhitelist = list("megamitchel")
+	character_name = list("Vivid")
+
+/datum/gear/fluff/vivid_zoey
+	path = /obj/item/toy/plushie/snakeplushie/fluff/zoey
+	display_name = "Vivid's Zoey"
+	ckeywhitelist = list("megamitchel")
+	character_name = list("Vivid")
+
+/datum/gear/fluff/tracking_implant
+	path = /obj/item/clothing/under/permit/fluff/tracking_implant
+	slot = slot_w_uniform
+	display_name = "Embedded Tracker Implant"
+	ckeywhitelist = list("draykenthedragon")
+	character_name = list("Anoscetia")

code/modules/client/preference_setup/loadout/loadout_questitems_rs.dm

@@ -0,0 +1,36 @@
+// Note for newly added fluff items: Ckeys should not contain any spaces, underscores or capitalizations,
+// or else the item will not be usable.
+// Example: Someone whose username is "Master Pred_Man" should be written as "masterpredman" instead
+// Note: Do not use characters such as # in the display_name. It will cause the item to be unable to be selected.
+
+/datum/gear/fluff
+	path = /obj/item
+	sort_category = "Quest Items"
+	display_name = "If this item can be chosen or seen, ping a coder immediately!"
+	ckeywhitelist = list("This entry should never be choosable with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
+	character_name = list("This entry should never be choosable with this variable set.")
+	cost = 0
+/*
+/datum/gear/fluff/testhorn
+	path = /obj/item/weapon/bikehorn
+	display_name = "Airhorn - Example Item"
+	description = "An example item that you probably shouldn't see!"
+	ckeywhitelist = list("mewchild")
+	allowed_roles = list("Engineer")
+*/
+
+
+/datum/gear/fluff/collar //Use this as a base path for collars if you'd like to set tags in loadout. Make sure you don't use apostrophes in the display name or this breaks!
+	slot = slot_tie
+
+/datum/gear/fluff/collar/New()
+	..()
+	gear_tweaks += gear_tweak_collar_tag
+
+//  0-9 CKEYS
+
+//  A CKEYS
+
+//  B CKEYS
+
+//  L CKEYS

code/modules/mob/_modifiers/aura.dm

@@ -12,7 +12,7 @@ making it not expire ever, which is likely not what you want.
 		expire()
 	var/atom/A = origin.resolve()
 	if(istype(A)) // Make sure we're not null.
-		if(get_dist(holder, A) > aura_max_distance)
+		if(!(A in view(aura_max_distance, holder)))
 			expire()
 	else
-		expire() // Source got deleted or something.
+		expire() // Source got deleted or something.

code/modules/vore/fluffstuff/custom_items_RS.dm

@@ -0,0 +1,77 @@
+//RS CUSTOM FLUFF ITEMS BEGIN
+
+/obj/item/clothing/head/fluff/dulahan_fire		//hiddenname1702 fluff item	- Sprites by VerySoft
+	name = "dulahan's fire"
+	desc = "This Dulahan's head appears to be missing, and a fire rests in it's place."
+	icon = 'icons/rogue-star/hats.dmi'
+	icon_state = "d_fire"
+	icon_override = 'icons/rogue-star/hats.dmi'
+	item_state = "d_fire"
+	body_parts_covered = HEAD
+	plane = PLANE_LIGHTING_ABOVE
+	light_range = 2
+	light_overlay = null
+	light_system = MOVABLE_LIGHT
+
+/obj/item/clothing/head/fluff/dulahan_fire/Initialize()
+	. = ..()
+	update_flashlight()
+
+/obj/item/clothing/head/fluff/dulahan_fire/update_flashlight(mob/user)
+	light_color = color
+	return ..()
+
+/obj/item/weapon/fluff/ena_head
+	name = "Ena's Head"
+	desc = "The head of a Dulahan, careful it doesn't bite you!"
+	icon = 'icons/vore/custom_items_rs.dmi'
+	icon_state = "ena_head"
+	force = 1
+	throwforce = 1
+	throw_speed = 4
+	throw_range = 20
+
+/obj/item/toy/plushie/snakeplushie/fluff/river
+	name = "Vivid's River"
+	desc = "An aquatic noodle that Vivid uses to showcase the actions of their blue wyrm"
+	icon = 'icons/vore/custom_items_rs.dmi'
+	icon_state = "river"
+	drop_sound = "generic_drop"
+
+/obj/item/toy/plushie/snakeplushie/fluff/jyen
+	name = "Vivid's Jyen"
+	desc = "A fluffy noodle that Vivid uses to showcase the actions of their white wyrm"
+	icon = 'icons/vore/custom_items_rs.dmi'
+	icon_state = "jyen"
+	drop_sound = "generic_drop"
+
+/obj/item/toy/plushie/snakeplushie/fluff/raye
+	name = "Vivid's Raye"
+	desc = "An acid noodle that Vivid uses to showcase the actions of their green wyrm"
+	icon = 'icons/vore/custom_items_rs.dmi'
+	icon_state = "raye"
+	drop_sound = "generic_drop"
+
+/obj/item/toy/plushie/snakeplushie/fluff/zoey
+	name = "Vivid's Zoey"
+	desc = "A hypnotic noodle that Vivid uses to showcase the actions of their yellow wyrm"
+	icon = 'icons/vore/custom_items_rs.dmi'
+	icon_state = "zoey"
+	drop_sound = "generic_drop"
+
+/obj/item/clothing/under/permit/fluff/tracking_implant
+	name = "embedded tracker implant"
+	desc = "A small, spherical black device. Emblazoned with a crimson Y-like logo on one side and the numbers 53799 stamped on the back."
+	icon = 'icons/vore/custom_items_rs.dmi'
+	icon_state = "anoscetiaImplant"
+	var/obj/item/device/gps/gps_tracker		//It has a secret GPS device in it
+
+/obj/item/clothing/under/permit/fluff/tracking_implant/Initialize()
+	. = ..()
+	gps_tracker = new(src)
+	gps_tracker.gps_tag = "Syne"
+	gps_tracker.tracking = TRUE
+
+/obj/item/clothing/under/permit/fluff/tracking_implant/Destroy()
+	gps_tracker = null
+	return ..()