cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3186 from VOREStation/runtimes-fix

Browse Source 
Fix Runtimes
This commit is contained in:
Anewbe
2017-03-30 21:53:22 -05:00
committed by GitHub
parent 4d42ac29a5 379ac4c63d
commit 5ceb96dfb5
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_onclick/click.dm
View File

@@ -341,6 +341,7 @@
var/mob/living/carbon/C = usr var/mob/living/carbon/C = usr
C.swap_hand() C.swap_hand()
else else
var/turf/T = screen_loc2turf("screen-loc", get_turf(usr)) var/turf/T = screen_loc2turf(screen_loc, get_turf(usr))
T.Click(location, control, params) if(T)
T.Click(location, control, params)
. = 1 . = 1

1
code/modules/mob/living/carbon/human/human.dm
View File

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

2
code/modules/paperwork/paper_bundle.dm
View File

@@ -180,7 +180,7 @@
update_icon() update_icon()
else else
usr << "<span class='notice'>You need to hold it in hands!</span>" 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) src.attack_self(usr)
updateUsrDialog() updateUsrDialog()