shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
DeltaFire
2021-08-29 19:32:17 +02:00
parent ab0bcc9355 02604ac878
commit 7db61cee86
67 changed files with 3034 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/misc_designs.dm
+30
View File
@@ -245,6 +245,36 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/emptybottle
name = "Glass Bottle"
desc = "A small, empty bottle for storing liquids."
id = "emptyglassbottle"
build_type = PROTOLATHE
materials = list(/datum/material/glass = 400)
build_path = /obj/item/reagent_containers/food/drinks/bottle/blank/small
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/largeemptybottle
name = "Large Glass Bottle"
desc = "A large, empty bottle for storing liquids."
id = "largeemptyglassbottle"
build_type = PROTOLATHE
materials = list(/datum/material/glass = 2000)
build_path = /obj/item/reagent_containers/food/drinks/bottle/blank
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/emptypitcher
name = "Pitcher"
desc = "A large Pitcher to hold vast amounts of liquid."
id = "emptypitcher"
build_type = PROTOLATHE
materials = list(/datum/material/glass = 3600)
build_path = /obj/item/reagent_containers/food/drinks/bottle/blank/pitcher
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/air_horn
name = "Air Horn"
desc = "Damn son, where'd you find this?"
code/modules/research/techweb/nodes/export_nodes.dm
+3 -3
View File
@@ -14,8 +14,8 @@
/datum/techweb_node/bottle_exports
id = "bottle_exports"
display_name = "Legal Bottling"
display_name = "Advanced Bottling"
prereq_ids = list("blueprinted_bottles")
description = "New bottles for printing and selling."
design_ids = list("minikeg", "blooddrop", "slim_gold", "white_bloodmoon", "greenroad")
description = "New bottles for printing, storage and selling."
design_ids = list("minikeg", "blooddrop", "slim_gold", "white_bloodmoon", "greenroad", "emptyglassbottle", "largeemptyglassbottle", "emptypitcher")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 250)