Merge remote-tracking branch 'upstream/master' into universal-damage

This commit is contained in:
Fox McCloud
2019-09-14 21:15:31 -04:00
212 changed files with 2977 additions and 1726 deletions
+1 -4
View File
@@ -303,10 +303,7 @@
//Light replacer code
if(istype(W, /obj/item/lightreplacer))
var/obj/item/lightreplacer/LR = W
if(isliving(user))
var/mob/living/U = user
LR.ReplaceLight(src, U)
return
LR.ReplaceLight(src, user)
// attempt to insert light
if(istype(W, /obj/item/light))