Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157

[MIRROR] Clean up some loc assignments
This commit is contained in:
LetterJay
2017-12-03 06:14:34 -06:00
committed by GitHub
7 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -160,7 +160,7 @@
return
if(!B)
return
src.loc = B.loc
forceMove(B.loc)
src.client.eye = src
src.visible_message("<span class='warning'><B>[src] rises out of the pool of blood!</B></span>")
exit_blood_effect(B)
+1 -1
View File
@@ -1022,4 +1022,4 @@
/mob/living/proc/add_abilities_to_panel()
for(var/obj/effect/proc_holder/A in abilities)
statpanel("[A.panel]",A.get_panel_text(),A)
statpanel("[A.panel]",A.get_panel_text(),A)
+1 -1
View File
@@ -78,4 +78,4 @@
var/last_words //used for database logging
var/list/obj/effect/proc_holder/abilities = list()
var/list/obj/effect/proc_holder/abilities = list()