Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

code/game/objects/effects/spawners/message_in_a_bottle.dm

@@ -0,0 +1,25 @@
+/obj/effect/spawner/message_in_a_bottle
+	name = "message in a bottle"
+	desc = "Sending out an SOS"
+	icon = 'icons/effects/random_spawners.dmi'
+	icon_state = "message_bottle"
+	var/probability = 100
+
+/obj/effect/spawner/message_in_a_bottle/Initialize(mapload)
+	. = ..()
+	if(!prob(probability))
+		return INITIALIZE_HINT_QDEL
+	if(!SSpersistence.initialized)
+		RegisterSignal(SSpersistence, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(on_persistence_init))
+	else
+		SSpersistence.load_message_bottle(loc)
+		return INITIALIZE_HINT_QDEL
+
+/obj/effect/spawner/message_in_a_bottle/proc/on_persistence_init(datum/source)
+	SIGNAL_HANDLER
+	UnregisterSignal(SSpersistence, COMSIG_SUBSYSTEM_POST_INITIALIZE)
+	SSpersistence.load_message_bottle(loc)
+	qdel(src)
+
+/obj/effect/spawner/message_in_a_bottle/low_prob
+	probability = 1.5

code/game/objects/effects/spawners/random/ai_module.dm

@@ -39,9 +39,12 @@
 		/obj/item/ai_module/supplied/quarantine,
 		/obj/item/ai_module/core/full/yesman,
 		/obj/item/ai_module/remove,
+<<<<<<< HEAD
 		/obj/item/ai_module/core/full/dagothbot, // SKYRAT EDIT - EDITION
 		/obj/item/ai_module/core/full/texas, // SKYRAT EDIT - EDITION
 		/obj/item/ai_module/core/full/emperor, // SKYRAT EDIT - EDITION
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	)
 
 /obj/effect/spawner/random/aimodule/harmful

code/game/objects/effects/spawners/random/decoration.dm

@@ -114,6 +114,29 @@
 		/obj/item/flashlight/glowstick/pink,
 	)
 
+<<<<<<< HEAD
+=======
+/obj/effect/spawner/random/decoration/glowstick/on
+	name = "random colored glowstick (on)"
+	icon_state = "glowstick"
+	loot = list(
+		/obj/item/flashlight/glowstick,
+		/obj/item/flashlight/glowstick/red,
+		/obj/item/flashlight/glowstick/blue,
+		/obj/item/flashlight/glowstick/cyan,
+		/obj/item/flashlight/glowstick/orange,
+		/obj/item/flashlight/glowstick/yellow,
+		/obj/item/flashlight/glowstick/pink,
+	)
+
+/obj/effect/spawner/random/decoration/glowstick/on/make_item(spawn_loc, type_path_to_make)
+	. = ..()
+
+	var/obj/item/flashlight/glowstick = .
+
+	glowstick.set_light_on(TRUE)
+
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 /obj/effect/spawner/random/decoration/paint
 	name = "paint spawner"
 	icon_state = "paint"

code/game/objects/effects/spawners/random/medical.dm

@@ -70,7 +70,11 @@
 	icon_state = "xeno_egg"
 	loot = list(
 		/obj/effect/decal/remains/xeno = 49,
+<<<<<<< HEAD
 		/obj/item/clothing/mask/facehugger/toy = 1, // SKYRAT EDIT - They should be handled by dynamic - ORIGIGNAL: /obj/effect/spawner/xeno_egg_delivery = 1,
+=======
+		/obj/effect/spawner/xeno_egg_delivery = 1,
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	)
 
 /obj/effect/spawner/random/medical/surgery_tool

code/game/objects/effects/spawners/random/structure.dm

@@ -23,6 +23,10 @@
 		/obj/effect/spawner/random/trash/mess = 30,
 		/obj/item/kirbyplants/fern = 20,
 		/obj/structure/closet/crate/decorations = 15,
+<<<<<<< HEAD
+=======
+		/obj/effect/decal/remains/human/smokey/maintenance = 7,
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 		/obj/structure/destructible/cult/pants_altar = 1,
 	)
 

code/game/objects/effects/spawners/random/trash.dm

@@ -89,7 +89,10 @@
 		/obj/item/trash/cnds = 1,
 		/obj/item/trash/syndi_cakes = 1,
 		/obj/item/trash/shrimp_chips = 1,
+<<<<<<< HEAD
 		/obj/item/trash/waffles = 1,
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 		/obj/item/trash/tray = 1,
 	)