Skip to content

Commit

Permalink
removed all references to tag/tags
Browse files Browse the repository at this point in the history
  • Loading branch information
mullenpaul committed Oct 11, 2023
1 parent f7dd489 commit ce7050c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
15 changes: 9 additions & 6 deletions code/datums/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
var/port_x_offset
var/port_y_offset

var/tags

/datum/map_template/shuttle/proc/prerequisites_met()
return TRUE

Expand Down Expand Up @@ -101,8 +99,7 @@
/datum/map_template/shuttle/proc/post_load(obj/docking_port/mobile/M)
if(movement_force)
M.movement_force = movement_force.Copy()
if(tags)
M.tag = tags


/datum/map_template/shuttle/vehicle
shuttle_id = MOBILE_SHUTTLE_VEHICLE_ELEVATOR
Expand All @@ -111,9 +108,15 @@
/datum/map_template/shuttle/trijent_elevator
name = "Trijent Elevator"
shuttle_id = MOBILE_TRIJENT_ELEVATOR
var/elevator_network

/datum/map_template/shuttle/trijent_elevator/post_load(obj/docking_port/mobile/M)
if(elevator_network)
var/obj/docking_port/mobile/trijent_elevator/elev = M
elev.elevator_network = elevator_network

/datum/map_template/shuttle/trijent_elevator/A
tags="A"
elevator_network="A"

/datum/map_template/shuttle/trijent_elevator/B
tags="B"
elevator_network="B"
7 changes: 4 additions & 3 deletions code/modules/shuttle/computers/trijent_elevator_control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@

/obj/structure/machinery/computer/shuttle/elevator_controller/proc/get_landing_zones()
. = list()
var/obj/docking_port/mobile/shuttle = SSshuttle.getShuttle(shuttleId)
var/obj/docking_port/mobile/trijent_elevator/shuttle = SSshuttle.getShuttle(shuttleId)

for(var/obj/docking_port/stationary/trijent_elevator/elev in SSshuttle.stationary)
if(shuttle.tag == "")
if(shuttle.elevator_network == "" || elev.elevator_network == null)
. += list(elev)
continue
if(shuttle.tag == elev.tag)
if(shuttle.elevator_network == elev.elevator_network)
. += list(elev)
continue

Expand Down
1 change: 1 addition & 0 deletions code/modules/shuttle/shuttles.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ To setup an elevator:
- place the docking port where you want the elevator to sit
- give the docking port instance a unique ID
- give the docking port instance a unique Name
- make sure the door direction is correct west/east
- give the docking port shuttle_area the area name for where it sits
- if you want to build a docking port 'network' then change the roudnstart_template to a subclass
- if you want to assign a docking port to a 'network' then give it a value in "tag"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/shuttle/shuttles/trijent_elevator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
var/datum/door_controller/aggregate/door_control
var/elevator_network

/obj/docking_port/mobile/trijent_elevator/Initialize(mapload, ...)
. = ..()
Expand All @@ -43,6 +44,7 @@
// shutters to clear the area
var/airlock_area
var/airlock_exit
var/elevator_network

/obj/docking_port/stationary/trijent_elevator/proc/get_doors()
. = list()
Expand All @@ -57,8 +59,6 @@
if(istype(arriving_shuttle, /obj/docking_port/mobile/trijent_elevator))
var/obj/docking_port/mobile/trijent_elevator/elevator = arriving_shuttle
elevator.door_control.control_doors("open", airlock_exit)
if(elevator.tag != "")
elevator.tag = tag

// open dock doors
var/datum/door_controller/single/door_control = new()
Expand Down
13 changes: 8 additions & 5 deletions maps/map_files/DesertDam/Desert_Dam.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -14391,7 +14391,8 @@
/obj/docking_port/stationary/trijent_elevator/occupied{
id = "trigent_lz2";
name = "Lz2 Elevator";
airlock_area = /area/shuttle/trijent_shuttle/lz2
airlock_area = /area/shuttle/trijent_shuttle/lz2;
elevator_network = "B"
},
/turf/open/gm/empty,
/area/shuttle/trijent_shuttle/lz2)
Expand Down Expand Up @@ -61547,7 +61548,8 @@
id = "trigent_omega";
name = "Omega Elevator";
airlock_exit = "east";
airlock_area = /area/shuttle/trijent_shuttle/omega
airlock_area = /area/shuttle/trijent_shuttle/omega;
elevator_network = "B"
},
/turf/open/gm/empty,
/area/shuttle/trijent_shuttle/omega)
Expand Down Expand Up @@ -63402,8 +63404,8 @@
id = "trigent_engineering";
name = "Engineering Elevator";
airlock_exit = "east";
tag = "A";
airlock_area = /area/shuttle/trijent_shuttle/engi
airlock_area = /area/shuttle/trijent_shuttle/engi;
elevator_network = "A"
},
/turf/open/gm/empty,
/area/shuttle/trijent_shuttle/engi)
Expand Down Expand Up @@ -64045,7 +64047,8 @@
/obj/docking_port/stationary/trijent_elevator/occupied{
id = "trigent_lz1";
name = "Lz1 Elevator";
tag = "A"
elevator_network = "A";
airlock_area = /area/shuttle/trijent_shuttle/lz1
},
/turf/open/gm/empty,
/area/shuttle/trijent_shuttle/lz1)
Expand Down

0 comments on commit ce7050c

Please sign in to comment.