Tried to fix merge conflicts, hopefully worked.

This commit is contained in:
kingofkosmos
2015-04-24 21:52:36 +03:00
parent 761d31cea0
commit d9b8b146c8
17 changed files with 4905 additions and 26 deletions
@@ -4,11 +4,4 @@
locked = 1
icon_state = "secure"
health = 200
user << "<span class='warning'>You have no idea how this thing is supposed to work!</span>"
user << "<span class='warning'>You can't do that right now!</span>"
user.visible_message("[user] has [locked ? null : "un"]locked the locker.", "<span class='notice'>You [locked ? null : "un"]lock the locker.</span>")
user << "<span class='danger'>Access Denied.</span>"
user << "<span class='warning'>The locker appears to be broken!</span>"
O.show_message("<span class='warning'>The locker has been broken by [user] with an electromagnetic card!</span>", 1, "<span class='italics'>You hear a faint electrical spark.</span>", 2)
user << "<span class='warning'>The locker is locked!</span>"
secure = 1