Skip to content

Commit

Permalink
Merge branch 'project/ares/holderperk' into project/ares/tm_holder
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Jun 29, 2024
2 parents ea906df + b6dcb88 commit 2170df0
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -49367,6 +49367,12 @@
name = "AI Core Intercom";
pixel_y = 32
},
/obj/item/device/radio/intercom{
freerange = 1;
name = "General Listening Channel";
pixel_y = 32;
pixel_x = 14
},
/turf/open/floor/almayer/aicore/no_build{
icon_state = "w_ai_floor1"
},
Expand Down Expand Up @@ -54405,6 +54411,11 @@
pixel_y = 6
},
/obj/item/tool/pen,
/obj/item/device/radio/intercom{
freerange = 1;
name = "General Listening Channel";
pixel_x = 28
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
"ouw" = (
Expand Down

0 comments on commit 2170df0

Please sign in to comment.