Merge remote-tracking branch 'upstream/master' into cumcom

2026-07-12 00:20:55 +01:00 · 2021-04-18 23:55:16 -06:00
parent 6c72b0e0e6 d085b4b001
commit 6c8a4cb9e0
3 changed files with 4 additions and 1 deletions
@@ -312,6 +312,9 @@
 /obj/screen/parallax_layer/random/asteroids
 	icon_state = "asteroids"

+/obj/screen/parallax_layer/random/nebula
+	icon_state = "nebula1"
+
 /obj/screen/parallax_layer/planet
 	icon_state = "planet"
 	blend_mode = BLEND_OVERLAY
@@ -14,7 +14,7 @@ SUBSYSTEM_DEF(parallax)
 /datum/controller/subsystem/parallax/PreInit()
 	. = ..()
 	if(prob(70))	//70% chance to pick a special extra layer
-		random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids)
+		random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids, /obj/screen/parallax_layer/random/nebula)
 		random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color.
 	planet_y_offset = rand(100, 160)
 	planet_x_offset = rand(100, 160)