From e12d47aab617e7a2edbfb1e8b1ece78a3cbc8871 Mon Sep 17 00:00:00 2001 From: SvartaSvansen Date: Fri, 31 Jul 2015 01:41:02 -0400 Subject: [PATCH] Centcom airlock assemblies! No more disintegrating airlocks! --- code/game/machinery/doors/airlock.dm | 5 ++++- code/game/objects/structures/door_assembly.dm | 9 +++++++++ html/changelogs/SvartaSvansen-airlocks.yml | 7 +++++++ icons/obj/doors/door_assembly.dmi | Bin 45099 -> 46345 bytes 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/SvartaSvansen-airlocks.yml diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index e023131b2f6..61d91961cb6 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -86,7 +86,7 @@ /obj/machinery/door/airlock/centcom icon = 'icons/obj/doors/Doorele.dmi' opacity = 1 - doortype = null //(centcom) there's no door assembly sprites for this one. + doortype = /obj/structure/door_assembly/door_assembly_centcom /obj/machinery/door/airlock/vault name = "vault door" @@ -980,6 +980,9 @@ About the new airlock wires panel: if(src.doortype) var/obj/structure/door_assembly/A = new src.doortype(src.loc) A.heat_proof_finished = src.heat_proof //tracks whether there's rglass in + else + var/obj/structure/door_assembly/A = new /obj/structure/door_assembly/door_assembly_0(src.loc) + //If you come across a null doortype, it will produce the default assembly instead of disintegrating. if(emagged) user << "You discard the damaged electronics." diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 6f5809891e2..65ab5f053bd 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -334,6 +334,15 @@ mineral = "glass" icon_state = "door_as_gviro1" +/obj/structure/door_assembly/door_assembly_centcom + icon_state = "door_as_ele1" + typetext = "centcom" + icontext = "ele" + airlock_type = /obj/machinery/door/airlock/centcom + anchored = 1 + density = 1 + state = 1 + /obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/pen)) var/t = stripped_input(user, "Enter the name for the door.", src.name, src.created_name,MAX_NAME_LEN) diff --git a/html/changelogs/SvartaSvansen-airlocks.yml b/html/changelogs/SvartaSvansen-airlocks.yml new file mode 100644 index 00000000000..123e092772f --- /dev/null +++ b/html/changelogs/SvartaSvansen-airlocks.yml @@ -0,0 +1,7 @@ +author: SvartaSvansen + +delete-after: True + +changes: + - rscadd: "Our lizard engineers have worked hard and managed to improve Centcom airlocks so they no longer disintegrate when the electronics are removed!" + - tweak: "Put a safety net in place so future airlocks without assemblies produce the default assembly instead of disintegrating." diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index 94ed8ac6c2daf79635c0cb0890ecc0eb79f7f993..06689649d8e6d2dd78218c8b271435a3794dcad2 100644 GIT binary patch delta 4618 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�rDtte zcZ0ZOcs|etCH42^yUn0@7?V5*5((B{o^19y9)k4e5^-Bi;H*t56#J>T@BIKHLucXI@7J9uGD>hn_tYL z!t7t_6u4j{2xaR}L0^POGVfg%7YP8rzq7*XUiz1(dee9+v3R|injK#=!^IYNZG3iO zB6Y;OZNtxV|7HC$A7yKiC1`N)1JeNnZOnJfLUlW{v``{wR07b_12x_I<#(T={|iKa B6jT5J delta 3361 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