mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
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:
@@ -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)
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user