-Individual dorms now have a button inside that bolts/unbolts the door

-Door control buttons give the user a message if they lack the access
-Virology door controls now properly restrict access
-Large beaker cost reduced to 5000u glass
-Shooooorts! They're comfy and easy to wear!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3602 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-05-17 20:10:22 +00:00
parent 470a3373e6
commit 44cf5ee86d
7 changed files with 8747 additions and 8730 deletions

View File

@@ -320,7 +320,7 @@
/obj/item/clothing/under/rank/cargotech
name = "cargo technician's jumpsuit"
desc = "It's specially designed to prevent back injuries caused by heavy lifting."
desc = "Shooooorts! They're comfy and easy to wear!"
icon_state = "cargotech"
item_state = "lb_suit"
color = "cargo"

View File

@@ -175,7 +175,10 @@ obj/machinery/access_button
icon_state = "access_button_off"
attack_hand(mob/user)
if(radio_connection)
if(!allowed(user))
user << "\red Access Denied"
else if(radio_connection)
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.data["tag"] = master_tag

View File

@@ -29,6 +29,7 @@
return
if(!allowed(user) && (wires & 1))
user << "\red Access Denied"
flick("doorctrl-denied",src)
return
@@ -47,8 +48,8 @@
if(specialfunctions & IDSCAN)
D.aiDisabledIdScanner = 1
if(specialfunctions & BOLTS)
spawn(5)
D.locked = 1
D.locked = 1
D.update_icon()
if(specialfunctions & SHOCK)
D.secondsElectrified = -1
if(specialfunctions & SAFE)
@@ -63,15 +64,13 @@
if(specialfunctions & IDSCAN)
D.aiDisabledIdScanner = 0
if(specialfunctions & BOLTS)
spawn(5)
D.locked = 0
D.locked = 0
D.update_icon()
if(specialfunctions & SHOCK)
D.secondsElectrified = 0
if(specialfunctions & SAFE)
D.safe = 1
else
for(var/obj/machinery/door/poddoor/M in world)
if (M.id == src.id)

View File

@@ -1871,7 +1871,7 @@
icon_state = "beakerlarge"
item_state = "beaker"
m_amt = 0
g_amt = 15000
g_amt = 5000
volume = 100
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100)