Merge pull request #235 from skull132/development

Freezers and Map
This commit is contained in:
skull132
2014-08-20 18:54:50 +03:00
3 changed files with 8207 additions and 8210 deletions
+2 -2
View File
@@ -1118,7 +1118,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/atmos_freezer
name = "Gas Cooling Unit"
contains = list(/obj/machinery/atmospherics/unary/cold_sink/freezer/cargo) //MAKE A FREEZER THAT IS, BY DEFAULT, UNANCHORED!
contains = list(/obj/machinery/atmospherics/unary/cold_sink/freezer) //MAKE A FREEZER THAT IS, BY DEFAULT, UNANCHORED!
cost = 50
containertype = /obj/structure/closet/crate/secure/large //Test if this works ((should))
containername = "gas cooling unit crate"
@@ -1127,7 +1127,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/atmos_heater
name = "Gas Heating Unit"
contains = list(/obj/machinery/atmospherics/unary/heat_reservoir/heater/cargo) //MAKE A COOLER THAT IS, BY DEFAULT, UNANCHORED!
contains = list(/obj/machinery/atmospherics/unary/heat_reservoir/heater) //MAKE A COOLER THAT IS, BY DEFAULT, UNANCHORED!
cost = 50
containertype = /obj/structure/closet/crate/secure/large //Test if this works ((should))
containername = "gas heating unit crate"
+3 -7
View File
@@ -11,6 +11,7 @@
/obj/machinery/atmospherics/unary/cold_sink/freezer/New()
..()
initialize_directions = dir
anchored = 0
/obj/machinery/atmospherics/unary/cold_sink/freezer/initialize()
if(node) return
@@ -119,9 +120,6 @@
anchored = 0
return
/obj/machinery/atmospherics/unary/cold_sink/freezer/cargo
anchored = 0
/obj/machinery/atmospherics/unary/heat_reservoir/heater
name = "gas heating system"
icon = 'icons/obj/Cryogenic2.dmi'
@@ -135,6 +133,7 @@
/obj/machinery/atmospherics/unary/heat_reservoir/heater/New()
..()
initialize_directions = dir
anchored = 0
/obj/machinery/atmospherics/unary/heat_reservoir/heater/initialize()
if(node) return
@@ -239,7 +238,4 @@
spawn(10)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", "You unsecure [src.name] from the floor.", "You hear a ratchet")
anchored = 0
return
/obj/machinery/atmospherics/unary/heat_reservoir/heater/cargo
anchored = 0
return
+8202 -8201
View File
File diff suppressed because it is too large Load Diff