diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/_maps/map_files/triumph/triumph-04-deck4.dmm index 14b296bf077..53df2629e8f 100644 --- a/_maps/map_files/triumph/triumph-04-deck4.dmm +++ b/_maps/map_files/triumph/triumph-04-deck4.dmm @@ -1967,7 +1967,8 @@ dir = 1 }, /obj/structure/flora/ausbushes/fernybush, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "buj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3955,7 +3956,8 @@ /obj/effect/floor_decal/spline/fancy{ dir = 10 }, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "cKZ" = ( /obj/machinery/door/airlock/maintenance/command, @@ -8766,7 +8768,8 @@ dir = 8 }, /obj/structure/flora/ausbushes/fernybush, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "glA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12612,7 +12615,8 @@ /turf/simulated/floor/tiled, /area/security/brig) "iNL" = ( -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "iNN" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -12803,7 +12807,8 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "iSV" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -20715,7 +20720,8 @@ /obj/effect/floor_decal/spline/fancy, /obj/structure/railing, /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "oxJ" = ( /obj/effect/floor_decal/spline/plain, @@ -22142,7 +22148,8 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "prp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24151,7 +24158,8 @@ /obj/effect/floor_decal/spline/fancy{ dir = 1 }, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "qEc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26387,7 +26395,8 @@ /area/bridge) "rZq" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "rZF" = ( /obj/structure/window/reinforced/tinted/frosted{ @@ -32351,7 +32360,8 @@ "vWU" = ( /obj/structure/railing, /obj/effect/floor_decal/spline/fancy, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "vXc" = ( /obj/structure/cable/green{ @@ -32753,7 +32763,8 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "wkW" = ( /obj/machinery/camera/network/security{ @@ -34255,7 +34266,8 @@ /obj/effect/floor_decal/spline/fancy{ dir = 9 }, -/turf/simulated/floor/outdoors/water/indoors, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/outdoors/water, /area/hydroponics/garden) "xqV" = ( /obj/structure/closet/crate/bin{ diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 4a57381f8ae..784ddcb0fb0 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -189,6 +189,9 @@ /mob/living/UnarmedAttack(var/atom/A, var/proximity_flag) + if(is_incorporeal()) + return 0 + if(!SSticker) to_chat(src, "You cannot attack people before the game has started.") return 0 diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 5a4032d27dd..7f569057167 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -138,6 +138,8 @@ return /obj/effect/ebeam/deadly/Crossed(atom/A) + if(A.is_incorporeal()) + return ..() A.ex_act(1) @@ -157,6 +159,8 @@ on_contact(A) /obj/effect/ebeam/reactive/Crossed(atom/A) + if(A.is_incorporeal()) + return ..() on_contact(A) diff --git a/code/datums/browser/color_matrix_picker.dm b/code/datums/browser/color_matrix_picker.dm new file mode 100644 index 00000000000..573c47d3a10 --- /dev/null +++ b/code/datums/browser/color_matrix_picker.dm @@ -0,0 +1,84 @@ +/datum/browser/modal/color_matrix_picker + var/color_matrix + +/datum/browser/modal/color_matrix_picker/New(mob/user, message, title, button1 = "Ok", button2, button3, stealfocus = TRUE, timeout = 0, list/values) + if(!user) + return + if(!values) + values = list(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) + if(values.len < 12) + values.len = 12 + var/list/output = list() + output += "