diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 73f7f051e4fe..dd42d30c65dc 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1133,6 +1133,13 @@ }, /turf/open/space, /area/centcom/ferry) +"apD" = ( +/obj/machinery/door/airlock/grunge{ + req_access = "109"; + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/centcom) "apF" = ( /obj/machinery/door/airlock/centcom{ name = "Auxillary Dock"; @@ -5504,6 +5511,11 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"aVT" = ( +/obj/effect/turf_decal/corner/opaque/lime/half, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/dark, +/area/centcom) "aVU" = ( /obj/machinery/door/poddoor/shutters{ id = "XCCcustoms2"; @@ -6951,6 +6963,12 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/evac) +"cIk" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel/telecomms_floor, +/area/centcom) "cIS" = ( /obj/structure/rack, /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq, @@ -7264,6 +7282,14 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/control) +"dBb" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/table{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/telecomms_floor, +/area/centcom) "dER" = ( /turf/open/floor/carpet/royalblue, /area/centcom) @@ -8151,6 +8177,24 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/centcom/control) +"feC" = ( +/obj/effect/turf_decal/spline/fancy/opaque/lime{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/folder/yellow{ + pixel_y = 5; + pixel_x = 7 + }, +/obj/item/folder/blue{ + pixel_x = 3 + }, +/obj/item/folder/red{ + pixel_x = -6; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/centcom) "ffT" = ( /obj/structure/table/wood, /obj/structure/mirror{ @@ -8284,6 +8328,13 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/control) +"fuf" = ( +/obj/effect/turf_decal/spline/fancy/opaque/lime{ + dir = 1 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel/dark, +/area/centcom) "fvB" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -8627,6 +8678,13 @@ }, /turf/open/floor/carpet/royalblue, /area/centcom) +"gga" = ( +/obj/machinery/telecomms/relay/preset/pgf, +/obj/effect/turf_decal/spline/fancy/opaque/lime{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/centcom) "ggX" = ( /obj/machinery/pdapainter, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -9310,6 +9368,12 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership/control) +"hRd" = ( +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/centcom) "hRK" = ( /obj/effect/turf_decal/corner/opaque/red{ dir = 1 @@ -9336,6 +9400,10 @@ }, /turf/open/floor/circuit/red, /area/ctf) +"hUN" = ( +/obj/effect/turf_decal/corner/opaque/lime/half, +/turf/open/floor/plasteel/dark, +/area/centcom) "hVO" = ( /obj/machinery/computer/security/telescreen, /obj/structure/table/reinforced, @@ -10590,6 +10658,13 @@ }, /turf/open/floor/plasteel, /area/tdome/arena_source) +"kkW" = ( +/obj/effect/turf_decal/spline/fancy/opaque/lime{ + dir = 1 + }, +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/dark, +/area/centcom) "kmQ" = ( /obj/effect/turf_decal/syndicateemblem/middle/right, /obj/structure/chair/office/dark{ @@ -10597,6 +10672,12 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom) +"knM" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/admin/pgf, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/telecomms_floor, +/area/centcom) "kqM" = ( /obj/machinery/shower{ dir = 4 @@ -11701,6 +11782,14 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom) +"mzB" = ( +/obj/structure/railing, +/obj/structure/sign/flag/gezena{ + dir = 4; + pixel_x = -30 + }, +/turf/open/floor/plasteel/mono/dark, +/area/centcom) "mzM" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -13837,6 +13926,18 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"qXV" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plasteel/stairs{ + icon = 'icons/obj/stairs.dmi'; + dir = 1 + }, +/area/centcom) "qYE" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -14592,6 +14693,16 @@ }, /turf/open/floor/plasteel, /area/tdome/arena_source) +"sqO" = ( +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/turf_decal/floordetail/tiled, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/centcom) "ssv" = ( /obj/effect/turf_decal/industrial/warning{ dir = 9 @@ -14915,6 +15026,9 @@ }, /turf/open/floor/plasteel/dark, /area/ctf) +"tcl" = ( +/turf/closed/indestructible/titanium/nodiagnonal, +/area/centcom) "tdN" = ( /obj/structure/chair{ dir = 8 @@ -15039,6 +15153,18 @@ }, /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) +"tmB" = ( +/obj/structure/table/reinforced, +/obj/item/desk_flag/gezena{ + pixel_x = 11; + pixel_y = 13 + }, +/obj/item/clothing/head/gezena/captain{ + pixel_x = -9; + pixel_y = 6 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/centcom) "tos" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -15107,6 +15233,10 @@ color = "#808080" }, /area/centcom) +"tus" = ( +/obj/machinery/computer/secure_data, +/turf/open/floor/plasteel/telecomms_floor, +/area/centcom) "tuw" = ( /obj/effect/turf_decal/industrial/loading{ dir = 8 @@ -15498,6 +15628,10 @@ }, /turf/open/floor/plasteel, /area/centcom/control) +"uuR" = ( +/obj/structure/railing, +/turf/open/floor/plasteel/mono/dark, +/area/centcom) "uuY" = ( /obj/effect/turf_decal/syndicateemblem/bottom/right, /turf/open/floor/mineral/plastitanium/red, @@ -15763,6 +15897,13 @@ }, /turf/open/floor/plasteel/dark, /area/ctf) +"vac" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/floor/plasteel/mono/dark, +/area/centcom) "vcL" = ( /obj/machinery/computer, /obj/effect/turf_decal/corner/transparent/bar, @@ -16683,6 +16824,15 @@ /obj/effect/turf_decal/syndicateemblem/top/middle, /turf/open/floor/mineral/plastitanium/red, /area/centcom) +"xAA" = ( +/obj/structure/railing, +/obj/structure/sign/flag/gezena{ + dir = 8; + pixel_y = 0; + pixel_x = 30 + }, +/turf/open/floor/plasteel/mono/dark, +/area/centcom) "xEx" = ( /obj/structure/chair, /obj/effect/turf_decal/industrial/warning{ @@ -30429,13 +30579,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcl +tcl +tcl +tcl +tcl +apD +tcl aaa aPu aPu @@ -30686,13 +30836,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcl +knM +hRd +mzB +gga +aVT +tcl aaa aPu nYZ @@ -30943,13 +31093,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcl +tmB +sqO +uuR +kkW +hUN +tcl aaa aPu qLN @@ -31200,13 +31350,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcl +cIk +hRd +vac +qXV +hUN +tcl aaa aPu wAh @@ -31457,13 +31607,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcl +tus +sqO +uuR +feC +hUN +tcl aaa aPu sZJ @@ -31714,13 +31864,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcl +dBb +hRd +xAA +fuf +aVT +tcl aaa aPu lKP @@ -31971,13 +32121,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tcl +tcl +tcl +tcl +tcl +apD +tcl aaa aPu aPu diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index c8842c88e569..4ebc29275cd9 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -1459,15 +1459,13 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/port) "lZ" = ( -/obj/machinery/fax{ - pixel_y = 3 - }, /obj/structure/table/reinforced, /obj/effect/turf_decal/corner/opaque/lime/mono, /obj/machinery/camera/autoname{ dir = 10 }, /obj/machinery/light/directional/south, +/obj/machinery/fax/pgf, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "md" = ( diff --git a/_maps/shuttles/pgf/pgf_elated_bolide.dmm b/_maps/shuttles/pgf/pgf_elated_bolide.dmm index d9ba8cdf5d30..c1d91bde84d7 100644 --- a/_maps/shuttles/pgf/pgf_elated_bolide.dmm +++ b/_maps/shuttles/pgf/pgf_elated_bolide.dmm @@ -1163,9 +1163,6 @@ /obj/effect/turf_decal/techfloor{ dir = 6 }, -/obj/machinery/fax{ - pixel_y = 7 - }, /obj/structure/cable{ icon_state = "0-2" }, @@ -1176,6 +1173,9 @@ pixel_x = -2; pixel_y = 5 }, +/obj/machinery/fax/pgf{ + pixel_y = 7 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "ij" = ( diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm index 5c3b554c98dd..9d186868cf54 100644 --- a/code/game/turfs/closed/indestructible.dm +++ b/code/game/turfs/closed/indestructible.dm @@ -111,6 +111,12 @@ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS) canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE) +/turf/closed/indestructible/titanium/nodiagnonal + icon = 'icons/turf/walls/shuttle_wall.dmi' + icon_state = "map-shuttle_nd" + base_icon_state = "shuttle_wall" + smoothing_flags = SMOOTH_BITMASK + /turf/closed/indestructible/riveted icon = 'icons/turf/walls/riveted.dmi' icon_state = "riveted-0" diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index ece23ebbfc81..36d25e940917 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -65,6 +65,7 @@ list(fax_name = "Solarian Confederation Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE), list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE), list(fax_name = "Confederated League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE), + list(fax_name = "PGF Military High Command", fax_id = "gezena", color = "olive", emag_needed = FALSE), list(fax_name = "Syndicate Coalition Coordination Center", fax_id = "syndicate", color = "red", emag_needed = FALSE), list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) ) @@ -558,6 +559,13 @@ list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) ) +/obj/machinery/fax/pgf + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), + list(fax_name = "PGF Military High Command", fax_id = "gezena", color = "olive", emag_needed = FALSE), + list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) + ) + /obj/machinery/fax/admin name = "Central Command Fax Machine" @@ -596,6 +604,11 @@ fax_name = "Saint-Roumain Council of Huntsmen" admin_fax_id = "roumain" +/obj/machinery/fax/admin/pgf + name = "PGF Military High Command Fax Machine" + fax_name = "PGF Military High Command" + admin_fax_id = "gezena" + /obj/machinery/fax/admin/frontiersmen name = "old fax machine" fax_name = "Frontiersmen Communications Quartermaster"