mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-12 07:35:31 +01:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts: # code/modules/client/preference_setup/general/03_body.dm # code/modules/mob/new_player/sprite_accessories.dm # html/changelogs/.all_changelog.yml # icons/mob/human_races/markings.dmi # vorestation.dme
This commit is contained in:
@@ -180,7 +180,7 @@
|
||||
update_icon()
|
||||
else
|
||||
usr << "<span class='notice'>You need to hold it in hands!</span>"
|
||||
if (istype(src.loc, /mob) ||istype(src.loc.loc, /mob))
|
||||
if (src.loc && istype(src.loc, /mob) ||istype(src.loc.loc, /mob))
|
||||
src.attack_self(usr)
|
||||
updateUsrDialog()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user