From a4ca1f486372d21ae20a2fadecbbc8acd80eb3d4 Mon Sep 17 00:00:00 2001 From: GDLW Date: Thu, 22 Jun 2023 18:07:42 +0200 Subject: [PATCH] small tweaks - removed the chance to become a fly if you use the stationary tele - added a mealdor to lavaland syndie base --- .../LavaRuins/lavaland_surface_syndicate_base1.dmm | 2 +- code/game/machinery/teleporter.dm | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 370b0c94..bde18c6e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -532,7 +532,7 @@ "lT" = (/obj/structure/sign/warning/vacuum{pixel_x = -32},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/arrivals) "lU" = (/obj/structure/cable/yellow{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 2},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "lV" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) -"lW" = (/obj/item/twohanded/required/kirbyplants{icon_state = "plant-22"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) +"lW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "lX" = (/obj/structure/table/wood,/obj/machinery/light/small,/obj/structure/cable/yellow,/obj/machinery/power/apc/syndicate{dir = 2; name = "Bar APC"; pixel_y = -24},/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) "lY" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) "lZ" = (/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 244aee05..eea5971a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -74,14 +74,6 @@ if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE)) use_power(5000) - if(!calibrated && iscarbon(M) && prob(30 - ((accuracy) * 10))) //oh dear a problem - var/mob/living/carbon/C = M - if(C.dna?.species && C.dna.species.id != "fly" && !HAS_TRAIT(C, TRAIT_RADIMMUNE)) - to_chat(C, "You hear a buzzing in your ears.") - C.set_species(/datum/species/fly) - log_game("[C] ([key_name(C)]) was turned into a fly person") - C.apply_effect((rand(120 - accuracy * 40, 180 - accuracy * 60)), EFFECT_IRRADIATE, 0) - calibrated = FALSE return