cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-19 11:59:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Modular doors

Browse Source 
Modular doors
This commit is contained in:
QuoteFox
2021-01-21 11:10:54 +00:00
parent 04bbe83725
commit cba5255206
7 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+34 -1
View File
@@ -43,7 +43,7 @@
/obj/machinery/door/airlock
name = "airlock"
icon = 'icons/obj/doors/airlocks/station/public.dmi'
icon = 'icons/obj/doors/airlocks/station/base.dmi'
icon_state = "closed"
max_integrity = 300
var/normal_integrity = AIRLOCK_INTEGRITY_N
@@ -86,6 +86,12 @@
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
var/color_overlay_file = 'icons/obj/doors/airlocks/station/color.dmi'
var/strip_overlay_file = 'icons/obj/doors/airlocks/station/strip.dmi'
//colours! modular wow!
var/basecolor = ""
var/stripcolor = rgb(130,160,90)
var/cyclelinkeddir = 0
var/obj/machinery/door/airlock/cyclelinkedairlock
@@ -452,11 +458,17 @@
var/mutable_appearance/damag_overlay
var/mutable_appearance/sparks_overlay
var/mutable_appearance/note_overlay
var/mutable_appearance/strip_overlay
var/mutable_appearance/color_overlay
var/notetype = note_type()
switch(state)
if(AIRLOCK_CLOSED)
frame_overlay = get_airlock_overlay("closed", icon)
color_overlay = get_airlock_overlay("closed", color_overlay_file)
strip_overlay = get_airlock_overlay("closed", strip_overlay_file)
color_overlay.color = basecolor
strip_overlay.color = stripcolor
if(airlock_material)
filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
else
@@ -485,6 +497,10 @@
if(!hasPower())
return
frame_overlay = get_airlock_overlay("closed", icon)
color_overlay = get_airlock_overlay("closed", color_overlay_file)
strip_overlay = get_airlock_overlay("closed", strip_overlay_file)
color_overlay.color = basecolor
strip_overlay.color = stripcolor
if(airlock_material)
filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
else
@@ -527,6 +543,10 @@
if(AIRLOCK_CLOSING)
frame_overlay = get_airlock_overlay("closing", icon)
color_overlay = get_airlock_overlay("closing", color_overlay_file)
strip_overlay = get_airlock_overlay("closing", strip_overlay_file)
color_overlay.color = basecolor
strip_overlay.color = stripcolor
if(airlock_material)
filling_overlay = get_airlock_overlay("[airlock_material]_closing", overlays_file)
else
@@ -543,6 +563,10 @@
if(AIRLOCK_OPEN)
frame_overlay = get_airlock_overlay("open", icon)
color_overlay = get_airlock_overlay("open", color_overlay_file)
strip_overlay = get_airlock_overlay("open", strip_overlay_file)
color_overlay.color = basecolor
strip_overlay.color = stripcolor
if(airlock_material)
filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file)
else
@@ -559,6 +583,10 @@
if(AIRLOCK_OPENING)
frame_overlay = get_airlock_overlay("opening", icon)
strip_overlay = get_airlock_overlay("opening", strip_overlay_file)
color_overlay = get_airlock_overlay("opening", color_overlay_file)
color_overlay.color = basecolor
strip_overlay.color = stripcolor
if(airlock_material)
filling_overlay = get_airlock_overlay("[airlock_material]_opening", overlays_file)
else
@@ -575,6 +603,10 @@
cut_overlays()
add_overlay(frame_overlay)
if (basecolor)
add_overlay(color_overlay)
if (stripcolor)
add_overlay(strip_overlay)
add_overlay(filling_overlay)
add_overlay(lights_overlay)
add_overlay(panel_overlay)
@@ -582,6 +614,7 @@
add_overlay(sparks_overlay)
add_overlay(damag_overlay)
add_overlay(note_overlay)
check_unres()
/proc/get_airlock_overlay(icon_state, icon_file, targetlayer = FLOAT_LAYER, targetplane = FLOAT_PLANE)
code/game/machinery/doors/airlock_types.dm
+23 -14
View File
@@ -6,29 +6,32 @@
abandoned = TRUE
/obj/machinery/door/airlock/command
icon = 'icons/obj/doors/airlocks/station/command.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_com
normal_integrity = 450
basecolor = rgb(0,110,200)
stripcolor = rgb(115,200,255)
/obj/machinery/door/airlock/security
icon = 'icons/obj/doors/airlocks/station/security.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_sec
normal_integrity = 450
basecolor = rgb(235,50,50)
stripcolor = ""
/obj/machinery/door/airlock/engineering
icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_eng
basecolor = rgb(235,190,0)
stripcolor = rgb(50,50,50)
/obj/machinery/door/airlock/engineering/abandoned
abandoned = TRUE
/obj/machinery/door/airlock/medical
icon = 'icons/obj/doors/airlocks/station/medical.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_med
basecolor = rgb(250,250,250)
stripcolor = rgb(0,255,255)
/obj/machinery/door/airlock/maintenance
name = "maintenance access"
icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_mai
normal_integrity = 250
@@ -37,39 +40,43 @@
/obj/machinery/door/airlock/maintenance/external
name = "external airlock access"
icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_extmai
/obj/machinery/door/airlock/mining
name = "mining airlock"
icon = 'icons/obj/doors/airlocks/station/mining.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_min
basecolor = rgb(150,112,50)
stripcolor = rgb(95,53,11)
/obj/machinery/door/airlock/atmos
name = "atmospherics airlock"
icon = 'icons/obj/doors/airlocks/station/atmos.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_atmo
basecolor = rgb(131,163,93)
stripcolor = ""
/obj/machinery/door/airlock/atmos/abandoned
abandoned = TRUE
/obj/machinery/door/airlock/research
icon = 'icons/obj/doors/airlocks/station/science.dmi'
//icon = 'icons/obj/doors/airlocks/station/research.dmi' this is the old version
assemblytype = /obj/structure/door_assembly/door_assembly_research
basecolor = rgb(250,250,250)
stripcolor = rgb(150,30,255)
/obj/machinery/door/airlock/freezer
name = "freezer airlock"
icon = 'icons/obj/doors/airlocks/station/freezer.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_fre
/obj/machinery/door/airlock/science
icon = 'icons/obj/doors/airlocks/station/science.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_science
basecolor = rgb(250,250,250)
stripcolor = rgb(150,30,255)
/obj/machinery/door/airlock/virology
icon = 'icons/obj/doors/airlocks/station/virology.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_viro
basecolor = rgb(250,250,250)
stripcolor = rgb(0,255,255)
//////////////////////////////////
/*
@@ -79,6 +86,8 @@
/obj/machinery/door/airlock/glass
opacity = 0
glass = TRUE
basecolor = ""
stripcolor = ""
/obj/machinery/door/airlock/glass/incinerator
autoclose = FALSE
@@ -308,9 +317,9 @@
*/
/obj/machinery/door/airlock/public
icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_public
basecolor = rgb(255,255,255)
stripcolor = 0
/obj/machinery/door/airlock/public/glass
opacity = 0