cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] New exports & bounties (#322)

Browse Source 
* New exports & bounties (#52428)

* Update organs.dm

tails :)

* durathread, plastic and cloth exports

* slime extracts for cargo

deffo wont get snatched up by an antag on the way

* paperwork bounties

* cat ears and nerf cat tail value

* buff hypercharged core & nerf rainbow core

* added humanlike meats

* soap bounty

* fun artisanal stuff to export

* already soap bounty i'm dumb

* lower bounty rewards

* `lower plastic value

* moving raw meat exports

* adding humanoid food values

* added export values to human meats

* added sheetza and meat blocks to exports

* nerfed the values big time

* no more plastique

* New exports & bounties

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-08-13 00:20:22 +02:00
committed by GitHub
co-authored by spessbro
parent 1a3c8fca61
commit 0a7d88f906
7 changed files with 141 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/food.dm
+5
View File
@@ -32,3 +32,8 @@
#define FOOD_EXOTIC 150
#define FOOD_LEGENDARY 1000
#define FOOD_ILLEGAL 1000
#define FOOD_MEAT_NORMAL 5
#define FOOD_MEAT_HUMAN 50
#define FOOD_MEAT_MUTANT 100
#define FOOD_MEAT_MUTANT_RARE 200
code/modules/cargo/bounties/assistant.dm
+23
View File
@@ -186,3 +186,26 @@
reward = 5000
required_count = 5
wanted_types = list(/obj/item/reagent_containers/food/snacks/deadmouse)
/datum/bounty/item/assistant/paper_bin
name = "Paper Bins"
description = "Our accounting division is all out of paper. We need a new shipment immediately."
reward = 2500
required_count = 5
wanted_types = list(/obj/item/paper_bin)
/datum/bounty/item/assistant/crayons
name = "Crayons"
description = "Dr Jones' kid ate all our crayons again. Please send us yours."
reward = 2000
required_count = 24
wanted_types = list(/obj/item/toy/crayon)
/datum/bounty/item/assistant/pens
name = "Pens"
description = "We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens."
reward = 2000
required_count = 10
include_subtypes = FALSE
wanted_types = list(/obj/item/pen)
code/modules/cargo/exports/organs.dm
+17
View File
@@ -36,3 +36,20 @@
cost = 5
unit_name = "humanoid tounge"
export_types = list(/obj/item/organ/tongue)
/datum/export/organ/tail/lizard
cost = 250
unit_name = "lizard tail"
export_types = list(/obj/item/organ/tail/lizard)
/datum/export/organ/tail/cat
cost = 300
unit_name = "cat tail"
export_types = list(/obj/item/organ/tail/cat)
/datum/export/organ/ears/cat
cost = 200
unit_name = "cat ears"
export_types = list(/obj/item/organ/ears/cat)
code/modules/cargo/exports/sheets.dm
+22
View File
@@ -83,6 +83,17 @@
unit_name = "wood plank"
export_types = list(/obj/item/stack/sheet/mineral/wood)
/datum/export/stack/cloth
cost = 5
message = "rolls of cloth"
export_types = list(/obj/item/stack/sheet/cloth)
/datum/export/stack/durathread
cost = 70
message = "rolls of durathread"
export_types = list(/obj/item/stack/sheet/durathread)
/datum/export/stack/cardboard
cost = 2
message = "of cardboard"
@@ -104,6 +115,17 @@
unit_name = "of ammonia crystal"
export_types = list(/obj/item/stack/ammonia_crystals)
/datum/export/stack/pizza
cost = 12
unit_name = "of sheetza"
export_types = list(/obj/item/stack/sheet/pizza)
/datum/export/stack/meat
cost = 8
unit_name = "of meat"
export_types = list(/obj/item/stack/sheet/meat)
// Weird Stuff
/datum/export/stack/abductor
code/modules/cargo/exports/tools.dm
+21
View File
@@ -155,3 +155,24 @@
. = ..()
if(. && notes)
. += " ERROR: Unscheduled energy ball delivery detected."
//artisanal exports for the mom and pops
/datum/export/soap
cost = 75
unit_name = "soap"
export_types = list(/obj/item/soap)
/datum/export/soap/homemade
cost = 30
unit_name = "artisanal soap"
export_types = list(/obj/item/soap/homemade)
/datum/export/soap/omega
cost = 7000
unit_name = "omega soap"
export_types = list(/obj/item/soap/omega)
/datum/export/candle
cost = 25
unit_name = "candle"
export_types = list(/obj/item/candle)
code/modules/cargo/exports/xenobio.dm
+43
View File
@@ -0,0 +1,43 @@
/datum/export/slime
/datum/export/slime/grey
cost = 25
unit_name = "grey slime core"
export_types = list(/obj/item/slime_extract/grey)
/datum/export/slime/common
cost = 60
unit_name = "common slime core"
export_types = list(/obj/item/slime_extract/metal,/obj/item/slime_extract/orange,/obj/item/slime_extract/purple,/obj/item/slime_extract/blue)
/datum/export/slime/uncommon
cost = 100
unit_name = "uncommon slime core"
export_types = list(/obj/item/slime_extract/gold,/obj/item/slime_extract/green,/obj/item/slime_extract/red,/obj/item/slime_extract/pink)
/datum/export/slime/rare
cost = 140
unit_name = "rare slime core"
export_types = list(/obj/item/slime_extract/silver,/obj/item/slime_extract/darkblue,/obj/item/slime_extract/darkpurple,/obj/item/slime_extract/yellow)
/datum/export/slime/charged
cost = 200
unit_name = "charged slime core"
export_types = list(/obj/item/stock_parts/cell/high/slime)
/datum/export/slime/hypercharged
cost = 600
unit_name = "hypercharged slime core"
export_types = list(/obj/item/stock_parts/cell/high/slime/hypercharged)
/datum/export/slime/epic //EPIIIIIIC
cost = 220
unit_name = "epic slime core"
export_types = list(/obj/item/slime_extract/black,/obj/item/slime_extract/cerulean,/obj/item/slime_extract/oil,/obj/item/slime_extract/sepia,/obj/item/slime_extract/pyrite,/obj/item/slime_extract/adamantine,/obj/item/slime_extract/lightpink,/obj/item/slime_extract/bluespace)
/datum/export/slime/rainbow
cost = 500
unit_name = "rainbow slime core"
export_types = list(/obj/item/slime_extract/rainbow)
code/modules/food_and_drinks/food/snacks/meat.dm
+10
View File
@@ -40,6 +40,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human
tastes = list("tender meat" = 1)
foodtype = MEAT | RAW | GROSS
value = FOOD_MEAT_HUMAN
/obj/item/reagent_containers/food/snacks/meat/slab/human/initialize_slice(obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human/slice, reagents_per_slice)
..()
@@ -67,6 +68,7 @@
filling_color = "#00FFFF"
tastes = list("slime" = 1, "jelly" = 1)
foodtype = MEAT | RAW | TOXIC
value = FOOD_MEAT_MUTANT_RARE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
icon_state = "golemmeat"
@@ -75,6 +77,7 @@
filling_color = "#A9A9A9"
tastes = list("rock" = 1)
foodtype = MEAT | RAW | GROSS
value = FOOD_MEAT_MUTANT_RARE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
icon_state = "agolemmeat"
@@ -88,6 +91,7 @@
filling_color = "#6B8E23"
tastes = list("meat" = 4, "scales" = 1)
foodtype = MEAT | RAW
value = FOOD_MEAT_MUTANT
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
icon_state = "plantmeat"
@@ -95,6 +99,7 @@
filling_color = "#E9967A"
tastes = list("salad" = 1, "wood" = 1)
foodtype = VEGETABLES
value = FOOD_MEAT_MUTANT_RARE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
icon_state = "shadowmeat"
@@ -102,6 +107,7 @@
filling_color = "#202020"
tastes = list("darkness" = 1, "meat" = 1)
foodtype = MEAT | RAW
value = FOOD_MEAT_MUTANT_RARE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
icon_state = "flymeat"
@@ -109,6 +115,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/uranium = 3)
tastes = list("maggots" = 1, "the inside of a reactor" = 1)
foodtype = MEAT | RAW | GROSS
value = FOOD_MEAT_MUTANT
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
icon_state = "mothmeat"
@@ -116,6 +123,7 @@
filling_color = "#BF896B"
tastes = list("dust" = 1, "powder" = 1, "meat" = 2)
foodtype = MEAT | RAW
value = FOOD_MEAT_MUTANT
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
name = "bone"
@@ -125,6 +133,7 @@
tastes = list("bone" = 1)
slice_path = null //can't slice a bone into cutlets
foodtype = GROSS
value = FOOD_MEAT_MUTANT_RARE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
name = " meat (rotten)"
@@ -141,6 +150,7 @@
list_reagents = list(/datum/reagent/consumable/liquidelectricity = 3)
tastes = list("pure electricity" = 2, "meat" = 1)
foodtype = RAW | MEAT | TOXIC
value = FOOD_MEAT_MUTANT
////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////