Skip to content

Commit

Permalink
Merge pull request #29 from shaky-jake/rust_mapping
Browse files Browse the repository at this point in the history
R-UST Mapped In
  • Loading branch information
NonQueueingMatt authored Sep 27, 2023
2 parents 13d61be + 64dc00d commit 6f6367a
Show file tree
Hide file tree
Showing 3 changed files with 1,777 additions and 1,065 deletions.
16 changes: 8 additions & 8 deletions maps/sccv_horizon/code/sccv_horizon_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
/area/engineering/aft_airlock
name = "Engineering - Aft Service Airlock"

/area/engineering/engine_room/tesla
name = "Engineering - Tesla Engine"
/area/engineering/engine_room/rust
name = "Engineering - R-UST Engine"

/area/engineering/smes
name = "Engineering - SM SMES"
icon_state = "engine_smes"
sound_env = SMALL_ENCLOSED
ambience = AMBIENCE_SINGULARITY

/area/engineering/smes/tesla
name = "Engineering - Tesla SMES"
/area/engineering/smes/rust
name = "Engineering - R-UST SMES"

/area/engineering/engine_monitoring/tesla
name = "Engineering - Tesla Engine Monitoring"
/area/engineering/engine_monitoring/rust
name = "Engineering - R-UST Engine Monitoring"

/area/engineering/atmos/air
name = "Engineering - Air Mixing"
Expand All @@ -40,8 +40,8 @@
ambience = AMBIENCE_ENGINEERING
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING

/area/hallway/engineering/tesla
name = "Engineering - Tesla Hallway"
/area/hallway/engineering/rust
name = "Engineering - R-UST Hallway"

//Medical

Expand Down
4 changes: 2 additions & 2 deletions maps/sccv_horizon/code/sccv_horizon_unittest.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/area/medical/cryo,
/area/medical/surgery,
/area/turret_protected/ai,
/area/engineering/smes/tesla,
/area/engineering/smes/rust,
/area/tcommsat/mainlvl_tcomms__relay,
/area/tcommsat/mainlvl_tcomms__relay/second,
/area/rnd/isolation_a,
Expand All @@ -53,4 +53,4 @@

/datum/unit_test/zas_area_test/sccv_horizon/storage
name = "ZAS: Operations Bay"
area_path = /area/operations/storage
area_path = /area/operations/storage
Loading

0 comments on commit 6f6367a

Please sign in to comment.