more tweaks and improvments

shiptest-ss13 · Oct 14, 2024 · f07ed20 · f07ed20
1 parent dd3b79f
commit f07ed20
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 15 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -79,6 +79,14 @@
 /obj/item/reagent_containers/food/drinks/beer,
 /turf/open/floor/plating/ice/icemoon,
 /area/overmap_encounter/planetoid/cave/explored)
+"hY" = (
+/obj/structure/vein/ice/classthree{
+	vein_class = 4;
+	mining_charges = 30
+	},
+/obj/effect/landmark/mission_poi/main/drill,
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/overmap_encounter/planetoid/cave/explored)
 "iz" = (
 /obj/structure/fence/door/opened{
 	dir = 8
@@ -477,6 +485,13 @@
 /obj/structure/chair/comfy/orange/directional/east,
 /turf/open/floor/carpet,
 /area/ruin/powered)
+"OI" = (
+/obj/effect/landmark/mission_poi/guard{
+	type_to_spawn = /mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals;
+	mission_index = 1
+	},
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/overmap_encounter/planetoid/cave/explored)
 "Pp" = (
 /obj/machinery/vending/snack/random,
 /turf/open/floor/holofloor/wood,
@@ -982,7 +997,7 @@ Og
 Og
 Og
 zT
-Og
+OI
 Og
 zT
 Og
@@ -1071,10 +1086,10 @@ Vn
 Og
 zT
 Og
-Og
-Og
 Bq
 Og
+hY
+Og
 Og
 Og
 Gy

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -666,7 +666,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/landmark/mission_poi/main/kill,
+/obj/effect/landmark/mission_poi/main/kill{
+	mission_index = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/bridge)
 "iN" = (
@@ -2179,6 +2181,9 @@
 	pixel_x = -5;
 	pixel_y = -3
 	},
+/obj/effect/landmark/mission_poi/main{
+	mission_index = 2
+	},
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/bridge)
 "Al" = (
@@ -2736,6 +2741,10 @@
 	dir = 10
 	},
 /obj/machinery/light/directional/south,
+/obj/effect/landmark/mission_poi/guard{
+	type_to_spawn = /mob/living/simple_animal/hostile/human/frontier/ranged/neutered;
+	mission_index = 2
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/jungle/cavecrew/bridge)
 "Ir" = (

diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -179,6 +179,14 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ruin/space/has_grav/corporatemine/bridge)
+"fd" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/landmark/mission_poi/guard{
+	mission_index = 1;
+	type_to_spawn = /mob/living/simple_animal/hostile/asteroid/hivelord
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
 "fi" = (
 /obj/structure/chair/office/light{
 	dir = 4
@@ -1093,6 +1101,20 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/airless,
 /area/ruin/space/has_grav/corporatemine)
+"zQ" = (
+/obj/effect/landmark/mission_poi/guard{
+	mission_index = 1;
+	type_to_spawn = /mob/living/simple_animal/hostile/asteroid/hivelord
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"Aa" = (
+/obj/effect/landmark/mission_poi{
+	mission_index = 1;
+	type_to_spawn = /obj/structure/spawner/burrow/asteroid
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
 "Ac" = (
 /obj/structure/railing,
 /obj/structure/cable{
@@ -2105,7 +2127,7 @@
 	vein_class = 4;
 	mining_charges = 30
 	},
-/obj/effect/landmark/mission_poi/drill,
+/obj/effect/landmark/mission_poi/main/drill,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "Vr" = (
@@ -3729,7 +3751,7 @@ VM
 VM
 Vj
 VM
-kp
+fd
 bl
 VM
 Pn
@@ -3830,7 +3852,7 @@ Al
 Al
 Iv
 VM
-VM
+zQ
 VM
 rG
 Bp
@@ -3937,7 +3959,7 @@ VM
 VM
 bl
 VM
-VM
+Aa
 VM
 VM
 VM

diff --git a/code/__DEFINES/dcs/signals/signals.dm b/code/__DEFINES/dcs/signals/signals.dm
@@ -700,7 +700,7 @@
 
 // Drill signals
 // Called when a mission drill finishes sampling
-#define COMSIG_DRILL_SAMPLES_DONE "spawner_toggle"
+#define COMSIG_DRILL_SAMPLES_DONE "drill_done"
 
 ///Beam Signals
 /// Called before beam is redrawn

diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm
@@ -18,7 +18,10 @@
 	description = "Who knows what lies within?"
 	suffix = "icemoon_underground_abandoned_village.dmm"
 	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_INHOSPITABLE)
-	dynamic_mission_types = list(/datum/mission/dynamic/data_reterival)
+	dynamic_mission_types = list(
+		/datum/mission/dynamic/data_reterival,
+		/datum/mission/dynamic/signaled/drill
+	)
 
 /datum/map_template/ruin/icemoon/brazillian_lab
 	name = "Barricaded Compound"

diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm
@@ -64,7 +64,10 @@
 	description = "A frontiersmen base, hidden within a cave. They don't seem friendly"
 	suffix = "jungle_cavecrew.dmm"
 	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_HAZARDOUS, RUIN_TAG_LIVEABLE, RUIN_TAG_MAJOR_LOOT)
-	dynamic_mission_types = list(/datum/mission/dynamic/kill/frontiersmen)
+	dynamic_mission_types = list(
+		/datum/mission/dynamic/kill/frontiersmen,
+		/datum/mission/dynamic/data_reterival
+	)
 
 /datum/map_template/ruin/jungle/library
 	name = "Abandoned Library"

diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
@@ -54,7 +54,7 @@
 	var/forgedseal = 0
 	var/copy_type = null
 
-/obj/item/documents/photocopy/New(loc, obj/item/documents/copy=null)
+/obj/item/documents/photocopy/New(loc, obj/item/documents/copy = null)
 	..()
 	if(copy)
 		copy_type = copy.type

diff --git a/code/modules/dynamic_missions/mission.dm b/code/modules/dynamic_missions/mission.dm
@@ -71,6 +71,7 @@
 		value = value * (dur_value_scaling ? old_dur / duration : 1)
 	value = round(value, 50)
 
+	faction = pick(faction)
 	author = random_species_name()
 	return
 

diff --git a/code/modules/dynamic_missions/missions/dynamic.dm b/code/modules/dynamic_missions/missions/dynamic.dm
@@ -48,7 +48,6 @@
 /datum/mission/dynamic/data_reterival
 	name = "data recovery"
 	setpiece_item = list(
-		/obj/item/blackbox,
 		/obj/item/research_notes/loot,
 		/obj/item/documents
 	)

diff --git a/code/modules/dynamic_missions/missions/guarded.dm b/code/modules/dynamic_missions/missions/guarded.dm
@@ -24,7 +24,6 @@
 	name = "NT asset recovery"
 	faction = /datum/faction/nt
 	setpiece_item = /obj/item/documents/nanotrasen
-	guard_type = /mob/living/simple_animal/hostile/human/syndicate/melee
 
 /datum/mission/dynamic/guarded/nt_files/generate_mission_details()
 	. = ..()

diff --git a/code/modules/dynamic_missions/missions/signaled.dm b/code/modules/dynamic_missions/missions/signaled.dm
@@ -16,11 +16,18 @@
 	UnregisterSignal(registered_item, mission_main_signal)
 	remove_bound(registered_item)
 
-/obj/effect/landmark/mission_poi/drill
+/obj/effect/landmark/mission_poi/main/drill
 
 /datum/mission/dynamic/signaled/drill
 	name = "drill mission"
 	desc = "get this drill back up and running and send us proof"
+	faction = list(
+		/datum/faction/nt,
+		/datum/faction/nt/ns_logi,
+		/datum/faction/nt/vigilitas,
+		/datum/faction/frontier,
+		/datum/faction/independent
+	)
 	registered_type = /obj/machinery/drill/mission/ruin
 	setpiece_item = /obj/item/drill_readout
 	mission_main_signal = COMSIG_DRILL_SAMPLES_DONE