cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

Browse Source 
This PR comments out the non-edible one and replaces any reference of it to the edible one.

Conflicts:
	code/defines/obj/weapon.dm
	maps/tgstation2.dmm
This commit is contained in:
igalan
2014-07-13 09:07:36 -04:00
committed by ZomgPonies
parent 800169feab
commit 7940e3d6db
5 changed files with 12784 additions and 12811 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/kitchen/processor.dm
+3 -3
View File
@@ -28,11 +28,11 @@
meat
input = /obj/item/weapon/reagent_containers/food/snacks/meat
output = /obj/item/weapon/reagent_containers/food/snacks/meatball
/* The meat recipe handles all of these.
meat2
input = /obj/item/weapon/syntiflesh
input = /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh
output = /obj/item/weapon/reagent_containers/food/snacks/meatball
/*
monkeymeat
input = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey
output = /obj/item/weapon/reagent_containers/food/snacks/meatball