From bca7b3602cdc98fa9ea7fdac438ea57a3c5f0a95 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Thu, 9 Nov 2017 15:23:15 +0400 Subject: [PATCH] renames assembly_type to assemblytype for parity with tg moved a few door and airlock procs around to more sensible positions removed useless vars on some airlocks in airlock_types.dm lowercased all airlock/door objects --- code/game/machinery/doors/airlock.dm | 143 +++++++++--------- code/game/machinery/doors/airlock_types.dm | 113 ++++++-------- code/game/machinery/doors/alarmlock.dm | 3 +- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/doors/door.dm | 26 ++-- code/game/machinery/doors/firedoor.dm | 6 +- code/game/machinery/doors/poddoor.dm | 2 +- code/game/machinery/doors/spacepod.dm | 2 +- code/game/objects/structures/door_assembly.dm | 49 +++--- code/modules/mining/mine_items.dm | 3 +- 10 files changed, 163 insertions(+), 186 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 726ab825b92..cb28d9770a8 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -40,7 +40,7 @@ var/obj/machinery/door/airlock/closeOther = null var/closeOtherId = null var/lockdownbyai = 0 - var/assembly_type = /obj/structure/door_assembly + assemblytype = /obj/structure/door_assembly var/mineral = null var/justzap = 0 var/safe = 1 @@ -73,6 +73,19 @@ About the new airlock wires panel: */ // You can find code for the airlock wires in the wire datum folder. +/obj/machinery/door/airlock/New() + ..() + wires = new(src) + +/obj/machinery/door/airlock/initialize() + . = ..() + if(closeOtherId != null) + for(var/obj/machinery/door/airlock/A in airlocks) + if(A.closeOtherId == closeOtherId && A != src) + closeOther = A + break + if(welded) + update_icon() /obj/machinery/door/airlock/Destroy() QDEL_NULL(electronics) @@ -568,7 +581,7 @@ About the new airlock wires panel: if(do_after(user, 40 * C.toolspeed, target = src)) to_chat(user, "You removed the airlock electronics!") - var/obj/structure/door_assembly/da = new assembly_type(loc) + var/obj/structure/door_assembly/da = new assemblytype(loc) da.heat_proof_finished = heat_proof //tracks whether there's rglass in da.anchored = 1 if(mineral) @@ -659,6 +672,59 @@ About the new airlock wires panel: ignite(is_hot(C)) ..() +/obj/machinery/door/airlock/hatch/gamma/attackby(C as obj, mob/user as mob, params) +// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) + if(!istype(usr, /mob/living/silicon)) + if(isElectrified()) + if(shock(user, 75)) + return + if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) + return + + if(istype(C, /obj/item/weapon/grenade/plastic/c4)) + to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") + return + + if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/weapon/rcd)) + to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") + return + + add_fingerprint(user) + if((istype(C, /obj/item/weapon/weldingtool) && !operating && density)) + var/obj/item/weapon/weldingtool/W = C + if(W.remove_fuel(0,user)) + if(!welded) + welded = 1 + else + welded = null + update_icon() + return + else + return + + +/obj/machinery/door/airlock/highsecurity/red/attackby(C as obj, mob/user as mob, params) +// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) + if(!istype(usr, /mob/living/silicon)) + if(isElectrified()) + if(shock(user, 75)) + return + if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) + return + + add_fingerprint(user) + if((istype(C, /obj/item/weapon/weldingtool) && !operating && density)) + var/obj/item/weapon/weldingtool/W = C + if(W.remove_fuel(0,user)) + if(!welded) + welded = 1 + else + welded = null + update_icon() + return + else + return + /obj/machinery/door/airlock/open(var/forced=0) if(operating || welded || locked || emagged) return 0 @@ -744,73 +810,6 @@ About the new airlock wires panel: update_icon() return 1 -/obj/machinery/door/airlock/New() - ..() - wires = new(src) - -/obj/machinery/door/airlock/initialize() - . = ..() - if(closeOtherId != null) - for(var/obj/machinery/door/airlock/A in airlocks) - if(A.closeOtherId == closeOtherId && A != src) - closeOther = A - break - if(welded) - update_icon() - -/obj/machinery/door/airlock/hatch/gamma/attackby(C as obj, mob/user as mob, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!istype(usr, /mob/living/silicon)) - if(isElectrified()) - if(shock(user, 75)) - return - if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) - return - - if(istype(C, /obj/item/weapon/grenade/plastic/c4)) - to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") - return - - if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/weapon/rcd)) - to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") - return - - add_fingerprint(user) - if((istype(C, /obj/item/weapon/weldingtool) && !operating && density)) - var/obj/item/weapon/weldingtool/W = C - if(W.remove_fuel(0,user)) - if(!welded) - welded = 1 - else - welded = null - update_icon() - return - else - return - - -/obj/machinery/door/airlock/highsecurity/red/attackby(C as obj, mob/user as mob, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!istype(usr, /mob/living/silicon)) - if(isElectrified()) - if(shock(user, 75)) - return - if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) - return - - add_fingerprint(user) - if((istype(C, /obj/item/weapon/weldingtool) && !operating && density)) - var/obj/item/weapon/weldingtool/W = C - if(W.remove_fuel(0,user)) - if(!welded) - welded = 1 - else - welded = null - update_icon() - return - else - return - /obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID) //Airlock is passable if it is open (!density), bot has access, and is not bolted shut) return !density || (check_access(ID) && !locked && arePowerSystemsOn()) @@ -860,6 +859,6 @@ About the new airlock wires panel: /obj/machinery/door/airlock/narsie_act() var/turf/T = get_turf(src) - if(prob(20)) - new/obj/machinery/door/airlock/cult(T) - qdel(src) + var/obj/machinery/door/airlock/cult/A = new(T) + A.name = name + qdel(src) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index df5c75ec9e5..a4ce0bc7cd2 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -3,55 +3,48 @@ */ /obj/machinery/door/airlock/command - name = "Airlock" icon = 'icons/obj/doors/Doorcom.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_com + assemblytype = /obj/structure/door_assembly/door_assembly_com /obj/machinery/door/airlock/security - name = "Airlock" icon = 'icons/obj/doors/Doorsec.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_sec + assemblytype = /obj/structure/door_assembly/door_assembly_sec /obj/machinery/door/airlock/engineering - name = "Airlock" icon = 'icons/obj/doors/Dooreng.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_eng + assemblytype = /obj/structure/door_assembly/door_assembly_eng /obj/machinery/door/airlock/medical - name = "Airlock" icon = 'icons/obj/doors/Doormed.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_med + assemblytype = /obj/structure/door_assembly/door_assembly_med /obj/machinery/door/airlock/maintenance - name = "Maintenance Access" + name = "maintenance access" icon = 'icons/obj/doors/Doormaint.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_mai + assemblytype = /obj/structure/door_assembly/door_assembly_mai /obj/machinery/door/airlock/mining - name = "Mining Airlock" + name = "mining airlock" icon = 'icons/obj/doors/Doormining.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_min + assemblytype = /obj/structure/door_assembly/door_assembly_min /obj/machinery/door/airlock/atmos - name = "Atmospherics Airlock" + name = "atmospherics airlock" icon = 'icons/obj/doors/Dooratmo.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_atmo + assemblytype = /obj/structure/door_assembly/door_assembly_atmo /obj/machinery/door/airlock/research - name = "Airlock" icon = 'icons/obj/doors/Doorresearch.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_research + assemblytype = /obj/structure/door_assembly/door_assembly_research /obj/machinery/door/airlock/freezer - name = "Freezer Airlock" + name = "freezer airlock" icon = 'icons/obj/doors/Doorfreezer.dmi' - opacity = 1 - assembly_type = /obj/structure/door_assembly/door_assembly_fre + assemblytype = /obj/structure/door_assembly/door_assembly_fre /obj/machinery/door/airlock/science - name = "Airlock" icon = 'icons/obj/doors/Doorsci.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_science + assemblytype = /obj/structure/door_assembly/door_assembly_science ////////////////////////////////// /* @@ -59,59 +52,51 @@ */ /obj/machinery/door/airlock/glass_command - name = "Maintenance Hatch" icon = 'icons/obj/doors/Doorcomglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_com + assemblytype = /obj/structure/door_assembly/door_assembly_com glass = 1 /obj/machinery/door/airlock/glass_engineering - name = "Maintenance Hatch" icon = 'icons/obj/doors/Doorengglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_eng + assemblytype = /obj/structure/door_assembly/door_assembly_eng glass = 1 /obj/machinery/door/airlock/glass_security - name = "Maintenance Hatch" icon = 'icons/obj/doors/Doorsecglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_sec + assemblytype = /obj/structure/door_assembly/door_assembly_sec glass = 1 /obj/machinery/door/airlock/glass_medical - name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormedglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_med + assemblytype = /obj/structure/door_assembly/door_assembly_med glass = 1 /obj/machinery/door/airlock/glass_research - name = "Maintenance Hatch" icon = 'icons/obj/doors/Doorresearchglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_research + assemblytype = /obj/structure/door_assembly/door_assembly_research glass = 1 /obj/machinery/door/airlock/glass_mining - name = "Maintenance Hatch" icon = 'icons/obj/doors/Doorminingglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_min + assemblytype = /obj/structure/door_assembly/door_assembly_min glass = 1 /obj/machinery/door/airlock/glass_atmos - name = "Maintenance Hatch" icon = 'icons/obj/doors/Dooratmoglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_atmo + assemblytype = /obj/structure/door_assembly/door_assembly_atmo glass = 1 /obj/machinery/door/airlock/glass_science - name = "Glass Airlocks" icon = 'icons/obj/doors/Doorsciglass.dmi' opacity = 0 - assembly_type = /obj/structure/door_assembly/door_assembly_science + assemblytype = /obj/structure/door_assembly/door_assembly_science glass = 1 ////////////////////////////////// @@ -120,22 +105,22 @@ */ /obj/machinery/door/airlock/gold - name = "Gold Airlock" + name = "gold airlock" icon = 'icons/obj/doors/Doorgold.dmi' mineral = "gold" /obj/machinery/door/airlock/silver - name = "Silver Airlock" + name = "silver airlock" icon = 'icons/obj/doors/Doorsilver.dmi' mineral = "silver" /obj/machinery/door/airlock/diamond - name = "Diamond Airlock" + name = "diamond airlock" icon = 'icons/obj/doors/Doordiamond.dmi' mineral = "diamond" /obj/machinery/door/airlock/uranium - name = "Uranium Airlock" + name = "uranium airlock" desc = "And they said I was crazy." icon = 'icons/obj/doors/Dooruranium.dmi' mineral = "uranium" @@ -174,14 +159,14 @@ return 0 /obj/machinery/door/airlock/bananium - name = "Bananium Airlock" + name = "bananium airlock" icon = 'icons/obj/doors/Doorbananium.dmi' mineral = "bananium" doorOpen = 'sound/items/bikehorn.ogg' doorClose = 'sound/items/bikehorn.ogg' /obj/machinery/door/airlock/tranquillite - name = "Tranquillite Airlock" + name = "tranquillite airlock" icon = 'icons/obj/doors/Doorfreezer.dmi' mineral = "tranquillite" doorOpen = null // it's silent! @@ -191,7 +176,7 @@ boltDown = null /obj/machinery/door/airlock/sandstone - name = "Sandstone Airlock" + name = "sandstone airlock" icon = 'icons/obj/doors/Doorsand.dmi' mineral = "sandstone" @@ -201,7 +186,7 @@ */ /obj/machinery/door/airlock/glass - name = "Glass Airlock" + name = "glass airlock" icon = 'icons/obj/doors/Doorglass.dmi' opacity = 0 glass = 1 @@ -214,9 +199,9 @@ */ /obj/machinery/door/airlock/external - name = "External Airlock" + name = "external airlock" icon = 'icons/obj/doors/Doorext.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_ext + assemblytype = /obj/structure/door_assembly/door_assembly_ext doorOpen = 'sound/machines/airlock_ext_open.ogg' doorClose = 'sound/machines/airlock_ext_close.ogg' @@ -226,7 +211,6 @@ */ /obj/machinery/door/airlock/centcom - name = "Airlock" icon = 'icons/obj/doors/Doorele.dmi' opacity = 0 @@ -236,10 +220,9 @@ */ /obj/machinery/door/airlock/vault - name = "Vault" + name = "vault door" icon = 'icons/obj/doors/vault.dmi' - opacity = 1 - assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites. + assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites. explosion_block = 2 ////////////////////////////////// @@ -248,23 +231,21 @@ */ /obj/machinery/door/airlock/hatch - name = "Airtight Hatch" + name = "airtight hatch" icon = 'icons/obj/doors/Doorhatchele.dmi' - opacity = 1 - assembly_type = /obj/structure/door_assembly/door_assembly_hatch + assemblytype = /obj/structure/door_assembly/door_assembly_hatch /obj/machinery/door/airlock/hatch/gamma - name = "Gamma Level Hatch" + name = "gamma level hatch" hackProof = 1 aiControlDisabled = 1 unacidable = 1 is_special = 1 /obj/machinery/door/airlock/maintenance_hatch - name = "Maintenance Hatch" + name = "maintenance hatch" icon = 'icons/obj/doors/Doorhatchmaint2.dmi' - opacity = 1 - assembly_type = /obj/structure/door_assembly/door_assembly_mhatch + assemblytype = /obj/structure/door_assembly/door_assembly_mhatch ////////////////////////////////// /* @@ -272,13 +253,13 @@ */ /obj/machinery/door/airlock/highsecurity - name = "High Tech Security Airlock" + name = "high tech security airlock" icon = 'icons/obj/doors/hightechsecurity.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity + assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity explosion_block = 2 /obj/machinery/door/airlock/highsecurity/red - name = "Secure Armory Airlock" + name = "secure armory airlock" hackProof = 1 aiControlDisabled = 1 @@ -290,7 +271,7 @@ /obj/machinery/door/airlock/shuttle name = "shuttle airlock" icon = 'icons/obj/doors/doorshuttle.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_shuttle + assemblytype = /obj/structure/door_assembly/door_assembly_shuttle ////////////////////////////////// /* @@ -300,7 +281,7 @@ /obj/machinery/door/airlock/cult name = "cult airlock" icon = 'icons/obj/doors/doorcult.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_cult + assemblytype = /obj/structure/door_assembly/door_assembly_cult hackProof = 1 aiControlDisabled = 1 var/friendly = FALSE @@ -340,7 +321,7 @@ */ /obj/machinery/door/airlock/alien - name = "Alien Airlock" + name = "alien airlock" desc = "A mysterious alien airlock with a complicated opening mechanism." hackProof = 1 icon = 'icons/obj/doors/Doorplasma.dmi' @@ -365,8 +346,8 @@ width = 2 /obj/machinery/door/airlock/multi_tile/glass - name = "Glass Airlock" + name = "large glass airlock" icon = 'icons/obj/doors/Door2x1glass.dmi' opacity = 0 glass = 1 - assembly_type = "obj/structure/door_assembly/multi_tile" + assemblytype = "obj/structure/door_assembly/multi_tile" diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index ba5497cdf60..6ae07303752 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -1,6 +1,5 @@ /obj/machinery/door/airlock/alarmlock - - name = "Glass Alarm Airlock" + name = "glass alarm airlock" icon = 'icons/obj/doors/Doorglass.dmi' opacity = 0 glass = 1 diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 39fa5e04037..0af3f1a575d 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -12,7 +12,7 @@ // Programmer: Veryinky ///////////////////////////////////////////////////////////////////////////////////////////////// /obj/machinery/door_timer - name = "Door Timer" + name = "door timer" icon = 'icons/obj/status_display.dmi' icon_state = "frame" desc = "A remote control for a door." diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index af27d8b2c1f..c4db518ae93 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -23,6 +23,7 @@ var/normalspeed = 1 var/auto_close_time = 150 var/auto_close_time_dangerous = 5 + var/assemblytype //the type of door frame to drop during deconstruction var/heat_proof = 0 // For rglass-windowed airlocks and firedoors var/emergency = 0 var/air_properties_vary_with_direction = 0 @@ -96,6 +97,18 @@ return return +/obj/machinery/door/Move(new_loc, new_dir) + var/turf/T = loc + . = ..() + move_update_air(T) + + if(width > 1) + if(dir in list(EAST, WEST)) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size /obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) @@ -296,19 +309,6 @@ close() return -/obj/machinery/door/Move(new_loc, new_dir) - var/turf/T = loc - . = ..() - move_update_air(T) - - if(width > 1) - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size - /obj/machinery/door/proc/update_freelook_sight() // Glass door glass = 1 // don't check then? diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 0e58537db9b..cad2212d0de 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -21,7 +21,7 @@ var/can_force = TRUE var/force_open_time = 300 var/can_crush = TRUE - var/assembly_type = /obj/structure/firelock_frame + assemblytype = /obj/structure/firelock_frame var/nextstate = null var/boltslocked = TRUE var/can_deconstruct = TRUE @@ -207,7 +207,7 @@ /obj/machinery/door/firedoor/deconstruct(disassembled = TRUE) if(can_deconstruct) - var/obj/structure/firelock_frame/F = new assembly_type(get_turf(src)) + var/obj/structure/firelock_frame/F = new assemblytype(get_turf(src)) if(disassembled) F.constructionStep = CONSTRUCTION_PANEL_OPEN else @@ -247,7 +247,7 @@ icon = 'icons/obj/doors/Doorfire.dmi' glass = FALSE opacity = 1 - assembly_type = /obj/structure/firelock_frame/heavy + assemblytype = /obj/structure/firelock_frame/heavy can_force = FALSE /obj/machinery/door/firedoor/heavy/ex_act(severity) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 3cd99685529..154ce951514 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -100,7 +100,7 @@ return /obj/machinery/door/poddoor/multi_tile // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. - name = "Large Pod Door" + name = "large pod door" /obj/machinery/door/poddoor/multi_tile/four_tile_ver/ icon = 'icons/obj/doors/1x4blast_vert.dmi' diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm index 021509a13ed..c661b71abce 100644 --- a/code/game/machinery/doors/spacepod.dm +++ b/code/game/machinery/doors/spacepod.dm @@ -1,5 +1,5 @@ /obj/structure/spacepoddoor - name = "Podlock" + name = "podlock" desc = "Why it no open!!!" icon = 'icons/effects/beam.dmi' icon_state = "n_beam" diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index b8ab485512a..af514a5a220 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,13 +1,12 @@ /obj/structure/door_assembly icon = 'icons/obj/doors/door_assembly.dmi' - - name = "Airlock Assembly" + name = "airlock assembly" icon_state = "door_as_0" anchored = 0 density = 1 var/state = 0 var/base_icon_state = "" - var/base_name = "Airlock" + var/base_name = "airlock" var/obj/item/weapon/airlock_electronics/electronics = null var/airlock_type = "" //the type path of the airlock once completed var/glass_type = "/glass" @@ -24,91 +23,91 @@ /obj/structure/door_assembly/door_assembly_com base_icon_state = "com" - base_name = "Command Airlock" + base_name = "command airlock" glass_type = "/glass_command" airlock_type = "/command" /obj/structure/door_assembly/door_assembly_sec base_icon_state = "sec" - base_name = "Security Airlock" + base_name = "security airlock" glass_type = "/glass_security" airlock_type = "/security" /obj/structure/door_assembly/door_assembly_eng base_icon_state = "eng" - base_name = "Engineering Airlock" + base_name = "engineering airlock" glass_type = "/glass_engineering" airlock_type = "/engineering" /obj/structure/door_assembly/door_assembly_min base_icon_state = "min" - base_name = "Mining Airlock" + base_name = "mining airlock" glass_type = "/glass_mining" airlock_type = "/mining" /obj/structure/door_assembly/door_assembly_atmo base_icon_state = "atmo" - base_name = "Atmospherics Airlock" + base_name = "atmospherics airlock" glass_type = "/glass_atmos" airlock_type = "/atmos" /obj/structure/door_assembly/door_assembly_research base_icon_state = "res" - base_name = "Research Airlock" + base_name = "research airlock" glass_type = "/glass_research" airlock_type = "/research" /obj/structure/door_assembly/door_assembly_science base_icon_state = "sci" - base_name = "Science Airlock" + base_name = "science airlock" glass_type = "/glass_science" airlock_type = "/science" /obj/structure/door_assembly/door_assembly_med base_icon_state = "med" - base_name = "Medical Airlock" + base_name = "medical airlock" glass_type = "/glass_medical" airlock_type = "/medical" /obj/structure/door_assembly/door_assembly_mai base_icon_state = "mai" - base_name = "Maintenance Airlock" + base_name = "maintenance airlock" airlock_type = "/maintenance" glass = -1 /obj/structure/door_assembly/door_assembly_ext base_icon_state = "ext" - base_name = "External Airlock" + base_name = "external airlock" airlock_type = "/external" glass = -1 /obj/structure/door_assembly/door_assembly_fre base_icon_state = "fre" - base_name = "Freezer Airlock" + base_name = "freezer airlock" airlock_type = "/freezer" glass = -1 /obj/structure/door_assembly/door_assembly_hatch base_icon_state = "hatch" - base_name = "Airtight Hatch" + base_name = "airtight hatch" airlock_type = "/hatch" glass = -1 /obj/structure/door_assembly/door_assembly_mhatch base_icon_state = "mhatch" - base_name = "Maintenance Hatch" + base_name = "maintenance hatch" airlock_type = "/maintenance_hatch" glass = -1 /obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly base_icon_state = "highsec" - base_name = "High Security Airlock" + base_name = "high security airlock" airlock_type = "/highsecurity" glass = -1 /obj/structure/door_assembly/door_assembly_shuttle base_icon_state = "shuttle" - base_name = "Shuttle Airlock" + base_name = "shuttle airlock" airlock_type = "/shuttle" glass = -1 @@ -236,7 +235,7 @@ if(!src) return to_chat(user, "You installed the airlock electronics!") src.state = 2 - src.name = "Near finished Airlock Assembly" + src.name = "near finished airlock assembly" src.electronics = W else W.loc = src.loc @@ -249,7 +248,7 @@ if(!src) return to_chat(user, "You removed the airlock electronics!") src.state = 1 - src.name = "Wired Airlock Assembly" + src.name = "wired airlock assembly" var/obj/item/weapon/airlock_electronics/ae if(!electronics) ae = new/obj/item/weapon/airlock_electronics( src.loc ) @@ -299,7 +298,7 @@ path = text2path("/obj/machinery/door/airlock[airlock_type]") var/obj/machinery/door/airlock/door = new path(src.loc) door.setDir(dir) - door.assembly_type = type + door.assemblytype = type door.electronics = src.electronics door.heat_proof = heat_proof_finished if(src.electronics.one_access) @@ -323,9 +322,9 @@ switch(state) if(0) if(anchored) - name = "Secured " + name = "secured " if(1) - name = "Wired " + name = "wired " if(2) - name = "Near Finished " - name += "[heat_proof_finished ? "Heat-Proofed " : ""][glass == 1 ? "Window " : ""][istext(glass) ? "[glass] Airlock" : base_name] Assembly" + name = "near finished " + name += "[heat_proof_finished ? "heat-proofed " : ""][glass == 1 ? "window " : ""][istext(glass) ? "[glass] airlock" : base_name] assembly" diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 11f16953017..82c64a3027d 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -373,9 +373,8 @@ //Door /obj/machinery/door/airlock/survival_pod - name = "Airlock" icon = 'icons/obj/doors/survival.dmi' - assembly_type = /obj/structure/door_assembly/door_assembly_pod + assemblytype = /obj/structure/door_assembly/door_assembly_pod opacity = 0 glass = 1