Skip to content

Commit

Permalink
Assistant Bounties Modernization (#4518)
Browse files Browse the repository at this point in the history
* Initial Commit

* re add monkey hides

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update code/modules/cargo/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/cargo/code/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/cargo/code/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/cargo/code/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/cargo/code/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/cargo/code/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/cargo/code/bounties/assistant.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/cargo/code/bounties/assistant.dm

---------

Co-authored-by: Bloop <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Nov 1, 2024
1 parent 355b549 commit 9995da6
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 0 deletions.
14 changes: 14 additions & 0 deletions code/modules/cargo/bounties/assistant.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
/datum/bounty/item/assistant/strange_object
name = "Strange Object"
description = "Nanotrasen has taken an interest in strange objects. Find one in maintenance, and ship it off to CentCom right away."
reward = CARGO_CRATE_VALUE * 2.4
wanted_types = list(/obj/item/relic = TRUE)
*/ // NOVA EDIT REMOVAL END

/* NOVA EDIT REMOVAL START - Removes bounties, these are just boring.
/datum/bounty/item/assistant/scooter
name = "Scooter"
description = "Nanotrasen has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up."
Expand All @@ -19,19 +22,22 @@
/obj/vehicle/ridden/scooter/skateboard = TRUE,
/obj/item/melee/skateboard = TRUE,
)
*/ // NOVA EDIT REMOVAL END

/datum/bounty/item/assistant/stunprod
name = "Stunprod"
description = "CentCom demands a stunprod to use against dissidents. Craft one, then ship it."
reward = CARGO_CRATE_VALUE * 2.6
wanted_types = list(/obj/item/melee/baton/security/cattleprod = TRUE)

/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
/datum/bounty/item/assistant/soap
name = "Soap"
description = "Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs."
reward = CARGO_CRATE_VALUE * 4
required_count = 3
wanted_types = list(/obj/item/soap = TRUE)
*/ // NOVA EDIT REMOVAL END

/datum/bounty/item/assistant/spear
name = "Spears"
Expand All @@ -53,6 +59,7 @@
reward = CARGO_CRATE_VALUE * 4
wanted_types = list(/obj/structure/statue = TRUE)

/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
/datum/bounty/item/assistant/clown_box
name = "Clown Box"
description = "The universe needs laughter. Stamp cardboard with a clown stamp and ship it out."
Expand All @@ -65,6 +72,7 @@
reward = CARGO_CRATE_VALUE * 2.4
required_count = 3
wanted_types = list(/obj/item/food/cheesiehonkers = TRUE)
*/ // NOVA EDIT REMOVAL END

/datum/bounty/item/assistant/baseball_bat
name = "Baseball Bat"
Expand Down Expand Up @@ -99,12 +107,14 @@
reward = CARGO_CRATE_VALUE * 3
wanted_types = list(/obj/item/stack/sheet/animalhide/monkey = TRUE)

/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
/datum/bounty/item/assistant/dead_mice
name = "Dead Mice"
description = "Station 14 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike."
reward = CARGO_CRATE_VALUE * 10
required_count = 5
wanted_types = list(/obj/item/food/deadmouse = TRUE)
*/ // NOVA EDIT REMOVAL END

/datum/bounty/item/assistant/comfy_chair
name = "Comfy Chairs"
Expand All @@ -129,12 +139,14 @@
wanted_types = list(/obj/item/food/grown/poppy = TRUE)
include_subtypes = FALSE

/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
/datum/bounty/item/assistant/potted_plants
name = "Potted Plants"
description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants."
reward = CARGO_CRATE_VALUE * 4
required_count = 8
wanted_types = list(/obj/item/kirbyplants = TRUE)
*/ // NOVA EDIT REMOVAL END

/datum/bounty/item/assistant/monkey_cubes
name = "Monkey Cubes"
Expand All @@ -150,6 +162,7 @@
required_count = 3
wanted_types = list(/obj/item/grenade/iedcasing = TRUE)

/* NOVA EDIT REMOVAL START - Removes bounties that are luck or destruction based
/datum/bounty/item/assistant/corgimeat
name = "Raw Corgi Meat"
description = "The Syndicate recently stole all of CentCom's corgi meat. Ship out a replacement immediately."
Expand All @@ -176,6 +189,7 @@
reward = CARGO_CRATE_VALUE * 4
required_count = 24
wanted_types = list(/obj/item/toy/crayon = TRUE)
*/ // NOVA EDIT REMOVAL END

/datum/bounty/item/assistant/pens
name = "Pens"
Expand Down
70 changes: 70 additions & 0 deletions modular_nova/modules/cargo/code/bounties/assistant.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/datum/bounty/item/assistant/nuggies
name = "Chicken Nuggets"
description = "We tried begging the chef and failed. We heard assistants get a free box from the blue machine with each redeemed GAP card."
reward = CARGO_CRATE_VALUE * 6
required_count = 5
wanted_types = list(/obj/item/food/nugget = TRUE)

/datum/bounty/item/assistant/fake_id
name = "Cardboard Identifications"
description = "Our HoP Identification machine is busted, send us some cardboard ID's so we can assign roles by hand."
reward = CARGO_CRATE_VALUE * 3
required_count = 3
wanted_types = list(/obj/item/card/cardboard = TRUE)

/datum/bounty/item/assistant/glass_bowl
name = "Glass Bowl"
description = "We broke the representative's commemorative glass bowl during an aggressive redecoration, please send a replacement ASAP!"
reward = CARGO_CRATE_VALUE * 12.5
wanted_types = list(/obj/item/reagent_containers/cup/bowl/blowing_glass = TRUE)

/datum/bounty/item/assistant/clay_craft
name = "Clay Crafts"
description = "Our museum ashwalker pots collection was smashed by a maniac mime wearing a green outfit! We need three ceramic pieces so we can still get the culture stimulus."
reward = CARGO_CRATE_VALUE * 12.5
required_count = 3
wanted_types = list(
/obj/item/reagent_containers/cup/bowl/ceramic = TRUE,
/obj/item/plate/oven_tray/material/ceramic = TRUE,
/obj/item/reagent_containers/cup/beaker/large/ceramic = TRUE,
/obj/item/plate/ceramic = TRUE,
)

/datum/bounty/item/assistant/forged_sharp
name = "Forged Dagger"
description = "Our chef is adamant to use an authentic Tiziran made knife. Send us anything that cuts and was forged and we will do the rest."
reward = CARGO_CRATE_VALUE * 9
wanted_types = list(
/obj/item/forging/reagent_weapon/sword = TRUE,
/obj/item/forging/reagent_weapon/katana = TRUE,
/obj/item/forging/reagent_weapon/dagger = TRUE,
/obj/item/forging/reagent_weapon/axe = TRUE,
)

/datum/bounty/item/assistant/wheelchair
name = "Two Wheelchairs"
description = "We had too many incidents with the Tram and people trying to skate in the middle rail, we now need extra wheelchairs. You can send them folded."
reward = CARGO_CRATE_VALUE * 5
required_count = 2
wanted_types = list(
/obj/vehicle/ridden/wheelchair = TRUE,
/obj/item/wheelchair = TRUE,
)

/datum/bounty/item/assistant/floodlight
name = "Flood Light"
description = "An electrical storm overloaded most of our lights! Please send us a complete floodlight, with the cables and light tube already assembled!"
reward = CARGO_CRATE_VALUE * 5
wanted_types = list(/obj/machinery/power/floodlight = TRUE)

/datum/bounty/item/assistant/mannequin
name = "Mannequin"
description = "I need to take a bathroom break and the desk needs to be manned. Send a Mannequin made out of wood or plastic, but do so urgently, I beg you!"
reward = CARGO_CRATE_VALUE * 4
wanted_types = list(/obj/structure/mannequin = TRUE)

/datum/bounty/item/assistant/blackmarket
name = "Black Market Uplink"
description = "We are having trouble receiving critical supplies through the regular channels, so we need a device that allows us to contact less regulated routes. Do not mention this shipment to security."
reward = CARGO_CRATE_VALUE * 8
wanted_types = list(/obj/item/market_uplink/blackmarket = TRUE)
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7223,6 +7223,7 @@
#include "modular_nova\modules\bsrpd\code\bsrpd.dm"
#include "modular_nova\modules\cargo\code\goodies.dm"
#include "modular_nova\modules\cargo\code\packs.dm"
#include "modular_nova\modules\cargo\code\bounties\assistant.dm"
#include "modular_nova\modules\cargo\code\items\AFAD.dm"
#include "modular_nova\modules\cargo\code\items\gbp_punchcard.dm"
#include "modular_nova\modules\cargo\code\items\improvedRCD.dm"
Expand Down

0 comments on commit 9995da6

Please sign in to comment.