diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm
index f9326745660..8d7b54bdf45 100644
--- a/code/game/area/areas_vr.dm
+++ b/code/game/area/areas_vr.dm
@@ -8,6 +8,8 @@
// Size of the area in open turfs, only calculated for indoors areas.
var/areasize = 0
+ var/no_comms = FALSE //When true, blocks radios from working in the area
+
/area/Entered(var/atom/movable/AM, oldLoc)
. = ..()
if(enter_message && isliving(AM))
@@ -69,4 +71,4 @@
power_environ = 0
power_change() // all machines set to current power level, also updates lighting icon
if(no_spoilers)
- set_spoiler_obfuscation(TRUE)
\ No newline at end of file
+ set_spoiler_obfuscation(TRUE)
diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm
index ace17fa07d4..f7d88977801 100644
--- a/code/game/objects/items/devices/radio/jammer.dm
+++ b/code/game/objects/items/devices/radio/jammer.dm
@@ -4,6 +4,11 @@ var/global/list/active_radio_jammers = list()
var/turf/Tr = get_turf(radio)
if(!Tr) return 0 //Nullspace radios don't get jammed.
+ var/area/our_area = get_area(Tr)
+
+ if(our_area.no_comms)
+ return TRUE
+
for(var/obj/item/device/radio_jammer/J as anything in active_radio_jammers)
var/turf/Tj = get_turf(J)
@@ -111,4 +116,3 @@ var/global/list/active_radio_jammers = list()
cut_overlays()
add_overlay("jammer_overlay_[overlay_percent]")
last_overlay_percent = overlay_percent
-
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 12b684cb219..63f59293078 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -490,7 +490,12 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
else if(subspace_transmission)
var/list/jamming = is_jammed(src)
if(jamming)
- var/distance = jamming["distance"]
+ var/distance = 0
+ var/area/our_area = get_area(src)
+ if(our_area.no_comms)
+ distance = 99
+ else
+ distance = jamming["distance"]
to_chat(M, "\icon[src][bicon(src)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.")
return FALSE
diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm
index 57630d9c88f..9bc4233ccf5 100644
--- a/code/game/objects/items/devices/translocator_vr.dm
+++ b/code/game/objects/items/devices/translocator_vr.dm
@@ -217,8 +217,10 @@ This device records all warnings given and teleport events for admin review in c
//No, you can't teleport if there's a jammer.
if(is_jammed(src) || is_jammed(destination))
- to_chat(user,"\The [src] refuses to teleport you, due to strong interference!")
- return FALSE
+ var/area/our_area = get_area(src)
+ if(!our_area.no_comms) //I don't actually want this to block teleporters, just comms
+ to_chat(user,"\The [src] refuses to teleport you, due to strong interference!")
+ return FALSE
//No, you can't port to or from away missions. Stupidly complicated check.
var/turf/uT = get_turf(user)
diff --git a/code/game/turfs/flooring/flooring_vr.dm b/code/game/turfs/flooring/flooring_vr.dm
index ac7f42a406c..6e6fc78a273 100644
--- a/code/game/turfs/flooring/flooring_vr.dm
+++ b/code/game/turfs/flooring/flooring_vr.dm
@@ -17,6 +17,12 @@
desc = "This slick flesh ripples and squishes under your touch"
icon = 'icons/turf/stomach_vr.dmi'
icon_base = "flesh_floor"
+ footstep_sounds = list("human" = list(
+ 'sound/effects/footstep/mud1.ogg',
+ 'sound/effects/footstep/mud2.ogg',
+ 'sound/effects/footstep/mud3.ogg',
+ 'sound/effects/footstep/mud4.ogg'
+ ))
/decl/flooring/grass/outdoors
flags = 0
@@ -115,4 +121,4 @@
initial_flooring = /decl/flooring/tiling/milspec/raised
/obj/item/stack/tile/floor/milspec/raised
- name = "raised milspec floor tile"
\ No newline at end of file
+ name = "raised milspec floor tile"
diff --git a/code/modules/awaymissions/redgate.dm b/code/modules/awaymissions/redgate.dm
index 1fae0316f29..17d3b3828e2 100644
--- a/code/modules/awaymissions/redgate.dm
+++ b/code/modules/awaymissions/redgate.dm
@@ -49,6 +49,7 @@
if(!ourturf.check_density(TRUE,TRUE)) //Make sure there isn't a wall there
M.unbuckle_all_mobs(TRUE)
M.stop_pulling()
+ playsound(src,'sound/effects/ominous-hum-2.ogg', 100,1)
M.forceMove(ourturf) //Let's just do forcemove, I don't really want people teleporting to weird places if they have bluespace stuff
else
to_chat(M, "Something blocks your way.")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
index 29806ec502e..f6f8f9ef6b2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
@@ -519,7 +519,12 @@
can_paint = TRUE
- footstep_sounds = list()
+ footstep_sounds = list("human" = list(
+ 'sound/effects/footstep/carpet1.ogg',
+ 'sound/effects/footstep/carpet2.ogg',
+ 'sound/effects/footstep/carpet3.ogg',
+ 'sound/effects/footstep/carpet4.ogg',
+ 'sound/effects/footstep/carpet5.ogg'))
/obj/structure/flora/tree/fur
name = "tall fur"
@@ -686,6 +691,9 @@
/obj/random/maintenance/clean = 10,
/obj/random/maintenance/misc = 10
)
+ no_comms = TRUE
+ ghostjoin = TRUE
+ sound_env = SOUND_ENVIRONMENT_CAVE
var/treasuremax = 3
var/spawnstuff = TRUE
var/include_enzyme = FALSE
@@ -819,6 +827,7 @@
/mob/living/simple_mob/vore/vore_hostile/gelatinous_cube = 100
)
)
+ ghostjoin = TRUE
/area/redgate/stardog/flesh_abyss/stomach
floracountmax = 3
@@ -850,6 +859,7 @@
treasure_chance = 25
treasuremax = 1
spawnstuff = TRUE
+ ghostjoin = FALSE
/area/redgate/stardog/flesh_abyss/s_int
floracountmax = 1
@@ -881,6 +891,7 @@
treasure_chance = 33
treasuremax = 5
spawnstuff = TRUE
+ ghostjoin = FALSE
/area/redgate/stardog/flesh_abyss/l_int
floracountmax = 5
@@ -910,6 +921,7 @@
treasure_chance = 50
treasuremax = 5
spawnstuff = TRUE
+ ghostjoin = FALSE
/area/redgate/stardog/flesh_abyss/node
enter_message = "Radical energy hangs as a haze in the air. It's much less hot here than other places within the dog, but the air is thick with alien whispers and desires that you can hardly comprehend."
@@ -926,14 +938,36 @@
name = "redgate lounge"
icon_state = "redwhisqu"
requires_power = 0
- forced_ambience = list()
+ ambience = list(
+ 'sound/ambience/star_dog/dougcockpit.ogg',
+ 'sound/ambience/otherworldly/otherworldly1.ogg',
+ 'sound/ambience/otherworldly/otherworldly2.ogg',
+ 'sound/ambience/otherworldly/otherworldly3.ogg',
+ 'sound/ambience/boy.ogg',
+ 'sound/ambience/expoutpost/expoutpost1.ogg',
+ 'sound/ambience/expoutpost/expoutpost2.ogg',
+ 'sound/ambience/expoutpost/expoutpost3.ogg',
+ 'sound/ambience/expoutpost/expoutpost4.ogg',
+ 'sound/ambience/tech_ruins/tech_ruins1.ogg',
+ 'sound/ambience/tech_ruins/tech_ruins2.ogg',
+ 'sound/ambience/tech_ruins/tech_ruins3.ogg',
+ 'sound/ambience/signal.ogg'
+ )
/area/redgate/stardog/outside
name = "star dog"
icon_state = "redblacir"
semirandom = TRUE
ghostjoin = TRUE
- forced_ambience = list()
+ ambience = list(
+ 'sound/ambience/star_dog/dark-cold-main-menu-loop-mild-mountain-sickness-marb7e.ogg',
+ 'sound/ambience/star_dog/ominous-ambience.ogg',
+ 'sound/ambience/star_dog/long_awoo.ogg',
+ 'sound/ambience/star_dog/woof.ogg',
+ 'sound/ambience/star_dog/woof2.ogg'
+ )
+ sound_env = SOUND_ENVIRONMENT_DIZZY
+
valid_mobs = list( //Dog map spawns the dogs. It's not hard to understand!
list(
/mob/living/simple_mob/vore/woof,
@@ -1232,6 +1266,7 @@
var/throw_through = TRUE //When moved the mob/obj will be thrown south
var/teleport_sound = 'sound/vore/schlorp.ogg' //The sound that plays when we use the teleporter. Respects vore sound preferences.
var/teleport_message = ""
+ var/check_keys = FALSE
/obj/effect/dog_teleporter/Initialize()
. = ..()
@@ -1258,6 +1293,14 @@
. = ..()
lets_go(AM)
+/obj/effect/dog_teleporter/attack_hand(mob/living/user)
+ . = ..()
+ lets_go(user)
+
+/obj/effect/dog_teleporter/attack_generic(mob/user)
+ . = ..()
+ lets_go(user)
+
/obj/effect/dog_teleporter/proc/lets_go(atom/movable/AM as mob|obj) //Wahoo! Here we go!
if(reciever)
return
@@ -1270,6 +1313,8 @@
L = AM
if(!L.devourable || !L.allowmobvore)
return
+ if(check_keys && !L.ckey)
+ return
L.stop_pulling()
L.Weaken(3)
if(target.reciever) //We don't have to worry
@@ -1354,6 +1399,7 @@
id = "exit"
pixel_x = -16
pixel_y = -16
+ check_keys = TRUE
/obj/effect/dog_teleporter/mouth_return
name = "light"
@@ -1362,6 +1408,7 @@
id = "mouth_b"
pixel_x = -16
pixel_y = -16
+ check_keys = TRUE
/obj/effect/dog_teleporter/reciever/exit //tee hee
name = "exit"
@@ -1574,6 +1621,7 @@
'sound/vore/sunesound/prey/squish_04.ogg',
'sound/vore/sunesound/prey/stomachmove.ogg'
)
+ var/faction = "macrobacteria"
/obj/structure/auto_flesh_door/Initialize()
. = ..()
@@ -1598,11 +1646,29 @@
if(prob(5))
to_chat(L, "\The [src] throbs heavily around you...")
+/obj/structure/auto_flesh_door/attack_generic(mob/user, damage, attack_verb)
+ . = ..()
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+ if(!Adjacent(user))
+ return
+ else if(user.faction == faction)
+ SwitchState()
+ else if(user.a_intent == I_HELP)
+ visible_message("[user] knocks on \the [src].", "Someone knocks on \the [src].")
+ playsound(src, knock_sound, 50, 0, 3)
+ countdown -= 10
+ else
+ visible_message("[user] hammers on \the [src]!", "Someone hammers loudly on \the [src]!")
+ playsound(src, knock_sound, 50, 0, 3)
+ countdown -= 25
+
/obj/structure/auto_flesh_door/attack_hand(mob/user as mob)
. = ..()
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!Adjacent(user))
return
+ else if(user.faction == faction)
+ SwitchState()
else if(user.a_intent == I_HELP)
visible_message("[user] knocks on \the [src].", "Someone knocks on \the [src].")
playsound(src, knock_sound, 50, 0, 3)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm
index 2001828fa50..9c0d4a9f38d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm
@@ -37,11 +37,17 @@
icon_living = "abyss_lurker"
icon_dead = "abyss_lurker-dead"
icon_rest = "abyss_lurker"
+ vis_height = 64
faction = "macrobacteria"
maxHealth = 600
health = 600
movement_cooldown = 3
+
+ harm_intent_damage = 1
+ melee_damage_lower = 1
+ melee_damage_upper = 1
+
meat_amount = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
catalogue_data = list(/datum/category_item/catalogue/fauna/abyss_lurker)
@@ -51,6 +57,7 @@
pixel_x = -16
default_pixel_x = -16
+
mob_size = MOB_LARGE
mob_bump_flag = HEAVY
mob_swap_flags = HEAVY
@@ -84,10 +91,10 @@
..()
var/obj/belly/B = vore_selected
B.name = "interior"
- B.desc = "soft"
+ B.desc = "It's hot and overwhelmingly tight! The interior of the pale creature groans with the effort of squeezing you. Everything is hot and churning and eager to grind and smother you in thick fluids. The weight of the creature's body pressing in at you makes it hard to move at all, while you are squeezed to the very core of the creature! There seems almost not to even be an organ for this so much as the creature has folded around you, trying to incorporate your matter into its body with vigor!"
B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING
B.belly_fullscreen = "yet_another_tumby"
- B.digest_brute = 2
+ B.digest_brute = 3
B.digest_burn = 2
B.digestchance = 0
B.absorbchance = 0
@@ -137,10 +144,16 @@
icon_living = "filter"
icon_dead = "filter-dead"
icon_rest = "filter"
+ vis_height = 64
faction = "macrobacteria"
maxHealth = 600
health = 600
+
+ harm_intent_damage = 1
+ melee_damage_lower = 1
+ melee_damage_upper = 1
+
movement_cooldown = 1
meat_amount = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
@@ -159,7 +172,7 @@
has_eye_glow = TRUE
- attacktext = list("flashes", "slaps", "smothers", "grapples")
+ attacktext = list("pushes", "slaps", "whips", "grapples")
attack_sound = 'sound/effects/attackblob.ogg'
ai_holder_type = /datum/ai_holder/simple_mob/vore
@@ -196,7 +209,7 @@
..()
var/obj/belly/B = vore_selected
B.name = "interior"
- B.desc = "soft"
+ B.desc = "The flesh of the tall creature's stomach folds over you in doughy waves, squeezing you into the tightest shape it can manage with idle flexes churning down on you. Your limbs often find themselves lost between folds and tugged this way or that, held in a skin tight press that is not painful, but is hard to pull away from. You can see a strange, glittering pink and purple light glimmering through the flesh of the monster all around you, like your very own sea of stars. The walls rush in to fill all the space, squeezing you from head to toe no matter how you might wiggle, the weight of the semi-transparent interior flesh keeping you neatly secured deep inside while wringing the fight out of you."
B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING
B.belly_fullscreen = "yet_another_tumby"
B.digest_brute = 2
@@ -206,7 +219,7 @@
B.escapechance = 25
B.colorization_enabled = TRUE
B.belly_fullscreen_color = "#591579"
- B.escape_stun = 5
+ B.escape_stun = 3
// The leaping attack.
/mob/living/simple_mob/vore/vore_hostile/leaper/do_special_attack(atom/A) //Mostly copied from hunter.dm
@@ -259,6 +272,7 @@
icon_living = "cube"
icon_dead = " "
icon_rest = "cube"
+ vis_height = 64
faction = "macrobacteria"
maxHealth = 500
@@ -284,7 +298,7 @@
mob_push_flags = HEAVY
mob_size = MOB_LARGE
- attacktext = list("flashes", "slaps", "smothers", "grapples")
+ attacktext = list("splashes against", "slaps", "smothers", "engulfs")
attack_sound = 'sound/effects/attackblob.ogg'
ai_holder_type = /datum/ai_holder/simple_mob/vore
@@ -311,7 +325,7 @@
..()
var/obj/belly/B = vore_selected
B.name = "interior"
- B.desc = "wobl"
+ B.desc = "An incredibly thick oozing slime surrounds you, filling in all the space around your form! It's hard to catch a breath here as the jiggling gel that makes up the body of the creature swiftly fills in the hole you made in its surface by entering. The gel is semi-transparent, and you can see your surroundings though its surface, and similarly you can be seen floating in the gel from the outside. When the cube moves, your whole body is wobbled along with it. There are clouds of still processing material floating all around you as the corrosive substance works on breaking everything down."
B.mode_flags = DM_FLAG_NUMBING
B.belly_fullscreen = "yet_another_tumby"
B.colorization_enabled = TRUE
@@ -324,7 +338,7 @@
B.escapechance = 10
B.escapetime = 10 SECONDS
B.selective_preference = DM_DIGEST
- B.escape_stun = 5
+ B.escape_stun = 3
/mob/living/simple_mob/vore/vore_hostile/gelatinous_cube/Initialize()
. = ..()
diff --git a/maps/redgate/eggnogtown.dmm b/maps/redgate/eggnogtown.dmm
index 3d831a7586b..df5d59b2ad9 100644
--- a/maps/redgate/eggnogtown.dmm
+++ b/maps/redgate/eggnogtown.dmm
@@ -493,10 +493,6 @@
temperature = 258.15
},
/area/redgate/eggnogtown/storage)
-"bA" = (
-/obj/machinery/vending/fitness,
-/turf/simulated/floor/wood,
-/area/redgate/eggnogtown/bar)
"bH" = (
/obj/random/maintenance,
/obj/random/maintenance,
@@ -2157,10 +2153,6 @@
"wt" = (
/turf/simulated/floor/outdoors/grass/forest,
/area/redgate/eggnogtown/greenhouse)
-"wu" = (
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/wood,
-/area/redgate/eggnogtown/bar)
"wx" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -2265,7 +2257,7 @@
},
/area/redgate/eggnogtown/cavehome)
"ym" = (
-/obj/machinery/vending/snack,
+/obj/random/vendorfood,
/turf/simulated/floor/wood,
/area/redgate/eggnogtown/bar)
"ys" = (
@@ -2720,7 +2712,7 @@
/turf/simulated/wall/wood,
/area/redgate/eggnogtown/dining)
"Fj" = (
-/obj/machinery/vending/cola/soft,
+/obj/random/vendordrink,
/turf/simulated/floor/wood,
/area/redgate/eggnogtown/bar)
"Fk" = (
@@ -13098,7 +13090,7 @@ Xp
Xp
Xp
fb
-bA
+ym
Pi
Hw
av
@@ -13240,7 +13232,7 @@ Xp
Xp
Xp
fb
-wu
+Fj
Hw
Hw
Hw
diff --git a/maps/redgate/eggnogtownunderground.dmm b/maps/redgate/eggnogtownunderground.dmm
index f93161eac42..07dc098d4d8 100644
--- a/maps/redgate/eggnogtownunderground.dmm
+++ b/maps/redgate/eggnogtownunderground.dmm
@@ -240,6 +240,14 @@
temperature = 258.15
},
/area/redgate/eggnogtown/hotspring)
+"hh" = (
+/obj/random/vendorfood{
+ dir = 1
+ },
+/turf/simulated/floor/bmarble{
+ temperature = 303.15
+ },
+/area/redgate/eggnogtown/hotsprings)
"hM" = (
/obj/structure/curtain,
/turf/simulated/floor/wood{
@@ -573,6 +581,12 @@
temperature = 258.15
},
/area/redgate/eggnogtown/vibeout)
+"FJ" = (
+/obj/random/vendordrink,
+/turf/simulated/floor/bmarble{
+ temperature = 303.15
+ },
+/area/redgate/eggnogtown/hotsprings)
"Gq" = (
/obj/structure/bed/chair/bay/comfy/red,
/turf/simulated/floor/plating/eris/under{
@@ -3502,13 +3516,13 @@ ab
ab
ab
Kk
-cb
+FJ
cb
Kk
Kk
Kk
cb
-cb
+hh
Kk
ab
ab
diff --git a/maps/redgate/stardog.dmm b/maps/redgate/stardog.dmm
index 903658ff8aa..6556d35a21b 100644
--- a/maps/redgate/stardog.dmm
+++ b/maps/redgate/stardog.dmm
@@ -56,6 +56,13 @@
/obj/effect/dog_teleporter/mouth_return,
/turf/simulated/floor/flesh,
/area/redgate/stardog/flesh_abyss/no_spawn)
+"dX" = (
+/obj/structure/auto_flesh_door,
+/turf/simulated/floor/flesh/mover{
+ dir = 4;
+ movechance = 1
+ },
+/area/redgate/stardog/flesh_abyss/no_spawn)
"el" = (
/obj/effect/map_effect/portal/line/side_b{
dir = 4
@@ -167,12 +174,14 @@
/obj/structure/bed/chair/sofa/corp/right,
/turf/simulated/floor/lino,
/area/redgate/stardog/lounge)
+"oU" = (
+/turf/simulated/floor/flesh/mover{
+ dir = 4
+ },
+/area/redgate/stardog/flesh_abyss/no_spawn)
"oZ" = (
/turf/simulated/floor/outdoors/fur/woof/no_trees,
/area/redgate/stardog/eyes)
-"pn" = (
-/turf/simulated/floor/flesh/mover,
-/area/redgate/stardog/flesh_abyss/no_spawn)
"pp" = (
/obj/effect/landmark/area_gatherer,
/turf/simulated/flesh,
@@ -220,11 +229,6 @@
/obj/item/weapon/pickaxe/hand,
/turf/simulated/floor/flesh,
/area/redgate/stardog/flesh_abyss/stomach)
-"uC" = (
-/turf/simulated/floor/flesh/mover{
- dir = 4
- },
-/area/redgate/stardog/flesh_abyss/no_spawn)
"uQ" = (
/obj/structure/redgate/away,
/turf/simulated/floor/reinforced,
@@ -238,6 +242,11 @@
"wg" = (
/turf/simulated/floor/flesh/mover,
/area/redgate/stardog/flesh_abyss/digestive_tract)
+"ww" = (
+/turf/simulated/floor/flesh/mover{
+ dir = 6
+ },
+/area/redgate/stardog/flesh_abyss/no_spawn)
"wL" = (
/turf/simulated/floor/flesh/mover{
dir = 1
@@ -386,13 +395,6 @@
"Ll" = (
/turf/simulated/flesh,
/area/redgate/stardog/flesh_abyss/stomach)
-"LH" = (
-/obj/structure/auto_flesh_door,
-/turf/simulated/floor/flesh/mover{
- dir = 4;
- movechance = 1
- },
-/area/redgate/stardog/flesh_abyss/no_spawn)
"MH" = (
/turf/simulated/floor/flesh/mover{
dir = 5
@@ -404,6 +406,7 @@
/area/redgate/stardog/outside)
"Nh" = (
/obj/machinery/light,
+/obj/machinery/telecomms/relay/preset/station,
/turf/simulated/floor/wood,
/area/redgate/stardog/lounge)
"Oa" = (
@@ -423,11 +426,6 @@
},
/turf/simulated/floor/outdoors/fur/woof/no_trees,
/area/redgate/stardog/outside)
-"Os" = (
-/turf/simulated/floor/flesh/mover{
- dir = 6
- },
-/area/redgate/stardog/flesh_abyss/no_spawn)
"Pe" = (
/obj/effect/map_effect/portal/master/side_a{
portal_id = "stardog_north"
@@ -521,6 +519,9 @@
dir = 4
},
/area/redgate/stardog/flesh_abyss/stomach)
+"Xt" = (
+/turf/simulated/floor/flesh/mover,
+/area/redgate/stardog/flesh_abyss/no_spawn)
"Xv" = (
/turf/simulated/floor/outdoors/fur/woof,
/area/redgate/stardog/outside)
@@ -5384,9 +5385,9 @@ gb
gb
gb
gb
-pn
-Os
-uC
+Xt
+ww
+oU
Ll
Ll
Zh
@@ -5527,8 +5528,8 @@ KL
KL
KL
Ll
-pn
-uC
+Xt
+oU
KL
Ll
Zh
@@ -5670,7 +5671,7 @@ KL
KL
Ll
Ll
-LH
+dX
Ll
Ll
Zh
@@ -5812,7 +5813,7 @@ KL
KL
Ll
Xi
-uC
+oU
Xi
Ll
Zh
diff --git a/maps/stellar_delight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm
index 737a94b5cca..26baa7a2460 100644
--- a/maps/stellar_delight/stellar_delight_defines.dm
+++ b/maps/stellar_delight/stellar_delight_defines.dm
@@ -168,11 +168,11 @@
)
lateload_redgate = list(
- list("Teppi Ranch"),
- list("Innland"),
- list("Abandoned Island"),
- list("Dark Adventure"),
- list("Eggnog Town Underground","Eggnog Town"),
+// list("Teppi Ranch"),
+// list("Innland"),
+// list("Abandoned Island"),
+// list("Dark Adventure"),
+// list("Eggnog Town Underground","Eggnog Town"),
list("Star Dog")
)
diff --git a/sound/ambience/star_dog/dark-cold-main-menu-loop-mild-mountain-sickness-marb7e.ogg b/sound/ambience/star_dog/dark-cold-main-menu-loop-mild-mountain-sickness-marb7e.ogg
new file mode 100644
index 00000000000..e9cd708597b
Binary files /dev/null and b/sound/ambience/star_dog/dark-cold-main-menu-loop-mild-mountain-sickness-marb7e.ogg differ
diff --git a/sound/ambience/star_dog/dougcockpit.ogg b/sound/ambience/star_dog/dougcockpit.ogg
new file mode 100644
index 00000000000..a23cbe22766
Binary files /dev/null and b/sound/ambience/star_dog/dougcockpit.ogg differ
diff --git a/sound/ambience/star_dog/long_awoo.ogg b/sound/ambience/star_dog/long_awoo.ogg
new file mode 100644
index 00000000000..18bdf0ae210
Binary files /dev/null and b/sound/ambience/star_dog/long_awoo.ogg differ
diff --git a/sound/ambience/star_dog/ominous-ambience.ogg b/sound/ambience/star_dog/ominous-ambience.ogg
new file mode 100644
index 00000000000..a1901f821d1
Binary files /dev/null and b/sound/ambience/star_dog/ominous-ambience.ogg differ
diff --git a/sound/ambience/star_dog/woof.ogg b/sound/ambience/star_dog/woof.ogg
new file mode 100644
index 00000000000..ed99b48647d
Binary files /dev/null and b/sound/ambience/star_dog/woof.ogg differ
diff --git a/sound/ambience/star_dog/woof2.ogg b/sound/ambience/star_dog/woof2.ogg
new file mode 100644
index 00000000000..a2d86d1718c
Binary files /dev/null and b/sound/ambience/star_dog/woof2.ogg differ
diff --git a/sound/effects/ominous-hum-2.ogg b/sound/effects/ominous-hum-2.ogg
new file mode 100644
index 00000000000..f590d2fdd8c
Binary files /dev/null and b/sound/effects/ominous-hum-2.ogg differ
diff --git a/sound/weapons/attributions.txt b/sound/weapons/attributions.txt
index fe2911c8738..c3ed487c9c3 100644
--- a/sound/weapons/attributions.txt
+++ b/sound/weapons/attributions.txt
@@ -6,4 +6,10 @@ No changes were made to the sounds, and all credit goes to kMoon.
batreflect sounds are by shadoWisp on freesound.org:
https://www.freesound.org/people/shadoWisp/sounds/252044/
-Small parts of the sound are cut out and used.
\ No newline at end of file
+Small parts of the sound are cut out and used.
+
+ominous-ambience.ogg by -Hero_of_the_Winds- on freesound.org
+https://freesound.org/people/-Hero_of_the_Winds-/sounds/221876/
+
+dark-cold-main-menu-loop-mild-mountain-sickness-marb7e.ogg - Mild Mountain Sickness - by Marb7e on freesound.org
+https://freesound.org/people/marb7e/sounds/674392/