Merge branch 'master' into throwing_disarm_stuff

2019-12-30 00:05:17 -08:00
parent f421649647 6b804fba8f
commit 47c92e380c
985 changed files with 37953 additions and 18652 deletions
@@ -172,9 +172,6 @@
 /obj/proc/container_resist(mob/living/user)
 	return

-/obj/proc/update_icon()
-	return
-
 /mob/proc/unset_machine()
 	if(machine)
 		machine.on_unset_machine(src)
@@ -233,6 +230,7 @@
 	. = ..()
 	if(unique_reskin && (!current_skin || always_reskinnable) && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
 		reskin_obj(user)
+		return TRUE

 /obj/proc/reskin_obj(mob/M)
 	if(!LAZYLEN(unique_reskin))