Runtime fixes

This commit is contained in:
Markolie
2015-03-02 21:34:25 +01:00
parent 82b96d305f
commit aba5593393
2 changed files with 2 additions and 0 deletions
+1
View File
@@ -207,6 +207,7 @@ proc/listclearnulls(list/list)
//Mergsort: does the actual sorting and returns the results back to sortAtom
/proc/mergeAtoms(var/list/atom/L, var/list/atom/R, var/order = 1)
if(!L || !R) return 0
var/Li=1
var/Ri=1
var/list/result = new()
+1
View File
@@ -1385,6 +1385,7 @@ proc/is_hot(obj/item/W as obj)
//Returns 1 if the given item is capable of popping things like balloons, inflatable barriers, or cutting police tape.
/proc/can_puncture(obj/item/W as obj) // For the record, WHAT THE HELL IS THIS METHOD OF DOING IT?
if(!istype(W)) return 0
if(!W) return 0
if(W.sharp) return 1
return ( \