Merge pull request #7523 from FlattestGuitar/no-stel-ples

Removes boring theft objectives

_maps/map_files/MetaStation/MetaStation.v41A.II.dmm

@@ -3468,7 +3468,7 @@
 "boJ" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/bikehorn/rubberducky,/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/obj/item/weapon/card/id/captains_spare,/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
 "boK" = (/obj/machinery/door/window{dir = 1; name = "Captain's Bedroom"; req_access_txt = "20"},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
 "boL" = (/obj/structure/closet/secure_closet/captains,/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
-"boM" = (/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/suit/space/captain,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
+"boM" = (/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/jetpack/oxygen/captain,/obj/item/clothing/suit/space/captain,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"})
 "boN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/central)
 "boO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/hallway/primary/central)
 "boP" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{req_access_txt = 1},/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 4},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central)

_maps/map_files/cyberiad/cyberiad.dmm

@@ -4438,7 +4438,7 @@
 "bHs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall/r_wall,/area/engine/gravitygenerator)
 "bHt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/space,/area/space)
 "bHu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/engine/gravitygenerator)
-"bHv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/suit/space/captain,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/obj/item/device/radio/intercom/private{pixel_x = -28},/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"bHv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/jetpack/oxygen/captain,/obj/item/clothing/suit/space/captain,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/obj/item/device/radio/intercom/private{pixel_x = -28},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bHw" = (/obj/machinery/computer/card,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bHx" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/melee/chainofcommand,/obj/item/weapon/card/id/captains_spare,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bHy" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain)

code/game/gamemodes/objective.dm

@@ -1,11 +1,7 @@
 var/global/list/all_objectives = list()
 
 var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \
-	- /datum/theft_objective/steal \
-	- /datum/theft_objective/special \
-	- /datum/theft_objective/number \
-	- /datum/theft_objective/number/special \
-	- /datum/theft_objective/number/coins
+	- /datum/theft_objective/steal
 
 /datum/objective
 	var/datum/mind/owner = null			//Who owns the objective.
@@ -340,7 +336,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \
 	var/datum/theft_objective/steal_target
 	martyr_compatible = 0
 
-/datum/objective/steal/find_target(var/special_only=0)
+/datum/objective/steal/find_target()
 	var/loop=50
 	while(!steal_target && loop > 0)
 		loop--
@@ -348,12 +344,6 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \
 		var/datum/theft_objective/O = new thefttype
 		if(owner.assigned_role in O.protected_jobs)
 			continue
-		if(special_only)
-			if(!(O.flags & 1)) // THEFT_FLAG_SPECIAL
-				continue
-		else
-			if(O.flags & 1) // THEFT_FLAG_SPECIAL
-				continue
 		if(O.flags & 2)
 			continue
 		steal_target=O

code/game/gamemodes/steal_items.dm

@@ -2,7 +2,7 @@
 //
 // Separated into datums so we can prevent roles from getting certain objectives.
 
-#define THEFT_FLAG_SPECIAL 1
+#define THEFT_FLAG_SPECIAL 1//unused, maybe someone will use it some day, I'll leave it here for the children
 #define THEFT_FLAG_UNIQUE 2
 
 /datum/theft_objective
@@ -31,6 +31,11 @@
 	typepath = /obj/item/weapon/gun/energy/laser/captain
 	protected_jobs = list("Captain")
 
+/datum/theft_objective/captains_jetpack
+	name = "the captain's deluxe jetpack"
+	typepath = /obj/item/weapon/tank/jetpack/oxygen/captain
+	protected_jobs = list("Captain")
+
 /datum/theft_objective/hoslaser
 	name = "the head of security's recreated antique laser gun"
 	typepath = /obj/item/weapon/gun/energy/gun/hos
@@ -41,11 +46,6 @@
 	typepath = /obj/item/weapon/hand_tele
 	protected_jobs = list("Captain", "Research Director")
 
-/datum/theft_objective/jetpack
-	name = "a jetpack"
-	typepath = /obj/item/weapon/tank/jetpack
-	protected_jobs = list("Chief Engineer")
-
 /datum/theft_objective/ai
 	name = "a functional AI"
 	typepath = /obj/item/device/aicard
@@ -173,32 +173,6 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C)
 /datum/theft_objective/number/plasma_gas/getAmountStolen(var/obj/item/I)
 	return I:air_contents:toxins
 
-/datum/theft_objective/number/coins
-	name = "credits of coins (in bag)"
-	min=1000
-	max=5000
-	step=500
-
-/datum/theft_objective/number/coins/check_completion(var/datum/mind/owner)
-	if(!owner.current)
-		return 0
-	if(!isliving(owner.current))
-		return 0
-	var/list/all_items = owner.current.get_contents()
-	var/found_amount=0.0
-	for(var/obj/item/weapon/moneybag/B in all_items)
-		if(B)
-			for(var/obj/item/weapon/coin/C in B)
-				found_amount += C.credits
-	return found_amount >= required_amount
-
-
-////////////////////////////////
-// SPECIAL OBJECTIVES
-////////////////////////////////
-/datum/theft_objective/special
-	flags = THEFT_FLAG_SPECIAL
-
 /datum/theft_objective/unique
 	flags = THEFT_FLAG_UNIQUE
 
@@ -209,47 +183,3 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C)
 /datum/theft_objective/unique/docs_blue
 	name = "the \"Blue\" secret documents"
 	typepath = /obj/item/documents/syndicate/blue
-
-/datum/theft_objective/special/pinpointer
-	name = "the captain's pinpointer"
-	typepath = /obj/item/weapon/pinpointer
-
-/datum/theft_objective/special/nuke_gun
-	name = "advanced energy gun"
-	typepath = /obj/item/weapon/gun/energy/gun/nuclear
-
-/datum/theft_objective/special/diamond_drill
-	name = "diamond drill"
-	typepath = /obj/item/weapon/pickaxe/drill/diamonddrill
-
-/datum/theft_objective/special/boh
-	name = "bag of holding"
-	typepath = /obj/item/weapon/storage/backpack/holding
-
-/datum/theft_objective/special/hyper_cell
-	name = "hyper-capacity cell"
-	typepath = /obj/item/weapon/stock_parts/cell/hyper
-
-/datum/theft_objective/number/special
-	flags = THEFT_FLAG_SPECIAL
-
-/datum/theft_objective/number/special/diamonds
-	name = "diamonds"
-	typepath = /obj/item/stack/sheet/mineral/diamond
-	min=5
-	max=10
-	step=5
-
-/datum/theft_objective/number/special/gold
-	name = "gold bars"
-	typepath = /obj/item/stack/sheet/mineral/gold
-	min=10
-	max=50
-	step=10
-
-/datum/theft_objective/number/special/uranium
-	name = "refined uranium bars"
-	typepath = /obj/item/stack/sheet/mineral/uranium
-	min=10
-	max=30
-	step=5

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -107,6 +107,14 @@
 	..()
 	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 
+/obj/item/weapon/tank/jetpack/oxygen/captain
+	name = "Captain's jetpack"
+	desc = "A compact, lightweight jetpack containing a high amount of compressed oxygen."
+	icon_state = "jetpack-captain"
+	item_state = "jetpack-captain"
+	volume = 90
+	w_class = WEIGHT_CLASS_NORMAL
+
 /obj/item/weapon/tank/jetpack/oxygen/harness
 	name = "jet harness (oxygen)"
 	desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."