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

Merge remote-tracking branch 'origin/master' into perlin-genny

Browse Source
This commit is contained in:
LetterN
2021-03-31 08:19:31 +08:00
parent e3fb2d5491 8bee5004ba
commit f976a89157
91 changed files with 1114 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/mineral.dm
+2 -2
View File
@@ -117,8 +117,8 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \
// new/datum/stack_recipe("diamond brick", /obj/item/ingot/diamond, 6, time = 100), \ not yet
))
new/datum/stack_recipe("diamond ingot", /obj/item/ingot/diamond, 6, time = 100), \
))
/obj/item/stack/sheet/mineral/diamond/get_main_recipes()
. = ..()