diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm index b14f891bbc4..b811b0e9a19 100644 --- a/_maps/map_files/Arachne/TGS_Arachne.dmm +++ b/_maps/map_files/Arachne/TGS_Arachne.dmm @@ -6097,10 +6097,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/port_hull) -"fjN" = ( -/obj/structure/prop/mainship/name_stencil/M, -/turf/open/floor/mainship_hull, -/area/space) "fki" = ( /obj/machinery/camera/autoname/mainship{ dir = 1 @@ -6134,7 +6130,7 @@ /area/mainship/living/starboard_garden) "fkW" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/mainship/medical/upper_medical) "fld" = ( /obj/structure/window/reinforced{ @@ -8853,7 +8849,7 @@ /turf/open/floor/mainship/mono, /area/mainship/living/tankerbunks) "hBd" = ( -/obj/structure/prop/mainship/name_stencil/G, +/obj/structure/prop/mainship/name_stencil/P, /turf/open/floor/mainship_hull, /area/space) "hBs" = ( @@ -16907,7 +16903,7 @@ /area/mainship/medical/chemistry) "nVh" = ( /obj/structure/cable, -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/mainship/medical/upper_medical) "nVu" = ( /obj/structure/disposalpipe/segment, @@ -24320,7 +24316,7 @@ "ush" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/mainship/medical/upper_medical) "usx" = ( /obj/effect/decal/cleanable/blood/oil{ @@ -25810,7 +25806,7 @@ /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar/droppod) "vED" = ( -/obj/structure/prop/mainship/name_stencil/T, +/obj/structure/prop/mainship/name_stencil/U, /turf/open/floor/mainship_hull, /area/space) "vEN" = ( @@ -28382,10 +28378,6 @@ dir = 4 }, /area/mainship/hallways/hangar) -"xPl" = ( -/obj/structure/prop/mainship/name_stencil/C, -/turf/open/floor/mainship_hull, -/area/space) "xPo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -36123,7 +36115,7 @@ vkb vkb vkb vkb -vED +vkb vkb vkb jUe @@ -36225,7 +36217,7 @@ mUw mUw pOz vkb -vkb +vED vkb mPj kqS @@ -36429,7 +36421,7 @@ yih oSy vkb vkb -hBd +vkb vkb mPj kqS @@ -36531,7 +36523,7 @@ vgE oSy vkb vkb -vkb +hBd vkb lYK noK @@ -36735,7 +36727,7 @@ bze oSy vkb vkb -fjN +vkb vkb mPj kqS @@ -36837,7 +36829,7 @@ bze oSy vkb vkb -vkb +hBd vkb lYK noK @@ -37041,7 +37033,7 @@ mUw mUw pOz vkb -xPl +vkb vkb lYK noK @@ -42587,10 +42579,10 @@ vkb hBd vkb vkb -fjN +hBd +vkb vkb vkb -xPl vkb vkb vkb diff --git a/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm b/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm index 634273ada4c..9fefe6083da 100644 --- a/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm +++ b/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm @@ -9982,7 +9982,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 5 }, -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/magmoor/civilian/arrival) "hgJ" = ( /obj/structure/table/woodentable, @@ -10949,7 +10949,7 @@ /turf/open/floor/plating, /area/magmoor/compound/north) "hWC" = ( -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/magmoor/civilian/arrival/east) "hWD" = ( /obj/structure/closet/crate/freezer/rations, @@ -11409,7 +11409,7 @@ "ilS" = ( /obj/structure/barricade/wooden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/magmoor/civilian/arrival/east) "img" = ( /obj/machinery/bodyscanner, @@ -24269,7 +24269,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/magmoor/civilian/arrival) "rMh" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -28628,7 +28628,7 @@ /area/magmoor/cargo/processing/south) "uSP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/magmoor/civilian/arrival/east) "uTa" = ( /turf/open/floor/mainship/emerald{ @@ -29389,7 +29389,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/magmoor/civilian/arrival) "vzw" = ( /obj/structure/cable, diff --git a/_maps/map_files/Orion_Military_Outpost/orionoutpost.dmm b/_maps/map_files/Orion_Military_Outpost/orionoutpost.dmm index ee1a827fe95..9f82037a6f4 100644 --- a/_maps/map_files/Orion_Military_Outpost/orionoutpost.dmm +++ b/_maps/map_files/Orion_Military_Outpost/orionoutpost.dmm @@ -455,7 +455,7 @@ /obj/structure/bed/chair/dropship/passenger{ dir = 8 }, -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/orion_outpost/ground/outpostse) "ct" = ( /obj/effect/landmark/start/job/survivor, @@ -3225,7 +3225,7 @@ /obj/structure/bed/chair/dropship/passenger{ dir = 4 }, -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/orion_outpost/ground/outpostse) "qv" = ( /obj/structure/cable, @@ -6892,7 +6892,7 @@ /turf/open/floor/plating/ground/concrete, /area/orion_outpost/surface/building/vehicledepot) "Jk" = ( -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/orion_outpost/ground/outpostse) "Jl" = ( /obj/structure/shuttle/engine/propulsion/burst/left, diff --git a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm index 9ed559c6663..c257de5e646 100644 --- a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm +++ b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm @@ -1064,7 +1064,7 @@ /obj/machinery/light/mainship{ dir = 4 }, -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/mainship/command/corporateliaison) "bni" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -1179,7 +1179,7 @@ }, /area/mainship/squads/req) "buS" = ( -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/mainship/squads/general) "bvv" = ( /obj/structure/cable, @@ -1456,7 +1456,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/mainship/squads/general) "bNl" = ( /obj/structure/bed/bunkbed, @@ -1711,7 +1711,7 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "bYP" = ( -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/mainship/squads/general) "bZE" = ( /obj/structure/bed/fancy, @@ -1881,7 +1881,7 @@ /turf/open/floor/mainship/sterile/corner, /area/mainship/medical/lower_medical) "cpi" = ( -/obj/structure/prop/mainship/name_stencil/M, +/obj/structure/prop/mainship/name_stencil/P, /turf/open/floor/mainship_hull, /area/space) "cqy" = ( @@ -3931,7 +3931,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/mainship/squads/general) "eUN" = ( /obj/machinery/light/mainship{ @@ -4208,7 +4208,7 @@ "fol" = ( /obj/effect/ai_node, /obj/structure/disposalpipe/segment, -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/mainship/command/corporateliaison) "fom" = ( /obj/machinery/cryopod/right, @@ -4680,7 +4680,7 @@ /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "fQp" = ( -/obj/structure/prop/mainship/name_stencil/C, +/obj/structure/prop/mainship/name_stencil/U, /turf/open/floor/mainship_hull, /area/space) "fQO" = ( @@ -4964,9 +4964,16 @@ /turf/open/floor/mainship/red/corner, /area/mainship/command/airoom) "glL" = ( -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/wood, -/area/mainship/living/grunt_rnr) +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/vending/weapon, +/obj/structure/window/reinforced, +/turf/open/floor/mainship/wylogo/wy2, +/area/mainship/squads/general) "glN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -5295,7 +5302,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/mainship/squads/general) "gMu" = ( /obj/machinery/light/mainship/small{ @@ -6576,7 +6583,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/mainship/squads/general) "ixk" = ( /turf/open/floor/mainship/cargo/arrow{ @@ -6802,7 +6809,7 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "iKM" = ( -/turf/open/floor/mainship/ntlogo, +/turf/open/floor/mainship/wylogo, /area/mainship/command/corporateliaison) "iLf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -8223,7 +8230,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/mainship/squads/general) "kJX" = ( /obj/structure/window/framed/mainship/hull, @@ -8610,10 +8617,6 @@ "leW" = ( /turf/open/floor/mainship/purple/full, /area/mainship/hallways/boxingring) -"lgF" = ( -/obj/structure/prop/mainship/name_stencil, -/turf/open/floor/mainship_hull, -/area/space) "lgL" = ( /obj/machinery/marine_selector/clothes, /obj/structure/window/reinforced{ @@ -11604,7 +11607,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/wylogo/wy3, /area/mainship/squads/general) "oKe" = ( /turf/open/floor/mainship/black, @@ -11901,10 +11904,6 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) -"pde" = ( -/obj/structure/prop/mainship/name_stencil/G, -/turf/open/floor/mainship_hull, -/area/space) "pdj" = ( /obj/machinery/loadout_vendor, /turf/open/floor/mainship/black{ @@ -15654,7 +15653,7 @@ }, /area/mainship/living/numbertwobunks) "tJA" = ( -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/wylogo/wy2, /area/mainship/squads/general) "tKd" = ( /obj/structure/table/mainship/nometal, @@ -45466,7 +45465,7 @@ poR jsE jsE jsE -glL +acv pMf dBm nHm @@ -46238,7 +46237,7 @@ hUf hUf qvJ spJ -glL +acv lhZ dBm nHm @@ -46495,7 +46494,7 @@ rPu jwA qvJ bLz -glL +acv cVd dST nHm @@ -49379,7 +49378,7 @@ qFT esN nWT nWT -lgF +nWT nWT nWT aiT @@ -49893,7 +49892,7 @@ wPV kUW nWT nWT -nWT +fQp nWT wSP qVo @@ -50150,7 +50149,7 @@ wPV kUW nWT nWT -pde +nWT nWT wSP qVo @@ -50664,7 +50663,7 @@ nkI esN nWT nWT -nWT +cpi nWT wSP qVo @@ -50921,7 +50920,7 @@ oco esN nWT nWT -cpi +nWT nWT wSP qVo @@ -51435,7 +51434,7 @@ pkN kUW nWT nWT -nWT +cpi nWT wSP qVo @@ -51692,7 +51691,7 @@ wPV kUW nWT nWT -fQp +nWT nWT wSP qVo @@ -55002,7 +55001,7 @@ hmH rUF dJU rHh -cPg +buS cPg kdF mqK @@ -55259,7 +55258,7 @@ iFI rUF cPg wkZ -cPg +tJA vVG sSA mqK @@ -55516,7 +55515,7 @@ cjl ekL mNM xWS -cPg +bYP xWS bAS mqK @@ -56526,7 +56525,7 @@ tJA xLV eMz xYh -kbg +glL kId esQ eMz diff --git a/_maps/map_files/Sulaco/TGS_Sulaco.dmm b/_maps/map_files/Sulaco/TGS_Sulaco.dmm index eff4022ff64..52c637fde7a 100644 --- a/_maps/map_files/Sulaco/TGS_Sulaco.dmm +++ b/_maps/map_files/Sulaco/TGS_Sulaco.dmm @@ -18028,10 +18028,6 @@ /obj/machinery/marine_selector/gear/commander, /turf/open/floor/wood, /area/sulaco/bridge/office) -"mno" = ( -/obj/structure/prop/mainship/name_stencil/M, -/turf/open/floor/mainship_hull/gray, -/area/space) "mnu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -19262,10 +19258,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/sulaco/cargo) -"nTc" = ( -/obj/structure/prop/mainship/name_stencil/G, -/turf/open/floor/mainship_hull/gray, -/area/space) "nTZ" = ( /obj/effect/ai_node, /turf/open/floor/prison/red/corner{ @@ -19585,7 +19577,7 @@ }, /area/sulaco/hangar/droppod) "orU" = ( -/obj/structure/prop/mainship/name_stencil/C, +/obj/structure/prop/mainship/name_stencil/P, /turf/open/floor/mainship_hull/gray, /area/space) "oso" = ( @@ -73136,7 +73128,7 @@ mDu mDu mDu mDu -nTc +orU mDu mDu qDO @@ -73907,7 +73899,7 @@ ipF mDu mDu mDu -mno +orU mDu mDu qDO @@ -74678,7 +74670,7 @@ mDu mDu mDu mDu -orU +mDu mDu mDu qDO diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index e7e4a50c8d9..3c8bbe795c2 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -2807,7 +2807,7 @@ }, /area/mainship/squads/delta) "bDD" = ( -/obj/structure/prop/mainship/name_stencil/C, +/obj/structure/prop/mainship/name_stencil/U, /turf/open/floor/mainship_hull, /area/space) "bDL" = ( @@ -6467,7 +6467,7 @@ /turf/open/floor/mainship/metal, /area/mainship/hallways/hangar) "dFh" = ( -/obj/structure/prop/mainship/name_stencil/M, +/obj/structure/prop/mainship/name_stencil/P, /turf/open/floor/mainship_hull, /area/space) "dFx" = ( @@ -25218,10 +25218,6 @@ /obj/effect/spawner/random/clothing/hats, /turf/open/floor/mainship/metal/full, /area/mainship/hallways/starboard_hallway) -"oLr" = ( -/obj/structure/prop/mainship/name_stencil/G, -/turf/open/floor/mainship_hull, -/area/space) "oLy" = ( /obj/item/weapon/gun/pistol/vp70, /obj/item/ammo_magazine/pistol/vp70, @@ -66008,7 +66004,7 @@ neu neu ooO dnv -oLr +dnv dnv dnv dnv @@ -66096,7 +66092,7 @@ dnv dnv dnv dnv -oLr +dnv enG neu neu @@ -66265,7 +66261,7 @@ neu neu ooO dnv -dnv +dFh dnv dnv dnv @@ -66353,7 +66349,7 @@ dnv dnv dnv dnv -dnv +dFh enG neu neu @@ -66522,7 +66518,7 @@ neu neu ooO dnv -dFh +dnv dnv dnv dnv @@ -66610,7 +66606,7 @@ dnv dnv dnv dnv -dFh +dnv enG neu neu @@ -67036,7 +67032,7 @@ neu neu ooO dnv -bDD +dFh dnv lXW dnv @@ -67124,7 +67120,7 @@ dnv lXW dnv dnv -bDD +dFh enG neu neu @@ -88276,7 +88272,7 @@ dnv dnv dnv dnv -dnv +bDD dnv dnv dnv @@ -88790,7 +88786,7 @@ dnv dnv dnv dnv -dnv +dFh dnv dnv dnv @@ -89304,7 +89300,7 @@ dnv dnv dnv dnv -dnv +dFh dnv dnv dnv @@ -89398,7 +89394,7 @@ ooO dnv dnv dnv -oLr +dnv dnv dnv dnv @@ -89480,7 +89476,7 @@ dnv dnv dnv dnv -oLr +dnv dnv dnv enG @@ -89655,7 +89651,7 @@ ooO dnv dnv dnv -dnv +dFh dnv dnv dnv @@ -89737,7 +89733,7 @@ dnv dnv dnv dnv -dnv +dFh dnv dnv enG @@ -89912,7 +89908,7 @@ ooO dnv dnv dnv -dFh +dnv dnv dnv dnv @@ -89994,7 +89990,7 @@ dnv dnv dnv dnv -dFh +dnv dnv dnv enG @@ -90426,7 +90422,7 @@ ooO dnv dnv dnv -bDD +dFh dnv dnv dnv @@ -90508,7 +90504,7 @@ ooO dnv dnv dnv -bDD +dFh dnv dnv enG diff --git a/_maps/map_files/Theseus/TGS_Theseus.dmm b/_maps/map_files/Theseus/TGS_Theseus.dmm index e9d130fa498..14837dd8a98 100644 --- a/_maps/map_files/Theseus/TGS_Theseus.dmm +++ b/_maps/map_files/Theseus/TGS_Theseus.dmm @@ -8927,10 +8927,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"etF" = ( -/obj/structure/prop/mainship/name_stencil/G, -/turf/open/floor/mainship_hull, -/area/space) "eus" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/firealarm{ @@ -9019,7 +9015,7 @@ }, /area/mainship/medical/lower_medical) "eAS" = ( -/obj/structure/prop/mainship/name_stencil/M, +/obj/structure/prop/mainship/name_stencil/P, /turf/open/floor/mainship_hull, /area/space) "eBv" = ( @@ -9047,10 +9043,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/port_hull) -"eFi" = ( -/obj/structure/prop/mainship/name_stencil/C, -/turf/open/floor/mainship_hull, -/area/space) "eFu" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -32766,7 +32758,7 @@ cjn wPV wPV wPV -etF +eAS fPA bYT eGg @@ -32779,7 +32771,7 @@ eGg bYT qOi wPV -etF +eAS wPV wPV xbS @@ -33794,7 +33786,7 @@ cjn wPV wPV wPV -eFi +wPV fPA bYT snR @@ -33807,7 +33799,7 @@ vkC bYT qOi wPV -eFi +wPV wPV wPV xbS diff --git a/code/game/objects/machinery/telecomms/ground_telecomms.dm b/code/game/objects/machinery/telecomms/ground_telecomms.dm index 66e5a00854c..b5cbefec911 100644 --- a/code/game/objects/machinery/telecomms/ground_telecomms.dm +++ b/code/game/objects/machinery/telecomms/ground_telecomms.dm @@ -29,8 +29,16 @@ GLOB.tower_relay = FALSE /obj/machinery/telecomms/relay/preset/tower/proc/init_marker() - var/marker_icon = "miner_[TRUE ? "platinum" : "phoron"]_off" - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, marker_icon)) + + var/marker_icon = "" + switch(tower_status) + if(TOWER_ON) + marker_icon = "comm_tower_on" + if(TOWER_OFF) + marker_icon = "comm_tower_off" + if(TOWER_BROKEN) + marker_icon= "comm_tower_broken" + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips_large.dmi', null, marker_icon)) /obj/machinery/telecomms/relay/preset/tower/update_icon() . = ..() diff --git a/code/game/objects/structures/prop.dm b/code/game/objects/structures/prop.dm index e1ed4189785..3247b34b1b0 100644 --- a/code/game/objects/structures/prop.dm +++ b/code/game/objects/structures/prop.dm @@ -251,13 +251,13 @@ /obj/structure/prop/mainship/mission_planning_system name = "\improper MPS IV computer" - desc = "The Mission Planning System IV (MPS IV), a enhancement in mission planning and charting for dropship pilots across the TGMC. Fully capable of customizing their flight paths and loadouts to suit their combat needs." + desc = "The Mission Planning System IV (MPS IV), a enhancement in mission planning and charting for dropship pilots across the UPP. Fully capable of customizing their flight paths and loadouts to suit their combat needs." icon = 'icons/Marine/mainship_props.dmi' icon_state = "mps" /obj/structure/prop/mainship/mapping_computer name = "\improper CMPS II computer" - desc = "The Common Mapping Production System version II allows for sensory imput from satellites and ship systems to derive planetary maps in a standardized fashion for all TGMC pilots." + desc = "The Common Mapping Production System version II allows for sensory imput from satellites and ship systems to derive planetary maps in a standardized fashion for all UPP pilots." icon = 'icons/Marine/mainship_props.dmi' icon_state = "mapping_comp" @@ -302,7 +302,7 @@ /obj/structure/prop/mainship/ship_memorial name = "slab of victory" - desc = "A ship memorial dedicated to the triumphs of the TGMC and the fallen marines of this ship. On the left there are grand tales of victory etched into the slab. On the right there is a list of famous marines who have fallen in combat serving the TGMC." + desc = "A ship memorial dedicated to the triumphs of the UPP and the fallen marines of this ship. On the left there are grand tales of victory etched into the slab. On the right there is a list of famous marines who have fallen in combat serving the UPP." icon = 'icons/Marine/mainship_props64.dmi' icon_state = "ship_memorial" bound_width = 64 @@ -345,25 +345,19 @@ /obj/structure/prop/mainship/name_stencil - name = "\improper The TGMC, a TGMC-Class Marine Carrier Arsenal Ship" + name = "\improper The UPP, a UPP-Class Marine Carrier Arsenal Ship" desc = "The name of the ship stenciled on the hull." icon = 'icons/Marine/mainship_props64.dmi' - icon_state = "TGMC1" + icon_state = "UPP1" density = FALSE resistance_flags = UNACIDABLE layer = ABOVE_TURF_LAYER -/obj/structure/prop/mainship/name_stencil/T - icon_state = "TGMC1" +/obj/structure/prop/mainship/name_stencil/U + icon_state = "UPP1" -/obj/structure/prop/mainship/name_stencil/G - icon_state = "TGMC2" - -/obj/structure/prop/mainship/name_stencil/M - icon_state = "TGMC3" - -/obj/structure/prop/mainship/name_stencil/C - icon_state = "TGMC4" +/obj/structure/prop/mainship/name_stencil/P + icon_state = "UPP2" /obj/structure/prop/mainship/name_stencil/Initialize(mapload) . = ..() @@ -2103,15 +2097,15 @@ A recent skirmish against the ICCN and the TGN results in a TGN victory. Both sides with 5 ships each are head on in a brachistochrone trajectory TG fires first firing a salvo of 200 torch missiles, the ICCN being primarily a laser star focused fleet makes them very effective in point defense allows them to intercept most, 3 missiles impact killing 2 ships and disabling 1. ICC ships fire off their lasers and a beam is able to focus enough to melt through the armor of a TG ship disabling them then being completely melted down with focused fire before counter fire from the remaining TG ships is able to vaporize the remaining ships.;\ Nano-toys, releases the rouny plush line based off the runner xenomorph, some concerned parents criticizes the toy saying, 'Its outrageous that it's ok to sell a plush depicting a killer alien that has killed hundreds of colonists as a toy for children!'.;\ Viral footage shows a mech racing against the colonists of LV-235, with the mech making extensive use of its boosters to outpace the other vehicles to the point of overheating. We ask mech freelancer John Sauter what his story is, 'We had a contract here but it was over pretty fast, so me and my comrades decided to see what kinda activities the locals have, apparently they have a racing event. One of the guys joked about bringing the mech to the race and i said fuck it, lets do it and man what a ride it was, won an entire basket of oranges for getting 1st place, not the best prize but ill take it, im pretty sure im a pioneer in this field too. John Sauter first mech racer, thats a good title.'.;\ - TG Transportation Safety Board has recently released a new list of locations marked as quarantine which includes LV-462, Big Red, and Chigusa. TGMC have been sent to enforce the quarantine and clear the infestation of the recent xenomorph outbreaks, a statement is also included stating the situation is currently under control.;\ + TG Transportation Safety Board has recently released a new list of locations marked as quarantine which includes LV-462, Big Red, and Chigusa. UPP have been sent to enforce the quarantine and clear the infestation of the recent xenomorph outbreaks, a statement is also included stating the situation is currently under control.;\ Tadpole class dropships land dropping off more rescue teams to rescue the civilians out of the Hope-3 O'Neill cylinder colony situated on lagrange 1 of Lakota as yesterday a cargo liner collision suspected to be manned by CLF operatives crashed into the colony. Death tolls are currently 45k+ dead and 15k+ injured. This is likely a reprisal attack after the navy began to clamp down on the CLF, more combat ships are being sent to protect especially high value targets.;\ - War correspondent Tim Sholk on the ground in Lolokal station, take it away 'It's a very tense situation here, as you can see most of the stations population have taken refuge near the medical wing caught in the middle of battle against MMC forces and the TGMC, while TG controls the station for now and preparing for evacuation of the-' 'BREACHING CHARGE ON ENGINEERING MARINES MOVE IN AND REEINFORCE, CUT THE FEED NOW!'.;\ + War correspondent Tim Sholk on the ground in Lolokal station, take it away 'It's a very tense situation here, as you can see most of the stations population have taken refuge near the medical wing caught in the middle of battle against MMC forces and the UPP, while TG controls the station for now and preparing for evacuation of the-' 'BREACHING CHARGE ON ENGINEERING MARINES MOVE IN AND REEINFORCE, CUT THE FEED NOW!'.;\ Famous photographer Will Navidson goes missing after going on a short break with his family on the planet of New Vingrina, local authorities ask for any information on whereabouts. Was last seen buying camping supplies in a Leafes Outdoor Equipment store.;\ 3rd generation bluespace drive. 1500kN of thrust. 200km+ Delta V. Liquid Droplet Radiators. Protection. Luxury. Luna Shipworks proudly presents the Marik Class Yacht with 4 large hardpoints for any of your needs whether it be transport or light cargo hauling or even racing.;\ Mars, a place that has been completely devastated by the independence war. Mine fields and rows of trenches litter the landscape with colonies wiped off the map completely, you can stop this tragedy from happening again, join the marine corps today.;\ 'This material will change the course of our species and its time to rise from the rubble, look upon the stars and grasp them!' DIRECTED BY ALEXANDER BREEN 'It's a race against time we have Onmark Fusion stating that they will get their bluespace drive test on the 15th, we have to rush this prototype Paul.' 'Paul me and the kids haven't seen you in 5 months! You have to take a break sometime.' THIS REMEMBRANCE DAY 'This is Armstrong-1 we have reached jump point anomaly. Begin ignition in 5 4 3 2 1' BLUESPACE In theaters 15th of July.;\ 'Hey Alex, got you the coffee you asked for' 'This doesn't seem like the usual' 'It's a new chain they got a classic pre strife era France vibe in their cafe, was founded by the Rushin Engines band' 'This is nice, wakes you up instantly and it's got a really rich flavour i haven't felt before' 'Yup that would be the special Java organically grown coffee beans, they also use the newest tech in chemistry, i swear it looked more like a lab back there than a cafe' Baron Cafe. 'Taste the future of coffee, today. No gimmicks. Pure quality'.;\ - TGMC enforces the peace here in the recently liberated Tiberius from the ICC, as you can see it has been very peacefu- 'FUCK YOU IMPERIALISTS! YOU AND THE CORPOS HAVE TAKEN EVERYTHING FROM ME, WHAT ELSE DO YOU WANT!' 'Shut that man up! Alec, escort that camera crew out of here things are about to get heated here'." + UPP enforces the peace here in the recently liberated Tiberius from the ICC, as you can see it has been very peacefu- 'FUCK YOU IMPERIALISTS! YOU AND THE CORPOS HAVE TAKEN EVERYTHING FROM ME, WHAT ELSE DO YOU WANT!' 'Shut that man up! Alec, escort that camera crew out of here things are about to get heated here'." /obj/prop/mainship/prop/news_tv/som news_stories = "Our navy makes a foothold on the Persatuan system as we destroy the imperialists holds in the system, using a mass amount of drones and carrier ships allows us to easily project force everywhere in the system in a matter of a few hours.;\ diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 4cbb620d916..b53b8b4bc5c 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -146,14 +146,14 @@ /turf/open/floor/mainship/rubber icon_state = "carpet_rubber" -/turf/open/floor/mainship/ntlogo - icon_state = "nt1" +/turf/open/floor/mainship/wylogo + icon_state = "wy1" -/turf/open/floor/mainship/ntlogo/nt2 - icon_state = "nt2" +/turf/open/floor/mainship/wylogo/wy2 + icon_state = "wy2" -/turf/open/floor/mainship/ntlogo/nt3 - icon_state = "nt3" +/turf/open/floor/mainship/wylogo/wy3 + icon_state = "wy3" //Cargo elevator /turf/open/floor/mainship/empty diff --git a/icons/Marine/mainship_props64.dmi b/icons/Marine/mainship_props64.dmi index 29f02eb8676..cd2f2e4e938 100644 Binary files a/icons/Marine/mainship_props64.dmi and b/icons/Marine/mainship_props64.dmi differ diff --git a/icons/UI_Icons/map_blips_large.dmi b/icons/UI_Icons/map_blips_large.dmi index 8d79f9a729e..270d7868a49 100644 Binary files a/icons/UI_Icons/map_blips_large.dmi and b/icons/UI_Icons/map_blips_large.dmi differ diff --git a/icons/turf/mainship.dmi b/icons/turf/mainship.dmi index 3d7838c820a..1892d16dcbb 100644 Binary files a/icons/turf/mainship.dmi and b/icons/turf/mainship.dmi differ