mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 07:08:00 +01:00
[MIRROR] refactors resist act to be on atom level (#384)
* refactors resist act to be on atom level (#53016) * refactors resist act to be on atom level Co-authored-by: Qustinnus <Floydje123@hotmail.com>
This commit is contained in:
@@ -351,7 +351,7 @@
|
||||
message_cooldown = world.time + 50
|
||||
to_chat(user, "<span class='warning'>[src]'s door won't budge!</span>")
|
||||
return
|
||||
container_resist(user)
|
||||
container_resist_act(user)
|
||||
|
||||
/obj/structure/closet/attack_hand(mob/living/user)
|
||||
. = ..()
|
||||
@@ -396,14 +396,14 @@
|
||||
return 0
|
||||
return 1
|
||||
|
||||
/obj/structure/closet/container_resist(mob/living/user)
|
||||
/obj/structure/closet/container_resist_act(mob/living/user)
|
||||
if(opened)
|
||||
return
|
||||
if(ismovable(loc))
|
||||
user.changeNext_move(CLICK_CD_BREAKOUT)
|
||||
user.last_special = world.time + CLICK_CD_BREAKOUT
|
||||
var/atom/movable/AM = loc
|
||||
AM.relay_container_resist(user, src)
|
||||
AM.relay_container_resist_act(user, src)
|
||||
return
|
||||
if(!welded && !locked)
|
||||
open()
|
||||
|
||||
@@ -105,7 +105,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
|
||||
recursive_organ_check(src)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/bodycontainer/container_resist(mob/living/user)
|
||||
/obj/structure/bodycontainer/container_resist_act(mob/living/user)
|
||||
if(!locked)
|
||||
open()
|
||||
return
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
if(current_size >= STAGE_FIVE)
|
||||
deconstruct(FALSE)
|
||||
|
||||
/obj/structure/transit_tube_pod/container_resist(mob/living/user)
|
||||
/obj/structure/transit_tube_pod/container_resist_act(mob/living/user)
|
||||
if(!user.incapacitated())
|
||||
empty_pod()
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user