Radiation Shutters + Micro Opts + Engine Weight

_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm

@@ -39,9 +39,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
@@ -300,9 +299,8 @@
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "wt" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
@@ -310,9 +308,8 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
@@ -546,9 +543,8 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
@@ -589,9 +585,8 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
@@ -828,9 +823,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)

_maps/RandomRuins/StationRuins/Box/Engine/engine_sm.dmm

@@ -179,9 +179,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "df" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/oil,
 /obj/effect/decal/cleanable/dirt,
@@ -601,9 +600,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "nW" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -637,9 +635,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "px" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -738,9 +735,8 @@
 /turf/open/floor/engine,
 /area/engine/supermatter)
 "re" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -1092,9 +1088,8 @@
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
 "Cn" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1572,9 +1567,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "Nw" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{

_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm

@@ -179,9 +179,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "df" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/oil,
 /obj/effect/decal/cleanable/dirt,
@@ -592,9 +591,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "nW" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -628,9 +626,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "px" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -729,9 +726,8 @@
 /turf/open/floor/engine,
 /area/engine/supermatter)
 "re" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -1066,9 +1062,8 @@
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
 "Cn" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1547,9 +1542,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "Nw" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{

_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm

@@ -191,9 +191,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "df" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/oil,
 /obj/effect/decal/cleanable/dirt,
@@ -295,9 +294,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
-"fK" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "fW" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -341,16 +337,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
-"hy" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "hJ" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -427,9 +413,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
-"iU" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "jg" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
@@ -458,10 +441,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
-"jB" = (
-/obj/structure/sign/warning/fire,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "jZ" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -552,12 +531,6 @@
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/plating,
 /area/engine/engineering)
-"mW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
 "mX" = (
 /obj/effect/turf_decal/stripes/corner,
 /obj/structure/cable{
@@ -588,10 +561,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
-"ni" = (
-/obj/machinery/status_display/ai,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "nz" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -633,9 +602,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "nW" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -669,9 +637,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "px" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -771,9 +738,8 @@
 /turf/closed/wall/r_wall,
 /area/engine/supermatter)
 "re" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -783,14 +749,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/supermatter)
-"rt" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/effect/turf_decal/bot,
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "ry" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -870,12 +828,6 @@
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /turf/open/floor/engine,
 /area/engine/engineering)
-"ti" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
 "tn" = (
 /turf/open/floor/engine,
 /area/engine/supermatter)
@@ -935,9 +887,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
-"vO" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "vX" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -1090,12 +1039,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
-"Bk" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
 "Bl" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -1134,9 +1077,8 @@
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
 "Cn" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1451,9 +1393,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
-"JK" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "JL" = (
 /obj/structure/sign/warning/fire,
 /turf/closed/wall/r_wall,
@@ -1627,9 +1566,8 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "Nw" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
+/obj/machinery/door/poddoor/shutters/radiation/preopen{
+	id = "engsm"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -1711,14 +1649,6 @@
 /obj/machinery/meter,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"Pa" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "Ph" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -1780,12 +1710,6 @@
 /obj/structure/lattice,
 /turf/open/space,
 /area/space/nearstation)
-"RA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
 "RV" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8

code/datums/components/radioactive.dm

@@ -34,13 +34,12 @@
 	var/atom/movable/master = parent
 	master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2))
 	addtimer(CALLBACK(src, .proc/glow_loop, master), rand(1,19))//Things should look uneven
-
 	START_PROCESSING(SSradiation, src)
 
 /datum/component/radioactive/Destroy()
-	STOP_PROCESSING(SSradiation, src)
 	var/atom/movable/master = parent
 	master.remove_filter("rad_glow")
+	STOP_PROCESSING(SSradiation, src)
 	return ..()
 
 /datum/component/radioactive/process()

code/game/machinery/doors/shutters.dm

@@ -1,13 +1,70 @@
 /obj/machinery/door/poddoor/shutters
 	gender = PLURAL
 	name = "shutters"
-	desc = "Heavy duty metal shutters that open mechanically."
+	desc = "Mechanical metal shutters operated by a button with a magnetic seal, keeping them airtight."
 	icon = 'icons/obj/doors/shutters.dmi'
 	layer = SHUTTER_LAYER
 	closingLayer = SHUTTER_LAYER
+	armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
 	damage_deflection = 20
+	max_integrity = 100
 
 /obj/machinery/door/poddoor/shutters/preopen
 	icon_state = "open"
 	density = FALSE
 	opacity = 0
+
+// The below shutters are the original ones from the TG codebase. They are remaining as "secure" shutters. If anyone wants to improve their animation, feel free.
+// The original shutters are now shutters_old.dmi; copy the naming format of the files into new a new .dmi to add new shutters that work with the poddoor code for animating the doors.
+// Originally, the shutters were reskins of blast doors. Eighty hits with the Cap's sabre to destroy one shutter is far too powerful considering shutters cannot be deconstructed (yet).
+// If you're a mapper and want super strong shutter, use the 'old' ones.
+
+/obj/machinery/door/poddoor/shutters/old
+	name = "strong shutters"
+	desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions."
+	icon = 'icons/obj/doors/shutters_old.dmi'
+	icon_state = "closed"
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 75, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+	max_integrity = 300
+
+/obj/machinery/door/poddoor/shutters/old/preopen
+	icon_state = "open"
+	density = FALSE
+	opacity = 0
+
+// End of old shutter stuff. Credit for the old shutter sprites to TG.
+
+/obj/machinery/door/poddoor/shutters/radiation
+	name = "radiation shutters"
+	desc = "Lead-lined shutters painted yellow with a radioactive hazard symbol on it. Blocks out most radiation"
+	icon = 'icons/obj/doors/shutters_radiation.dmi'
+	icon_state = "closed"
+	rad_insulation = 0.2
+
+/obj/machinery/door/poddoor/shutters/radiation/preopen
+	icon_state = "open"
+	density = FALSE
+	opacity = 0
+	rad_insulation = 1
+
+/obj/machinery/door/poddoor/shutters/radiation/do_animate(animation)
+	..()
+	switch(animation)
+		if("opening")
+			rad_insulation = 1
+		if("closing")
+			rad_insulation = -0.5
+
+// A 3x3 N2 SM setup won't irradiate you if you're behind the shutter at -0.9 insulation. If it starts to delam, it'll start irradiating you slowly. Keep the value between -0.1 to -0.9
+
+/obj/machinery/door/poddoor/shutters/window
+	name = "windowed shutters"
+	desc = "Mechanical shutters that have some form of plastic window in them, allowing you to see through the shutters at all times."
+	icon = 'icons/obj/doors/shutters_window.dmi'
+	icon_state = "closed"
+	opacity = 0
+	glass = 1
+
+/obj/machinery/door/poddoor/shutters/window/preopen
+	icon_state = "open"
+	density = FALSE

config/game_options.txt

@@ -561,8 +561,8 @@ BOX_RANDOM_ENGINE Box Tesla,3
 BOX_RANDOM_ENGINE Box Singulo,3
 BOX_RANDOM_ENGINE Box SM 1x3,1
 BOX_RANDOM_ENGINE Box SM 5x5,1
-BOX_RANDOM_ENGINE Box SM 3x,0
-BOX_RANDOM_ENGINE Box TEG,3
+BOX_RANDOM_ENGINE Box SM 3x,1
+BOX_RANDOM_ENGINE Box TEG,2
 BOX_RANDOM_ENGINE Box Empty,0
 BOX_RANDOM_ENGINE Box Antimatter,1
 BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0