diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm index 65170fd4d13..65e3cdecf22 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm @@ -430,13 +430,13 @@ /obj/item/flashlight/flare, /obj/item/flashlight/flare, /obj/item/flashlight/flare, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /obj/item/flashlight/flare, /obj/item/flashlight/flare, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /obj/structure/closet/crate, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index c0554600ef5..b26d174a2ea 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -3501,7 +3501,7 @@ /obj/structure/table, /obj/effect/decal/cleanable/dirt, /obj/item/crowbar, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel, /area/ruin/ancientstation) "ke" = ( @@ -3551,7 +3551,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/crowbar, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel, /area/ruin/ancientstation) "ko" = ( diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index b532dbeeb4b..4242310f88a 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -5239,11 +5239,11 @@ /area/mine/laborcamp) "sL" = ( /obj/structure/closet/cardboard, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 8bd9883f96a..09a8cd0b8b7 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -25848,7 +25848,7 @@ "dCv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -37232,7 +37232,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "green" diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 5ebde7da1af..7f0b1731dc0 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -12358,7 +12358,7 @@ "aVZ" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aWa" = ( diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index e05cb4f92df..accd71a8b06 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -2548,7 +2548,7 @@ /area/station/security/prison/cell_block) "aAR" = ( /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/item/stack/cable_coil, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) @@ -2740,9 +2740,9 @@ /area/station/supply/qm) "aDv" = ( /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/aft) "aDx" = ( @@ -4521,7 +4521,7 @@ /area/station/medical/medbay2) "aWx" = ( /obj/structure/table, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -5254,7 +5254,7 @@ "bcg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "bch" = ( @@ -11526,7 +11526,7 @@ "cmH" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cmI" = ( @@ -14135,7 +14135,7 @@ /area/station/engineering/smes) "cOx" = ( /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -15958,7 +15958,7 @@ /area/station/service/hydroponics) "diy" = ( /obj/structure/table, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "diD" = ( @@ -16378,13 +16378,13 @@ /area/station/maintenance/security/aft_starboard) "dmR" = ( /obj/structure/closet/crate, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -21171,7 +21171,7 @@ "eme" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "emi" = ( @@ -22944,12 +22944,12 @@ /area/station/command/office/blueshield) "eEs" = ( /obj/structure/closet/crate, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/starboard) "eEt" = ( @@ -24319,7 +24319,7 @@ /area/station/maintenance/apmaint) "eTs" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/structure/cable{ icon_state = "2-4" }, @@ -25983,7 +25983,7 @@ "fhT" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/aft) "fhY" = ( @@ -41754,7 +41754,7 @@ dir = 4 }, /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -42247,7 +42247,7 @@ /area/station/security/armory/secure) "itZ" = ( /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/item/t_scanner, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) @@ -49914,7 +49914,7 @@ "jRJ" = ( /obj/machinery/alarm/directional/south, /obj/structure/closet/firecloset, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel, /area/station/maintenance/security/aft_port) "jRK" = ( @@ -53622,7 +53622,7 @@ /obj/structure/table, /obj/effect/spawner/random/trash, /obj/item/crowbar, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "kHv" = ( @@ -58449,10 +58449,10 @@ /area/station/hallway/primary/starboard) "lEt" = ( /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -64889,7 +64889,7 @@ /area/station/public/fitness) "mWP" = ( /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "mWS" = ( @@ -67030,7 +67030,7 @@ "nsf" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "nsh" = ( @@ -67116,7 +67116,7 @@ /area/station/security/brig) "ntJ" = ( /obj/structure/table, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/item/paper_bin, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -67918,7 +67918,7 @@ "nBJ" = ( /obj/structure/table, /obj/item/decorations/sticky_decorations/flammable/ghost, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -70285,8 +70285,8 @@ /area/station/maintenance/fsmaint2) "nYu" = ( /obj/structure/closet/secure_closet/evidence, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /obj/item/restraints/handcuffs/pinkcuffs, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -71019,7 +71019,7 @@ "oeZ" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -78531,7 +78531,7 @@ "pBT" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "pCt" = ( @@ -80512,7 +80512,7 @@ /obj/structure/table, /obj/effect/spawner/random/cobweb/left/rare, /obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -81305,7 +81305,7 @@ /area/station/engineering/equipmentstorage) "qey" = ( /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -83364,7 +83364,7 @@ "qCB" = ( /obj/effect/decal/cleanable/confetti, /obj/structure/rack, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/machinery/light/small{ dir = 4 }, @@ -92651,7 +92651,7 @@ /area/station/hallway/primary/central/ne) "sqZ" = ( /obj/structure/table, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /obj/item/stack/cable_coil, /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -97648,7 +97648,7 @@ /area/station/security/processing) "toU" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "toV" = ( @@ -100229,7 +100229,7 @@ "tRB" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "tRV" = ( @@ -109787,8 +109787,8 @@ /area/station/engineering/control) "vLQ" = ( /obj/structure/table, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "vLS" = ( @@ -111155,9 +111155,9 @@ "vZb" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, +/obj/effect/spawner/random/glowstick, /obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/starboard) diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 88a6de64719..b3b25b906eb 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -38118,7 +38118,7 @@ desc = "An old NT branded sleeper, decommissioned after heavy usage. None of the functional machinery remains inside."; name = "Decommissioned Sleeper" }, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59388,7 +59388,7 @@ "lRY" = ( /obj/effect/decal/cleanable/greenglow, /obj/structure/glowshroom, -/obj/item/flashlight/flare/glowstick/random, +/obj/effect/spawner/random/glowstick, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "lSa" = ( diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index f23a221b4de..ba6607cf132 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -102,3 +102,16 @@ /obj/effect/spawner/random/stock_parts/Initialize(mapload) spawn_loot_count = rand(4, 7) . = ..() + +/obj/effect/spawner/random/glowstick + name = "random glowstick spawner" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "glowstick" + loot = list( + /obj/item/flashlight/flare/glowstick, + /obj/item/flashlight/flare/glowstick/red, + /obj/item/flashlight/flare/glowstick/blue, + /obj/item/flashlight/flare/glowstick/orange, + /obj/item/flashlight/flare/glowstick/yellow, + /obj/item/flashlight/flare/glowstick/pink, + ) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index efc660d4511..d710a6c19b2 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -287,7 +287,7 @@ /obj/item/flashlight/flare/glowstick/red name = "red glowstick" - color = LIGHT_COLOR_RED + color = LIGHT_COLOR_PURE_RED /obj/item/flashlight/flare/glowstick/blue name = "blue glowstick" @@ -312,17 +312,6 @@ fuel_lower = 30 fuel_upp = 90 -/obj/item/flashlight/flare/glowstick/random - name = "random colored glowstick" - icon_state = "random_glowstick" - color = null - -/obj/item/flashlight/flare/glowstick/random/Initialize(mapload) - . = ..() - var/T = pick(typesof(/obj/item/flashlight/flare/glowstick) - /obj/item/flashlight/flare/glowstick/random - /obj/item/flashlight/flare/glowstick/emergency) - new T(loc) - qdel(src) // return INITIALIZE_HINT_QDEL <-- Doesn't work - /obj/item/flashlight/flare/extinguish_light(force = FALSE) if(force) fuel = 0 diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi index 2b9bdacc42f..b96edb305f0 100644 Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index cf13b5c75b0..89e4167774e 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/tools/UpdatePaths/Scripts/28755_random_glowstick.txt b/tools/UpdatePaths/Scripts/28755_random_glowstick.txt new file mode 100644 index 00000000000..1e550ddc002 --- /dev/null +++ b/tools/UpdatePaths/Scripts/28755_random_glowstick.txt @@ -0,0 +1 @@ +/obj/item/flashlight/flare/glowstick/random : /obj/effect/spawner/random/glowstick