From 2f7baa26f82327a90513f422fe4569c23c605e19 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 1 Dec 2012 17:49:34 +1000 Subject: [PATCH] antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas Signed-off-by: Cael_Aislinn --- baystation12.dme | 4 ++ .../components/binary_devices/pump.dm | 6 ++ .../WorkInProgress/Cael_Aislinn/Rust/areas.dm | 61 ++++++++++++++++--- code/game/area/Space Station 13 areas.dm | 24 ++++++++ code/game/objects/effects/signs.dm | 9 +++ code/game/objects/sign_decals.dm | 49 +++++++++++++++ .../crates_lockers/closets/wardrobe.dm | 20 ++++++ 7 files changed, 166 insertions(+), 7 deletions(-) create mode 100644 code/game/objects/sign_decals.dm diff --git a/baystation12.dme b/baystation12.dme index 5ab7609868a..ce69add117c 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -288,6 +288,7 @@ #include "code\ATMOSPHERICS\he_pipes.dm" #include "code\ATMOSPHERICS\pipes.dm" #include "code\ATMOSPHERICS\components\portables_connector.dm" +#include "code\ATMOSPHERICS\components\tvalve.dm" #include "code\ATMOSPHERICS\components\valve.dm" #include "code\ATMOSPHERICS\components\binary_devices\binary_atmos_base.dm" #include "code\ATMOSPHERICS\components\binary_devices\circulator.dm" @@ -635,6 +636,7 @@ #include "code\game\objects\explosion_recursive.dm" #include "code\game\objects\items.dm" #include "code\game\objects\objs.dm" +#include "code\game\objects\sign_decals.dm" #include "code\game\objects\structures.dm" #include "code\game\objects\weapons.dm" #include "code\game\objects\closets\walllocker.dm" @@ -1206,6 +1208,7 @@ #include "code\modules\power\switch.dm" #include "code\modules\power\terminal.dm" #include "code\modules\power\tracker.dm" +#include "code\modules\power\turbine.dm" #include "code\modules\power\antimatter\containment_jar.dm" #include "code\modules\power\antimatter\control.dm" #include "code\modules\power\antimatter\shielding.dm" @@ -1338,6 +1341,7 @@ #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm" #include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm" #include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm" +#include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm" diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 03c5ec3eee6..7746d238d22 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -26,6 +26,12 @@ obj/machinery/atmospherics/binary/pump var/id = null var/datum/radio_frequency/radio_connection + highcap + name = "High capacity gas pump" + desc = "A high capacity pump" + + target_pressure = 15000000 + on on = 1 icon_state = "intact_on" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm index d59882ee9ab..a8822acb60b 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm @@ -1,14 +1,61 @@ -/area/engine/cooling +//reactor areas -/area/engine/port_gyro_bay +/area/engine + fore + name = "\improper Fore" -/area/engine/starboard_gyro_bay + construction_storage + name = "\improper Construction storage" -/area/engine/generators + locker + name = "\improper Locker room" -/area/engine/turbine_control + atmos_storage + name = "\improper Atmos storage" -/area/engine/reactor_core + control + name = "\improper Control" -/area/engine/aux_control + electrical_storage + name = "\improper Electrical storage" + + reactor_core + name = "\improper Reactor Core" + icon_state = "engine_core" + + reactor_gas + name = "Reactor Gas Storage" + icon_state = "engine_atmos" + + aux_control + name = "Reactor Auxiliary Control" + icon_state = "engine_aux" + + turbine_control + name = "Turbine Control" + icon_state = "engine_turbine" + + reactor_airlock + name = "\improper Reactor Primary Entrance" + icon_state = "engine_airlock" + + reactor_fuel_storage + name = "Reactor Fuel Storage" + icon_state = "engine_fuel" + + reactor_fuel_ports + name = "\improper Reactor Fuel Ports" + icon_state = "engine_port" + + generators + name = "\improper Generator Room" + icon_state = "engine_generators" + + port_gyro_bay + name = "\improper Port Gyrotron Bay" + icon_state = "engine_starboardgyro" + + starboard_gyro_bay + name = "\improper Starboard Gyrotron Bay" + icon_state = "engine_portgyro" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index e3e081d772c..ad012b025a1 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -684,6 +684,26 @@ proc/process_ghost_teleport_locs() name = "\improper Captain's Quarters" icon_state = "captain" +/area/crew_quarters/heads/hop + name = "\improper Head of Personnel's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/hor + name = "\improper Research Director's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/chief + name = "\improper Chief Engineer's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/hos + name = "\improper Head of Security's Quarters" + icon_state = "head_quarters" + +/area/crew_quarters/heads/cmo + name = "\improper Chief Medical Officer's Quarters" + icon_state = "head_quarters" + /area/crew_quarters/courtroom name = "\improper Courtroom" icon_state = "courtroom" @@ -1001,6 +1021,10 @@ proc/process_ghost_teleport_locs() name = "\improper Security Office" icon_state = "security" +/area/security/lobby + name = "\improper Security lobby" + icon_state = "security" + /area/security/brig name = "\improper Brig" icon_state = "brig" diff --git a/code/game/objects/effects/signs.dm b/code/game/objects/effects/signs.dm index bec0ba7d64f..64cbc125f1a 100644 --- a/code/game/objects/effects/signs.dm +++ b/code/game/objects/effects/signs.dm @@ -77,6 +77,15 @@ opacity = 0 density = 0 +/obj/effect/sign/movingparts + desc = "A warning sign which reads 'CAUTION: MOVING PARTS, machinery liable to stop and start at random'" + name = "CAUTION" + icon = 'decals.dmi' + icon_state = "securearea" + anchored = 1.0 + opacity = 0 + density = 0 + /obj/effect/sign/examroom desc = "A guidance sign which reads 'EXAM ROOM'" name = "EXAM" diff --git a/code/game/objects/sign_decals.dm b/code/game/objects/sign_decals.dm new file mode 100644 index 00000000000..10a08d81363 --- /dev/null +++ b/code/game/objects/sign_decals.dm @@ -0,0 +1,49 @@ +/obj/effect/sign/barsign + icon = 'barsigns.dmi' + icon_state = "empty" + anchored = 1 + New() + ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead")) + return + proc/ChangeSign(var/Text) + src.icon_state = "[Text]" + //on = 0 + //brightness_on = 4 //uncomment these when the lighting fixes get in + return + +/obj/effect/sign/securearea/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + del(src) + return + if(3.0) + del(src) + return + else + return + +/obj/effect/sign/securearea/blob_act() + del(src) + return + + +/obj/effect/sign/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + del(src) + return + if(3.0) + del(src) + return + else + return + +/obj/effect/sign/blob_act() + del(src) + return \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 801befad0b4..fb0b72a8d4e 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -279,6 +279,26 @@ return +/obj/structure/closet/wardrobe/medic_white + name = "medical wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/virology_white/New() + new /obj/item/clothing/under/rank/medical(src) + new /obj/item/clothing/under/rank/medical(src) + new /obj/item/clothing/under/rank/medical/blue(src) + new /obj/item/clothing/under/rank/medical/green(src) + new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/mask/surgical(src) + new /obj/item/clothing/mask/surgical(src) + return + + /obj/structure/closet/wardrobe/grey name = "grey wardrobe" icon_state = "grey"