3/10/24 - Map swap

code/_helpers/global_lists_vr.dm

@@ -80,6 +80,7 @@ var/global/list/classic_release_sounds = list(
 		"Rustle 5 (cloth)" = 'sound/effects/rustle5.ogg',
 		"Zipper" = 'sound/items/zip.ogg',
 		"Splatter" = 'sound/effects/splat.ogg',
+		"Belch" = "belches",
 		"None" = null
 		)
 
@@ -115,6 +116,7 @@ var/global/list/fancy_release_sounds = list(
 		"Stomach Move" = 'sound/vore/sunesound/pred/stomachmove.ogg',
 		"Pred Escape" = 'sound/vore/sunesound/pred/escape.ogg',
 		"Splatter" = 'sound/effects/splat.ogg',
+		"Belch" = "belches",
 		"None" = null
 		)
 

code/datums/underwear/bottom.dm

@@ -95,4 +95,14 @@
 /datum/category_item/underwear/bottom/onepiece
 	name = "Swimming One Piece"
 	icon_state = "onepiece"
-	has_color = TRUE
+	has_color = TRUE
+
+/datum/category_item/underwear/top/onepiece_alt
+	name = "Swimming One Piece, Alt"
+	icon_state = "swim_onepiece"
+	has_color = TRUE
+
+/datum/category_item/underwear/top/onepiece_strapless
+	name = "Swimming One Piece, Strapless"
+	icon_state = "swim_strapless_onepiece"
+	has_color = TRUE

code/datums/underwear/socks.dm

@@ -208,4 +208,8 @@
 /datum/category_item/underwear/socks/stirrup_thigh_black
 	name = "Black Stirrup Stockings"
 	icon_state = "leggings-stir-black"
-	has_color = TRUE
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stirrup_pantyhose
+	name = "Pantyhose, stirrup"
+	icon_state = "pantyhose-stir"

code/datums/underwear/top.dm

@@ -51,10 +51,20 @@
 	name = "Fishnet top"
 	icon_state = "fishnet_body"
 
+/datum/category_item/underwear/top/fishnet_base_alt
+	name = "Fishnet top, alt"
+	icon_state = "fishnet_body_alt"
+	has_color = TRUE
+
 /datum/category_item/underwear/top/fishnet_sleeves
 	name = "Fishnet with sleeves"
 	icon_state = "fishnet_sleeves"
 
+/datum/category_item/underwear/top/fishnet_sleeves_alt
+	name = "Fishnet with sleeves, alt"
+	icon_state = "fishnet_sleeves_alt"
+	has_color = TRUE
+
 /datum/category_item/underwear/top/fishnet_gloves
 	name = "Fishnet with gloves"
 	icon_state = "fishnet_gloves"
@@ -95,4 +105,4 @@
 /datum/category_item/underwear/top/swimtop
 	name = "Swimming Top"
 	icon_state = "swimtop"
-	has_color = TRUE
+	has_color = TRUE

code/datums/underwear/undershirts.dm

@@ -189,13 +189,38 @@
 	icon_state = "pinkblack_tshirt"
 
 /datum/category_item/underwear/undershirt/turtle
+	name = "Turtleneck, Old"
+	icon_state = "turtleneck_old"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/sleevelessturtle
+	name = "Turtleneck, Sleeveless, Old"
+	icon_state = "turtleneck_sleeveless_old"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/turtleneck
 	name = "Turtleneck"
 	icon_state = "turtleneck"
 	has_color = TRUE
 
-/datum/category_item/underwear/undershirt/sleevelessturtle
+/datum/category_item/underwear/undershirt/turtleneck_smooth
+	name = "Turtleneck, Smooth"
+	icon_state = "turtleneck_smooth"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/turtlesleeveless
 	name = "Turtleneck, Sleeveless"
-	icon_state = "sleevelessturtle"
+	icon_state = "turtleneck_sleeveless"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/leotardturtle
+	name = "Leotard Turtleneck"
+	icon_state = "leotard_turtleneck"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/leotardturtlesleeveless
+	name = "Leotard Turtleneck, Sleeveless"
+	icon_state = "leotard_turtleneck_sleeveless"
 	has_color = TRUE
 
 /datum/category_item/underwear/undershirt/dress_shirt_fem
@@ -226,4 +251,4 @@
 /datum/category_item/underwear/undershirt/leotard
 	name = "Leotard"
 	icon_state = "leotard"
-	has_color = TRUE
+	has_color = TRUE

