mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 20:15:47 +01:00
Merge pull request #10948 from SvartaSvansen/disintegrating-airlocks
Fixes disintegrating airlocks.
This commit is contained in:
@@ -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 << "<span class='warning'>You discard the damaged electronics.</span>"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 45 KiB |
Reference in New Issue
Block a user