Skip to content

Commit

Permalink
Merge branch 'master' into kilomaint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KnigTheThrasher
KnigTheThrasher committed Oct 31, 2024
2 parents f449833 + f2aa031 commit a282137
Show file tree
Hide file tree
Showing 187 changed files with 5,949 additions and 5,944 deletions.
38 changes: 14 additions & 24 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9651,8 +9651,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/command/captain,
/obj/machinery/duct,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"bSQ" = (
Expand Down Expand Up @@ -19386,9 +19387,6 @@
/obj/item/pen/fountain{
pixel_y = 10
},
/obj/item/stamp/centcom{
pixel_x = 6
},
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"dJh" = (
Expand Down Expand Up @@ -35335,16 +35333,7 @@
dir = 8
},
/obj/structure/window/spawner/directional/west,
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/under/rank/centcom/officer_skirt,
/obj/item/clothing/under/rank/centcom/intern,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/item/clothing/head/hats/centcom_cap,
/obj/item/clothing/head/hats/centhat,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/suit/armor/centcom_formal,
/obj/structure/closet/secure_closet/nanotrasen_representative,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"gPh" = (
Expand Down Expand Up @@ -39111,7 +39100,8 @@
/obj/machinery/door/airlock/corporate{
name = "Representative's Office"
},
/obj/effect/mapping_helpers/airlock/access/all/command/captain,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"hCU" = (
Expand Down Expand Up @@ -54800,6 +54790,7 @@
name = "Premium Cozy Chair"
},
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/start/nanotrasen_representative,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"kAU" = (
Expand Down Expand Up @@ -70915,11 +70906,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
"nOw" = (
/obj/item/clothing/accessory/medal/silver/bureaucracy,
/obj/item/clothing/accessory/medal/gold/ordom,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"nOE" = (
/obj/structure/barricade/security,
/obj/effect/turf_decal/stripes,
Expand Down Expand Up @@ -73721,8 +73707,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/command/captain,
/obj/machinery/duct,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
"ooF" = (
Expand Down Expand Up @@ -81111,9 +81098,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/airlock/access/all/command/captain,
/obj/machinery/duct,
/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/turf/open/floor/wood,
/area/station/command/heads_quarters/nt_rep)
"pLg" = (
Expand Down Expand Up @@ -88249,7 +88237,7 @@
/obj/structure/window/reinforced/tinted/spawner/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/structure/toiletbong,
/obj/item/bodypart/head/simian,
/obj/item/bodypart/head/monkey,
/obj/effect/decal/cleanable/blood/old{
icon_state = "floor5-old"
},
Expand Down Expand Up @@ -123003,6 +122991,8 @@
/obj/item/pen/fountain{
pixel_y = 5
},
/obj/item/clothing/accessory/medal/gold/ordom,
/obj/item/clothing/accessory/medal/silver/bureaucracy,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
"xLj" = (
Expand Down Expand Up @@ -214752,7 +214742,7 @@ jrA
ide
ide
ide
nOw
oTn
bhf
rre
ide
Expand Down
25 changes: 9 additions & 16 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2241,9 +2241,6 @@
pixel_x = -6;
pixel_y = 4
},
/obj/item/stamp/centcom{
pixel_x = 6
},
/obj/item/pen/fountain{
pixel_y = 10
},
Expand Down Expand Up @@ -26761,17 +26758,8 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"goE" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/under/rank/centcom/officer_skirt,
/obj/item/clothing/under/rank/centcom/intern,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/item/clothing/head/hats/centcom_cap,
/obj/item/clothing/head/hats/centhat,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/suit/armor/centcom_formal,
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/obj/structure/closet/secure_closet/nanotrasen_representative,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"goG" = (
Expand Down Expand Up @@ -62792,7 +62780,9 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/landmark/navigate_destination,
/turf/open/floor/carpet/neon/simple/blue/nodots,
/area/station/command/heads_quarters/blueshield)
"oTs" = (
Expand Down Expand Up @@ -77128,11 +77118,12 @@
id_tag = "Repdoor";
name = "Representative's Office"
},
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/turf/open/floor/wood,
/area/station/command/heads_quarters/nt_rep)
"sqI" = (
Expand Down Expand Up @@ -82131,7 +82122,8 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/turf/open/floor/carpet/neon/simple/blue/nodots,
/area/station/command/heads_quarters/blueshield)
"tBf" = (
Expand Down Expand Up @@ -91113,6 +91105,7 @@
},
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/effect/landmark/start/nanotrasen_representative,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/nt_rep)
"vFU" = (
Expand Down
29 changes: 12 additions & 17 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2646,9 +2646,6 @@
/obj/item/pen/fountain{
pixel_y = 10
},
/obj/item/stamp/centcom{
pixel_x = 6
},
/obj/structure/window/spawner/directional/west,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/carpet/green,
Expand Down Expand Up @@ -10838,7 +10835,6 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"dmG" = (
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/obj/machinery/door/airlock/corporate{
id_tag = "Repdoor";
name = "Representative's Office"
Expand All @@ -10851,6 +10847,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/turf/open/floor/wood,
/area/station/command/heads_quarters/nt_rep)
"dmI" = (
Expand Down Expand Up @@ -28950,6 +28948,7 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/nanotrasen_representative,
/turf/open/floor/carpet/green,
/area/station/command/heads_quarters/nt_rep)
"jlF" = (
Expand Down Expand Up @@ -50589,7 +50588,8 @@
name = "Blueshield's Office"
},
/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/access/all/admin/general,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/blueshield)
"pYz" = (
Expand Down Expand Up @@ -55811,16 +55811,6 @@
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
"rLe" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/under/rank/centcom/officer_skirt,
/obj/item/clothing/under/rank/centcom/intern,
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/centcom_skirt,
/obj/item/clothing/head/hats/centcom_cap,
/obj/item/clothing/head/hats/centhat,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/suit/armor/centcom_formal,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
Expand All @@ -55829,6 +55819,7 @@
/obj/machinery/camera/directional/north{
c_tag = "Teleporter"
},
/obj/structure/closet/secure_closet/nanotrasen_representative,
/turf/open/floor/wood,
/area/station/command/heads_quarters/nt_rep)
"rLo" = (
Expand Down Expand Up @@ -56548,10 +56539,12 @@
/obj/effect/landmark/navigate_destination,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/command/teleporter,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/command/teleporter,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/turf/open/floor/iron,
/area/station/command/teleporter)
"rXX" = (
Expand Down Expand Up @@ -59365,7 +59358,9 @@
name = "Representative's Office"
},
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/airlock/access/all/command/teleporter,
/obj/effect/mapping_helpers/airlock/access/any/command/teleporter,
/obj/effect/mapping_helpers/airlock/access/any/command/nt_rep,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/turf/open/floor/iron,
/area/station/maintenance/central/lesser)
"sUi" = (
Expand Down
Loading

0 comments on commit a282137

Please sign in to comment.