Merge pull request #3447 from CHOMPStation2/upstream-merge-11842

[MIRROR] SpaceVines - Now with 100% More Landmark Moments

code/game/objects/effects/landmarks.dm

@@ -83,6 +83,12 @@
 			endgame_exits += loc
 			delete_me = 1
 			return
+		//VOREStation Add Start
+		if("vinestart")
+			vinestart += loc
+			delete_me = 1
+			return
+		//VORE Station Add End
 
 	landmarks_list += src
 	return 1

code/global_vr.dm

@@ -1,3 +1,5 @@
+var/list/vinestart			= list()
+
 var/list/awayabductors = list() // List of scatter landmarks for Abductors in Gateways
 var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals
 var/list/eventabductors = list() // List of scatter landmarks for VOREStation abductor portals

code/modules/hydroponics/spreading/spreading.dm

@@ -3,7 +3,7 @@
 
 /proc/spacevine_infestation(var/potency_min=70, var/potency_max=100, var/maturation_min=5, var/maturation_max=15)
 	spawn() //to stop the secrets panel hanging
-		var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas
+		var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas //CHOMPedit start: keeping old method over upstream's landmark method
 		for(var/areapath in typesof(/area/hallway))
 			var/area/A = locate(areapath)
 			for(var/turf/simulated/floor/F in A.contents)
@@ -11,7 +11,7 @@
 					turfs += F
 
 		if(turfs.len) //Pick a turf to spawn at if we can
-			var/turf/simulated/floor/T = pick(turfs)
+			var/turf/simulated/floor/T = pick(turfs) //CHOMPedit end
 			var/datum/seed/seed = SSplants.create_random_seed(1)
 			seed.set_trait(TRAIT_SPREAD,2)             // So it will function properly as vines.
 			seed.set_trait(TRAIT_POTENCY,rand(potency_min, potency_max)) // 70-100 potency will help guarantee a wide spread and powerful effects.

maps/stellardelight/stellar_delight1.dmm

@@ -675,6 +675,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/catwalk_plated/dark,
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor,
 /area/stellardelight/deck1/port)
 "bx" = (
@@ -1346,6 +1349,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/starboard)
 "cV" = (
@@ -4722,6 +4728,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/pathfinder)
+"jT" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/aft)
 "jV" = (
 /obj/machinery/power/terminal{
 	dir = 4
@@ -7150,6 +7165,9 @@
 	dir = 8
 	},
 /obj/effect/catwalk_plated/dark,
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor,
 /area/stellardelight/deck1/starboard)
 "ph" = (
@@ -10763,6 +10781,9 @@
 /obj/effect/floor_decal/milspec/color/red/half{
 	dir = 1
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/fore)
 "xa" = (
@@ -14130,6 +14151,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/port)
 "Eq" = (
@@ -21093,6 +21117,9 @@
 /obj/structure/closet/crate/bin{
 	anchored = 1
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/milspec,
 /area/stellardelight/deck1/exploration)
 "TB" = (
@@ -33362,7 +33389,7 @@ MK
 qR
 CG
 iS
-KX
+jT
 dl
 QK
 pV

maps/stellardelight/stellar_delight2.dmm

@@ -5402,6 +5402,9 @@
 	},
 /obj/machinery/vending/loadout/loadout_misc,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/crew_quarters/locker)
 "me" = (
@@ -5417,6 +5420,9 @@
 "mg" = (
 /obj/random/vendordrink,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck2/port)
 "mh" = (
@@ -7889,6 +7895,9 @@
 	dir = 4;
 	pixel_x = 24
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/storage/primary)
 "rF" = (
@@ -9062,6 +9071,9 @@
 "us" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/machinery/recharge_station,
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck2/starboard)
 "ut" = (
@@ -10220,6 +10232,15 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/milspec/color/white/half,
+<<<<<<< HEAD
+=======
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+>>>>>>> 7ff0acbf5e... Merge pull request #11842 from Enzo-Leon/comedy-vines
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/central)
 "xo" = (
@@ -16237,6 +16258,16 @@
 /obj/machinery/light{
 	dir = 4
 	},
+<<<<<<< HEAD
+=======
+/obj/item/paint_palette,
+/obj/item/paint_palette,
+/obj/item/paint_brush,
+/obj/item/paint_brush,
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+>>>>>>> 7ff0acbf5e... Merge pull request #11842 from Enzo-Leon/comedy-vines
 /turf/simulated/floor/tiled,
 /area/storage/art)
 "KD" = (
@@ -18075,6 +18106,9 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/quartermaster/storage)
 "OQ" = (

maps/stellardelight/stellar_delight3.dmm

@@ -218,6 +218,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
+"ba" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
 "bb" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
@@ -6315,6 +6322,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/stellardelight/deck3/commandhall)
 "yc" = (
@@ -9198,6 +9208,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
+"ID" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
 "IG" = (
 /obj/structure/cable/blue{
 	icon_state = "4-8"
@@ -10085,6 +10104,9 @@
 	dir = 4;
 	pixel_x = 27
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/starboarddock)
 "LR" = (
@@ -10262,6 +10284,15 @@
 /obj/random/maintenance,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck3/starboardfore)
+"Mv" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
 "Mw" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 1
@@ -10460,6 +10491,15 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck3/cryo)
+"Nd" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/port)
 "Ne" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -11089,6 +11129,15 @@
 "OX" = (
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck3/portcent)
+"OY" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/starboard)
 "Pa" = (
 /obj/structure/lattice,
 /turf/simulated/open,
@@ -12599,6 +12648,9 @@
 	dir = 8;
 	pixel_x = -27
 	},
+/obj/effect/landmark{
+	name = "vinestart"
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/portdock)
 "UX" = (
@@ -21407,7 +21459,7 @@ CS
 oW
 oW
 oW
-QF
+Nd
 oW
 oW
 oW
@@ -22238,7 +22290,7 @@ Cp
 qF
 qF
 qF
-Cb
+Mv
 qF
 qF
 qF
@@ -23216,7 +23268,7 @@ qp
 NF
 qp
 Qp
-Hf
+ba
 Ie
 tV
 cb
@@ -25353,7 +25405,7 @@ qF
 qF
 qF
 qF
-KF
+ID
 qF
 qF
 qF
@@ -26244,8 +26296,13 @@ ow
 ow
 ow
 ow
+<<<<<<< HEAD
 ZC
 ow
+=======
+OY
+yP
+>>>>>>> 7ff0acbf5e... Merge pull request #11842 from Enzo-Leon/comedy-vines
 ow
 ZM
 ow