cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor airlock spawner helpers to use access_txt and use cycle_interior/exterior for the door buttons (#17741)

Browse Source
This commit is contained in:
Vi3trice
2022-05-10 22:24:39 +09:00
committed by GitHub
parent 2d8d26264d
commit 84cb9696f7
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/airlock_spawner.dm
+22 -15
View File
@@ -33,7 +33,7 @@ This spawner places pipe leading up to the interior door, you will need to finis
var/tiles_in_y_direction = 1
var/id_to_link
var/radio_frequency = 1379
var/required_access = list(ACCESS_EXTERNAL_AIRLOCKS)
req_access_txt = ACCESS_EXTERNAL_AIRLOCKS //If req_one_access_txt is set, this is ignored
var/door_name = "external access"
var/door_type = /obj/machinery/door/airlock/external/glass
var/one_door_interior //For square airlocks, if you set this then a) only one door will spawn, and b) you can choose if the door should go opposite to how it normally goes. Please use the define
@@ -89,11 +89,13 @@ This spawner places pipe leading up to the interior door, you will need to finis
handle_door_stuff(A, is_this_an_interior_airlock)
if(one_door_only == DOOR_FLIPPED_PLACEMENT)
the_button.forceMove(get_step(the_button, NORTH))
if(!one_door_only)
the_button.command = "[is_this_an_interior_airlock ? "cycle_interior" : "cycle_exterior"]"
/obj/effect/spawner/airlock/proc/handle_door_stuff(obj/machinery/door/airlock/A, is_this_an_interior_airlock) //This sets up the door vars correctly and then locks it before first use
A.set_frequency(radio_frequency)
A.id_tag = is_this_an_interior_airlock ? INNER_DOOR_TAG : OUTER_DOOR_TAG
A.req_access = required_access
set_access_helper(A)
A.name = door_name
A.lock()
@@ -114,14 +116,14 @@ This spawner places pipe leading up to the interior door, you will need to finis
if(WEST)
the_button.pixel_x -= 7
the_button.pixel_y -= 25
the_button.req_access = required_access
set_access_helper(the_button)
return the_button
/obj/effect/spawner/airlock/proc/handle_control_placement() //Stick the sensor and controller on the same bit of wall, this will ONLY be unsuitable if airlocks are on both the south and west turfs
var/turf/T = get_turf(src)
var/obj/machinery/airlock_sensor/AS = new(T)
var/obj/machinery/embedded_controller/radio/airlock/airlock_controller/AC = new(T, id_to_link, radio_frequency, OUTER_DOOR_TAG, INNER_DOOR_TAG, AIRPUMP_TAG, SENSOR_TAG)
AC.req_access = required_access
set_access_helper(AC)
AS.id_tag = SENSOR_TAG
AS.set_frequency(radio_frequency)
if(interior_direction != WEST && exterior_direction != WEST) //If west wall is free, place stuff there
@@ -199,6 +201,11 @@ This spawner places pipe leading up to the interior door, you will need to finis
created_pump.id_tag = AIRPUMP_TAG
created_pump.set_frequency(radio_frequency)
/obj/effect/spawner/airlock/proc/set_access_helper(obj/I)
if(req_one_access_txt == "0")
I.req_access_txt = "[req_access_txt]"
else
I.req_one_access_txt = "[req_one_access_txt]"
//Premade airlocks for mappers, probably won't need all of these but whatever
/obj/effect/spawner/airlock/s_to_n
@@ -282,22 +289,22 @@ This spawner places pipe leading up to the interior door, you will need to finis
tiles_in_y_direction = 3
/obj/effect/spawner/airlock/e_to_w/arrivals
required_access = null
req_access_txt = null
/obj/effect/spawner/airlock/engineer
required_access = list(ACCESS_ENGINE)
req_access_txt = ACCESS_ENGINE
door_name = "engineering external access"
/obj/effect/spawner/airlock/e_to_w/engineer
required_access = list(ACCESS_ENGINE)
req_access_txt = ACCESS_ENGINE
door_name = "engineering external access"
/obj/effect/spawner/airlock/s_to_n/engineer
required_access = list(ACCESS_ENGINE)
req_access_txt = ACCESS_ENGINE
door_name = "engineering external access"
/obj/effect/spawner/airlock/long/engineer
required_access = list(ACCESS_ENGINE)
req_access_txt = ACCESS_ENGINE
door_name = "engineering external access"
/obj/effect/spawner/airlock/long/square/engine
required_access = list(ACCESS_ENGINE)
req_access_txt = ACCESS_ENGINE
door_name = "engine external access"
icon_state = "2x2_N_to_S_leftdoors"
door_type = /obj/machinery/door/airlock/external
@@ -310,17 +317,17 @@ This spawner places pipe leading up to the interior door, you will need to finis
/obj/effect/spawner/airlock/w_to_e/long/square/wide/mining
door_name = "mining external access"
required_access = list(ACCESS_MINING)
req_access_txt = ACCESS_MINING
/obj/effect/spawner/airlock/long/square/wide/mining
door_name = "mining external access"
required_access = list(ACCESS_MINING)
req_access_txt = ACCESS_MINING
/obj/effect/spawner/airlock/e_to_w/minisat
door_name = "minisat external access"
required_access = list(ACCESS_MINISAT)
req_access_txt = ACCESS_MINISAT
/obj/effect/spawner/airlock/long/square/e_to_s/telecoms
door_name = "telecoms external access"
required_access = list(ACCESS_TCOMSAT, ACCESS_EXTERNAL_AIRLOCKS)
req_access_txt = "61;13" //ACCESS_TCOMSAT,ACCESS_EXTERNAL_AIRLOCKS
door_type = /obj/machinery/door/airlock/external
/obj/effect/spawner/airlock/long/square/three/syndicate
@@ -329,7 +336,7 @@ This spawner places pipe leading up to the interior door, you will need to finis
interior_direction = WEST
exterior_direction = NORTH
door_name = "ship external access"
req_access = list(ACCESS_SYNDICATE)
req_access_txt = ACCESS_SYNDICATE
door_type = /obj/machinery/door/airlock/external
#undef HALF_X