mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 21:48:39 +01:00
Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination. Fixing being able to adjust jumpsuit while restrained. Fixing one typo.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
/obj/item/weapon/paper
|
||||
name = "paper"
|
||||
gender = PLURAL
|
||||
gender = NEUTER
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "paper"
|
||||
throwforce = 0
|
||||
@@ -66,6 +66,8 @@
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
if(usr.stat || !usr.canmove || usr.restrained())
|
||||
return
|
||||
if((CLUMSY in usr.mutations) && prob(25))
|
||||
usr << "<span class='warning'>You cut yourself on the paper! Ahhhh! Ahhhhh!</span>"
|
||||
usr.damageoverlaytemp = 9001
|
||||
|
||||
@@ -73,7 +73,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)
|
||||
if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && usr.canmove && !usr.restrained())
|
||||
name = "photo[(n_name ? text("- '[n_name]'") : null)]"
|
||||
add_fingerprint(usr)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user