diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index ce7d88a56a968..17ab457ded0f6 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -28720,6 +28720,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/command/bridge) +"keb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/cargo/lobby) "keE" = ( /obj/machinery/door/poddoor/massdriver_chapel, /turf/open/floor/plating, @@ -45154,7 +45163,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/wood, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, /area/station/cargo/lobby) "pDc" = ( /obj/effect/turf_decal/stripes/line{ @@ -57481,7 +57493,6 @@ /area/station/tcommsat/computer) "tOq" = ( /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -179699,11 +179710,11 @@ ovE ovE ovE ovE -uyB -uyB -uyB -uyB -rAn +rPl +rPl +rPl +rPl +rPl lwE tOq eNx @@ -179956,13 +179967,13 @@ ovE ovE ovE ovE -xdO +rPl hKx wvs kYd -rAn +rPl wmS -pnK +keb xHE rSu aQu @@ -180213,11 +180224,11 @@ ovE ovE ovE ovE -xdO +rPl rBK pGf jPq -rAn +rPl dbk pnK qRD @@ -180470,11 +180481,11 @@ ovE ovE ovE ovE -xdO +rPl nFH udh iSW -rAn +rPl lNN pnK wlo @@ -180727,7 +180738,7 @@ ovE ovE ovE ovE -xdO +rPl xIV ryH qxn @@ -180984,7 +180995,7 @@ ovE ovE ovE ovE -xdO +rPl gss hEf fOX @@ -181241,11 +181252,11 @@ ovE ovE ovE ovE -xdO +rPl mWE mWE mWE -rRv +rPl heE jGE tAN diff --git a/code/game/objects/effects/spawners/random/random.dm b/code/game/objects/effects/spawners/random/random.dm index e8653a30cfb0c..23728ad430409 100644 --- a/code/game/objects/effects/spawners/random/random.dm +++ b/code/game/objects/effects/spawners/random/random.dm @@ -97,7 +97,8 @@ if(radius >= 0) for(var/turf/turf_in_view in view(radius, get_turf(src))) - if(isclosedturf(turf_in_view) || (isgroundlessturf(turf_in_view) && !GET_TURF_BELOW(turf_in_view))) + //if(isclosedturf(turf_in_view) || (isgroundlessturf(turf_in_view) && !GET_TURF_BELOW(turf_in_view))) BUBBERSTATION CHANGE: REMOVES BAD CODE THAT SPAWNED THINGS IN OPENTURFS. + if(isclosedturf(turf_in_view) || isgroundlessturf(turf_in_view)) //BUBBERSTATION CHANGE: ADDS GOOD CODE. continue scatter_locations += turf_in_view diff --git a/modular_zubbers/code/modules/hydroponics/plant_genes.dm b/modular_zubbers/code/modules/hydroponics/plant_genes.dm index b14ff1298ee86..ab567776505da 100644 --- a/modular_zubbers/code/modules/hydroponics/plant_genes.dm +++ b/modular_zubbers/code/modules/hydroponics/plant_genes.dm @@ -4,6 +4,9 @@ /datum/plant_gene/reagent mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE +/datum/plant_gene/trait/backfire + mutability_flags = PLANT_GENE_GRAFTABLE //Making this mutatable causes bugs and linters to fail. + /* * Returns the formatted name of the plant gene. *