Merge pull request #844 from Erthilo/TGUpdates

TG Updates up to r2962
This commit is contained in:
CIB
2012-04-16 08:05:11 -07:00
56 changed files with 513 additions and 300 deletions
+2
View File
@@ -52,6 +52,8 @@
icon_closed = "emergency"
icon_opened = "emergencyopen"
/obj/structure/closet/emcloset/legacy
/obj/structure/closet/firecloset
name = "Fire Closet"
desc = "A bulky (yet mobile) closet. Comes with supplies to fight fire."
+15 -2
View File
@@ -257,11 +257,24 @@
active_power_usage = 400
/obj/machinery/door_control
name = "Remote Door Control"
name = "remote door-control"
desc = "It controls doors, remotely."
icon = 'stationobjs.dmi'
icon_state = "doorctrl0"
desc = "A remote control switch for a door."
desc = "A remote control-switch for a door."
var/id = null
var/range = 10
var/normaldoorcontrol = 0
var/desiredstate = 0 // Zero is closed, 1 is open.
var/specialfunctions = 1
/*
Bitflag, 1= open
2= idscan,
4= bolts
8= shock
16= door safties
*/
anchored = 1.0
use_power = 1
idle_power_usage = 2