New Cargo Missions (Pirate Bounties, Salvage) (#3327)

## About The Pull Request A few more missions to cargo. Should make them more varied, with some financial incentive for combat ships or scrappers to search for certain things - [x] Add dogtags to Frontiersmen corpses - [x] Add dogtags to Ramzi drops or have them spawn corpses with dogtag on them (ramzi mobs are kind of stupid i might change them) - [x] Frontie Mission - [x] Ramzi Mission - [x] Turn in Protolathe Mission - [x] Turn in RND Console Mission (may combine all three of these into one) - [x] Remove Fishing Missions - [x] Remove impossible missions like Capture Abandoned Floorbot and Capture Bluespace Watcher - [x] Descriptions - [x] Increase value of migo mission - [x] Increase value of Strange Crystal mission - [x] Dogtag sprites (courtesy of @rye-rice (prices subject to change) ## Why It's Good For The Game More financial incentives to go hunt down the Pirate ruins for combat ships. A reason to stash up the rare machinery you find from ruins to sell them instead of Grinding RND And Getting Those Sweet Research Points Crew bonding session of stripping dogtags from pirates, ensuring their bodies never return to their loved ones and you can rack in that sweet, sweet Inteq cash ## Changelog :cl: add: Adds Dogtag Missions to hunt down Ramzi Clique and Frontiersman NPCS from Ruins add: Adds Salvage Missions to collect Protolathe or R&D Console Boards del: Removes Fishing Missions del: Removes impossible missions like Bluespace Watcher and Abandoned Floorbot balance: Increases price of Migo missions to be on par with Legion balance: Increases the value of Strange Crystal missions del: Remove R&D design board from unlocked Protolathes and Science Protolathes /:cl: --------- Signed-off-by: generalthrax <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]>
shiptest-ss13 · Nov 27, 2024 · eb0c9b4 · eb0c9b4
1 parent 9c8ecde
commit eb0c9b4
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 41 deletions.
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
@@ -267,6 +267,26 @@
 	STR.max_combined_w_class = 4
 	STR.max_items = 2
 
+/obj/item/storage/toolbox/bounty/hunt
+	name = "dogtag case"
+	desc = "Store pirate dogtags in here."
+
+/obj/item/storage/toolbox/bounty/hunt/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_combined_w_class = 6
+	STR.max_items = 3
+
+/obj/item/storage/toolbox/bounty/salvage
+	name = "research case"
+	desc = "Store salvaged science equipment in here."
+
+/obj/item/storage/toolbox/bounty/salvage/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_combined_w_class = 2
+	STR.max_items = 1
+
 //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/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
@@ -310,6 +310,23 @@
 	tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN)
 	name = "[initial(name)] - [tagname]"
 
+/obj/item/clothing/neck/dogtag
+	name = "dogtag"
+	desc = "A nondescript dogtag."
+	icon = 'icons/obj/clothing/neck.dmi'
+	icon_state = "dogtag"
+	resistance_flags = FIRE_PROOF
+	w_class = WEIGHT_CLASS_SMALL
+	slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_POCKETS
+
+/obj/item/clothing/neck/dogtag/frontier
+	name = "frontiersman dogtag"
+	desc = "A dogtag marked with the name and rank of a Frontiersmen pirate. You could turn this in to an outpost console contract for money."
+
+/obj/item/clothing/neck/dogtag/ramzi
+	name = "ramzi clique dogtag"
+	desc = "A dogtag marked with the name and rank of a Ramzi Clique pirate. You could turn this in to an outpost console contract for money."
+
 //////////////
 //DOPE BLING//
 //////////////

diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
@@ -129,6 +129,7 @@
 	shoes = /obj/item/clothing/shoes/jackboots
 	head = /obj/item/clothing/head/beret/sec/frontier
 	gloves = /obj/item/clothing/gloves/color/black
+	neck = /obj/item/clothing/neck/dogtag/frontier
 
 /obj/effect/mob_spawn/human/corpse/frontier/ranged
 	outfit = /datum/outfit/frontier

