From 6e0a4e221a8649b0c5de30b2a34cb25ac11d8849 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Mon, 29 Nov 2021 19:01:36 -0600 Subject: [PATCH 1/2] Fixed airlock painter --- code/game/machinery/doors/airlock.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2bfb3e73355f..ef7d5be04e0e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1462,6 +1462,8 @@ icon = initial(airlock.icon) overlays_file = initial(airlock.overlays_file) assemblytype = initial(airlock.assemblytype) + anim_parts = initial(airlock.anim_parts) + rebuild_parts() update_icon() /obj/machinery/door/airlock/CanAStarPass(obj/item/card/id/ID) From 7c3ca848646ee60a2b87d1493a8719e8fb8d87ec Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Mon, 29 Nov 2021 19:18:36 -0600 Subject: [PATCH 2/2] Removed can_repaint because it was a bad version of this fix --- code/game/machinery/doors/airlock.dm | 5 ----- code/game/machinery/doors/airlock_types.dm | 5 ----- 2 files changed, 10 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ef7d5be04e0e..cf6a369ffc6c 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -95,8 +95,6 @@ var/abandoned = FALSE /// Material of inner filling; if its an airlock with glass, this should be set to "glass" var/airlock_material - /// Can this airlock be repainted, FALSE if it has weird transforms(hatches) - var/can_repaint = TRUE var/obj/item/electronics/airlock/electronics var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to @@ -1437,9 +1435,6 @@ /obj/machinery/door/airlock/proc/change_paintjob(obj/item/airlock_painter/painter, mob/user) - if(!can_repaint) - to_chat(user, span_warning("The airlock painter does not support this airlock.")) - return if((!in_range(src, user) && loc != user) || !painter.can_use(user)) // user should be adjacent to the airlock, and the painter should have a toner cartridge that isn't empty return diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index cc067f320c31..d9452836de4e 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -378,7 +378,6 @@ overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_hatch - can_repaint = FALSE //anim_parts = "ul=-9,9;ur=9,9;dl=-9,-9;dr=9,-9" anim_parts = "ul=-15,0,0,5,-90;ur=0,15,0,5,-90;dl=0,-15,0,5,-90;dr=15,0,0,5,-90" note_attachment = "ul" @@ -394,7 +393,6 @@ anim_parts = "ul=-15,0,0,5,-90;ur=0,15,0,5,-90;dl=0,-15,0,5,-90;dr=15,0,0,5,-90" note_attachment = "ul" panel_attachment = "dr" - can_repaint = FALSE ////////////////////////////////// /* @@ -460,7 +458,6 @@ var/openingoverlaytype = /obj/effect/temp_visual/cult/door var/friendly = FALSE var/stealthy = FALSE - can_repaint = FALSE /obj/machinery/door/airlock/cult/Initialize() . = ..() @@ -567,7 +564,6 @@ damage_deflection = 30 normal_integrity = 240 var/construction_state = GEAR_SECURE //Pinion airlocks have custom deconstruction - can_repaint = FALSE /obj/machinery/door/airlock/clockwork/Initialize() . = ..() @@ -686,7 +682,6 @@ assemblytype = null glass = TRUE bound_width = 64 // 2x1 - can_repaint = FALSE /obj/machinery/door/airlock/glass_large/narsie_act() return