Skip to content

Commit

Permalink
Merge branch 'cmss13-devs:master' into NightmareDocumentation
Browse files Browse the repository at this point in the history
  • Loading branch information
TopHatPenguin authored Apr 3, 2024
2 parents 24a5c47 + 058d0ae commit 94d0609
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-6067.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "QuickLode"
delete-after: True
changes:
- qol: "Moves CL's Office and SEA's Office phone lines to \"Offices\" category."
4 changes: 2 additions & 2 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -36152,7 +36152,7 @@
},
/obj/structure/transmitter/rotary{
name = "Senior Enlisted Advisor Office Telephone";
phone_category = "Almayer";
phone_category = "Offices";
phone_id = "Senior Enlisted Advisor's Office";
pixel_x = -3
},
Expand Down Expand Up @@ -50075,7 +50075,7 @@
"neT" = (
/obj/structure/transmitter/rotary{
name = "CL Office Telephone";
phone_category = "Almayer";
phone_category = "Offices";
phone_id = "CL Office"
},
/obj/structure/surface/table/woodentable/fancy,
Expand Down

0 comments on commit 94d0609

Please sign in to comment.