From e197513bcc9938af403023899ab968f3a792a6b4 Mon Sep 17 00:00:00 2001
From: Detective Google <48196179+Detective-Google@users.noreply.github.com>
Date: Sun, 3 May 2020 01:22:18 -0500
Subject: [PATCH] fixes lone ops and ninjas

---
 .../map_files/IceBoxStation/IceBoxStation.dmm | 43 ++++++++++++-------
 .../dynamic/dynamic_rulesets_midround.dm      |  3 ++
 code/game/objects/effects/landmarks.dm        |  5 +++
 code/modules/events/operative.dm              |  2 +
 code/modules/ninja/ninja_event.dm             |  3 ++
 tgstation.dme                                 |  2 +-
 6 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 802db55f19..2cb2cf3497 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -53835,6 +53835,11 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/engine,
 /area/engine/engineering)
+"dIH" = (
+/obj/structure/grille/broken,
+/obj/effect/landmark/loneopspawn,
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
 "dJL" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -56457,6 +56462,10 @@
 /obj/effect/landmark/xeno_spawn,
 /turf/open/floor/wood,
 /area/maintenance/bar)
+"kyT" = (
+/obj/effect/landmark/loneopspawn,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
 "kzT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall/r_wall,
@@ -57967,6 +57976,10 @@
 	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
+"oDb" = (
+/obj/effect/landmark/loneopspawn,
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
 "oDm" = (
 /obj/machinery/gulag_teleporter,
 /turf/open/floor/plasteel,
@@ -75139,7 +75152,7 @@ aBM
 aBM
 aBM
 ayF
-ayF
+oDb
 ayF
 ayF
 ayF
@@ -79835,7 +79848,7 @@ aBM
 aBM
 aBM
 aBM
-ayF
+oDb
 avU
 ayF
 ayF
@@ -80517,7 +80530,7 @@ aBM
 aBM
 aBM
 aBM
-ayF
+oDb
 ayF
 ayF
 ayF
@@ -80882,7 +80895,7 @@ cfx
 cfx
 ayF
 ayF
-ayF
+oDb
 aBM
 aBM
 aBM
@@ -82958,7 +82971,7 @@ aBD
 aBD
 aBD
 aBD
-ayF
+oDb
 ayF
 aBM
 aBM
@@ -90929,7 +90942,7 @@ iPp
 hVs
 ccw
 ayF
-ayF
+oDb
 aBM
 aBM
 aBM
@@ -95553,7 +95566,7 @@ ayF
 ayF
 ayF
 ayF
-aAM
+dIH
 aBM
 aBM
 aBM
@@ -100570,7 +100583,7 @@ aBM
 aBM
 aBM
 aBM
-ayF
+oDb
 ayF
 ayF
 ayF
@@ -103756,7 +103769,7 @@ cNW
 bAw
 bAw
 clp
-crk
+kyT
 ayF
 ayF
 ayF
@@ -105205,7 +105218,7 @@ ayB
 aAM
 ayB
 ayB
-ayF
+oDb
 ayF
 ayF
 ayF
@@ -109927,7 +109940,7 @@ ttL
 cOe
 cOe
 cNW
-ayF
+oDb
 ayB
 ayB
 ayB
@@ -113778,7 +113791,7 @@ ayF
 ayF
 ayF
 ayF
-ayF
+oDb
 ayF
 ayF
 ayF
@@ -113962,7 +113975,7 @@ aBM
 aBM
 aBM
 aBM
-ayF
+oDb
 ayF
 ayF
 aBM
@@ -114019,7 +114032,7 @@ ayF
 aBM
 aBM
 ayF
-ayF
+oDb
 ayF
 aBM
 aBM
@@ -115292,7 +115305,7 @@ aBM
 aBM
 aBM
 ayF
-ayF
+oDb
 ayF
 aBM
 aBM
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 4378a5c440..6a7671cd5b 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -642,6 +642,9 @@
 		for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
 			if(isturf(L.loc))
 				spawn_locs += L.loc
+		for(var/obj/effect/landmark/loneopspawn/L in GLOB.landmarks_list)
+			if(isturf(L.loc))
+				spawn_locs += L.loc
 		if(!spawn_locs.len)
 			return FALSE
 		spawn_loc = pick(spawn_locs)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 11dd5a0c39..f066430c13 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -313,6 +313,11 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	name = "carpspawn"
 	icon_state = "carp_spawn"
 
+// lone op (optional)
+/obj/effect/landmark/loneopspawn
+	name = "loneop+ninjaspawn"
+	icon_state = "snukeop_spawn"
+
 // observer-start.
 /obj/effect/landmark/observer_start
 	name = "Observer-Start"
diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm
index 7fca4188b7..6ef693a886 100644
--- a/code/modules/events/operative.dm
+++ b/code/modules/events/operative.dm
@@ -19,6 +19,8 @@
 	var/list/spawn_locs = list()
 	for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
 		spawn_locs += L.loc
+	for(var/obj/effect/landmark/loneopspawn/L in GLOB.landmarks_list)
+		spawn_locs += L.loc
 	if(!spawn_locs.len)
 		return MAP_ERROR
 
diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm
index f1e7119530..bc3c445731 100644
--- a/code/modules/ninja/ninja_event.dm
+++ b/code/modules/ninja/ninja_event.dm
@@ -41,6 +41,9 @@ Contents:
 		for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
 			if(isturf(L.loc))
 				spawn_locs += L.loc
+		for(var/obj/effect/landmark/loneopspawn/L in GLOB.landmarks_list)
+			if(isturf(L.loc))
+				spawn_locs += L.loc
 		if(!spawn_locs.len)
 			return kill()
 		spawn_loc = pick(spawn_locs)
diff --git a/tgstation.dme b/tgstation.dme
index 8869563b04..c2e492821e 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -523,8 +523,8 @@
 #include "code\datums\elements\ghost_role_eligibility.dm"
 #include "code\datums\elements\mob_holder.dm"
 #include "code\datums\elements\polychromic.dm"
-#include "code\datums\elements\snail_crawl.dm"
 #include "code\datums\elements\scavenging.dm"
+#include "code\datums\elements\snail_crawl.dm"
 #include "code\datums\elements\spellcasting.dm"
 #include "code\datums\elements\squish.dm"
 #include "code\datums\elements\swimming.dm"