cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-28 11:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	maps/tgstation2.dmm
This commit is contained in:
RavingManiac
2014-03-06 19:22:06 +08:00
parent 8126611ebf 608c48c6db
commit f022a19452
49 changed files with 615 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/reagent_containers/food/snacks/meat.dm
View File

@@ -10,7 +10,7 @@
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/kitchen/utensil/knife))
if(istype(W,/obj/item/weapon/kitchenknife))
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)