Merge pull request #3186 from VOREStation/runtimes-fix

Fix Runtimes
This commit is contained in:
Anewbe
2017-03-30 21:53:22 -05:00
committed by GitHub
3 changed files with 5 additions and 3 deletions

View File

@@ -1452,6 +1452,7 @@
if(stat) return
var/datum/category_group/underwear/UWC = input(usr, "Choose underwear:", "Show/hide underwear") as null|anything in global_underwear.categories
if(!UWC) return
var/datum/category_item/underwear/UWI = all_underwear[UWC.name]
if(!UWI || UWI.name == "None")
src << "<span class='notice'>You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "\a [UWC.display_name]"].</span>"

View File

@@ -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()