Merge pull request #9796 from Ghommie/Ghommie-cit347
Unmodularize airlocks.
This commit is contained in:
@@ -1,10 +1,35 @@
|
||||
/datum/wires/airlock
|
||||
holder_type = /obj/machinery/door/airlock
|
||||
proper_name = "Airlock"
|
||||
proper_name = "Generic Airlock"
|
||||
var/wiretype
|
||||
|
||||
/datum/wires/airlock/secure
|
||||
randomize = TRUE
|
||||
|
||||
/datum/wires/airlock/command
|
||||
proper_name = "Command Airlock"
|
||||
wiretype = "commandairlock"
|
||||
|
||||
/datum/wires/airlock/security
|
||||
proper_name = "Security Airlock"
|
||||
wiretype = "securityairlock"
|
||||
|
||||
/datum/wires/airlock/engineering
|
||||
proper_name = "Engineering Airlock"
|
||||
wiretype = "engineeringairlock"
|
||||
|
||||
/datum/wires/airlock/science
|
||||
proper_name = "Science Airlock"
|
||||
wiretype = "scienceairlock"
|
||||
|
||||
/datum/wires/airlock/medical
|
||||
proper_name = "Medical Airlock"
|
||||
wiretype = "medicalairlock"
|
||||
|
||||
/datum/wires/airlock/cargo
|
||||
proper_name = "Cargo Airlock"
|
||||
wiretype = "cargoairlock"
|
||||
|
||||
/datum/wires/airlock/New(atom/holder)
|
||||
wires = list(
|
||||
WIRE_POWER1, WIRE_POWER2,
|
||||
@@ -14,7 +39,16 @@
|
||||
WIRE_ZAP1, WIRE_ZAP2
|
||||
)
|
||||
add_duds(2)
|
||||
..()
|
||||
. = ..()
|
||||
if(randomize || !wiretype)
|
||||
return
|
||||
if(!GLOB.wire_color_directory[wiretype])
|
||||
colors = list()
|
||||
randomize()
|
||||
GLOB.wire_color_directory[wiretype] = colors
|
||||
GLOB.wire_name_directory[wiretype] = proper_name
|
||||
else
|
||||
colors = GLOB.wire_color_directory[wiretype]
|
||||
|
||||
/datum/wires/airlock/interactable(mob/user)
|
||||
var/obj/machinery/door/airlock/A = holder
|
||||
|
||||
@@ -83,6 +83,7 @@
|
||||
var/boltDown = 'sound/machines/boltsdown.ogg'
|
||||
var/noPower = 'sound/machines/doorclick.ogg'
|
||||
var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to
|
||||
var/wiretypepath = /datum/wires/airlock // which set of per round randomized wires this airlock type has.
|
||||
var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass"
|
||||
var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
|
||||
var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
|
||||
|
||||
@@ -8,16 +8,19 @@
|
||||
/obj/machinery/door/airlock/command
|
||||
icon = 'icons/obj/doors/airlocks/station/command.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_com
|
||||
wiretypepath = /datum/wires/airlock/command
|
||||
normal_integrity = 450
|
||||
|
||||
/obj/machinery/door/airlock/security
|
||||
icon = 'icons/obj/doors/airlocks/station/security.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_sec
|
||||
wiretypepath = /datum/wires/airlock/security
|
||||
normal_integrity = 450
|
||||
|
||||
/obj/machinery/door/airlock/engineering
|
||||
icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_eng
|
||||
wiretypepath = /datum/wires/airlock/engineering
|
||||
|
||||
/obj/machinery/door/airlock/engineering/abandoned
|
||||
abandoned = TRUE
|
||||
@@ -25,6 +28,7 @@
|
||||
/obj/machinery/door/airlock/medical
|
||||
icon = 'icons/obj/doors/airlocks/station/medical.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_med
|
||||
wiretypepath = /datum/wires/airlock/medical
|
||||
|
||||
/obj/machinery/door/airlock/maintenance
|
||||
name = "maintenance access"
|
||||
@@ -44,11 +48,13 @@
|
||||
name = "mining airlock"
|
||||
icon = 'icons/obj/doors/airlocks/station/mining.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_min
|
||||
wiretypepath = /datum/wires/airlock/cargo
|
||||
|
||||
/obj/machinery/door/airlock/atmos
|
||||
name = "atmospherics airlock"
|
||||
icon = 'icons/obj/doors/airlocks/station/atmos.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_atmo
|
||||
wiretypepath = /datum/wires/airlock/engineering
|
||||
|
||||
/obj/machinery/door/airlock/atmos/abandoned
|
||||
abandoned = TRUE
|
||||
@@ -56,6 +62,7 @@
|
||||
/obj/machinery/door/airlock/research
|
||||
icon = 'icons/obj/doors/airlocks/station/research.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_research
|
||||
wiretypepath = /datum/wires/airlock/science
|
||||
|
||||
/obj/machinery/door/airlock/freezer
|
||||
name = "freezer airlock"
|
||||
@@ -65,10 +72,12 @@
|
||||
/obj/machinery/door/airlock/science
|
||||
icon = 'icons/obj/doors/airlocks/station/science.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_science
|
||||
wiretypepath = /datum/wires/airlock/science
|
||||
|
||||
/obj/machinery/door/airlock/virology
|
||||
icon = 'icons/obj/doors/airlocks/station/virology.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_viro
|
||||
wiretypepath = /datum/wires/airlock/medical
|
||||
|
||||
//////////////////////////////////
|
||||
/*
|
||||
@@ -376,6 +385,7 @@
|
||||
icon = 'icons/obj/doors/airlocks/vault/vault.dmi'
|
||||
overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi'
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_vault
|
||||
wiretypepath = /datum/wires/airlock/secure
|
||||
explosion_block = 2
|
||||
normal_integrity = 400 // reverse engieneerd: 400 * 1.5 (sec lvl 6) = 600 = original
|
||||
security_level = 6
|
||||
|
||||
Reference in New Issue
Block a user