From 07a1236f12659a43d157dbc55eedd2ddc768c91a Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Sun, 23 Jun 2024 17:56:28 -0700 Subject: [PATCH 1/3] rustedlandminesmission --- code/game/objects/items/storage/toolbox.dm | 12 ++++++++++++ code/modules/overmap/missions/acquire_mission.dm | 15 +++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 87497a2a7562..13117284fdde 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -312,6 +312,18 @@ new /obj/item/clothing/mask/infiltrator(src) new /obj/item/clothing/shoes/combat/sneakboots(src) +/obj/item/storage/toolbox/bounty + name = "defused explosives case" + desc = "Store defused landmines in here." + icon_state = "infiltrator_case" + item_state = "infiltrator_case" + +/obj/item/storage/toolbox/bounty/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_combined_w_class = 8 + STR.max_items = 4 + //floorbot assembly /obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm index de60174081db..da0591fe5e09 100644 --- a/code/modules/overmap/missions/acquire_mission.dm +++ b/code/modules/overmap/missions/acquire_mission.dm @@ -211,6 +211,21 @@ Acquire: Anomaly weight = 1 objective_type = /mob/living/simple_animal/bot/firebot/rockplanet +/* + Acquire: Landmines +*/ + +/datum/mission/acquire/landmine/rusted + name = "Defuse rusted landmines" + desc = "We've been issued a bounty to make the Frontier a safer place by disarming landmines. Mind your fingers." + weight = 3000 + value = 3000 + duration = 80 MINUTES + dur_mod_range = 0.3 + container_type = /obj/item/storage/toolbox/bounty + objective_type = /obj/item/mine/pressure/explosive/rusty + num_wanted = 4 + /* Acquire: Fishing */ From fce24375c3f546e3e4bf7414472323d3cd1960e5 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Sun, 23 Jun 2024 17:56:46 -0700 Subject: [PATCH 2/3] oopsie --- code/modules/overmap/missions/acquire_mission.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm index da0591fe5e09..910af64293b7 100644 --- a/code/modules/overmap/missions/acquire_mission.dm +++ b/code/modules/overmap/missions/acquire_mission.dm @@ -217,11 +217,11 @@ Acquire: Anomaly /datum/mission/acquire/landmine/rusted name = "Defuse rusted landmines" - desc = "We've been issued a bounty to make the Frontier a safer place by disarming landmines. Mind your fingers." - weight = 3000 - value = 3000 + desc = "We've been issued a bounty to make the Frontier a safer place by disarming dated landmines. Mind your fingers." + weight = 6 + value = 2000 duration = 80 MINUTES - dur_mod_range = 0.3 + dur_mod_range = 0.4 container_type = /obj/item/storage/toolbox/bounty objective_type = /obj/item/mine/pressure/explosive/rusty num_wanted = 4 From db96b0c0a47a636c08b6749f272fc9d4027d63e6 Mon Sep 17 00:00:00 2001 From: rye-rice <58402542+rye-rice@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:45:22 -0700 Subject: [PATCH 3/3] Update code/modules/overmap/missions/acquire_mission.dm Co-authored-by: Theos Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com> --- code/modules/overmap/missions/acquire_mission.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm index 910af64293b7..7a389fa1655a 100644 --- a/code/modules/overmap/missions/acquire_mission.dm +++ b/code/modules/overmap/missions/acquire_mission.dm @@ -223,7 +223,7 @@ Acquire: Anomaly duration = 80 MINUTES dur_mod_range = 0.4 container_type = /obj/item/storage/toolbox/bounty - objective_type = /obj/item/mine/pressure/explosive/rusty + objective_type = /obj/item/mine/pressure/explosive num_wanted = 4 /*