mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 15:47:15 +01:00
[MIRROR] Multi-tile airlock assemblies/pathing [NO GBP] [MDB IGNORE] (#23138)
* Multi-tile airlock assemblies/pathing [NO GBP] (#77537) ## About The Pull Request Small fixes after https://github.com/tgstation/tgstation/pull/76732 - Creates base large subtype for mapping - Door assembly naming consistent with other airlocks - Base subtype large airlock no longer spawns in a normal sized airlock - Renames station2 subtype to public for consistency ## Changelog 🆑 LT3 fix: Base large airlock subtype no longer spawns a normal sized airlock image: Added mapping icons for large airlocks code: Repathed all public airlocks to consistent naming /🆑 * Multi-tile airlock assemblies/pathing [NO GBP] * maps * Merge remote-tracking branch 'upstream/master' into upstream-merge-77537 --------- Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
co-authored by
lessthanthree
parent
500cfa3672
commit
0e533de6cf
@@ -34,8 +34,16 @@
|
||||
var/material_amt = 4
|
||||
|
||||
/obj/structure/door_assembly/multi_tile
|
||||
name = "large airlock assembly"
|
||||
icon = 'icons/obj/doors/airlocks/multi_tile/public/glass.dmi'
|
||||
overlays_file = 'icons/obj/doors/airlocks/multi_tile/public/overlays.dmi'
|
||||
base_name = "large airlock"
|
||||
glass_type = /obj/machinery/door/airlock/multi_tile/public/glass
|
||||
airlock_type = /obj/machinery/door/airlock/multi_tile/public/glass
|
||||
dir = EAST
|
||||
multi_tile = TRUE
|
||||
glass = TRUE
|
||||
nomineral = TRUE
|
||||
|
||||
/obj/structure/door_assembly/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/structure/door_assembly/door_assembly_public
|
||||
name = "public airlock assembly"
|
||||
icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
|
||||
overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
|
||||
icon = 'icons/obj/doors/airlocks/public/glass.dmi'
|
||||
overlays_file = 'icons/obj/doors/airlocks/public/overlays.dmi'
|
||||
glass_type = /obj/machinery/door/airlock/public/glass
|
||||
airlock_type = /obj/machinery/door/airlock/public
|
||||
|
||||
@@ -267,14 +267,9 @@
|
||||
nomineral = TRUE
|
||||
material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS
|
||||
|
||||
/obj/structure/door_assembly/multi_tile/glass
|
||||
name = "large glass airlock assembly"
|
||||
base_name = "large glass airlock"
|
||||
icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi'
|
||||
overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi'
|
||||
airlock_type = /obj/machinery/door/airlock/multi_tile/glass
|
||||
glass_type = /obj/machinery/door/airlock/multi_tile/glass
|
||||
|
||||
/obj/structure/door_assembly/multi_tile/door_assembly_public
|
||||
name = "large public airlock assembly"
|
||||
base_name = "large public airlock"
|
||||
|
||||
/obj/structure/door_assembly/door_assembly_material/deconstruct(disassembled = TRUE)
|
||||
if(!(flags_1 & NODECONSTRUCT_1))
|
||||
|
||||
Reference in New Issue
Block a user