Skip to content
This repository has been archived by the owner on Jun 29, 2024. It is now read-only.

Commit

Permalink
Makes the Nerve Master unlockable by the Master Key. (#1181)
Browse files Browse the repository at this point in the history
  • Loading branch information
PotatoTomahto authored Jun 17, 2024
2 parents 970fec2 + 2b54368 commit e31f92c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/roguetown/roguemachine/merchant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
/obj/structure/roguemachine/merchantvend/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/roguekey))
var/obj/item/roguekey/K = P
if(K.lockid == "merchant")
if(K.lockid == "merchant" || K.lockid == "lord")
locked = !locked
playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
update_icon()
Expand All @@ -149,7 +149,7 @@
if(istype(P, /obj/item/keyring))
var/obj/item/keyring/K = P
for(var/obj/item/roguekey/KE in K.keys)
if(KE.lockid == "merchant")
if(KE.lockid == "merchant" || KE.lockid == "lord")
locked = !locked
playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
update_icon()
Expand Down

0 comments on commit e31f92c

Please sign in to comment.