Skip to content

Commit

Permalink
CC's Room Buff (#4761)
Browse files Browse the repository at this point in the history 
# About the pull request

Increases the size of the Combat Correspondants room and adds a few
things requested by a friend of mine.

# Explain why it's good for the game

Expands the cramped CC room and adds a few QOL additions.

# Changelog

:cl:
add: added flashlight, donk pocket box, interview table, folder,
taperecorder, ink toner, extra lights and expanded the size of the CC's
room.
/:cl:
  • Loading branch information
@HeresKozmos
HeresKozmos authored Oct 31, 2023
1 parent 50be75d commit 6f33357
Showing 1 changed file with 120 additions and 60 deletions.
180 changes: 120 additions & 60 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2676,8 +2676,9 @@
},
/area/almayer/living/starboard_garden)
"aiQ" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/faxmachine,
/obj/structure/surface/table/almayer,
/obj/structure/machinery/light/small,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -26149,6 +26150,20 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/brig/cic_hallway)
"cgW" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/photo_album{
pixel_x = -4;
pixel_y = 5
},
/obj/item/folder/black{
pixel_y = -3;
pixel_x = 7
},
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/command/combat_correspondent)
"chf" = (
/obj/structure/window/reinforced{
dir = 4;
Expand Down Expand Up @@ -28829,6 +28844,15 @@
icon_state = "test_floor4"
},
/area/almayer/medical/containment/cell/cl)
"cNK" = (
/obj/structure/pipes/vents/pump{
dir = 1
},
/obj/structure/machinery/light/small,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/command/combat_correspondent)
"cNX" = (
/obj/structure/disposalpipe/segment{
dir = 4
Expand Down Expand Up @@ -29690,6 +29714,11 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
"dha" = (
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/command/combat_correspondent)
"dhQ" = (
/obj/structure/sign/safety/terminal{
pixel_x = -17
Expand Down Expand Up @@ -31764,10 +31793,8 @@
},
/area/almayer/engineering/laundry)
"dXo" = (
/obj/structure/machinery/photocopier,
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
},
/obj/structure/surface/table/almayer,
/obj/item/device/taperecorder,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -36476,12 +36503,12 @@
/area/almayer/hallways/aft_hallway)
"fXE" = (
/obj/structure/surface/table/almayer,
/obj/item/paper_bin/uscm{
pixel_y = 6
/obj/structure/machinery/computer/emails{
pixel_x = 2;
pixel_y = 5
},
/obj/item/tool/pen{
pixel_x = 4;
pixel_y = -4
/obj/structure/machinery/light/small{
dir = 1
},
/turf/open/floor/almayer{
icon_state = "plate"
Expand Down Expand Up @@ -38100,6 +38127,22 @@
icon_state = "plate"
},
/area/almayer/squads/delta)
"gGp" = (
/obj/structure/surface/table/almayer,
/obj/item/clothing/mask/cigarette/pipe{
pixel_x = 8
},
/obj/structure/transmitter/rotary{
name = "Reporter Telephone";
phone_category = "Almayer";
phone_id = "Reporter";
pixel_x = -4;
pixel_y = 6
},
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/command/combat_correspondent)
"gGr" = (
/obj/structure/machinery/vending/cigarette,
/turf/open/floor/almayer{
Expand Down Expand Up @@ -40121,8 +40164,9 @@
/turf/closed/wall/almayer,
/area/almayer/living/synthcloset)
"hzb" = (
/obj/structure/bed/chair/office/dark{
dir = 8
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4;
icon_state = "exposed01-supply"
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/command/combat_correspondent)
Expand Down Expand Up @@ -46099,19 +46143,9 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_a_p)
"kaS" = (
/obj/structure/machinery/light/small{
/obj/structure/bed/chair/office/dark{
dir = 8
},
/obj/structure/surface/table/almayer,
/obj/item/device/camera{
pixel_x = -9;
pixel_y = 16
},
/obj/item/storage/photo_album{
pixel_x = -6;
pixel_y = -17
},
/obj/item/clothing/mask/cigarette/pipe,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -48999,6 +49033,28 @@
icon_state = "orange"
},
/area/almayer/hallways/hangar)
"llV" = (
/obj/structure/surface/table/almayer,
/obj/item/device/camera{
pixel_x = -8;
pixel_y = 12
},
/obj/item/paper_bin/uscm{
pixel_y = 6;
pixel_x = 6
},
/obj/item/tool/pen{
pixel_x = 4;
pixel_y = -4
},
/obj/item/storage/box/donkpockets{
pixel_x = -8;
pixel_y = -1
},
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/command/combat_correspondent)
"lmk" = (
/obj/structure/machinery/light/small{
dir = 1
Expand Down Expand Up @@ -49399,7 +49455,9 @@
/turf/open/floor/plating,
/area/almayer/hull/upper_hull/u_m_p)
"ltU" = (
/obj/structure/filingcabinet,
/obj/structure/bed/chair{
dir = 8
},
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -56255,6 +56313,23 @@
"opD" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/gym)
"opI" = (
/obj/structure/closet/secure_closet,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/storage/box/tapes,
/obj/item/clothing/head/fedora,
/obj/item/clothing/suit/storage/marine/light/reporter,
/obj/item/clothing/head/helmet/marine/reporter,
/obj/item/clothing/head/cmcap/reporter,
/obj/item/device/flashlight,
/obj/item/device/toner,
/obj/item/device/toner,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/command/combat_correspondent)
"opJ" = (
/obj/docking_port/stationary/emergency_response/external/port4,
/turf/open/space/basic,
Expand Down Expand Up @@ -58184,16 +58259,10 @@
},
/area/almayer/living/briefing)
"phj" = (
/obj/item/clothing/head/helmet/marine/reporter,
/obj/item/clothing/suit/storage/marine/light/reporter,
/obj/item/clothing/head/cmcap/reporter,
/obj/item/clothing/head/fedora,
/obj/structure/closet/secure_closet,
/obj/item/storage/box/tapes,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/machinery/photocopier,
/obj/structure/machinery/light/small{
dir = 1
},
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -71017,7 +71086,9 @@
},
/area/almayer/hallways/stern_hallway)
"uBM" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 5
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/command/combat_correspondent)
"uBN" = (
Expand Down Expand Up @@ -73681,8 +73752,8 @@
},
/area/almayer/medical/hydroponics)
"vEf" = (
/obj/structure/machinery/light/small{
dir = 4
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 10
},
/turf/open/floor/almayer{
icon_state = "plate"
Expand Down Expand Up @@ -75715,22 +75786,11 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/stern_hallway)
"wqr" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/emails{
pixel_x = 2;
pixel_y = 5
},
/obj/structure/sign/safety/terminal{
pixel_x = 7;
pixel_y = 29
},
/obj/structure/transmitter/rotary{
name = "Reporter Telephone";
phone_category = "Almayer";
phone_id = "Reporter";
pixel_x = -17;
pixel_y = 2
},
/obj/structure/filingcabinet,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -79686,8 +79746,8 @@
},
/area/almayer/hull/upper_hull/u_m_s)
"xUV" = (
/obj/structure/pipes/vents/pump{
dir = 1
/obj/structure/bed/chair{
dir = 4
},
/turf/open/floor/almayer{
icon_state = "plate"
Expand Down Expand Up @@ -122995,9 +123055,9 @@ alG
anG
apf
oIB
oIB
oIB
oIB
llV
gGp
cgW
oIB
sFR
vuv
Expand Down Expand Up @@ -123402,7 +123462,7 @@ anG
apd
oIB
wqr
hzb
bZw
xUV
oIB
sFR
Expand Down Expand Up @@ -123808,7 +123868,7 @@ anG
mPX
oIB
wKF
bZw
hzb
ltU
oIB
fbx
Expand Down Expand Up @@ -124012,7 +124072,7 @@ iAB
oIB
phj
vEf
pxj
cNK
oIB
fbx
cxo
Expand Down Expand Up @@ -124213,9 +124273,9 @@ rFY
ctC
gPF
oIB
oIB
oIB
oIB
opI
dha
pxj
oIB
fbx
gHg
Expand Down

0 comments on commit 6f33357

Please sign in to comment.