mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-13 16:13:49 +01:00
Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.
Triggered mousetraps and dead mice will be moved back to the top layer. Monkeys will no longer move randomly while being pulled.
This commit is contained in:
@@ -45,6 +45,7 @@
|
||||
visible_message("\red <b>SPLAT!</b>")
|
||||
M.splat()
|
||||
playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
|
||||
layer = MOB_LAYER - 0.2
|
||||
armed = 0
|
||||
update_icon()
|
||||
pulse(0)
|
||||
@@ -112,4 +113,16 @@
|
||||
|
||||
/obj/item/device/assembly/mousetrap/armed
|
||||
icon_state = "mousetraparmed"
|
||||
armed = 1
|
||||
armed = 1
|
||||
|
||||
|
||||
/obj/item/device/assembly/mousetrap/verb/hide_under()
|
||||
set src in oview(1)
|
||||
set name = "Hide"
|
||||
set category = "Object"
|
||||
|
||||
if(usr.stat)
|
||||
return
|
||||
|
||||
layer = TURF_LAYER+0.2
|
||||
usr << "<span class='notice'>You hide [src].</span>"
|
||||
@@ -67,8 +67,18 @@
|
||||
G.process()
|
||||
|
||||
if(!client && stat == CONSCIOUS)
|
||||
|
||||
if(prob(33) && canmove && isturf(loc))
|
||||
step(src, pick(cardinal))
|
||||
|
||||
var/isBeingPulled = 0
|
||||
|
||||
for(var/mob/M in range(src, 1)) //won't move if being pulled
|
||||
if(M.pulling == src)
|
||||
isBeingPulled = 1
|
||||
|
||||
if(isBeingPulled == 0)
|
||||
step(src, pick(cardinal))
|
||||
|
||||
if(prob(1))
|
||||
emote(pick("scratch","jump","roll","tail"))
|
||||
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
src.stat = DEAD
|
||||
src.icon_dead = "mouse_[body_color]_splat"
|
||||
src.icon_state = "mouse_[body_color]_splat"
|
||||
layer = MOB_LAYER
|
||||
if(client)
|
||||
client.time_died_as_mouse = world.time
|
||||
|
||||
@@ -179,6 +180,7 @@
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/mouse/Die()
|
||||
layer = MOB_LAYER
|
||||
if(client)
|
||||
client.time_died_as_mouse = world.time
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user