code/game/objects/effects/pet_spawner.dm

@@ -0,0 +1,57 @@
+/obj/random/mob/semirandom_mob_spawner/pet
+	mob_faction = "pet"
+	overwrite_hostility = TRUE
+	mob_hostile = FALSE
+	mob_returns_home = FALSE
+	possible_mob_types = list()
+
+/obj/random/mob/semirandom_mob_spawner/pet/all_themes/Initialize()
+	possible_mob_types = list(
+		theme_farm,
+		theme_bird,
+		theme_forest,
+		theme_jungle,
+		theme_domestic,
+		theme_lizard,
+		theme_sif,
+		theme_space
+		)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/farm
+	icon_state = "animal"
+/obj/random/mob/semirandom_mob_spawner/pet/farm/Initialize()
+	possible_mob_types = list(theme_farm)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/bird
+	icon_state = "bird"
+/obj/random/mob/semirandom_mob_spawner/pet/bird/Initialize()
+	possible_mob_types = list(theme_bird)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/forest/Initialize()
+	possible_mob_types = list(theme_forest)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/jungle/Initialize()
+	possible_mob_types = list(theme_jungle)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/domestic
+	icon_state = "animal"
+/obj/random/mob/semirandom_mob_spawner/pet/domestic/Initialize()
+	possible_mob_types = list(theme_domestic)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/lizard/Initialize()
+	possible_mob_types = list(theme_lizard)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/sif/Initialize()
+	possible_mob_types = list(theme_sif)
+	. = ..()
+
+/obj/random/mob/semirandom_mob_spawner/pet/space/Initialize()
+	possible_mob_types = list(theme_space)
+	. = ..()

code/game/objects/items/devices/denecrotizer_vr.dm

@@ -67,7 +67,7 @@
 		visible_message("[src]'s eyes flicker with a curious intelligence.", runemessage = "looks around")
 		return
 	if(revivedby != "no one")
-		to_chat(src, "<span class='notice'>Where once your life had been rough and scary, you have been assisted by [revivedby]. They seem to be the reason you are on your feet again... so perhaps you should help them out.</span> <span class= warning> Being as you were revived, you are allied with the station. Do not attack anyone unless they are threatening the one who revived you. And try to listen to the one who revived you within reason. Of course, you may do scenes as you like, but you must still respect preferences.</span>")
+		to_chat(src, "<span class='notice'>You are bound to [revivedby], they take care of you, so you should follow their lead.</span> <span class= warning> You are allied with the station. Do not attack anyone unless they are threatening the one who revived you. And try to listen to the one who revived you within reason. Of course, you may do scenes as you like, but you must still respect preferences.</span>")
 		visible_message("[src]'s eyes flicker with a curious intelligence.", runemessage = "looks around")
 
 /// Evaluate someone for being allowed to join as this mob from being a ghost

code/game/objects/random/mob.dm

@@ -8,6 +8,7 @@
 	icon_state = "animal"
 
 	var/overwrite_hostility = 0
+	var/overwrite_retaliate = FALSE	//RS ADD - spaghetti
 
 	var/mob_faction = null
 	var/mob_returns_home = 0
@@ -52,6 +53,7 @@
 		AI.max_home_distance = mob_wander_distance
 		if(overwrite_hostility)
 			AI.hostile = mob_hostile
+		if(overwrite_retaliate)
 			AI.retaliate = mob_retaliate
 		AI.go_wake() //Now you can kill eachother if your faction didn't override.
 

code/game/turfs/flooring/flooring.dm

@@ -117,6 +117,9 @@ var/list/flooring_types
 
 	var/check_season = FALSE	//VOREStation Addition
 	var/preset_season = null	//RS ADD
+	var/skipseason = null		//RS ADD
+	var/replacement_season = null	//RS ADD
+
 
 /decl/flooring/proc/get_plating_type(var/turf/T)
 	return plating_type
@@ -644,3 +647,6 @@ var/list/flooring_types
 	preset_season = "autumn"
 /decl/flooring/grass/seasonal_grass/winter
 	preset_season = "winter"
+/decl/flooring/grass/seasonal_grass/skipwinter_autumn
+	skipseason = "winter"
+	replacement_season = "autumn"

code/game/turfs/flooring/seasonal.dm

@@ -36,6 +36,8 @@ var/world_time_day
 	var/tree_types = list()
 	var/snow_chance = 10
 	var/preset_season = null
