Skip to content

Commit

Permalink
Rebalanced Captain Inventory so its not Centcom. Added missing gun to…
Browse files Browse the repository at this point in the history
… XO Locker. Added decoration to bridge.
  • Loading branch information
Ossa88 committed Aug 28, 2024
1 parent f02ce6f commit 9c9d66c
Showing 1 changed file with 36 additions and 46 deletions.
82 changes: 36 additions & 46 deletions _maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
/obj/machinery/computer/helm/viewscreen/directional/south,
/turf/open/floor/carpet/green,
/area/ship/crew)
"ei" = (
Expand Down Expand Up @@ -1824,15 +1825,6 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/security)
"jq" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/corner/opaque/brown/half,
/obj/machinery/light_switch{
dir = 1;
pixel_y = -18
},
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"jr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
Expand Down Expand Up @@ -3104,9 +3096,6 @@
dir = 8
},
/obj/item/radio/intercom/directional/south,
/obj/structure/closet/secure_closet/head_of_personnel{
name = "XO's locker"
},
/turf/open/floor/carpet/royalblue,
/area/ship/crew/crewtwo)
"pT" = (
Expand Down Expand Up @@ -4089,6 +4078,15 @@
},
/turf/open/floor/plasteel,
/area/ship/hallway/aft)
"tU" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/corner/opaque/brown/half,
/obj/machinery/light_switch{
dir = 1;
pixel_y = -18
},
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"tV" = (
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
Expand Down Expand Up @@ -4268,6 +4266,14 @@
/obj/machinery/door/morgue,
/turf/open/floor/plasteel/mono/dark,
/area/ship/medical)
"uN" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw,
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"uO" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/railing,
Expand Down Expand Up @@ -4513,14 +4519,6 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"wh" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw,
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"wj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
Expand Down Expand Up @@ -5195,6 +5193,7 @@
/obj/structure/bed,
/obj/item/bedsheet/captain,
/obj/structure/curtain/cloth/fancy,
/obj/item/toy/figure/captain,
/turf/open/floor/carpet/green,
/area/ship/crew)
"zp" = (
Expand Down Expand Up @@ -8177,6 +8176,7 @@
/turf/open/floor/plating,
/area/ship/hangar)
"MH" = (
/obj/structure/displaycase/captain,
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"MI" = (
Expand Down Expand Up @@ -9240,14 +9240,16 @@
name = "XO's beret"
},
/obj/item/cartridge/head_of_personnel,
/obj/item/storage/box/silver_ids,
/obj/item/storage/box/ids,
/obj/item/megaphone/command,
/obj/item/assembly/flash,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/neck/petcollar,
/obj/item/pet_carrier,
/obj/item/storage/photo_album/HoP,
/obj/item/gun/energy/e_gun/mini,
/obj/item/storage/photo_album/HoP{
name = "photo album (XO)"
},
/turf/open/floor/carpet/royalblue,
/area/ship/crew/crewtwo)
"Rq" = (
Expand Down Expand Up @@ -9709,31 +9711,17 @@
/area/ship/security)
"Tu" = (
/obj/machinery/light/directional/west,
/obj/structure/closet/secure_closet{
icon_state = "cap";
name = "\proper captain's locker";
req_access_txt = "20"
/obj/machinery/light_switch{
pixel_y = 23
},
/obj/item/clothing/gloves/color/captain/nt,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/head/centcom_cap,
/obj/item/gun/energy/e_gun/adv_stopping,
/obj/item/stock_parts/cell/gun/upgraded,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/head/beret/centcom_formal,
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/suit/toggle/armor/vest/centcom_formal,
/obj/item/clothing/gloves/color/captain/nt,
/obj/item/megaphone/command,
/obj/item/door_remote/captain,
/obj/item/gun/energy/e_gun/adv_stopping,
/obj/item/storage/belt/sabre,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/storage/backpack/captain,
/obj/item/clothing/neck/cloak/cap,
/obj/item/radio/headset/heads/captain/alt,
/obj/machinery/light_switch{
pixel_y = 23
},
/obj/structure/closet/secure_closet/captains,
/obj/item/pen/fountain/captain,
/turf/open/floor/carpet/green,
/area/ship/crew)
"Tv" = (
Expand Down Expand Up @@ -10022,7 +10010,9 @@
"Uq" = (
/obj/item/clothing/suit/space/hardsuit/swat/captain,
/obj/machinery/suit_storage_unit/inherit,
/obj/machinery/computer/helm/viewscreen/directional/north,
/obj/structure/plaque/static_plaque/golden/captain{
pixel_y = 32
},
/turf/open/floor/carpet/green,
/area/ship/crew)
"Ur" = (
Expand Down Expand Up @@ -11332,7 +11322,7 @@ rL
Rh
rL
DH
wh
uN
DC
QS
hm
Expand Down Expand Up @@ -12347,7 +12337,7 @@ bd
bO
kd
OV
jq
tU
st
lE
FO
Expand Down

0 comments on commit 9c9d66c

Please sign in to comment.