diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm index 71c7495ae22..bcea9d1adbd 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm @@ -122,7 +122,7 @@ /obj/effect/turf_decal/arrows{ dir = 1 }, -/turf/open/floor/asphalt/lavaland, +/turf/open/floor/asphalt/lavaland/outdoors, /area/lavaland/surface/outdoors) "fF" = ( /obj/machinery/portable_atmospherics/canister, @@ -343,7 +343,7 @@ }, /area/ruin/thelizardsgas_lavaland) "om" = ( -/turf/open/floor/asphalt/lavaland, +/turf/open/floor/asphalt/lavaland/outdoors, /area/lavaland/surface/outdoors) "ou" = ( /obj/structure/cable, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm index 6aca5d7938a..f3a4b1f7528 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm @@ -316,7 +316,7 @@ /obj/structure/lattice, /obj/structure/grille, /obj/effect/spawner/random/entertainment/plushie, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/foodwaste) "oq" = ( /obj/item/food/cheese/wheel, @@ -367,7 +367,7 @@ /area/ruin/space/has_grav/garbagetruck/foodwaste) "pP" = ( /obj/structure/lattice/catwalk, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/foodwaste) "qd" = ( /obj/item/food/breadslice/moldy/bacteria{ @@ -385,8 +385,8 @@ /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) "qM" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "re" = ( /obj/item/trash/shrimp_chips, /obj/item/trash/sosjerky, @@ -626,7 +626,7 @@ "AR" = ( /obj/structure/lattice, /obj/structure/grille, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/foodwaste) "BS" = ( /obj/item/storage/bag/trash/filled{ @@ -1143,7 +1143,7 @@ "UX" = ( /obj/structure/lattice/catwalk, /obj/item/crowbar/large/emergency, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/foodwaste) "Vb" = ( /obj/structure/closet/crate/cardboard/mothic, @@ -1161,8 +1161,8 @@ /area/ruin/space/has_grav/garbagetruck/foodwaste) "VL" = ( /obj/machinery/power/shuttle_engine/propulsion, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "Xi" = ( /obj/item/food/badrecipe/moldy/bacteria, /obj/effect/decal/cleanable/food/egg_smudge, @@ -1177,7 +1177,7 @@ "XY" = ( /obj/structure/lattice, /obj/structure/grille/broken, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/foodwaste) "Yu" = ( /obj/structure/table/reinforced, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm index c394d14f977..c697cd5fa00 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm @@ -20,8 +20,8 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/medicalwaste) "gh" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "gr" = ( /obj/machinery/door/poddoor/shutters/preopen, /turf/open/floor/plating, @@ -83,7 +83,7 @@ /obj/structure/lattice, /obj/structure/grille, /obj/effect/spawner/random/entertainment/plushie, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/medicalwaste) "iU" = ( /obj/item/storage/medkit/brute, @@ -110,7 +110,7 @@ "kx" = ( /obj/structure/lattice, /obj/structure/grille, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/medicalwaste) "lT" = ( /turf/open/floor/catwalk_floor/iron, @@ -207,7 +207,7 @@ /area/ruin/space/has_grav/garbagetruck/medicalwaste) "sU" = ( /obj/structure/lattice/catwalk, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/medicalwaste) "tI" = ( /obj/structure/tank_holder/anesthetic, @@ -494,7 +494,7 @@ "LG" = ( /obj/structure/lattice/catwalk, /obj/item/crowbar/large/emergency, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/medicalwaste) "LI" = ( /obj/structure/table/reinforced, @@ -558,7 +558,7 @@ "Pd" = ( /obj/structure/lattice, /obj/structure/grille/broken, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/medicalwaste) "Pe" = ( /obj/effect/decal/cleanable/robot_debris/up, @@ -659,8 +659,8 @@ /area/ruin/space/has_grav/garbagetruck/medicalwaste) "VL" = ( /obj/machinery/power/shuttle_engine/propulsion, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "WX" = ( /obj/machinery/light/warm, /obj/structure/cable, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm index 03a9b87ff4e..cdb5b4e2cec 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm @@ -202,7 +202,7 @@ "la" = ( /obj/structure/lattice, /obj/structure/grille/broken, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/squat) "le" = ( /obj/structure/door_assembly/door_assembly_mhatch, @@ -286,7 +286,7 @@ /area/ruin/space/has_grav/garbagetruck/squat) "pk" = ( /obj/structure/lattice/catwalk, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/squat) "pC" = ( /obj/effect/decal/cleanable/fuel_pool, @@ -513,7 +513,7 @@ "zC" = ( /obj/structure/lattice, /obj/structure/grille, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/squat) "zN" = ( /obj/structure/table/reinforced, @@ -716,8 +716,8 @@ /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) "JX" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "Ko" = ( /obj/machinery/computer/terminal{ content = list("Property of Spinward-Upsilon Sanitation Department. Authorised employees only."); @@ -751,7 +751,7 @@ "MJ" = ( /obj/structure/lattice/catwalk, /obj/item/crowbar/large/emergency, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/squat) "MQ" = ( /obj/item/stock_parts/power_store/cell/crap/empty{ @@ -885,8 +885,8 @@ /area/ruin/space/has_grav/garbagetruck/squat) "VL" = ( /obj/machinery/power/shuttle_engine/propulsion, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "WK" = ( /obj/effect/decal/cleanable/fuel_pool, /obj/item/clothing/shoes/workboots{ @@ -921,7 +921,7 @@ /obj/structure/lattice, /obj/structure/grille, /obj/effect/spawner/random/entertainment/plushie, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/squat) "Zu" = ( /obj/item/food/candy, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm index 84ec36e943a..aa15bb27e8b 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm @@ -118,7 +118,7 @@ /area/ruin/space/has_grav/garbagetruck/toystore) "lg" = ( /obj/structure/lattice/catwalk, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/toystore) "lm" = ( /obj/structure/spider/stickyweb, @@ -210,7 +210,7 @@ "ri" = ( /obj/structure/lattice/catwalk, /obj/item/crowbar/large/emergency, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/toystore) "rr" = ( /obj/structure/floodlight_frame, @@ -222,7 +222,7 @@ "rI" = ( /obj/structure/lattice, /obj/structure/grille, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/toystore) "sh" = ( /obj/item/food/badrecipe/moldy/bacteria, @@ -492,7 +492,7 @@ /obj/structure/lattice, /obj/structure/grille, /obj/effect/spawner/random/entertainment/plushie, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/toystore) "yS" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -585,7 +585,7 @@ "Hj" = ( /obj/structure/lattice, /obj/structure/grille/broken, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/garbagetruck/toystore) "Hv" = ( /obj/effect/decal/cleanable/glass/plastitanium/screws, @@ -812,8 +812,8 @@ /area/ruin/space/has_grav/garbagetruck/toystore) "VL" = ( /obj/machinery/power/shuttle_engine/propulsion, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "Wl" = ( /obj/structure/plasticflaps/opaque, /turf/open/floor/plating, @@ -879,8 +879,8 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "Zi" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "ZM" = ( /obj/item/papercutter, /obj/item/paper_bin, diff --git a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm index 9efa8cd3654..6954a5f57a2 100644 --- a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm @@ -77,8 +77,8 @@ "ba" = ( /obj/structure/grille, /obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "bd" = ( /obj/structure/table/wood, /obj/structure/cable/layer1, @@ -483,7 +483,7 @@ /obj/effect/spawner/random/structure/grille, /obj/structure/lattice/catwalk, /obj/structure/cable/layer1, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom) "dD" = ( /turf/open/floor/wood, @@ -666,7 +666,7 @@ /obj/effect/spawner/random/structure/grille, /obj/structure/lattice/catwalk, /obj/structure/cable/layer1, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/office) "fW" = ( /obj/structure/rack, @@ -816,7 +816,8 @@ bot_cover_flags = 4; baton_type = /obj/item/melee/baton/security/cattleprod; name = "\improper Syndicate Securitron"; - desc = "A little security robot, reprogrammed by the syndicate. He looks downright surly." + desc = "A little security robot, reprogrammed by the syndicate. He looks downright surly."; + security_mode_flags = 11 }, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom) @@ -1239,8 +1240,8 @@ "kr" = ( /obj/structure/lattice, /obj/structure/grille, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "kx" = ( /mob/living/basic/bot/dedbot{ bot_mode_flags = 29 @@ -1809,7 +1810,7 @@ /obj/effect/spawner/structure/electrified_grille{ spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1) }, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/office) "pN" = ( /obj/structure/cable/layer1, @@ -1939,8 +1940,8 @@ /turf/open/floor/carpet/orange, /area/ruin/space/has_grav/hauntedtradingpost/public/corridor) "qR" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "qY" = ( /obj/item/tank/jetpack/oxygen/security{ name = "red jetpack (oxygen)" @@ -2355,14 +2356,13 @@ "tW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/layer1, -/obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/hauntedtradingpost/employees) "tZ" = ( /obj/structure/lattice/catwalk, /obj/effect/spawner/random/structure/grille, /obj/structure/cable/layer1, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom) "uj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -2419,7 +2419,7 @@ /obj/effect/spawner/random/structure/grille, /obj/structure/lattice/catwalk, /obj/structure/cable/layer1, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/employees/corridor) "ve" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, @@ -2883,8 +2883,8 @@ "yS" = ( /obj/effect/spawner/random/structure/grille, /obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "yU" = ( /obj/item/rack_parts{ pixel_y = 8; @@ -3051,7 +3051,7 @@ /obj/effect/spawner/structure/electrified_grille{ spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1) }, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/employees/corridor) "Au" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -3143,8 +3143,8 @@ "Bi" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "Bj" = ( /obj/structure/rack, /obj/effect/spawner/random/medical/minor_healing, @@ -3249,7 +3249,7 @@ /obj/effect/spawner/random/structure/grille, /obj/structure/lattice/catwalk, /obj/structure/cable/layer1, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/employees/workstation) "CF" = ( /obj/structure/sink/directional/south, @@ -3465,7 +3465,7 @@ /obj/effect/spawner/structure/electrified_grille{ spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1) }, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/employees/workstation) "EK" = ( /obj/item/coin/plastic{ @@ -3585,7 +3585,7 @@ /obj/effect/spawner/random/trash/crushed_can, /obj/structure/cable/layer1, /obj/effect/spawner/random/trash/food_packaging, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/office) "FI" = ( /mob/living/basic/mouse/rat, @@ -4563,6 +4563,7 @@ desc = "It's labelled STAFFROOM - EMPLOYEES ONLY" }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/wood, /area/ruin/space/has_grav/hauntedtradingpost/employees) "Nt" = ( @@ -4611,8 +4612,8 @@ /area/ruin/space/has_grav/hauntedtradingpost/public) "NS" = ( /obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "NY" = ( /obj/structure/cable/layer1, /obj/machinery/vending/coffee{ @@ -4637,8 +4638,18 @@ /area/ruin/space/has_grav/hauntedtradingpost/public/corridor) "Of" = ( /obj/structure/cable/layer1, -/obj/effect/decal/cleanable/fuel_pool, /obj/structure/reagent_dispensers/fueltank, +/obj/structure/closet/crate/cardboard{ + desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - DECO' and has the Donk Co. logo stamped on it." + }, +/obj/effect/spawner/random/maintenance/no_decals/two, +/obj/item/toy/snappop{ + pixel_x = 5 + }, +/obj/item/assembly/prox_sensor{ + pixel_y = -3; + pixel_x = -6 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/hauntedtradingpost/employees) "Oh" = ( @@ -5031,8 +5042,8 @@ shuttle_id = "whiteship_home"; width = 35 }, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "RI" = ( /obj/structure/chair/sofa/left/brown{ dir = 1 @@ -5288,18 +5299,8 @@ "TR" = ( /obj/structure/sign/poster/ripped/directional/south, /obj/structure/cable/layer1, -/obj/structure/closet/crate/cardboard{ - desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - DECO' and has the Donk Co. logo stamped on it." - }, -/obj/effect/spawner/random/maintenance/no_decals/two, -/obj/item/toy/snappop{ - pixel_x = 5 - }, -/obj/item/assembly/prox_sensor{ - pixel_y = -3; - pixel_x = -6 - }, /obj/effect/decal/cleanable/fuel_pool, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/carpet/donk, /area/ruin/space/has_grav/hauntedtradingpost/employees) "TT" = ( @@ -5308,8 +5309,8 @@ dir = 4; name = "external vent" }, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "TU" = ( /obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -5548,7 +5549,6 @@ /obj/structure/cable/layer1, /obj/structure/rack, /obj/item/gun/ballistic/automatic/pistol/toy, -/obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/hauntedtradingpost/employees) "Wa" = ( @@ -5574,7 +5574,7 @@ /obj/effect/spawner/structure/electrified_grille{ spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1) }, -/turf/open/space/basic, +/turf/template_noop, /area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom) "Wg" = ( /obj/structure/rack, @@ -6019,8 +6019,8 @@ "Zu" = ( /obj/structure/lattice, /obj/structure/grille/broken, -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "ZI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 diff --git a/_maps/shuttles/hunter_mi13_foodtruck.dmm b/_maps/shuttles/hunter_mi13_foodtruck.dmm index 6ece8822d80..34e6bb730ca 100644 --- a/_maps/shuttles/hunter_mi13_foodtruck.dmm +++ b/_maps/shuttles/hunter_mi13_foodtruck.dmm @@ -214,7 +214,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/hunter/mi13_foodtruck) "hB" = ( -/obj/machinery/power/shuttle_engine/propulsion, +/obj/machinery/power/shuttle_engine/propulsion/left, /turf/template_noop, /area/shuttle/hunter/mi13_foodtruck) "iO" = ( @@ -271,8 +271,8 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/hunter/mi13_foodtruck) "kf" = ( -/obj/effect/turf_decal/box, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/machinery/power/shuttle_engine/propulsion/right, +/turf/template_noop, /area/shuttle/hunter/mi13_foodtruck) "kj" = ( /obj/structure/table/reinforced/plastitaniumglass, @@ -841,7 +841,7 @@ jc kv ku aj -hB +kf "} (5,1,1) = {" Ev @@ -889,7 +889,7 @@ ku ku ku ah -kf +ku ku Pq Pq @@ -960,7 +960,7 @@ pU ab ku aj -hB +kf "} (12,1,1) = {" Pq diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index 4f248fba836..9c2450e5af2 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -357,6 +357,12 @@ desc = "Melted down oil can, in some cases, be used to pave road surfaces." icon_state = "asphalt" +/turf/open/floor/asphalt/outdoors + planetary_atmos = TRUE + /turf/open/floor/asphalt/lavaland initial_gas_mix = LAVALAND_DEFAULT_ATMOS baseturfs = /turf/open/misc/asteroid/basalt + +/turf/open/floor/asphalt/lavaland/outdoors + planetary_atmos = TRUE diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm b/code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm index 04404dc6308..39458ac9429 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm @@ -224,7 +224,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT icon = 'icons/effects/effects.dmi' icon_state = "empdisable" - //trap wont damage mobs in its faction + //trap won't damage mobs in its faction. set this to null to make it attack everyone faction = list(ROLE_SYNDICATE) invisibility = INVISIBILITY_ABSTRACT plane = ABOVE_GAME_PLANE @@ -269,35 +269,29 @@ if(donk_ai_slave) SSqueuelinks.add_to_queue(src, SELFDESTRUCT_QUEUE) -/obj/effect/overloader_trap/proc/check_faction(mob/target) - for(var/faction1 in faction) - if(faction1 in target.faction) - return TRUE - return FALSE - -/obj/effect/overloader_trap/HasProximity(mob/living) +/obj/effect/overloader_trap/HasProximity(mob/living/target as mob) if(!locate(host_machine) in loc) //muh machine's gone, delete myself because im disarmed qdel(src) return + if(!isliving(target)) + return if(!COOLDOWN_FINISHED(src, trigger_cooldown)) //do nothing if we're on cooldown return if(uses_remaining == 0) //deletes trap if it triggers when it has no uses left. should only happen if var edited but lets just be safe qdel(src) return - if (!isliving(living)) //ensure the guy triggering us is alive + if (target.stat) //ensure the guy triggering us is alive return - if (living.stat && check_faction(living)) //and make sure it ain't someone on our team - return - COOLDOWN_START(src, trigger_cooldown, 4 SECONDS) - trap_alerted() + if (!faction_check_atom(target)) //and make sure it ain't someone on our team + COOLDOWN_START(src, trigger_cooldown, 4 SECONDS) + trap_alerted() /obj/effect/overloader_trap/proc/trap_alerted() - if(host_machine in loc) + if(host_machine in loc) //if someone breaks or moves the machine before the trap goes off, this should fail to do anything visible_message(span_boldwarning("Sparks fly from [host_machine] as it shakes vigorously!")) do_sparks(number = 3, source = host_machine) host_machine.Shake(2, 1, trigger_delay) addtimer(CALLBACK(src, PROC_REF(trap_effect)), trigger_delay) - //if someone breaks or moves the machine before the trap goes off, this should fail to do anything /obj/effect/overloader_trap/proc/trap_effect() for(var/mob/living/living_mob in range(shock_range, src)) diff --git a/code/modules/mob/living/basic/bots/dedbot.dm b/code/modules/mob/living/basic/bots/dedbot.dm index 0dd5bff9a7c..1b077af343f 100644 --- a/code/modules/mob/living/basic/bots/dedbot.dm +++ b/code/modules/mob/living/basic/bots/dedbot.dm @@ -39,10 +39,13 @@ var/exenteration_cooldown_duration = 0.5 SECONDS //aoe slash ability var/datum/action/cooldown/mob_cooldown/bot/exenterate + var/list/remains = list(/obj/effect/gibspawner/robot) /mob/living/basic/bot/dedbot/Initialize(mapload) . = ..() - AddElement(/datum/element/death_drops, /obj/effect/gibspawner/robot) + if(length(remains)) + remains = string_list(remains) + AddElement(/datum/element/death_drops, remains) var/static/list/innate_actions = list( SPIN_SLASH_ABILITY_TYPEPATH = BB_DEDBOT_SLASH, ) diff --git a/code/modules/mob/living/basic/ruin_defender/mad_piano.dm b/code/modules/mob/living/basic/ruin_defender/mad_piano.dm index d5563564f0e..6ffa90c3912 100644 --- a/code/modules/mob/living/basic/ruin_defender/mad_piano.dm +++ b/code/modules/mob/living/basic/ruin_defender/mad_piano.dm @@ -34,11 +34,13 @@ COOLDOWN_DECLARE(tantrum_time) //length of aggro state var/tantrum_time_duration = 3.5 SECONDS + var/list/remains = list(/obj/effect/gibspawner/robot) /mob/living/basic/mad_piano/Initialize(mapload) . = ..() - var/static/list/death_loot = list(/obj/effect/gibspawner/robot) - AddElement(/datum/element/death_drops, death_loot) + if(length(remains)) + remains = string_list(remains) + AddElement(/datum/element/death_drops, remains) var/static/list/connections = list(COMSIG_ATOM_ENTERED = PROC_REF(aggro_tantrum)) AddComponent(/datum/component/connect_range, tracked = src, connections = connections, range = 1, works_in_containers = FALSE) AddElementTrait(TRAIT_WADDLING, INNATE_TRAIT, /datum/element/waddling)