diff --git a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
@@ -12,7 +12,8 @@
 	icon_living = "syndicate"
 	speak_chance = 0
 	stat_attack = HARD_CRIT
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/clothing/neck/dogtag/ramzi)
+	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
 	maxbodytemp = 400
 	unsuitable_atmos_damage = 15
 	faction = list(FACTION_ANTAG_SYNDICATE)
@@ -32,6 +33,7 @@
 	minbodytemp = 0
 	maxbodytemp = 1000
 	speed = 1
+	loot = list(/obj/item/clothing/neck/dogtag/ramzi)
 	armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
 
 /mob/living/simple_animal/hostile/human/syndicate/space/Initialize()
@@ -53,7 +55,7 @@
 	melee_damage_upper = 15
 	icon_state = "syndicate_knife"
 	icon_living = "syndicate_knife"
-	loot = list(/obj/effect/gibspawner/human)
+	loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/neck/dogtag/ramzi)
 	attack_verb_continuous = "slashes"
 	attack_verb_simple = "slash"
 	attack_sound = 'sound/weapons/bladeslice.ogg'
@@ -82,6 +84,8 @@
 	icon_state = "syndicate_stormtrooper_knife"
 	icon_living = "syndicate_stormtrooper_knife"
 	name = "Ramzi Clique Stormtrooper"
+	maxHealth = 250
+	health = 250
 	projectile_deflect_chance = 50
 	armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
 
@@ -99,7 +103,7 @@
 	light_color = COLOR_SOFT_RED
 	status_flags = 0
 	var/obj/effect/light_emitter/red_energy_sword/sord
-	projectile_deflect_chance = 50
+	projectile_deflect_chance = 25
 
 /mob/living/simple_animal/hostile/human/syndicate/melee/sword/Initialize()
 	. = ..()
@@ -157,13 +161,13 @@
 	icon_living = "syndicate_pistol"
 	casingtype = /obj/item/ammo_casing/c10mm
 	projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
-	loot = list(/obj/effect/gibspawner/human)
+	loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/neck/dogtag/ramzi)
 	dodging = FALSE
 	rapid_melee = 1
 
 /mob/living/simple_animal/hostile/human/syndicate/ranged/infiltrator //shuttle loan event
 	projectilesound = 'sound/weapons/gun/smg/shot_suppressed.ogg'
-	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/clothing/neck/dogtag/ramzi)
 
 /mob/living/simple_animal/hostile/human/syndicate/ranged/space
 	name = "Ramzi Clique Operative"

diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm
@@ -104,7 +104,7 @@
 
 /datum/mission/acquire/true_love/strange_crystal
 	name = "Strange crystal needed (urgent!!!)"
-	value = 1000
+	value = 4000
 	weight = 1
 	objective_type = /obj/item/strange_crystal
 
@@ -172,40 +172,16 @@ Acquire: Anomaly
 	value = 1300
 	objective_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
 
-/datum/mission/acquire/creature/ice_whelp
-	name = "Capture an ice whelp"
-	desc = "I require a live ice whelp for research purposes. Trap one within the given \
-			Lifeform Containment Unit and return it to me and you will be paid handsomely."
-	value = 1700
-	weight = 2
-	objective_type = /mob/living/simple_animal/hostile/asteroid/ice_whelp
-
 /datum/mission/acquire/creature/migo
 	name = "Capture a live mi-go"
 	desc = "I require a live mi-go for research purposes. Trap one within the given \
 			Lifeform Containment Unit and return it to me and you will be paid handsomely."
-	value = 1050
+	value = 1300
 	weight = 2
 	objective_type = /mob/living/simple_animal/hostile/netherworld/migo/asteroid
 
