From 5447f9c812a595a174cf969cc082570fa1b0f685 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sun, 29 Sep 2024 13:33:28 -0500 Subject: [PATCH] changes path for this --- .../IceRuins/icemoon_crashed_holemaker.dmm | 2 +- .../RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm | 2 +- .../icemoon_underground_abandoned_village.dmm | 2 +- .../dynamic_missions/missions/guarded/nt_files.dm | 2 +- code/modules/dynamic_missions/missions/simple.dm | 3 +-- .../dynamic_missions/missions/simple/blackbox.dm | 12 ++++++++---- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm index 152150623524..362eaaccf331 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm @@ -196,7 +196,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/mission_poi/blackbox, +/obj/effect/landmark/mission_poi/recovery, /turf/open/floor/plasteel/dark, /area/ruin/unpowered/crashed_holemaker) "cS" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm b/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm index 96ba1763a877..9ec1515525c5 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm @@ -2197,7 +2197,7 @@ /area/ruin/powered/hydroponicslab) "Xb" = ( /obj/structure/table/wood, -/obj/effect/landmark/mission_poi/blackbox, +/obj/effect/landmark/mission_poi/recovery, /turf/open/floor/wood/walnut, /area/ruin/powered/hydroponicslab) "Xt" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index 14cfb6a2a8d3..9dc046b1eb6f 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -138,7 +138,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/mission_poi/blackbox, +/obj/effect/landmark/mission_poi/recovery, /turf/open/floor/wood, /area/ruin/powered) "mI" = ( diff --git a/code/modules/dynamic_missions/missions/guarded/nt_files.dm b/code/modules/dynamic_missions/missions/guarded/nt_files.dm index 578390c9d1d3..22a15c7d6c0a 100644 --- a/code/modules/dynamic_missions/missions/guarded/nt_files.dm +++ b/code/modules/dynamic_missions/missions/guarded/nt_files.dm @@ -11,7 +11,7 @@ /datum/mission/dynamic/simple/guarded/nt_files/generate_mission_details() name = pick("NT asset recovery", "Asset recovery requested ASAP") author = "Captain [random_species_name()]" - desc = pick("Look- long story short, I need this folder retrieved. You don't ask why, I make sure you get paid") + desc = pick("Look- long story short, I need this folder retrieved. You don't ask why, I make sure you get paid.") /datum/mission/dynamic/simple/guarded/nt_files/spawn_guard(obj/effect/landmark/mission_poi/guard_poi) guard_type = pick(/mob/living/simple_animal/hostile/human/syndicate/melee, /mob/living/simple_animal/hostile/human/syndicate/ranged) diff --git a/code/modules/dynamic_missions/missions/simple.dm b/code/modules/dynamic_missions/missions/simple.dm index 50ee535e46fb..c7d75f09781c 100644 --- a/code/modules/dynamic_missions/missions/simple.dm +++ b/code/modules/dynamic_missions/missions/simple.dm @@ -1,6 +1,5 @@ /datum/mission/dynamic/simple - name = "Item recovery" - desc = "Retrive this thing for us and we will pay you" + setpiece_poi = /obj/effect/landmark/mission_poi/recovery /datum/mission/dynamic/simple/spawn_mission_setpiece(datum/overmap/dynamic/planet) for(var/obj/effect/landmark/mission_poi/mission_poi in planet.spawned_mission_pois) diff --git a/code/modules/dynamic_missions/missions/simple/blackbox.dm b/code/modules/dynamic_missions/missions/simple/blackbox.dm index 9f81b61d9841..421b897e5c7c 100644 --- a/code/modules/dynamic_missions/missions/simple/blackbox.dm +++ b/code/modules/dynamic_missions/missions/simple/blackbox.dm @@ -1,8 +1,12 @@ /datum/mission/dynamic/simple/blackbox - name = "Blackbox recovery" - desc = "Recover one of our lost blackboxes from the location at this planet. We've pinged its location to a local ruin." - setpiece_poi = /obj/effect/landmark/mission_poi/blackbox setpiece_item = /obj/item/blackbox -/obj/effect/landmark/mission_poi/blackbox +/datum/mission/dynamic/kill/generate_mission_details() + . = ..() + if(!name) + name = "[setpiece_item::name] recovery" + if(!desc) + desc = "Recover one of our lost [setpiece_item::name] from the location at this planet. We've pinged its location to a local ruin." + +/obj/effect/landmark/mission_poi/recovery icon_state = "main_blackbox"