Merge pull request #1535 from Neerti/5/2/2016_runtime_fixes

Fixes two very common runtimes
2026-07-19 02:56:14 +01:00 · 2016-05-02 01:01:20 -04:00
parent c9c7cb588f 3ea6635f6a
commit 6dce14fd17
2 changed files with 13 additions and 11 deletions
@@ -166,6 +166,8 @@ var/list/slot_equipment_priority = list( \
 	return slot

 /mob/proc/removeItem(var/obj/item/I, var/atom/T = loc, var/force = 0)
+	if(!I) // Nothing to remove, so we succeed.
+		return 1
 	if(!force && !src.canUnEquip(I))
 		return 0