mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-07-18 19:22:43 +01:00
adjusted bounties
removed neurotoxin, fixed blood drive
This commit is contained in:
@@ -58,12 +58,15 @@
|
||||
reward = 3000
|
||||
wanted_types = list(/obj/item/organ/tail/cat)
|
||||
|
||||
|
||||
/*
|
||||
/datum/bounty/item/medical/blood
|
||||
name = "Generic Blood"
|
||||
description = "The Kinaris annual blood drive is back up to full speed, following the garlic incident. Good blood in good volumes accepted for Credit returns."
|
||||
reward = 3500
|
||||
required_count = 600
|
||||
wanted_types = list(/datum/reagent/blood)
|
||||
*/
|
||||
|
||||
/* If anyone wants to try and fix/work, go for it
|
||||
/datum/bounty/item/medical/medibot // Mob so this dosn't work yet*
|
||||
|
||||
@@ -105,7 +105,6 @@ datum/bounty/reagent/complex_drink/New()
|
||||
/datum/reagent/consumable/ethanol/hearty_punch,\
|
||||
/datum/reagent/consumable/ethanol/manhattan_proj,\
|
||||
/datum/reagent/consumable/ethanol/narsour,\
|
||||
/datum/reagent/consumable/ethanol/neurotoxin,\
|
||||
/datum/reagent/consumable/ethanol/patron,\
|
||||
/datum/reagent/consumable/ethanol/quadruple_sec,\
|
||||
/datum/reagent/consumable/ethanol/quintuple_sec,\
|
||||
@@ -170,3 +169,15 @@ datum/bounty/reagent/chemical/New()
|
||||
description = "CentCom is in desperate need of the chemical [name]. Ship a container of it to be rewarded."
|
||||
reward += rand(0, 4) * 500
|
||||
|
||||
/datum/bounty/reagent/blood
|
||||
name = "Blood Drive"
|
||||
reward = 3500
|
||||
required_volume = 600
|
||||
|
||||
/datum/bounty/reagent/blood/New()
|
||||
|
||||
var/reagent_type = /datum/reagent/blood
|
||||
wanted_reagent = new reagent_type
|
||||
name = wanted_reagent.name
|
||||
description = "The Kinaris annual blood drive is back up to full speed, following the garlic incident. Good blood in good volumes accepted for Credit returns."
|
||||
reward += rand(0, 2) * 300
|
||||
|
||||
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
|
||||
|
||||
// Returns a new bounty of random type, but does not add it to GLOB.bounties_list.
|
||||
/proc/random_bounty()
|
||||
switch(rand(1, 14))
|
||||
switch(rand(1, 15))
|
||||
if(1)
|
||||
var/subtype = pick(subtypesof(/datum/bounty/item/assistant))
|
||||
return new subtype
|
||||
@@ -118,6 +118,8 @@ GLOBAL_LIST_EMPTY(bounties_list)
|
||||
if(14)
|
||||
var/subtype = pick(subtypesof(/datum/bounty/lewd))
|
||||
return new subtype
|
||||
if(15)
|
||||
return new /datum/bounty/reagent/blood
|
||||
|
||||
// Called lazily at startup to populate GLOB.bounties_list with random bounties.
|
||||
/proc/setup_bounties()
|
||||
@@ -144,7 +146,8 @@ GLOBAL_LIST_EMPTY(bounties_list)
|
||||
/********************************Strict Type Gens********************************/
|
||||
var/list/easy_add_list_strict_types = list(/datum/bounty/reagent/simple_drink = 1,
|
||||
/datum/bounty/reagent/complex_drink = 1,
|
||||
/datum/bounty/reagent/chemical = 1)
|
||||
/datum/bounty/reagent/chemical = 1,
|
||||
/datum/bounty/reagent/blood = 1)
|
||||
|
||||
for(var/the_strict_type in easy_add_list_strict_types)
|
||||
for(var/i in 1 to easy_add_list_strict_types[the_strict_type])
|
||||
|
||||
Reference in New Issue
Block a user