diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index e4e295db06a..117056ee5eb 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -141,6 +141,24 @@ return SSmaterials.get_material_by_name(mineral) return SSmaterials.get_material_by_name(DEFAULT_WALL_MATERIAL) +/obj/machinery/door/airlock/service // Service Airlock + icon = 'icons/obj/doors/doorser.dmi' + assembly_type = /obj/structure/door_assembly/door_assembly_ser + hatch_colour = "#6f8751" + +/obj/machinery/door/airlock/glass_service // Service Airlock (Glass) + name = "Glass Airlock" + icon = 'icons/obj/doors/doorserglass.dmi' + hitsound = 'sound/effects/glass_hit.ogg' + maxhealth = 300 + explosion_resistance = 5 + opacity = FALSE + assembly_type = /obj/structure/door_assembly/door_assembly_ser + glass = 1 + hatch_colour = "#6f8751" + open_sound_powered = 'sound/machines/airlock/hall3o.ogg' + close_sound_powered = 'sound/machines/airlock/hall3c.ogg' + /obj/machinery/door/airlock/command icon = 'icons/obj/doors/Doorcom.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_com @@ -1680,4 +1698,4 @@ About the new airlock wires panel: #undef CYBORG_AIRLOCKCRUSH_RESISTANCE #undef BOLTS_FINE #undef BOLTS_EXPOSED -#undef BOLTS_CUT +#undef BOLTS_CUT \ No newline at end of file diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index cd73f461255..10e2576a0b8 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -25,6 +25,12 @@ . = ..() update_state() +/obj/structure/door_assembly/door_assembly_ser + base_icon_state = "ser" + base_name = "Service Airlock" + glass_type = "/glass_service" + airlock_type = "/service" + /obj/structure/door_assembly/door_assembly_com base_icon_state = "com" base_name = "Command Airlock" diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index 6cca2d9f686..ba882cfcd7f 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -82,6 +82,7 @@ recipes += new /datum/stack_recipe_list("airlock assemblies", list( new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, BUILD_AMT, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("service airlock assembly", /obj/structure/door_assembly/door_assembly_ser, BUILD_AMT, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, BUILD_AMT, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, BUILD_AMT, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, BUILD_AMT, time = 50, one_per_turf = 1, on_floor = 1), diff --git a/html/changelogs/service_airlock.yml b/html/changelogs/service_airlock.yml new file mode 100644 index 00000000000..5b01d0bcae7 --- /dev/null +++ b/html/changelogs/service_airlock.yml @@ -0,0 +1,7 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Adds service airlocks to the code." + - tweak: "The default airlock sprite is now plain metal." \ No newline at end of file diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index 556796f04f2..d64d0e63802 100644 Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ diff --git a/icons/obj/doors/doorint.dmi b/icons/obj/doors/doorint.dmi index 44a0a797038..0ab6c6df3f7 100644 Binary files a/icons/obj/doors/doorint.dmi and b/icons/obj/doors/doorint.dmi differ diff --git a/icons/obj/doors/doorser.dmi b/icons/obj/doors/doorser.dmi new file mode 100644 index 00000000000..7bbcb42bff7 Binary files /dev/null and b/icons/obj/doors/doorser.dmi differ diff --git a/icons/obj/doors/doorserglass.dmi b/icons/obj/doors/doorserglass.dmi new file mode 100644 index 00000000000..8d21b85a140 Binary files /dev/null and b/icons/obj/doors/doorserglass.dmi differ