Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions _maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_cheyenne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger2";
name = "Cheyenne Hanger 2"
name = "Cheyenne Hangar 2"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -363,7 +363,7 @@
"bq" = (
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/ert/lp{
name = "XOs Hardsuit"
name = "XO's Hardsuit"
},
/obj/machinery/light/directional/north,
/turf/open/floor/carpet/royalblue,
Expand Down Expand Up @@ -452,7 +452,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1"
name = "Cheyenne Hangar 1"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -628,7 +628,7 @@
},
/mob/living/simple_animal/turtle{
name = "Leonardo";
desc = "You wouldn't be able to tell with that hat. But this turtle is secretly a ninja. Shh. Don't tell anyone.";
desc = "You wouldn't be able to tell with that hat, but this turtle is secretly a ninja. Shh. Don't tell anyone.";
faction = list("playerNanotrasen")
},
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -1473,12 +1473,12 @@
id = "cheyenne_holo2";
pixel_x = -23;
pixel_y = -9;
name = "Cheyenne Hanger 2"
name = "Cheyenne Hangar 2"
},
/obj/machinery/button/door{
dir = 4;
id = "cheyenne_hanger2";
name = "Cheyenne Hanger 2";
name = "Cheyenne Hangar 2";
pixel_x = -25;
pixel_y = 5
},
Expand Down Expand Up @@ -1527,7 +1527,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger2";
name = "Cheyenne Hanger 2"
name = "Cheyenne Hangar 2"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand All @@ -1539,7 +1539,7 @@
dir = 2
},
/obj/machinery/door/airlock/public/glass{
name = "Cyro Chamber"
name = "Cryo Chamber"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/fore)
Expand Down Expand Up @@ -2881,7 +2881,7 @@
/obj/machinery/telecomms/relay{
freq_listening = list(1353,1447,1459);
id = "Nanotrasen Relay";
name = "Nanotrasen relay";
name = "Nanotrasen Relay";
network = "nt_commnet"
},
/turf/open/floor/circuit,
Expand Down Expand Up @@ -3564,7 +3564,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1"
name = "Cheyenne Hangar 1"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -4347,7 +4347,7 @@
},
/obj/structure/closet/secure_closet/empty{
icon_state = "blueshield";
name = "XO Locker"
name = "XO's Locker"
},
/turf/open/floor/carpet/royalblue,
/area/ship/crew/crewtwo)
Expand Down Expand Up @@ -4443,7 +4443,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1"
name = "Cheyenne Hangar 1"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -4989,7 +4989,7 @@
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/ert/lp/engi{
name = "Chief Engineers Hardsuit"
name = "Chief Engineer's Hardsuit"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/machinery/firealarm/directional/west,
Expand Down Expand Up @@ -6510,26 +6510,26 @@
/obj/structure/table/reinforced,
/obj/machinery/button/door{
id = "cheyenne_hanger2";
name = "Cheyenne Hanger 2";
name = "Cheyenne Hangar 2";
pixel_y = 10;
pixel_x = 5
},
/obj/machinery/button/door{
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1";
name = "Cheyenne Hangar 1";
pixel_y = 10;
pixel_x = -6
},
/obj/machinery/button/shieldwallgen{
id = "cheyenne_holo1";
pixel_y = -2;
name = "Cheyenne Hanger 1";
name = "Cheyenne Hangar 1";
pixel_x = -6
},
/obj/machinery/button/shieldwallgen{
id = "cheyenne_holo2";
pixel_y = -2;
name = "Cheyenne Hanger 2";
name = "Cheyenne Hangar 2";
pixel_x = 5
},
/turf/open/floor/plasteel/patterned,
Expand Down Expand Up @@ -7025,7 +7025,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/airlock/public/glass{
name = "Cyro Chamber"
name = "Cryo Chamber"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/fore)
Expand Down Expand Up @@ -7063,7 +7063,7 @@
"Eq" = (
/obj/machinery/door/airlock/medical/glass{
dir = 4;
name = "Chemisty"
name = "Chemistry"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
Expand Down Expand Up @@ -7761,12 +7761,12 @@
id = "cheyenne_holo1";
pixel_x = 23;
pixel_y = 9;
name = "Cheyenne Hanger 1"
name = "Cheyenne Hangar 1"
},
/obj/machinery/button/door{
dir = 8;
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1";
name = "Cheyenne Hangar 1";
pixel_x = 25;
pixel_y = -5
},
Expand Down Expand Up @@ -7938,7 +7938,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/airlock/command{
name = "Adminal's Quarters";
name = "Admiral's Quarters";
req_access_txt = "20"
},
/turf/open/floor/plasteel/tech,
Expand Down Expand Up @@ -8162,7 +8162,7 @@
/area/ship/hangar)
"Jo" = (
/obj/machinery/door/airlock/command{
name = "CMO Quarters";
name = "CMO's Quarters";
req_access_txt = "40";
dir = 4
},
Expand Down Expand Up @@ -8533,7 +8533,7 @@
},
/obj/machinery/airalarm/directional/south,
/mob/living/simple_animal/hostile/carp/cayenne{
desc = "A descendant from the legendary Mr Fiish, a failed Syndicate experiment in weaponized space carp.";
desc = "A descendant of the legendary Mr Fiish, a failed Syndicate experiment in weaponized space carp.";
faction = list("playerNanotrasen","silicon","neutral");
name = "Mr Fiiish"
},
Expand Down Expand Up @@ -8583,7 +8583,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1"
name = "Cheyenne Hangar 1"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -9935,7 +9935,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger2";
name = "Cheyenne Hanger 2"
name = "Cheyenne Hangar 2"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -10410,7 +10410,7 @@
/area/ship/hallway/aft)
"RP" = (
/obj/item/soap{
name = "Oh no you dropped the soap- go ahead, bend over and grab it."
name = "Oh no, you dropped the soap - go ahead, bend over and grab it."
},
/obj/machinery/shower{
pixel_y = 19
Expand Down Expand Up @@ -10461,7 +10461,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger2";
name = "Cheyenne Hanger 2"
name = "Cheyenne Hangar 2"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -10673,7 +10673,7 @@
dir = 8
},
/obj/item/clothing/suit/space/hardsuit/ert/lp/med{
name = "Chief Medical Officers Hardsuit"
name = "Chief Medical Officer's Hardsuit"
},
/obj/machinery/suit_storage_unit/inherit,
/obj/machinery/airalarm/directional/south,
Expand Down Expand Up @@ -10754,7 +10754,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1"
name = "Cheyenne Hangar 1"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand Down Expand Up @@ -11068,10 +11068,10 @@
},
/obj/machinery/atmospherics/components/binary/pump/on/layer4{
dir = 1;
name = "waste to environment"
name = "Waste to Environment"
},
/obj/machinery/atmospherics/components/binary/pump/on/layer2{
name = "air to distro"
name = "Air to Distro"
},
/obj/effect/turf_decal/industrial/warning/full,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -11198,7 +11198,7 @@
},
/obj/machinery/door/poddoor{
id = "cheyenne_hanger1";
name = "Cheyenne Hanger 1"
name = "Cheyenne Hangar 1"
},
/turf/open/floor/plasteel/patterned,
/area/ship/hangar)
Expand All @@ -11220,7 +11220,7 @@
/obj/machinery/suit_storage_unit/inherit,
/obj/machinery/firealarm/directional/north,
/obj/item/clothing/suit/space/hardsuit/swat/captain{
name = "admiral's SWAT suit"
name = "Admiral's SWAT Suit"
},
/turf/open/floor/carpet/green,
/area/ship/crew)
Expand Down
Loading
Loading