From e4b9988b852fada11e071f5d569a1bf5e39e6efe Mon Sep 17 00:00:00 2001 From: Tails2091 Date: Fri, 15 Mar 2019 12:53:00 -0400 Subject: [PATCH 1/2] Lockbox now kicks user out upon locking --- code/game/objects/items/weapons/storage/lockbox.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index c080715a035..ed6c015c98a 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -24,6 +24,8 @@ if(locked) icon_state = icon_locked to_chat(user, "You lock \the [src]!") + if(user.s_active) + user.s_active.close(user) return else icon_state = icon_closed @@ -131,5 +133,5 @@ /obj/item/storage/lockbox/t4/New() ..() - for(var/i = 0, i < 3, i++) + for(var/i in 0 to 3) new /obj/item/grenade/plastic/x4/thermite(src) \ No newline at end of file From 8865cbeb83fb6d4c46a9bae06606be014af27368 Mon Sep 17 00:00:00 2001 From: Tails2091 Date: Sun, 17 Mar 2019 17:01:54 -0400 Subject: [PATCH 2/2] 3 is now 2 and 4 is now 3 My bad. --- code/game/objects/items/weapons/storage/lockbox.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index ed6c015c98a..9cd4178aaf2 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -133,5 +133,5 @@ /obj/item/storage/lockbox/t4/New() ..() - for(var/i in 0 to 3) + for(var/i in 0 to 2) new /obj/item/grenade/plastic/x4/thermite(src) \ No newline at end of file