cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
This commit is contained in:
PsiOmegaDelta
2015-07-01 22:46:40 +02:00
parent 0e6aea6842 b7bb0e8b44
commit b5a47fd43b
24 changed files with 2 additions and 2602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/material_recipes.dm
-2
View File
@@ -82,8 +82,6 @@
..()
recipes += new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1)
recipes += new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1)
recipes += new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/frame/rust/assembly, 12, time = 50, one_per_turf = 1)
recipes += new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/frame/rust, 12, time = 50, one_per_turf = 1)
recipes += new/datum/stack_recipe("knife grip", /obj/item/weapon/material/butterflyhandle, 4, time = 20, one_per_turf = 0, on_floor = 1)
/material/sandstone/generate_recipes()