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

Mimic shipping (#29872)

Browse Source 
* mimic wrapping

* mimic shipping

* mimics only for now

* angry unwrapping

* cleanup
This commit is contained in:
Apogee-dev
2021-06-25 13:48:20 -07:00
committed by GitHub
parent 46923ce7a6
commit 156f56a1eb
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/mob/living/simple_animal/hostile/mimic.dm
View File

@@ -188,7 +188,12 @@ var/global/list/crate_mimic_disguises = list(\
/mob/living/simple_animal/hostile/mimic/crate/attackby(obj/W, mob/user)
if(angry) //If we're angry - proceed as normal
if(istype(W, /obj/item/stack/package_wrap))
to_chat(user, "<span class='warning'>You can't wrap \the [src] while it's angry!</span>")
return
return ..()
else if(istype(W, /obj/item/stack/package_wrap))
return
else
return attack_hand(user) //If we're hidden - attempt to open (same as a normal crate)
@@ -441,6 +446,12 @@ var/global/list/item_mimic_disguises = list(
copied_object = meat_type //Without this line, mimics would spawn items they're disguised as. Since they're relatively weak and can appear as gatling guns, this is required!
..(gibbed)
/mob/living/simple_animal/hostile/mimic/crate/item/attackby(obj/W, mob/user)
if(angry) //If we're angry - proceed as normal
return ..()
else
return attack_hand(user) //can't wrap these
/mob/living/simple_animal/hostile/mimic/crate/item/attack_hand(mob/user)
if(angry)
return ..()