Skip to content

Commit

Permalink
added funny cores to cargo bounties (BeeStation#11685)
Browse files Browse the repository at this point in the history
* added funny cores to cargo bounties

* out of order...?

* bumped up their worth

* Create core.dm

* fixed desc and added file to dme
  • Loading branch information
MarkusLarsson421 authored Oct 22, 2024
1 parent c1a299a commit 2c44598
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 0 deletions.
2 changes: 2 additions & 0 deletions beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2310,6 +2310,7 @@
#include "code\modules\cargo\bounties\assistant.dm"
#include "code\modules\cargo\bounties\botany.dm"
#include "code\modules\cargo\bounties\chef.dm"
#include "code\modules\cargo\bounties\core.dm"
#include "code\modules\cargo\bounties\engineering.dm"
#include "code\modules\cargo\bounties\item.dm"
#include "code\modules\cargo\bounties\mech.dm"
Expand All @@ -2321,6 +2322,7 @@
#include "code\modules\cargo\bounties\slime.dm"
#include "code\modules\cargo\bounties\special.dm"
#include "code\modules\cargo\bounties\virus.dm"
#include "code\modules\cargo\exports\core.dm"
#include "code\modules\cargo\exports\gear.dm"
#include "code\modules\cargo\exports\large_objects.dm"
#include "code\modules\cargo\exports\lavaland.dm"
Expand Down
47 changes: 47 additions & 0 deletions code/modules/cargo/bounties/core.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/datum/bounty/item/core/New()
..()
description = "The admiral heard that a [name] core help you grow your beard, fetch a [name] core immediately! Ship it to receive a large payment."
required_count = 1

/datum/bounty/item/core/mark_high_priority(scale_reward)
return ..(max(scale_reward * 0.7, 1.2))

/datum/bounty/item/core/bleed
name = "Bleed"
reward = 25000
wanted_types = list(/obj/item/assembly/signaler/anomaly/blood)

/datum/bounty/item/core/bluespace
name = "Bluespace"
reward = 45000
wanted_types = list(/obj/item/assembly/signaler/anomaly/bluespace)

/datum/bounty/item/core/delimber
name = "Delimber"
reward = 30000
wanted_types = list(/obj/item/assembly/signaler/anomaly/bioscrambler)

/datum/bounty/item/core/flux
name = "Flux"
reward = 20000
wanted_types = list(/obj/item/assembly/signaler/anomaly/flux)

/datum/bounty/item/core/pyro
name = "Pyro"
reward = 25000
wanted_types = list(/obj/item/assembly/signaler/anomaly/pyro)

/datum/bounty/item/core/vortex
name = "Vortex"
reward = 50000
wanted_types = list(/obj/item/assembly/signaler/anomaly/vortex)

/datum/bounty/item/core/gravity
name = "Gravity"
reward = 20000
wanted_types = list(/obj/item/assembly/signaler/anomaly/grav)

/datum/bounty/item/core/hallucination
name = "Hallucination"
reward = 15000
wanted_types = list(/obj/item/assembly/signaler/anomaly/hallucination)
1 change: 1 addition & 0 deletions code/modules/cargo/bounty.dm
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
/********************************Subtype Gens********************************/
var/list/easy_add_list_subtypes = list(/datum/bounty/item/assistant = 2,
/datum/bounty/item/mech = 1,
/datum/bounty/item/core = 2,
/datum/bounty/item/chef = 2,
/datum/bounty/item/security = 1,
/datum/bounty/virus = 1,
Expand Down
36 changes: 36 additions & 0 deletions code/modules/cargo/exports/core.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/datum/export/core

/datum/export/core/bleed
cost = 5000
unit_name = "bleed"
export_types = list(/obj/item/assembly/signaler/anomaly/)
/datum/export/core/bluespace
cost = 10000
unit_name = "bluespace"
export_types = list(/obj/item/assembly/signaler/anomaly/)
/datum/export/core/delimber
cost = 3000
unit_name = "delimber"
export_types = list(/obj/item/assembly/signaler/anomaly/)
/datum/export/core/vortex
cost = 15000
unit_name = "vortex"
export_types = list(/obj/item/assembly/signaler/anomaly/)

// These are created by the SM and therefore has a lower value.
/datum/export/core/gravity
cost = 500
unit_name = "gravity"
export_types = list(/obj/item/assembly/signaler/anomaly/)
/datum/export/core/hallucination
cost = 250
unit_name = "hallucination"
export_types = list(/obj/item/assembly/signaler/anomaly/)
/datum/export/core/flux
cost = 500
unit_name = "flux"
export_types = list(/obj/item/assembly/signaler/anomaly/)
/datum/export/core/pyro
cost = 750
unit_name = "pyro"
export_types = list(/obj/item/assembly/signaler/anomaly/)

0 comments on commit 2c44598

Please sign in to comment.