+	var/skipseason = null
+	var/replacement_season = null
 
 /turf/simulated/floor/outdoors/grass/seasonal/Initialize()
 
@@ -217,6 +219,11 @@ var/world_time_day
 		if(preset_season == "spring" || "summer" || "autumn" || "winter")
 			ourseason = preset_season
 
+	else if(skipseason && replacement_season)
+		if(ourseason == skipseason)
+			if(replacement_season == "spring" || "summer" || "autumn" || "winter")
+				ourseason = replacement_season
+
 	switch(ourseason)
 		if("spring")
 			if(prob(50))
@@ -323,3 +330,9 @@ var/world_time_day
 	initial_flooring = /decl/flooring/grass/seasonal_grass/winter
 	color = "#0066ff"
 	preset_season = "winter"
+
+/turf/simulated/floor/outdoors/grass/seasonal/preset/skipwinter_autumn
+	initial_flooring = /decl/flooring/grass/seasonal_grass/skipwinter_autumn
+	color = "#ff00c8"
+	skipseason = "winter"
+	replacement_season = "autumn"

code/game/turfs/simulated/floor_icon.dm

@@ -30,6 +30,10 @@ var/image/no_ceiling_image = null
 				if(flooring.preset_season)
 					if(flooring.preset_season == "spring" || "summer" || "autumn" || "winter")
 						ourseason = flooring.preset_season
+				else if(flooring.skipseason && flooring.replacement_season)
+					if(ourseason == flooring.skipseason)
+						if(flooring.replacement_season == "spring" || "summer" || "autumn" || "winter")
+							ourseason = flooring.replacement_season
 
 				icon_state = "[icon_state]-[ourseason]"	//VOREStation Addition End
 			if(flooring.has_base_range)

code/modules/awaymissions/redgate.dm

@@ -12,6 +12,7 @@
 	on_store_visible_message_2 = "finishes walks through it."
 	var/obj/machinery/cryopod/robot/door/gateway/redgate/target
 	var/secret = FALSE	//If either end of the redgate has this enabled, ghosts will not be able to click to teleport
+	var/restrict_mobs = TRUE
 	var/list/exceptions = list(
 		/obj/structure/ore_box
 		)	//made it a var so that GMs or map makers can selectively allow things to pass through
@@ -33,19 +34,19 @@
 
 /obj/machinery/cryopod/robot/door/gateway/redgate/proc/teleport(var/mob/M as mob)
 	var/keycheck = TRUE
-	if (!istype(M,/mob/living))		//We only want mob/living, no bullets or mechs or AI eyes or items
+	if(!isliving(M))		//We only want mob/living, no bullets or mechs or AI eyes or items
 		if(M.type in exceptions)
 			keycheck = FALSE		//we'll allow it
-		else
-			return
+		else return
+	if(!restrict_mobs || M.faction == "neutral" || M.faction == "pet")
+		keycheck = FALSE		//Probably a pet or something people will want to vibe with
 
 	if(M.type in restrictions)	//Some stuff we don't want to bring EVEN IF it has a key.
 		return
 
 	if(keycheck)		//exceptions probably won't have a ckey
 		if(!M.ckey)		//We only want players, no bringing the weird stuff on the other side back
 			return
-
 	if(!target)
 		if(density)
 			toggle_portal()

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

@@ -76,3 +76,7 @@
 
 /datum/gear/mask/lace/New()
 	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/mask/half
+	display_name = "black half-mask"
+	path = /obj/item/clothing/accessory/gaiter/half

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

@@ -497,6 +497,10 @@
 	)
 	gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits)
 
+/datum/gear/uniform/hightrousers
+	display_name = "high-waisted trousers"
+	path = /obj/item/clothing/under/dress/hightrousers
+
 /*
  * 80s
  */
@@ -586,3 +590,16 @@
 /datum/gear/uniform/fienddress
     display_name = "fiendish dress"
     path = /obj/item/clothing/under/fienddress
+
+//tabard dresses
+/datum/gear/uniform/tabarddress
+	display_name = "tabard-dress selection"
+	path = /obj/item/clothing/under/dress/tabard
+
+/datum/gear/uniform/tabarddress/New()
+	..()
+	var/list/tabarddress = list(
+	"white tabard-dress"=/obj/item/clothing/under/dress/tabard,
+	"black tabard-dress"=/obj/item/clothing/under/dress/tabard/black
+	)
+	gear_tweaks += list(new/datum/gear_tweak/path(tabarddress))