From 21c5ff3d7c668bf8b328555b2754bd9a3af64083 Mon Sep 17 00:00:00 2001 From: c4xmaniac2 <133173804+c4xmaniac2@users.noreply.github.com> Date: Sun, 24 Sep 2023 03:26:38 -0400 Subject: [PATCH 1/4] LV Comms Update (#4469) # About the pull request This PR updates the telecomms around the map. There is a guaranteed telecomms spawn in the Tcomms area of the map. Additionally, the west and east bank rivers have had their areas altered to make them easier to siege for xenos. # Explain why it's good for the game Xenos can finally weed the tcomms units and properly siege them, and the extremely enclosed tcomms units have been opened up to make them less claustrophobic. Done at the request of @morrowwolf. # Testing Photographs and Procedure
Screenshots & Videos ![image](https://github.com/cmss13-devs/cmss13/assets/133173804/9743d88c-2be3-48a0-b989-eef6dc6d96bd) ![image](https://github.com/cmss13-devs/cmss13/assets/133173804/f846f90f-e142-4037-b832-f1552d9f8cf1) ![image](https://github.com/cmss13-devs/cmss13/assets/133173804/e9581e81-b4a8-4ede-a6c0-7b5952e9de8c)
# Changelog :cl: balance: Comms areas around the east/west rivers expanded for easier sieges and weedable now. maptweak: LV Comms now always spawn in Tcomms and one either on the east or west river /:cl: --- maps/map_files/LV624/LV624.dmm | 932 +++++++++++++++++++++------------ 1 file changed, 596 insertions(+), 336 deletions(-) diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index bdf4663a0717..ae0f259c8b2d 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -3938,9 +3938,7 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor{ - icon_state = "cult" - }, +/turf/open/floor/wood, /area/lv624/ground/jungle/west_jungle/ceiling) "auP" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -5066,7 +5064,7 @@ /area/lv624/lazarus/research) "ayN" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass/grass1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_jungle) "ayO" = ( /obj/item/weapon/baseballbat/metal, @@ -5106,7 +5104,7 @@ /area/lv624/ground/jungle/west_jungle) "ayU" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_central_jungle) "ayV" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, @@ -5309,9 +5307,9 @@ }, /area/lv624/lazarus/sleep_female) "azB" = ( -/obj/effect/landmark/static_comms/net_one, +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirt, -/area/lv624/ground/colony/telecomm/tcommdome/south) +/area/lv624/ground/jungle/north_west_jungle) "azD" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, @@ -5438,6 +5436,10 @@ }, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) +"azX" = ( +/obj/effect/landmark/hunter_primary, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "azY" = ( /obj/item/weapon/harpoon/yautja{ anchored = 1; @@ -7217,7 +7219,7 @@ /area/lv624/lazarus/toilet) "aFQ" = ( /obj/structure/window_frame/wood, -/turf/open/floor/plating, +/turf/open/floor/wood, /area/lv624/ground/jungle/west_jungle/ceiling) "aFR" = ( /turf/open/floor{ @@ -8778,7 +8780,7 @@ /area/lv624/lazarus/landing_zones/lz1) "aMr" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass/grass1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/east_jungle) "aMt" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, @@ -11280,6 +11282,10 @@ icon_state = "whiteyellowfull" }, /area/lv624/ground/jungle/south_west_jungle/ceiling) +"aWq" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/gm/dirtgrassborder/east, +/area/lv624/ground/jungle/north_west_jungle) "aWs" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 @@ -12259,6 +12265,10 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) +"bav" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/up, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "baN" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/grass/grass2, @@ -12506,8 +12516,7 @@ /turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "btS" = ( -/obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass/grass1, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/east_jungle) "btX" = ( /turf/open/gm/river, @@ -12879,6 +12888,13 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) +"ciz" = ( +/obj/item/device/assembly/signaller{ + pixel_x = -6; + pixel_y = -9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "ciA" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -12947,7 +12963,8 @@ /area/lv624/lazarus/landing_zones/lz1) "crF" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/grass1, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_jungle) "csu" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -13030,6 +13047,22 @@ "cCr" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) +"cDQ" = ( +/obj/item/ammo_magazine/sentry{ + current_rounds = 0; + pixel_y = -13 + }, +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_10_1" + }, +/obj/item/ammo_casing/bullet{ + icon_state = "casing_9_1" + }, +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_6_1" + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "cEh" = ( /obj/structure/flora/bush/ausbushes/pointybush, /turf/open/gm/grass/grass1, @@ -13207,6 +13240,15 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) +"deU" = ( +/obj/item/circuitboard/airlock{ + pixel_x = 12 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/lv624/ground/colony/telecomm/cargo) "dff" = ( /obj/structure/bed/sofa/vert/grey, /turf/open/floor{ @@ -13293,6 +13335,12 @@ icon_state = "whiteyellowfull" }, /area/lv624/ground/barrens/south_eastern_barrens) +"dqz" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/lv624/ground/colony/telecomm/cargo) "dqK" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass1, @@ -13311,6 +13359,10 @@ icon_state = "dark" }, /area/lv624/ground/barrens/north_east_barrens/ceiling) +"dsi" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "dsz" = ( /obj/structure/closet/crate/hydroponics/prespawned, /obj/effect/landmark/objective_landmark/close, @@ -13941,6 +13993,9 @@ icon_state = "desert_dug" }, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"eOk" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, +/area/lv624/ground/jungle/east_jungle) "eOq" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, @@ -14292,8 +14347,9 @@ /obj/structure/machinery/power/apc{ start_charge = 0 }, -/turf/open/floor/plating{ - icon_state = "platebotc" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, /area/lv624/ground/colony/telecomm/cargo) "fGO" = ( @@ -14306,6 +14362,13 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"fHw" = ( +/obj/item/device/sentry_computer{ + pixel_y = 5 + }, +/obj/structure/surface/table, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "fHz" = ( /obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, @@ -15141,11 +15204,12 @@ }, /area/lv624/lazarus/medbay) "hZn" = ( -/obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 8 +/obj/item/stack/sheet/metal{ + pixel_x = 6; + pixel_y = 30 }, -/turf/open/gm/grass/grass1, -/area/lv624/ground/jungle/east_jungle) +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "hZW" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor{ @@ -15228,6 +15292,17 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) +"ihS" = ( +/obj/structure/surface/table, +/obj/item/reagent_container/food/drinks/cans/lemon_lime{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/structure/prop/server_equipment/laptop/on{ + pixel_y = 8 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "iiK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/queen_spawn, @@ -15255,10 +15330,20 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) +"ioC" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, +/area/lv624/ground/jungle/east_jungle) "isF" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) +"isJ" = ( +/obj/structure/surface/table, +/obj/item/storage/beer_pack{ + pixel_y = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "isR" = ( /obj/effect/landmark/objective_landmark/medium, /obj/structure/largecrate/random, @@ -15344,11 +15429,8 @@ /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_central_jungle) "iBy" = ( -/obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/floor/plating{ - icon_state = "platebotc" - }, -/area/lv624/ground/colony/telecomm/cargo) +/turf/open/gm/dirtgrassborder/east, +/area/lv624/ground/jungle/east_jungle) "iBD" = ( /turf/open/floor{ dir = 10; @@ -15678,6 +15760,10 @@ icon_state = "floor6" }, /area/lv624/ground/caves/sand_temple) +"jDY" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/limb, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "jEc" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, @@ -15835,6 +15921,10 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"jRJ" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "jRM" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, @@ -15934,6 +16024,10 @@ "kjC" = ( /turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/barrens/east_barrens) +"kjD" = ( +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, +/area/lv624/ground/jungle/east_jungle) "kmP" = ( /obj/item/stool, /turf/open/gm/dirt, @@ -16092,8 +16186,12 @@ /turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/west_barrens) "kGk" = ( -/turf/closed/wall/r_wall, -/area/lv624/ground/colony/telecomm/tcommdome/south) +/obj/item/storage/toolkit/empty{ + pixel_x = 5; + pixel_y = -3 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "kHB" = ( /turf/open/gm/dirt{ icon_state = "desert3" @@ -16205,6 +16303,10 @@ icon_state = "asteroidwarning" }, /area/lv624/ground/colony/telecomm/sw_lz2) +"kXE" = ( +/obj/structure/flora/bush/ausbushes/ausbush, +/turf/open/gm/dirtgrassborder/north, +/area/lv624/ground/jungle/south_central_jungle) "kYx" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -16397,6 +16499,11 @@ "lBw" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) +"lCG" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/blood/gibs/robot/down, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "lDh" = ( /obj/item/clothing/suit/armor/yautja_flavor, /turf/open/floor/strata{ @@ -16626,6 +16733,10 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) +"mbN" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "mdQ" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/west_caves) @@ -16718,6 +16829,9 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) +"mnr" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, +/area/lv624/ground/jungle/east_jungle) "mnK" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/gm/grass/grass1, @@ -16792,8 +16906,9 @@ /area/lv624/ground/jungle/north_east_jungle) "mvc" = ( /obj/effect/landmark/static_comms/net_two, -/turf/open/floor/plating{ - icon_state = "platebotc" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, /area/lv624/ground/colony/telecomm/cargo) "mvr" = ( @@ -17064,10 +17179,20 @@ icon_state = "asteroidwarning" }, /area/lv624/lazarus/landing_zones/lz2) +"njl" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "njC" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, /area/lv624/ground/colony/west_tcomms_road) +"njO" = ( +/turf/open/floor{ + dir = 5; + icon_state = "asteroidwarning" + }, +/area/lv624/ground/colony/telecomm/cargo) "nkg" = ( /obj/structure/prop/brazier/torch, /turf/closed/wall/mineral/sandstone/runed, @@ -17664,6 +17789,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, /area/lv624/ground/barrens/central_barrens) +"omu" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/west_jungle) "omK" = ( /turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/barrens/west_barrens) @@ -17697,6 +17826,12 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) +"orB" = ( +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/lv624/ground/colony/telecomm/cargo) "oua" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -17786,6 +17921,18 @@ }, /turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) +"oEc" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_6_1" + }, +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_3_1" + }, +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_10_1" + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "oED" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, @@ -17984,8 +18131,8 @@ /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_west_jungle) "oXI" = ( -/turf/open/gm/grass/grass2, -/area/lv624/ground/jungle/north_west_jungle) +/turf/closed/wall/r_wall/unmeltable, +/area/lv624/lazarus/landing_zones/lz2) "oXS" = ( /turf/open/gm/coast/west, /area/lv624/ground/river/central_river) @@ -18049,7 +18196,7 @@ /area/lv624/ground/barrens/east_barrens) "pcu" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass/grass1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/east_jungle) "pcz" = ( /obj/effect/landmark/objective_landmark/medium, @@ -18331,6 +18478,12 @@ /obj/effect/landmark/hunter_secondary, /turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) +"pKm" = ( +/turf/open/floor{ + icon_state = "asteroidwarning"; + dir = 8 + }, +/area/lv624/ground/colony/telecomm/sw_lz2) "pKp" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ @@ -18346,6 +18499,10 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/west_nexus_road) +"pMM" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/gm/dirtgrassborder/east, +/area/lv624/ground/jungle/east_jungle) "pMV" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, @@ -18533,6 +18690,10 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) +"qns" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "qnQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass2, @@ -18723,6 +18884,10 @@ "qIO" = ( /turf/open/gm/dirt, /area/lv624/ground/colony/west_tcomms_road) +"qJe" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "qJg" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/science, @@ -18744,7 +18909,6 @@ /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_nexus_road) "qKC" = ( -/obj/structure/flora/jungle/vines/heavy, /turf/open/floor{ dir = 9; icon_state = "asteroidwarning" @@ -18862,6 +19026,10 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"rcy" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/dirtgrassborder/west, +/area/lv624/ground/jungle/east_jungle) "rcR" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, @@ -19077,9 +19245,9 @@ /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "rGW" = ( -/obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass/grass2, -/area/lv624/ground/jungle/north_west_jungle) +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/south, +/area/lv624/ground/jungle/east_jungle) "rGZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, @@ -19174,6 +19342,9 @@ icon_state = "green" }, /area/lv624/lazarus/hydroponics) +"rSy" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, +/area/lv624/ground/jungle/east_jungle) "rTG" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/light_3, @@ -19327,6 +19498,13 @@ "sqj" = ( /turf/open/gm/river, /area/lv624/ground/river/central_river) +"sqs" = ( +/obj/item/stack/sheet/metal{ + pixel_x = -7; + pixel_y = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "sqw" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, @@ -19515,6 +19693,13 @@ /obj/structure/flora/jungle/planttop1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) +"sOC" = ( +/obj/item/stack/sheet/metal{ + pixel_x = 16; + pixel_y = -10 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "sOZ" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/south, @@ -19531,6 +19716,9 @@ /obj/structure/flora/bush/ausbushes/palebush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) +"sRW" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, +/area/lv624/ground/jungle/east_jungle) "sSE" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/grass/grass1, @@ -19712,8 +19900,16 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/north_west_caves) "tka" = ( -/obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass/grass1, +/obj/item/ammo_casing/bullet{ + icon_state = "casing_9_1" + }, +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_6_1" + }, +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_9_1" + }, +/turf/open/gm/dirt, /area/lv624/ground/jungle/north_west_jungle) "tlD" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -19987,6 +20183,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) +"tRE" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "tSd" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/lazarus/quartstorage/outdoors) @@ -20132,10 +20332,27 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/north_tcomms_road) +"uiW" = ( +/obj/structure/barricade/metal/wired{ + dir = 1; + health = 10; + is_wired = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "ujd" = ( /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) +"ukh" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_6_1" + }, +/obj/item/ammo_casing/bullet{ + icon_state = "casing_9_1" + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "ukk" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 @@ -20148,8 +20365,9 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "ukZ" = ( -/turf/open/floor/plating{ - icon_state = "platebotc" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, /area/lv624/ground/colony/telecomm/cargo) "ulj" = ( @@ -20184,8 +20402,9 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) "unT" = ( -/turf/open/gm/dirt, -/area/lv624/ground/colony/telecomm/tcommdome/south) +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/dirtgrassborder/south, +/area/lv624/ground/jungle/east_jungle) "upM" = ( /obj/effect/landmark/crap_item, /turf/open/gm/grass/grass1, @@ -20196,6 +20415,13 @@ /obj/effect/landmark/corpsespawner/colonist/random/burst, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) +"upV" = ( +/obj/item/stack/cable_coil/random{ + pixel_y = 9; + pixel_x = 7 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "urR" = ( /turf/open/floor/corsat{ dir = 1; @@ -20212,6 +20438,14 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirt, /area/lv624/ground/barrens/central_barrens) +"uuf" = ( +/obj/effect/landmark/hunter_primary, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) +"uuV" = ( +/obj/effect/landmark/hunter_primary, +/turf/open/gm/dirtgrassborder/south, +/area/lv624/ground/jungle/east_jungle) "uve" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) @@ -20470,6 +20704,14 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"vbh" = ( +/obj/item/device/radio/off{ + frequency = 1469; + pixel_x = -9; + pixel_y = -13 + }, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/east_jungle) "vcY" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, @@ -20746,11 +20988,9 @@ /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "vOD" = ( -/turf/open/floor{ - dir = 9; - icon_state = "asteroidwarning" - }, -/area/lv624/ground/colony/telecomm/tcommdome/south) +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/north_west_jungle) "vOF" = ( /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_central_jungle) @@ -20934,6 +21174,15 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"woF" = ( +/obj/structure/flora/jungle/vines/light_3, +/obj/structure/barricade/metal/wired{ + dir = 1; + health = 10; + is_wired = 1 + }, +/turf/open/gm/dirtgrassborder/east, +/area/lv624/ground/jungle/north_west_jungle) "woK" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/wood{ @@ -21218,6 +21467,11 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) +"wUv" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/dirtgrassborder/north, +/area/lv624/ground/jungle/east_jungle) "wUz" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirt, @@ -21262,14 +21516,12 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) "wXg" = ( -/obj/structure/machinery/power/apc{ - start_charge = 0 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" +/obj/item/stack/sheet/metal{ + pixel_x = 16; + pixel_y = -10 }, -/area/lv624/ground/colony/telecomm/tcommdome/south) +/turf/open/gm/dirt, +/area/lv624/ground/jungle/west_jungle) "wXp" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/west_central_jungle) @@ -21573,6 +21825,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"xTM" = ( +/obj/structure/flora/bush/ausbushes/ausbush, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/west_jungle) "xTT" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_west_jungle) @@ -21589,6 +21845,9 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"xVN" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, +/area/lv624/ground/jungle/south_central_jungle) "xXB" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/grass/grass1, @@ -21681,9 +21940,10 @@ }, /area/lv624/lazarus/corporate_dome) "yiE" = ( -/obj/structure/flora/bush/ausbushes/pointybush, +/obj/structure/flora/jungle/vines/heavy, +/obj/effect/landmark/lv624/xeno_tunnel, /turf/open/gm/grass/grass1, -/area/lv624/ground/jungle/east_jungle) +/area/lv624/ground/jungle/north_west_jungle) "yiT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/adv{ @@ -26908,8 +27168,8 @@ aFm auO aFm aFm -uSw -asa +aAl +aqR asa aja asa @@ -27136,9 +27396,9 @@ aue auf aXC aFm -aro +aAl ayN -asc +asx ayT aAp aAp @@ -27364,9 +27624,9 @@ auf auf aZp aFm -aro -aro -ayT +aAl +omu +aqS aAp aAp aAp @@ -27592,9 +27852,9 @@ aug wFx avo aFQ -axX -baN -aAp +xTM +aAl +aDv aAp aAp nmO @@ -27814,15 +28074,15 @@ aud bGb auP aqi -aqS +ase aFm aZn axp auf aFm -asw -aro -aAp +aAl +wXg +aDv aAp nmO aXX @@ -28041,16 +28301,16 @@ aud aud aud auP -aqR -arn +aAl +aAl aFm aIH auR auf aFm -atC -ayT -aAp +aAl +aAl +aDv aAp aXX aRG @@ -28269,16 +28529,16 @@ sFc aud aud auP -aqS -aro +aAl +aAl aFm aFm aFQ aFm aFm -atC -aAp -aAp +aAl +qKC +pKm aAp nmO aZP @@ -28497,12 +28757,12 @@ aud aud aud avy -teS -rGW -psh -nuW -psh -vEp +jRJ +oTJ +oTJ +uiW +sqs +oTJ qKC kWX hdh @@ -28725,12 +28985,12 @@ aud arU aud auP -teS -psh -dop -kVP -psh -psh +vOD +oTJ +azB +sOC +oTJ +oTJ mBL hdh hdh @@ -28953,15 +29213,15 @@ aud aud aud auP -teS -pYq -hIq -nuW -psh -psh +oTJ +tRE +jRJ +oTJ +ukh +njl vVf fqM -aAp +oXI aAp fuy aXX @@ -29181,15 +29441,15 @@ aud aud amG auP -teS -qSZ -fio -nuW +oTJ +oTJ +bav +uiW tka +lCG +cDQ +oTJ nuW -psh -cRT -cqz aAp cIL nmO @@ -29409,14 +29669,14 @@ aud arV aud auP -teS -kRg -nVG -psh -nuW -txx -cRT -cRT +oTJ +azX +qJe +oTJ +oTJ +oEc +fHw +oTJ aAp aAp aAp @@ -29637,15 +29897,15 @@ aud aud aud auP -eHQ -pOC -nuW -oXI -nuW -cqz -cTi -cRT -cRT +vOD +jRJ +oTJ +oTJ +oTJ +asH +oTJ +oTJ +oTJ aAp aAp aXX @@ -29866,14 +30126,14 @@ amG aud auP oTJ -teS -psh -psh -dmS -cRT -cRT -dmS -txx +oTJ +oTJ +hZn +oTJ +oTJ +oTJ +oTJ +nuW aAp nmO aXX @@ -30094,13 +30354,13 @@ aud aud auP asH -teS -psh -pGD -vXW -cTi -cTi -psh +jDY +oTJ +oTJ +tlE +fZO +fZO +fZO aAp aAp cIL @@ -30322,10 +30582,10 @@ aud amG auP oTJ -teS -psh -pYJ -cRT +tlE +aWq +woF +gyP vEp txx xHa @@ -30552,7 +30812,7 @@ auP oTJ teS pDI -cRT +yiE pYJ dmS cRT @@ -39273,7 +39533,7 @@ kxI awQ qtj qtj -hLu +xVN tsa tsa aac @@ -39500,9 +39760,9 @@ kxI kxI dEc pcA -azB -vOD -kGk +qtj +qtj +tsa tsa aac aaa @@ -39728,9 +39988,9 @@ sBJ kxI kxI ayU -unT -wXg -kGk +qtj +qtj +tsa tsa aac aaa @@ -39955,10 +40215,10 @@ aPt tzK kxI kxI -ooM -unT -kGk -kGk +kXE +qtj +tsa +tsa tsa aac aaa @@ -57915,10 +58175,10 @@ atI avS atI asN -dLY -dLY -dLY -dLY +ihS +oUa +oUa +deU fFZ xDw apu @@ -58137,16 +58397,16 @@ vNP dLY dLY pcu -dLY -dLY -dLY -dLY -lxX -dLY -dLY -hRS -dLY -dLY +ioC +oUa +oUa +oUa +oUa +oUa +isJ +oUa +kGk +dqz ukZ mvc apu @@ -58364,18 +58624,18 @@ dLY dLY fSX dLY -dLY -fSX btS -dLY -dLY -dLY -dLY -dLY -vNP -eCx -dLY -iBy +oUa +oUa +oUa +oUa +oUa +oUa +vbh +dsi +oUa +dqz +ukZ ukZ apu apu @@ -58592,21 +58852,21 @@ dLY dLY fED dLY -dLY -dLY -dLY -fSX -dLY -dLY -dLY -dLY -dLY -dLY -dLY -dLY +btS +oUa +oUa +oUa +oUa +oUa +oUa +oUa +upV +oUa +njO +orB apu apu -dLY +oUa apu apu apu @@ -58820,21 +59080,21 @@ fSX dLY dLY fSX -dLY -dLY +btS +oUa jik -dLY -dLY -dLY -dLY -dLY -dLY -crF -dLY -dLY -dLY -hmK -xVk +oUa +oUa +oUa +oUa +oUa +oUa +oUa +ciz +oUa +oUa +oUa +oUa apu apu apu @@ -59048,22 +59308,22 @@ dLY gAI dLY dLY -dLY -lxX -dLY -dLY -dLY -hRS -dLY -dLY -dLY -qcX -dLY -dLY -yiE -kNm -dLY -eSg +eOk +rSy +oUa +oUa +oUa +oUa +oUa +oUa +oUa +qns +oUa +oUa +oUa +uuf +oUa +cCr vKt apu apu @@ -59277,21 +59537,21 @@ fSX dLY dLY dLY -dLY -qcX -dLY -dLY -dLY +btS +qns +oUa +oUa +oUa jik -dLY -dLY -dLY -dLY +oUa +oUa +oUa +oUa jik -dLY -dLY -vKt -vKt +oUa +oUa +oUa +cCr djI dZY djI @@ -59505,21 +59765,21 @@ fSX dLY gMe gcn -fSX -dLY -hmK -xVk -dLY -dLY -dLY -uYC -psc -xQI -dLY -dLY -crF -dLY -vKt +btS +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +cCr rON djI vKt @@ -59733,21 +59993,21 @@ hKk psc xQI dLY -dLY -dLY -dLY -dLY -dLY -uYC -psc -eil -eil -sXi -dLY -sHT -dLY -hRS -dLY +btS +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +cCr jik jik rON @@ -59960,22 +60220,22 @@ cCr lLO eil sXi -dLY -dLY -fSX -fSX -dLY -dLY -lLO -hZn -eil -eil -dNN -dLY -dLY -dLY -dLY -dLY +sRW +ioC +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +cCr jik jik jik @@ -60188,23 +60448,23 @@ cCr dLY xDR sXi -dLY -dLY -dLY -dLY -dLY -lxX +btS +oUa +oUa +oUa +oUa +oUa jik -dLY -lLO -dNN -dLY -hRS -dLY -dLY -dLY -fED -dLY +oUa +oUa +oUa +oUa +oUa +oUa +oUa +oUa +vPV +fqh vKt jik jik @@ -60416,23 +60676,23 @@ cCr dLY xDR sXi -dLY -eCx -dLY -hRS -dLY -dLY -dLY -dLY -lxX -dLY -dLY +eOk +pMM +iBy +rSy +oUa +mnr +iBy +rSy +oUa +oUa +oUa jik jik -bMu -bMu -bMu -fqh +jik +iBy +iBy +iab hmK xVk dLY @@ -60646,21 +60906,21 @@ lbX dNN dLY fSX +hRS +btS +oUa +uuV dLY +eOk +iBy +jik +iBy +iab +jik dLY dLY -kNm -dLY -dLY -dLY -jik dLY dLY -jik -oUa -oUa -oUa -cCr dLY dLY dLY @@ -60668,8 +60928,8 @@ dLY djI jik crF -dLY -dZY +rcy +kjD dZY fbD xVk @@ -60875,8 +61135,8 @@ fSX dLY dLY dLY -dLY -dLY +eOk +iBy jik dLY fED @@ -60886,18 +61146,18 @@ jik kNm jik jik -oUa -oUa -cCr -jik dLY -kNm +dLY dLY jik dLY +kNm dLY -djI -dZY +jik +oUa +oUa +mbN +rGW jik jik vWs @@ -61121,11 +61381,11 @@ jik jik dLY dLY -hRS -dLY -dLY -djI -djI +wUv +oUa +oUa +mbN +unT djI uVU jik From ab575b29b76dbfd721104543cf97e664e361c6b1 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 24 Sep 2023 08:35:29 +0100 Subject: [PATCH 2/4] Automatic changelog for PR #4469 [ci skip] --- html/changelogs/AutoChangeLog-pr-4469.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4469.yml diff --git a/html/changelogs/AutoChangeLog-pr-4469.yml b/html/changelogs/AutoChangeLog-pr-4469.yml new file mode 100644 index 000000000000..50e824d10e9f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4469.yml @@ -0,0 +1,5 @@ +author: "c4xmaniac2" +delete-after: True +changes: + - balance: "Comms areas around the east/west rivers expanded for easier sieges and weedable now." + - maptweak: "LV Comms now always spawn in Tcomms and one either on the east or west river" \ No newline at end of file From da4398ea4488d727e1a69eb16fcfc07622386e07 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Sun, 24 Sep 2023 01:51:50 -0700 Subject: [PATCH 3/4] Cloaked mobs don't give off visible messages (+cloak logic refactor) (#4410) # About the pull request Pretty much the title. Visible messages (visible_message proc) don't give off messages to others if the origin is cloaked. I'm a bit leery of doing this on `visible_message` so this is gonna need testing first. Makes checking for cloaking better, adding a trait on cloak instead of checking for user alpha # Explain why it's good for the game Being able to see things like "Unknown peers through the laser designator" while they're invisible is a pretty large tell despite you not having seen them. # Testing Photographs and Procedure
Screenshots & Videos Works
# Changelog :cl: balance: Cloaked mobs no longer give off visible messages /:cl: --------- Co-authored-by: forest2001 <41653574+realforest2001@users.noreply.github.com> --- code/__DEFINES/traits.dm | 3 +++ code/game/machinery/ARES/ARES_step_triggers.dm | 4 ++-- code/game/objects/items/storage/backpack.dm | 2 ++ code/modules/cm_preds/yaut_bracers.dm | 4 +++- .../mob/living/carbon/xenomorph/castes/Lurker.dm | 6 ++++-- code/modules/mob/mob.dm | 12 ++++++++++-- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index f36441d0a5f9..3486988d4d60 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -179,6 +179,8 @@ #define TRAIT_HARDCORE "t_hardcore" /// If the mob is able to use the vulture rifle or spotting scope #define TRAIT_VULTURE_USER "t_vulture_user" +/// If the mob is cloaked in any form +#define TRAIT_CLOAKED "t_cloaked" // -- ability traits -- /// Xenos with this trait cannot have plasma transfered to them @@ -282,6 +284,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_LISPING" = TRAIT_LISPING, "TRAIT_CANNOT_EAT" = TRAIT_CANNOT_EAT, "TRAIT_VULTURE_USER" = TRAIT_VULTURE_USER, + "TRAIT_CLOAKED" = TRAIT_CLOAKED, ), /mob/living/carbon/xenomorph = list( "TRAIT_ABILITY_NO_PLASMA_TRANSFER" = TRAIT_ABILITY_NO_PLASMA_TRANSFER, diff --git a/code/game/machinery/ARES/ARES_step_triggers.dm b/code/game/machinery/ARES/ARES_step_triggers.dm index 335a877f9f25..51480371be51 100644 --- a/code/game/machinery/ARES/ARES_step_triggers.dm +++ b/code/game/machinery/ARES/ARES_step_triggers.dm @@ -25,7 +25,7 @@ return FALSE if(!(ishuman(passer) || isxeno(passer))) return FALSE - if(passer.alpha <= 100)//Can't be seen/detected to trigger alert. + if(HAS_TRAIT(passer, TRAIT_CLOAKED)) return FALSE if(pass_jobs) if(passer.job in pass_jobs) @@ -117,7 +117,7 @@ return FALSE if(!passer) return FALSE - if(passer.alpha <= 100)//Can't be seen/detected to trigger alert. + if(HAS_TRAIT(passer, TRAIT_CLOAKED))//Can't be seen/detected to trigger alert. return FALSE var/area/pass_area = get_area(get_step(passer, passer.dir)) if(istype(pass_area, /area/almayer/command/airoom))//Don't want it to freak out over someone /entering/ the area. Only leaving. diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index cdfaa9f3c009..3b65811b05b3 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -747,6 +747,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r RegisterSignal(H, COMSIG_HUMAN_EXTINGUISH, PROC_REF(wrapper_fizzle_camouflage)) camo_active = TRUE + ADD_TRAIT(H, TRAIT_CLOAKED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK)) H.visible_message(SPAN_DANGER("[H] vanishes into thin air!"), SPAN_NOTICE("You activate your cloak's camouflage."), max_distance = 4) playsound(H.loc, 'sound/effects/cloak_scout_on.ogg', 15, TRUE) H.unset_interaction() @@ -785,6 +786,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r cloak_cooldown = world.time + 10 SECONDS camo_active = FALSE + REMOVE_TRAIT(H, TRAIT_CLOAKED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK)) H.visible_message(SPAN_DANGER("[H] shimmers into existence!"), SPAN_WARNING("Your cloak's camouflage has deactivated!"), max_distance = 4) playsound(H.loc, 'sound/effects/cloak_scout_off.ogg', 15, TRUE) diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 4e8dbf9d711a..4e5dcb8c6386 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -571,6 +571,7 @@ return FALSE cloaked = TRUE + ADD_TRAIT(M, TRAIT_CLOAKED, TRAIT_SOURCE_EQUIPMENT(WEAR_HANDS)) RegisterSignal(M, COMSIG_HUMAN_EXTINGUISH, PROC_REF(wrapper_fizzle_camouflage)) RegisterSignal(M, COMSIG_HUMAN_PRE_BULLET_ACT, PROC_REF(bullet_hit)) @@ -617,7 +618,8 @@ cloak_malfunction = world.time + decloak_timer cloaked = FALSE - log_game("[key_name_admin(usr)] has disabled their cloaking device.") + REMOVE_TRAIT(user, TRAIT_CLOAKED, TRAIT_SOURCE_EQUIPMENT(WEAR_HANDS)) + log_game("[key_name_admin(user)] has disabled their cloaking device.") user.visible_message(SPAN_WARNING("[user] shimmers into existence!"), SPAN_WARNING("Your cloaking device deactivates.")) playsound(user.loc, 'sound/effects/pred_cloakoff.ogg', 15, 1) user.alpha = initial(user.alpha) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm index 8dda6755cca8..c106eb30781b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm @@ -120,6 +120,7 @@ if (LPA && istype(LPA)) LPA.knockdown = TRUE // pounce knocks down LPA.freeze_self = TRUE + ADD_TRAIT(bound_xeno, TRAIT_CLOAKED, TRAIT_SOURCE_ABILITY("cloak")) bound_xeno.stealth = TRUE can_go_invisible = FALSE invis_start_time = world.time @@ -130,6 +131,7 @@ LPA.knockdown = FALSE // pounce no longer knocks down LPA.freeze_self = FALSE bound_xeno.stealth = FALSE + REMOVE_TRAIT(bound_xeno, TRAIT_CLOAKED, TRAIT_SOURCE_ABILITY("cloak")) // SLIGHTLY hacky because we need to maintain lots of other state on the lurker // whenever invisibility is on/off CD and when it's active. @@ -166,8 +168,8 @@ return var/mob/living/carbon/human/bumped_into = movable_atom - if(bumped_into.alpha < 100) //ignore invisible scouts and preds + if(HAS_TRAIT(bumped_into, TRAIT_CLOAKED)) //ignore invisible scouts and preds return - + to_chat(bound_xeno, SPAN_XENOHIGHDANGER("You bumped into someone and lost your invisibility!")) lurker_invisibility_action.invisibility_off() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 4dfa0644aa21..ec8249fdca5c 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -148,10 +148,14 @@ if(max_distance) view_dist = max_distance for(var/mob/M as anything in viewers(view_dist, src)) var/msg = message - if(self_message && M==src) + if(self_message && M == src) msg = self_message if(flags & CHAT_TYPE_TARGETS_ME) flags = CHAT_TYPE_BEING_HIT + + else if((M != src) && HAS_TRAIT(src, TRAIT_CLOAKED)) + continue + M.show_message( msg, SHOW_MESSAGE_VISIBLE, blind_message, SHOW_MESSAGE_AUDIBLE, flags) CHECK_TICK @@ -183,10 +187,14 @@ // message is output to anyone who can see, e.g. "The [src] does something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" /atom/proc/visible_message(message, blind_message, max_distance, message_flags = CHAT_TYPE_OTHER) + if(HAS_TRAIT(src, TRAIT_CLOAKED)) + return FALSE var/view_dist = 7 - if(max_distance) view_dist = max_distance + if(max_distance) + view_dist = max_distance for(var/mob/M as anything in viewers(view_dist, src)) M.show_message(message, SHOW_MESSAGE_VISIBLE, blind_message, SHOW_MESSAGE_AUDIBLE, message_flags) + return TRUE // Show a message to all mobs in earshot of this atom // Use for objects performing only audible actions From ab44c0dd2a9ea424cb7585d20d5d0905ee9a537d Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 24 Sep 2023 09:59:45 +0100 Subject: [PATCH 4/4] Automatic changelog for PR #4410 [ci skip] --- html/changelogs/AutoChangeLog-pr-4410.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4410.yml diff --git a/html/changelogs/AutoChangeLog-pr-4410.yml b/html/changelogs/AutoChangeLog-pr-4410.yml new file mode 100644 index 000000000000..917a1aaace36 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4410.yml @@ -0,0 +1,4 @@ +author: "Zonespace27" +delete-after: True +changes: + - balance: "Cloaked mobs no longer give off visible messages" \ No newline at end of file