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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
This commit is contained in:
Mark van Alphen
2019-03-30 22:55:09 +01:00
parent f92be2c67d 97eac63f9c
commit 45a066c7d1
282 changed files with 2928 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ore.dm
+1 -1
View File
@@ -52,7 +52,7 @@
F.attackby(OB, AM)
return ..()
/obj/item/stack/ore/fire_act()
/obj/item/stack/ore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
if(isnull(refined_type))
return