mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
fixing conflicts
This commit is contained in:
@@ -483,7 +483,7 @@
|
||||
return
|
||||
|
||||
for(var/obj/screen/item_action/actionitem in hud_used.item_action_list)
|
||||
if(actionitem.owner && (actionitem.owner.loc == src))
|
||||
if(actionitem.owner.loc == src)
|
||||
actionitem.overlay.appearance = actionitem.owner.appearance
|
||||
actionitem.overlay.dir = SOUTH
|
||||
switch(num)
|
||||
|
||||
Reference in New Issue
Block a user