shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262

Browse Source 
[MIRROR] Soft crit, except not terrible
This commit is contained in:
LetterJay
2017-09-07 10:01:35 -05:00
committed by GitHub
parent 2768aa68f9 8299cf576c
commit 31102d0ec4
57 changed files with 316 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -97,7 +97,7 @@
H.update_damage_hud()
return
var/n_name = stripped_input(usr, "What would you like to label the paper?", "Paper Labelling", null, MAX_NAME_LEN)
if((loc == usr && usr.stat == 0))
if((loc == usr && usr.stat == CONSCIOUS))
name = "paper[(n_name ? text("- '[n_name]'") : null)]"
add_fingerprint(usr)
code/modules/paperwork/photography.dm
+2 -2
View File
@@ -47,7 +47,7 @@
if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text)
txt = copytext(txt, 1, 128)
if(loc == user && user.stat == 0)
if(loc == user && user.stat == CONSCIOUS)
scribble = txt
..()
@@ -78,7 +78,7 @@
var/n_name = copytext(sanitize(input(usr, "What would you like to label the photo?", "Photo Labelling", null) as text), 1, MAX_NAME_LEN)
//loc.loc check is for making possible renaming photos in clipboards
if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && usr.canmove && !usr.restrained())
if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && usr.canmove && !usr.restrained())
name = "photo[(n_name ? text("- '[n_name]'") : null)]"
add_fingerprint(usr)