Merge pull request #10714 from dovydas12345/Simple-Animals

Stops simple animals and silicons being able to do what they shouldn't be able to.
This commit is contained in:
variableundefined
2019-01-24 07:12:57 +08:00
committed by GitHub
4 changed files with 9 additions and 1 deletions
+3 -1
View File
@@ -273,7 +273,9 @@
if(!istype(user) || user.incapacitated())
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(!in_range(src, user) || issilicon(usr))
if(!in_range(src, user))
return
if(!ishuman(usr))
return
if(amount < 1)
return
@@ -59,6 +59,8 @@
if(usr.incapacitated())
to_chat(usr, "<span class='warning'>You can't do that right now!</span>")
return
if(!ishuman(usr))
return
usr.visible_message("<span class='notice'>[usr] grabs \the [src.name].</span>", "<span class='notice'>You grab \the [src.name].</span>")
var/C = new item_chair(loc)
usr.put_in_hands(C)
+2
View File
@@ -219,6 +219,8 @@
var/mob/M = usr
if(M.incapacitated() || !Adjacent(M))
return
if(!ishuman(M))
return
if(over_object == M || istype(over_object, /obj/screen))
if(!remove_item_from_storage(M))
+2
View File
@@ -30,6 +30,8 @@
var/mob/M = usr
if(M.restrained() || M.stat || !Adjacent(M))
return
if(!ishuman(M))
return
if(over_object == M)
if(!remove_item_from_storage(M))