-/datum/mission/acquire/creature/floorbot
-	name = "Detain a malfunctioning floorbot"
-	desc = "I require a functional abandoned floorbot for \"research\" purposes. Trap one within \
-			the given Lifeform Containment Unit and return it to me and you will be paid handsomely."
-	value = 1450
-	weight = 1
-	objective_type = /mob/living/simple_animal/bot/floorbot/rockplanet
-
-/datum/mission/acquire/creature/firebot
-	name = "Detain a malfunctioning firebot"
-	desc = "I require a functional abandoned firebot for \"research\" purposes. Trap one within \
-			the given Lifeform Containment Unit and return it to me and you will be paid handsomely."
-	value = 1450
-	weight = 1
-	objective_type = /mob/living/simple_animal/bot/firebot/rockplanet
-
 /*
-		Acquire: Landmines
+		Acquire: Salvage
 */
 
 /datum/mission/acquire/landmine
@@ -219,6 +195,50 @@ Acquire: Anomaly
 	objective_type = /obj/item/mine/pressure/explosive
 	num_wanted = 2
 
+/datum/mission/acquire/bounty
+	name = "Hunt down Frontiersmen Dogtags"
+	desc = "CLIP has assigned us to offer out bounties to hunt down Frontiersman cells and turn in their dogtags. We'll reward you well."
+	weight = 4
+	value = 3000
+	duration = 100 MINUTES
+	dur_mod_range = 0.2
+	container_type = /obj/item/storage/toolbox/bounty/hunt
+	objective_type = /obj/item/clothing/neck/dogtag/frontier
+	num_wanted = 3
+
+/datum/mission/acquire/bounty/ramzi
+	name = "Hunt down Ramzi Clique Dogtags"
+	desc = "Gezena has assigned us to offer out bounties to hunt down Ramzi Clique outfits and turn in their dogtags. We'll reward you well."
+	weight = 3
+	value = 4000
+	duration = 120 MINUTES
+	dur_mod_range = 0.1
+	container_type = /obj/item/storage/toolbox/bounty/hunt
+	objective_type = /obj/item/clothing/neck/dogtag/ramzi
+	num_wanted = 3
+
+/datum/mission/acquire/salvage
+	name = "Deliver Protolathe"
+	desc = "The Nanotrasen Corporation is contracting out to have scientific equipment returned. Looking for a rare circuitboard (R&D Console, Protolathe, Circuit Imprinter) of any type."
+	weight = 2
+	value = 4000
+	duration = 120 MINUTES
+	dur_mod_range = 0.3
+	container_type = /obj/item/storage/toolbox/bounty/salvage
+	objective_type = /obj/item/circuitboard/machine/protolathe
+	num_wanted = 1
+
+/datum/mission/acquire/salvage/console
+	name = "Deliver R&D Console"
+	desc = "The Nanotrasen Corporation is contracting out to have scientific equipment returned. Looking for a rare circuitboard (R&D Console, Protolathe, Circuit Imprinter) of any type."
+	weight = 3
+	value = 2500
+	duration = 120 MINUTES
+	dur_mod_range = 0.3
+	container_type = /obj/item/storage/toolbox/bounty/salvage
+	objective_type = /obj/item/circuitboard/computer/rdconsole
+	num_wanted = 1
+
 /*
 		Acquire: Fishing
 */

diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
@@ -182,14 +182,6 @@
 	category = list("Computer Boards")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO
 
-/datum/design/board/rdconsole
-	name = "Computer Design (R&D Console)"
-	desc = "Allows for the construction of circuit boards used to build a new R&D console."
-	id = "rdconsole"
-	build_path = /obj/item/circuitboard/computer/rdconsole
-	category = list("Computer Boards")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
 /datum/design/board/bounty
 	name = "Computer Design (Bounty Console)"
 	desc = "Allows for the construction of circuit boards used to build a Bounty Console."

diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
@@ -13,7 +13,7 @@
 		// Cargo Stuff
 		"c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
 		// Research Stuff
-		"destructive_analyzer", "experimentor", "rdconsole", "rdserver", "design_disk", "tech_disk", "mechfab",
+		"destructive_analyzer", "experimentor", "rdserver", "design_disk", "tech_disk", "mechfab",
 		// Miscellaneous Stufff
 		"paystand", "space_heater", "bucket", "plastic_knife", "plastic_fork", "plastic_spoon", "fax",
 		// Security Stuff

diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi