diff --git a/aurorastation.dme b/aurorastation.dme
index 9f92cd6ae07..00d6f9a4952 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -748,6 +748,7 @@
#include "code\game\machinery\firealarm.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\floodlight.dm"
+#include "code\game\machinery\floor_frames.dm"
#include "code\game\machinery\floor_light.dm"
#include "code\game\machinery\floorlayer.dm"
#include "code\game\machinery\from_beyond.dm"
diff --git a/code/game/machinery/floor_frames.dm b/code/game/machinery/floor_frames.dm
new file mode 100644
index 00000000000..a1a7f293e0d
--- /dev/null
+++ b/code/game/machinery/floor_frames.dm
@@ -0,0 +1,63 @@
+/obj/item/floor_frame
+ name = "frame"
+ desc = "Used for building machines."
+ icon = 'icons/obj/monitors.dmi'
+ icon_state = "fire_bitem"
+ flags = CONDUCT
+ var/build_machine_type
+ var/refund_amt = 2
+ var/refund_type = /obj/item/stack/material/steel
+ var/reverse = 0 //if resulting object faces opposite its dir (like light fixtures)
+
+/obj/item/floor_frame/attackby(obj/item/W, mob/user)
+ if (W.iswrench())
+ new refund_type(get_turf(src.loc), refund_amt)
+ qdel(src)
+ return TRUE
+ return ..()
+
+/obj/item/floor_frame/proc/try_build(turf/on_floor, mob/user)
+ if(!build_machine_type)
+ return
+
+ if (get_dist(on_floor,usr)>1)
+ return
+
+ var/ndir
+ if(reverse)
+ ndir = get_dir(usr,on_floor)
+ else
+ ndir = get_dir(on_floor,usr)
+
+ if (!(ndir in cardinal))
+ return
+
+ var/turf/loc = get_turf(on_floor)
+ var/area/A = loc.loc
+ if (!istype(loc, /turf/simulated/floor))
+ to_chat(usr, SPAN_WARNING("\The [src] cannot be placed on this spot."))
+ return
+ if (istype(A, /area/space) || istype(A, /area/mine))
+ to_chat(usr, SPAN_WARNING("\The [src] cannot be placed in this area."))
+ return
+
+ var/obj/machinery/M = new build_machine_type(loc, ndir, 1)
+ M.fingerprints = src.fingerprints
+ M.fingerprintshidden = src.fingerprintshidden
+ M.fingerprintslast = src.fingerprintslast
+ user.remove_from_mob(src) //Prevents gripper duplication
+ qdel(src)
+
+/obj/item/floor_frame/light
+ name = "floor light fixture frame"
+ desc = "Used for building lights."
+ icon = 'icons/obj/lights.dmi'
+ icon_state = "floortube-construct-stage1"
+ build_machine_type = /obj/machinery/light_construct/floor
+ reverse = 1
+
+/obj/item/floor_frame/light/small
+ name = "small floor light fixture frame"
+ icon_state = "floor-construct-stage1"
+ refund_amt = 1
+ build_machine_type = /obj/machinery/light_construct/small/floor
diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm
index 7fa8024f1c0..adb27d8dd1d 100644
--- a/code/game/machinery/wall_frames.dm
+++ b/code/game/machinery/wall_frames.dm
@@ -35,14 +35,14 @@
var/turf/loc = get_turf(usr)
var/area/A = loc.loc
if (!istype(loc, /turf/simulated/floor))
- to_chat(usr, "\The [src] Alarm cannot be placed on this spot.")
+ to_chat(usr, SPAN_WARNING("\The [src] cannot be placed on this spot."))
return
if (istype(A, /area/space) || istype(A, /area/mine))
- to_chat(usr, "\The [src] Alarm cannot be placed in this area.")
+ to_chat(usr, SPAN_WARNING("\The [src] cannot be placed in this area."))
return
if(gotwallitem(loc, ndir))
- to_chat(usr, "There's already an item on this wall!")
+ to_chat(usr, SPAN_WARNING("There's already an item on this wall!"))
return
var/obj/machinery/M = new build_machine_type(loc, ndir, 1)
@@ -67,7 +67,7 @@
/obj/item/frame/light
name = "light fixture frame"
desc = "Used for building lights."
- icon = 'icons/obj/lighting.dmi'
+ icon = 'icons/obj/lights.dmi'
icon_state = "tube-construct-item"
build_machine_type = /obj/machinery/light_construct
reverse = 1
@@ -77,3 +77,9 @@
icon_state = "bulb-construct-item"
refund_amt = 1
build_machine_type = /obj/machinery/light_construct/small
+
+/obj/item/frame/light/spot
+ name = "spotlight fixture frame"
+ icon_state = "slight-construct-item"
+ refund_amt = 3
+ build_machine_type = /obj/machinery/light_construct/spot
diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm
index 969f02243e7..bc39e1ade2f 100644
--- a/code/game/turfs/simulated/floor_attackby.dm
+++ b/code/game/turfs/simulated/floor_attackby.dm
@@ -130,6 +130,12 @@
visible_message("[user] has melted the plating's reinforcements! It should be possible to pry it off.")
playsound(src, 'sound/items/Welder.ogg', 80, 1)
return
+
+ if(istype(C,/obj/item/floor_frame))
+ var/obj/item/floor_frame/F = C
+ F.try_build(src, user)
+ return
+
return ..()
/turf/simulated/floor/proc/welder_melt()
diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index ac9bf862265..956fcc4e8dd 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -59,7 +59,10 @@
new /datum/stack_recipe("computer frame", /obj/structure/computerframe, BUILD_AMT, time = 25, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("machine blueprint", /obj/machinery/constructable_frame/machine_frame, 2, time = 25, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("light fixture frame", /obj/item/frame/light, 2),
+ new /datum/stack_recipe("floor light fixture frame", /obj/item/floor_frame/light, 2),
new /datum/stack_recipe("small light fixture frame", /obj/item/frame/light/small, 1),
+ new /datum/stack_recipe("small floor light fixture frame", /obj/item/floor_frame/light/small, 1),
+ new /datum/stack_recipe("spotlight fixture frame", /obj/item/frame/light/spot, 3),
new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2),
new /datum/stack_recipe("air alarm frame", /obj/item/frame/air_alarm, 2),
new /datum/stack_recipe("fire alarm frame", /obj/item/frame/fire_alarm, 2)
@@ -303,4 +306,4 @@
/material/wood/branch/generate_recipes()
recipes = list()
recipes += new/datum/stack_recipe("bonfire", /obj/structure/bonfire, 10, time = 50, one_per_turf = 1, on_floor = 1)
- recipes += new/datum/stack_recipe("torch handle", /obj/item/torch, 1, time = 15, one_per_turf = 0, on_floor = 0)
\ No newline at end of file
+ recipes += new/datum/stack_recipe("torch handle", /obj/item/torch, 1, time = 15, one_per_turf = 0, on_floor = 0)
diff --git a/code/modules/power/lights/bulbs.dm b/code/modules/power/lights/bulbs.dm
index 73cee9ff8ea..3de89c13b42 100644
--- a/code/modules/power/lights/bulbs.dm
+++ b/code/modules/power/lights/bulbs.dm
@@ -4,7 +4,7 @@
// will fit into empty /obj/machinery/light of the corresponding type
/obj/item/light
- icon = 'icons/obj/lighting.dmi'
+ icon = 'icons/obj/lights.dmi'
force = 2
throwforce = 5
w_class = ITEMSIZE_TINY
@@ -140,9 +140,12 @@
/obj/item/light/tube/large
w_class = ITEMSIZE_SMALL
name = "large light tube"
+ desc = "A replacement large light tube."
+ icon_state = "lstube_preset"
brightness_range = 15
brightness_power = 0.75
randomize_range = FALSE
+ lighttype = "stube"
/obj/item/light/bulb
name = "light bulb"
@@ -189,14 +192,3 @@
/obj/item/light/throw_impact(atom/hit_atom)
..()
shatter()
-
-/obj/item/light/bulb/fire
- name = "fire bulb"
- desc = "A replacement fire bulb."
- icon_state = "flight"
- item_state = "egg_red"
- matter = list(MATERIAL_GLASS = 100)
- brightness_range = 8
- brightness_power = 0.45
- randomize_range = FALSE
- randomize_color = FALSE
diff --git a/code/modules/power/lights/construction.dm b/code/modules/power/lights/construction.dm
index 3a489d70333..3fcf7c3af98 100644
--- a/code/modules/power/lights/construction.dm
+++ b/code/modules/power/lights/construction.dm
@@ -2,7 +2,7 @@
/obj/machinery/light_construct
name = "light fixture frame"
desc = "A light fixture under construction."
- icon = 'icons/obj/lighting.dmi'
+ icon = 'icons/obj/lights.dmi'
icon_state = "tube-construct-stage1"
anchored = TRUE
layer = 5
@@ -17,6 +17,12 @@
. = ..()
if (fixture_type == "bulb")
icon_state = "bulb-construct-stage1"
+ if (fixture_type == "spotlight")
+ icon_state = "slight-construct-stage1"
+ if (fixture_type == "floorbulb")
+ icon_state = "floor-construct-stage1"
+ if (fixture_type == "floorlight")
+ icon_state = "floortube-construct-stage1"
/obj/machinery/light_construct/Destroy()
QDEL_NULL(cell)
@@ -72,6 +78,12 @@
icon_state = "tube-construct-stage1"
if("bulb")
icon_state = "bulb-construct-stage1"
+ if("spotlight")
+ icon_state = "slight-construct-stage1"
+ if ("floorbulb")
+ icon_state = "floor-construct-stage1"
+ if ("floorlight")
+ icon_state = "floortube-construct-stage1"
new /obj/item/stack/cable_coil(get_turf(src), 1, "red")
user.visible_message(SPAN_NOTICE("\The [user] removes the wiring from \the [src]."), SPAN_NOTICE("You remove the wiring from [src]."), SPAN_WARNING("You hear something being cut."))
playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 100, TRUE)
@@ -87,6 +99,12 @@
icon_state = "tube-construct-stage2"
if("bulb")
icon_state = "bulb-construct-stage2"
+ if("spotlight")
+ icon_state = "slight-construct-stage2"
+ if ("floorbulb")
+ icon_state = "floor-construct-stage2"
+ if ("floorlight")
+ icon_state = "floortube-construct-stage2"
stage = 2
user.visible_message(SPAN_NOTICE("\The [user] adds wires to \the [src]."), SPAN_NOTICE("You add wires to \the [src]."))
return
@@ -98,6 +116,12 @@
icon_state = "tube_empty"
if("bulb")
icon_state = "bulb_empty"
+ if("slight")
+ icon_state = "slight_empty"
+ if ("floorbulb")
+ icon_state = "floor_empty"
+ if ("floorlight")
+ icon_state = "floortube_empty"
stage = 3
user.visible_message(SPAN_NOTICE("\The [user] closes \the [src]'s casing."), SPAN_NOTICE("You close \the [src]'s casing."), SPAN_WARNING("You hear something being screwed in."))
playsound(get_turf(src), W.usesound, 75, TRUE)
@@ -107,6 +131,12 @@
newlight = new /obj/machinery/light/built(get_turf(src))
if("bulb")
newlight = new /obj/machinery/light/small/built(get_turf(src))
+ if("slight")
+ newlight = new /obj/machinery/light/spot/built(get_turf(src))
+ if("floorbulb")
+ newlight = new /obj/machinery/light/small/floor/built(get_turf(src))
+ if("floorlight")
+ newlight = new /obj/machinery/light/floor/built(get_turf(src))
newlight.dir = src.dir
if(cell)
@@ -155,10 +185,42 @@
/obj/machinery/light_construct/small
name = "small light fixture frame"
desc = "A small light fixture under construction."
- icon = 'icons/obj/lighting.dmi'
+ icon = 'icons/obj/lights.dmi'
icon_state = "bulb-construct-stage1"
anchored = TRUE
layer = 5
stage = 1
fixture_type = "bulb"
sheets_refunded = 1
+
+/obj/machinery/light_construct/spot
+ name = "spotlight fixture frame"
+ desc = "A spotlight fixture under construction."
+ icon = 'icons/obj/lights.dmi'
+ icon_state = "slight-construct-stage1"
+ anchored = TRUE
+ layer = 5
+ stage = 1
+ fixture_type = "spotlight"
+ sheets_refunded = 3
+
+/obj/machinery/light_construct/small/floor
+ name = "small floor light fixture frame"
+ desc = "A small floor light fixture under construction."
+ icon = 'icons/obj/lights.dmi'
+ icon_state = "floor-construct-stage1"
+ anchored = TRUE
+ layer = 2.5
+ stage = 1
+ fixture_type = "floorbulb"
+ sheets_refunded = 1
+
+/obj/machinery/light_construct/floor
+ name = "floor light fixture frame"
+ desc = "A floor light fixture under construction."
+ icon = 'icons/obj/lights.dmi'
+ icon_state = "floortube-construct-stage1"
+ anchored = TRUE
+ layer = 2.5
+ stage = 1
+ fixture_type = "floorlight"
diff --git a/code/modules/power/lights/fixtures.dm b/code/modules/power/lights/fixtures.dm
index b467be40004..5dcb2e7625e 100644
--- a/code/modules/power/lights/fixtures.dm
+++ b/code/modules/power/lights/fixtures.dm
@@ -3,13 +3,12 @@
// consists of light fixtures (/obj/machinery/light) and light tube/bulb items (/obj/item/light)
#define LIGHTING_POWER_FACTOR 40 //20W per unit luminosity
-#define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb
// the standard tube light fixture
/obj/machinery/light
name = "light fixture"
- icon = 'icons/obj/lighting.dmi'
- var/base_state = "tube" // base description and icon_state
- icon_state = "tube_empty"
+ icon = 'icons/obj/lights.dmi'
+ var/base_state = "tube"
+ icon_state = "tube_example"
desc = "A lighting fixture."
desc_info = "Use grab intent when interacting with a working light to take it out of its fixture."
anchored = TRUE
@@ -48,6 +47,9 @@
var/bulb_is_noisy = TRUE
+ var/fitting_has_empty_icon = FALSE
+ var/fitting_is_on_floor = FALSE
+
var/previous_stat
var/randomize_color = TRUE
var/default_color
@@ -62,17 +64,27 @@
base_state = "skrell"
icon_state = "skrell_empty"
supports_nightmode = FALSE
- fitting= "skrell"
+ fitting = "skrell"
bulb_is_noisy = FALSE
light_type = /obj/item/light/tube
inserted_light = /obj/item/light/tube
brightness_power = 0.45
brightness_color = LIGHT_COLOR_PURPLE
+/obj/machinery/light/floor
+ name = "floor lighting fixture"
+ icon_state = "floortube_example"
+ base_state = "floortube"
+ desc = "A lighting fixture. This one is set into the floor."
+ layer = 2.5
+ fitting_has_empty_icon = TRUE
+ fitting_is_on_floor = TRUE
+
// the smaller bulb light fixture
/obj/machinery/light/small
- icon_state = "bulb1"
+ name = "small light fixture"
+ icon_state = "bulb_example"
base_state = "bulb"
fitting = "bulb"
brightness_range = 5
@@ -84,6 +96,14 @@
supports_nightmode = FALSE
bulb_is_noisy = FALSE
+/obj/machinery/light/small/floor
+ name = "small floor lighting fixture"
+ icon_state = "floor_example"
+ base_state = "floor"
+ desc = "A small lighting fixture. This one is set into the floor."
+ layer = 2.5
+ fitting_is_on_floor = TRUE
+
/obj/machinery/light/small/emergency
brightness_range = 6
brightness_power = 0.45
@@ -113,7 +133,10 @@
randomize_color = FALSE
/obj/machinery/light/spot
- name = "spotlight"
+ name = "spotlight fixture"
+ icon_state = "slight_example"
+ base_state = "slight"
+ desc = "An extremely powerful lighting fixture."
fitting = "large tube"
light_type = /obj/item/light/tube/large
inserted_light = /obj/item/light/tube/large
@@ -121,11 +144,6 @@
brightness_power = 3.5
supports_nightmode = FALSE
-/obj/machinery/light/spot/weak
- name = "low-intensity spotlight"
- brightness_range = 12
- brightness_power = 1.2
-
/obj/machinery/light/built
start_with_cell = FALSE
@@ -134,11 +152,26 @@
stat |= MAINT
. = ..()
+/obj/machinery/light/floor/built/Initialize()
+ status = LIGHT_EMPTY
+ stat |= MAINT
+ . = ..()
+
/obj/machinery/light/small/built/Initialize()
status = LIGHT_EMPTY
stat |= MAINT
. = ..()
+/obj/machinery/light/small/floor/built/Initialize()
+ status = LIGHT_EMPTY
+ stat |= MAINT
+ . = ..()
+
+/obj/machinery/light/spot/built/Initialize()
+ status = LIGHT_EMPTY
+ stat |= MAINT
+ . = ..()
+
// create a new lighting fixture
/obj/machinery/light/Initialize(mapload)
. = ..()
@@ -155,6 +188,9 @@
if("bulb")
if(prob(5))
broken(1)
+ if("large tube")
+ if(prob(1))
+ broken(1)
if(randomize_color)
brightness_color = pick(randomized_colors)
@@ -167,7 +203,11 @@
/obj/machinery/light/update_icon()
cut_overlays()
- icon_state = "[base_state]_empty"
+ if ((status == LIGHT_EMPTY) || !fitting_has_empty_icon)
+ icon_state = "[base_state]_empty"
+ else
+ icon_state = "[base_state]"
+ var/on = emergency_mode || !stat
switch(status) // set icon_states
if(LIGHT_OK)
var/target_color
@@ -176,11 +216,17 @@
else
target_color = brightness_color
if (supports_nightmode && nightmode && !stat)
- target_color = BlendRGB("#d2d2d2", target_color, 0.25)
+ target_color = BlendRGB("#D2D2D2", target_color, 0.25)
- var/on = emergency_mode || !stat
-
- add_overlay(LIGHT_FIXTURE_CACHE(icon, "[base_state][on]", target_color))
+ if (on)
+ var/image/I = LIGHT_FIXTURE_CACHE(icon, "[base_state]_on", target_color)
+ if (!fitting_is_on_floor)
+ I.layer = EFFECTS_ABOVE_LIGHTING_LAYER
+ else
+ I.layer = layer
+ add_overlay(I)
+ else
+ add_overlay(LIGHT_FIXTURE_CACHE(icon, "[base_state]_off", target_color))
if(LIGHT_BURNED)
add_overlay(LIGHT_FIXTURE_CACHE(icon, "[base_state]_burned", brightness_color))
@@ -400,6 +446,10 @@
if("bulb")
newlight = new /obj/machinery/light_construct/small(get_turf(src))
newlight.icon_state = "bulb-construct-stage2"
+
+ if("large tube")
+ newlight = new /obj/machinery/light_construct/spot(get_turf(src))
+ newlight.icon_state = "slight-construct-stage2"
newlight.dir = src.dir
newlight.stage = 2
newlight.fingerprints = src.fingerprints
diff --git a/html/changelogs/GeneralCamo - Floor Lighting.yml b/html/changelogs/GeneralCamo - Floor Lighting.yml
new file mode 100644
index 00000000000..cc24e8cec95
--- /dev/null
+++ b/html/changelogs/GeneralCamo - Floor Lighting.yml
@@ -0,0 +1,46 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: GeneralCamo
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Added floor variants of the small and tube lighting fixtures. (Large floor light ported from CEV Eris, small floor light made by atteria)"
+ - rscadd: "The spotlight is now buildable."
+ - rscadd: "The spotlight and large tube light now has a distinct sprite."
+ - rscdel: "Removed the low-intensity spotlight. All instances have been replaced with standard spotlights."
+ - tweak: "Added new sprites for wall lights. (made by Gem)"
+ - tweak: "Lightbulbs (except in floor lights) now layer above darkness."
+ - maptweak: "Added floor lights on decks 2 and 3, replacing most instances of wall lights on railings."
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 6bcbae1a039..7f3bcc17b45 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/lights.dmi b/icons/obj/lights.dmi
new file mode 100644
index 00000000000..47640b9d00d
Binary files /dev/null and b/icons/obj/lights.dmi differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 08cfeed1f87..3dcb3ef1478 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -18228,7 +18228,7 @@
/obj/effect/floor_decal/corner/paleblue{
dir = 5
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1;
name = "adjusted spotlight";
pixel_x = -16
@@ -40893,7 +40893,7 @@
/turf/unsimulated/floor,
/area/centcom/ferry)
"wNC" = (
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/obj/effect/floor_decal/corner/paleblue{
dir = 10
},
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index d1082597597..743621b9dfa 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -2055,7 +2055,7 @@
/area/engineering/atmos)
"aeW" = (
/obj/structure/window/borosilicate/reinforced,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/turf/simulated/floor/reinforced/airless,
@@ -3691,7 +3691,7 @@
/obj/structure/window/borosilicate/reinforced{
dir = 4
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/turf/simulated/floor/reinforced/airless,
@@ -5145,7 +5145,7 @@
/turf/simulated/floor/reinforced,
/area/engineering/gravity_gen)
"alP" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/unsimulated/floor/asteroid/ash/rocky,
@@ -20000,7 +20000,7 @@
/obj/structure/window/borosilicate/reinforced{
dir = 1
},
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/turf/simulated/floor/reinforced/airless,
/area/rnd/test_area)
"aPE" = (
@@ -20590,7 +20590,7 @@
dir = 8
},
/obj/structure/window/borosilicate/reinforced,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/reinforced/airless,
@@ -20602,7 +20602,7 @@
/obj/structure/window/borosilicate/reinforced{
dir = 1
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/reinforced/airless,
@@ -24097,7 +24097,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research_xenobiology)
"bgd" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/unsimulated/floor/asteroid/ash/rocky,
@@ -24231,7 +24231,7 @@
/obj/effect/floor_decal/industrial/warning/dust{
dir = 1
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/airless{
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index b30a25678f3..76d08ef4d13 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -52487,7 +52487,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/bar)
"bVE" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4;
must_start_working = 1
},
@@ -56660,7 +56660,7 @@
/obj/structure/track{
icon_state = "track12"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/turf/simulated/floor/tiled/asteroid/airless,
@@ -57377,7 +57377,7 @@
/obj/effect/floor_decal/industrial/warning/dust{
dir = 8
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/tiled/asteroid/airless,
@@ -60463,7 +60463,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8;
must_start_working = 1
},
@@ -62601,7 +62601,7 @@
/turf/simulated/floor/plating,
/area/maintenance/bar)
"jcx" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/tiled/asteroid/airless,
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index 832e6a47c42..21b5e7ebb09 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -6725,7 +6725,7 @@
/turf/unsimulated/floor/asteroid/ash/rocky,
/area/maintenance/interstitial_construction_site/zone_2)
"xa" = (
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/turf/unsimulated/floor/asteroid/ash/rocky,
/area/mine/unexplored)
"xi" = (
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 20a84ececdf..4764267f99a 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -15097,7 +15097,7 @@
dir = 5
},
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/obj/machinery/airlock_sensor{
diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm
index 3528d180f77..95d0252f288 100644
--- a/maps/event/generic_dock/generic_dock-1.dmm
+++ b/maps/event/generic_dock/generic_dock-1.dmm
@@ -7399,7 +7399,7 @@
/obj/effect/floor_decal/corner/paleblue{
dir = 5
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1;
name = "adjusted spotlight";
pixel_x = -16
@@ -17533,7 +17533,7 @@
/turf/simulated/floor/shuttle/white,
/area/shuttle/escape)
"wNC" = (
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/obj/effect/floor_decal/corner/paleblue{
dir = 10
},
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index 9989858640b..14730170a7c 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -84,7 +84,7 @@
/turf/simulated/floor/tiled,
/area/horizon/custodial)
"adv" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8;
must_start_working = 1
},
@@ -1213,7 +1213,7 @@
/area/maintenance/research_port)
"aVU" = (
/obj/structure/reagent_dispensers/extinguisher,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -2067,7 +2067,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/turf/simulated/floor/plating,
@@ -3207,7 +3207,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/machinery/firealarm/east,
@@ -3841,7 +3841,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4;
must_start_working = 1
},
@@ -3924,7 +3924,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/structure/sign/emergency/evacuation/pods{
@@ -3961,7 +3961,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -4320,7 +4320,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/obj/structure/closet/emcloset,
@@ -5125,7 +5125,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/intrepid/cargo_bay)
"dJm" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4;
must_start_working = 1
},
@@ -5145,7 +5145,7 @@
/obj/effect/floor_decal/corner/green{
dir = 9
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8;
must_start_working = 1
},
@@ -9214,7 +9214,7 @@
/obj/structure/railing/mapped{
dir = 8
},
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -13896,7 +13896,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/machinery/alarm{
@@ -14158,7 +14158,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/obj/structure/sign/emergency/evacuation{
@@ -14896,7 +14896,7 @@
/obj/effect/floor_decal/corner/green{
dir = 9
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8;
must_start_working = 1
},
@@ -15936,7 +15936,7 @@
/obj/effect/floor_decal/corner/green{
dir = 9
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8;
must_start_working = 1
},
@@ -18144,7 +18144,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/machinery/alarm{
@@ -18529,7 +18529,7 @@
icon_state = "1-2"
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/obj/effect/floor_decal/industrial/warning{
@@ -19943,7 +19943,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4;
must_start_working = 1
},
@@ -21389,7 +21389,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -21604,7 +21604,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4;
must_start_working = 1
},
@@ -26470,7 +26470,7 @@
/turf/simulated/floor/tiled/dark,
/area/storage/eva)
"sKc" = (
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/obj/structure/cable/green{
icon_state = "1-8"
},
@@ -27405,7 +27405,7 @@
/turf/simulated/floor/reinforced/nitrogen,
/area/engineering/atmos/air)
"trW" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -27933,7 +27933,7 @@
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos/propulsion/starboard)
"tJR" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/structure/sign/crush{
@@ -28317,7 +28317,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/obj/effect/floor_decal/corner/green{
@@ -28824,7 +28824,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/obj/structure/sign/emergency/evacuation/pods{
@@ -31946,7 +31946,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/rnd/xenoarch_atrium)
"wvY" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/effect/floor_decal/industrial/warning{
@@ -32150,7 +32150,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/effect/floor_decal/corner/green{
@@ -32541,7 +32541,7 @@
/obj/effect/floor_decal/corner/green{
dir = 9
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -32795,7 +32795,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/effect/floor_decal/corner/green{
@@ -33695,7 +33695,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/plating,
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 22eff112617..0e96b503863 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -968,7 +968,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/tiled/dark/full,
@@ -3023,12 +3023,6 @@
},
/turf/simulated/wall,
/area/horizon/bar)
-"bto" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/open,
-/area/hallway/primary/central_one)
"btv" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -9536,7 +9530,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 9
},
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"eMT" = (
@@ -14589,7 +14583,7 @@
/turf/simulated/floor/tiled,
/area/hallway/engineering)
"hax" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/obj/structure/sign/electricshock/tesla{
@@ -15473,10 +15467,14 @@
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard/far)
"hvu" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/dark/full,
-/area/hallway/primary/central_one)
+/obj/effect/floor_decal/corner/brown{
+ dir = 9
+ },
+/obj/machinery/light/floor{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/operations/office)
"hvH" = (
/obj/effect/floor_decal/corner/brown{
dir = 9
@@ -16608,9 +16606,6 @@
/turf/simulated/floor/tiled/dark/full,
/area/engineering/engine_monitoring/tesla)
"iaW" = (
-/obj/machinery/light{
- dir = 4
- },
/obj/effect/floor_decal/spline/plain{
dir = 4
},
@@ -16623,6 +16618,9 @@
/obj/effect/floor_decal/corner_wide/white{
dir = 6
},
+/obj/machinery/light/floor{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark/full,
/area/hallway/primary/central_one)
"ibx" = (
@@ -18297,7 +18295,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/turf/simulated/floor/tiled/dark/full,
@@ -19698,6 +19696,9 @@
/obj/effect/floor_decal/corner_wide/white{
dir = 5
},
+/obj/machinery/light/floor{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark/full,
/area/hallway/primary/central_one)
"jvL" = (
@@ -20222,6 +20223,15 @@
},
/turf/simulated/floor/carpet/rubber,
/area/engineering/engine_monitoring/tesla)
+"jIW" = (
+/obj/effect/floor_decal/corner/brown{
+ dir = 5
+ },
+/obj/machinery/light/floor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/operations/office)
"jIY" = (
/obj/structure/railing/mapped{
dir = 8
@@ -21752,7 +21762,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
},
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"kzr" = (
@@ -23489,14 +23499,23 @@
/turf/simulated/floor/plating,
/area/maintenance/wing/port)
"lvH" = (
-/obj/effect/floor_decal/corner/green{
- dir = 5
+/obj/structure/cable/green{
+ icon_state = "1-2"
},
-/obj/machinery/light{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/brown{
+ dir = 9
+ },
+/obj/effect/landmark/start{
+ name = "Hangar Technician"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/floor{
+ dir = 8
},
/turf/simulated/floor/tiled,
-/area/hallway/primary/central_one)
+/area/operations/office)
"lvM" = (
/turf/simulated/floor/wood,
/area/horizon/bar)
@@ -25303,9 +25322,6 @@
/area/horizon/security/equipment)
"mqj" = (
/obj/structure/closet/secure_closet/hangar_tech,
-/obj/machinery/light{
- dir = 4
- },
/obj/effect/floor_decal/corner/brown{
dir = 6
},
@@ -27034,6 +27050,13 @@
"ncR" = (
/turf/simulated/wall/r_wall,
/area/horizon/security/lobby)
+"ndk" = (
+/obj/effect/floor_decal/corner/green{
+ dir = 10
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_one)
"ndn" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -27947,7 +27970,7 @@
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"nzn" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/structure/sign/electricshock/tesla{
@@ -30833,7 +30856,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 1
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/turf/simulated/floor/plating,
@@ -31925,7 +31948,7 @@
icon_state = "0-8"
},
/obj/machinery/power/terminal,
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/machinery/power/sensor{
@@ -32494,7 +32517,7 @@
/obj/structure/cable/orange{
icon_state = "2-4"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 8
},
/turf/simulated/floor/tiled/dark/full,
@@ -34003,6 +34026,18 @@
},
/turf/simulated/floor/wood,
/area/operations/qm)
+"qCP" = (
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/spline/fancy{
+ dir = 1
+ },
+/obj/structure/railing/mapped,
+/obj/effect/floor_decal/corner_wide/white{
+ dir = 10
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled/dark/full,
+/area/hallway/primary/central_one)
"qCX" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -34137,10 +34172,10 @@
/area/maintenance/wing/starboard)
"qFz" = (
/obj/effect/floor_decal/corner/green{
- dir = 10
+ dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/light/floor{
+ dir = 8
},
/turf/simulated/floor/tiled,
/area/hallway/primary/central_one)
@@ -35077,7 +35112,7 @@
/obj/structure/cable/orange{
icon_state = "1-2"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/machinery/button/remote/blast_door{
@@ -35329,7 +35364,7 @@
/obj/structure/cable/orange{
icon_state = "2-8"
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/floor/tiled/dark/full,
@@ -36801,6 +36836,13 @@
"rVg" = (
/turf/simulated/wall,
/area/operations/office)
+"rVt" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark/full,
+/area/hallway/primary/central_one)
"rVL" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
@@ -38014,9 +38056,6 @@
/turf/simulated/floor/plating,
/area/maintenance/wing/port/far)
"sFf" = (
-/obj/machinery/light{
- dir = 8
- },
/obj/effect/floor_decal/spline/plain{
dir = 8
},
@@ -38029,6 +38068,9 @@
/obj/effect/floor_decal/corner_wide/white{
dir = 9
},
+/obj/machinery/light/floor{
+ dir = 8
+ },
/turf/simulated/floor/tiled/dark/full,
/area/hallway/primary/central_one)
"sFk" = (
@@ -39756,7 +39798,7 @@
/area/horizon/security/hallway)
"tzw" = (
/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"tzF" = (
@@ -44821,7 +44863,7 @@
input_tag = "cooling_in";
name = "Engine Cooling Control";
output_tag = "cooling_out";
- sensors = list("engine_sensor"="Engine Core")
+ sensors = list("engine_sensor"="Engine Core")
},
/obj/machinery/camera/network/engineering{
c_tag = "Engineering - Supermatter Reactor Monitoring";
@@ -47577,6 +47619,15 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
+"xcS" = (
+/obj/effect/floor_decal/corner/green{
+ dir = 5
+ },
+/obj/machinery/light/floor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_one)
"xdl" = (
/obj/effect/floor_decal/corner/green{
dir = 5
@@ -48747,7 +48798,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/exam)
"xGT" = (
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 4
},
/obj/machinery/button/remote/blast_door{
@@ -61020,7 +61071,7 @@ gvB
aqV
hUP
nTB
-kRZ
+jIW
aoC
kmc
epw
@@ -61424,7 +61475,7 @@ qpB
rju
qpB
iGE
-kRZ
+jIW
rtF
rew
nZZ
@@ -61623,9 +61674,9 @@ qEQ
rSG
wmT
pew
+hvu
skq
-skq
-skq
+hvu
qXx
vwg
rew
@@ -62427,7 +62478,7 @@ pMJ
dcI
hBJ
gwv
-gwv
+lvH
gwv
rVV
qSE
@@ -70099,7 +70150,7 @@ ayF
wTb
pyc
mHG
-bto
+xQj
mHG
nEx
hDd
@@ -70500,17 +70551,17 @@ vja
qja
ego
ayF
-wTb
+rVt
pyc
mHG
xQj
mHG
nEx
xhg
-pdv
+ndk
bJp
siL
-xhg
+xcS
nkF
mCE
xWr
@@ -70702,13 +70753,13 @@ ajN
xEH
sYl
ayF
-hvu
+wTb
plf
hfq
vbk
hfq
wdk
-lvH
+xhg
pdv
cMn
wlg
@@ -70902,12 +70953,12 @@ nUN
rUT
gDw
pyc
-bto
+xQj
ayF
aIj
yea
fEQ
-fEQ
+qFz
fEQ
fEQ
tZV
@@ -71102,7 +71153,7 @@ iVp
iVp
nUN
vcv
-lPO
+ndk
bJp
mHG
cTn
@@ -71304,7 +71355,7 @@ iVp
iVp
nUN
vcv
-qFz
+lPO
luT
vbk
ayF
@@ -72322,7 +72373,7 @@ xhg
hcF
pdv
dPz
-gkM
+qCP
oFp
lTn
ygu
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index ea700da599d..b24327a992b 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -1198,7 +1198,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/obj/structure/railing/mapped{
dir = 4
},
@@ -1503,14 +1503,6 @@
},
/turf/simulated/floor/tiled/full,
/area/lawoffice/consular)
-"bbI" = (
-/obj/effect/floor_decal/corner/brown{
- dir = 10
- },
-/obj/structure/window/reinforced,
-/obj/machinery/light/spot,
-/turf/simulated/floor/tiled/dark,
-/area/horizon/holodeck_control/beta)
"bbV" = (
/obj/structure/railing/mapped{
dir = 4
@@ -2302,6 +2294,13 @@
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/investigators_office)
+"bUB" = (
+/obj/effect/floor_decal/corner_wide/green{
+ dir = 10
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled/white,
+/area/hallway/medical/upper)
"bVX" = (
/obj/effect/floor_decal/corner/blue{
dir = 9
@@ -2547,6 +2546,16 @@
/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/dark,
/area/horizon/crew_armoury)
+"cid" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/corner/green{
+ dir = 10
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"cih" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4283,6 +4292,15 @@
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/horizon/hallway/deck_three/primary/port/docks)
+"dSw" = (
+/obj/effect/floor_decal/corner_wide/green{
+ dir = 5
+ },
+/obj/machinery/light/floor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/hallway/medical/upper)
"dSF" = (
/turf/template_noop,
/area/template_noop)
@@ -4591,6 +4609,25 @@
/obj/random/loot,
/turf/simulated/floor,
/area/maintenance/security_starboard)
+"egb" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/corner/green{
+ dir = 10
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"egX" = (
/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{
id = "investigator_office"
@@ -4659,6 +4696,19 @@
},
/turf/simulated/floor/tiled,
/area/engineering/break_room)
+"ehN" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/corner/green{
+ dir = 10
+ },
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"eih" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -5253,6 +5303,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"eDV" = (
@@ -5681,7 +5734,7 @@
/area/horizon/holodeck_control/beta)
"eWK" = (
/obj/structure/lattice,
-/obj/machinery/light{
+/obj/machinery/light/spot{
dir = 1
},
/turf/simulated/open,
@@ -5748,6 +5801,13 @@
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
+"eZr" = (
+/obj/effect/floor_decal/corner/green{
+ dir = 10
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/starboard)
"eZt" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
@@ -6228,7 +6288,7 @@
pixel_x = -22;
pixel_y = 10
},
-/obj/machinery/light/spot,
+/obj/machinery/light/floor,
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control)
"fom" = (
@@ -7005,6 +7065,9 @@
/obj/effect/floor_decal/corner_wide/green{
dir = 6
},
+/obj/machinery/light/floor{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/hallway/medical/upper)
"fOk" = (
@@ -7445,6 +7508,20 @@
/obj/machinery/door/window/southright,
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control)
+"ghN" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/green{
+ dir = 6
+ },
+/obj/machinery/light/floor{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"gin" = (
/obj/effect/floor_decal/corner/blue{
dir = 6
@@ -7802,7 +7879,7 @@
/obj/structure/railing/mapped{
dir = 1
},
-/obj/machinery/light,
+/obj/machinery/light/spot,
/obj/structure/lattice,
/turf/simulated/open,
/area/horizon/hallway/deck_three/primary/central)
@@ -7820,8 +7897,8 @@
dir = 10
},
/obj/structure/window/reinforced,
-/obj/machinery/light/spot,
/obj/effect/floor_decal/industrial/outline/medical,
+/obj/machinery/light/floor,
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"gyk" = (
@@ -9437,8 +9514,8 @@
dir = 10
},
/obj/structure/window/reinforced,
-/obj/machinery/light/spot,
/obj/effect/floor_decal/industrial/outline/medical,
+/obj/machinery/light/floor,
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control)
"hDn" = (
@@ -9684,7 +9761,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/structure/railing/mapped{
@@ -10322,9 +10399,6 @@
/turf/simulated/floor/carpet,
/area/lawoffice/consular)
"iya" = (
-/obj/machinery/light{
- dir = 1
- },
/obj/structure/closet/walllocker/medical{
pixel_y = 32
},
@@ -11225,14 +11299,14 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/light{
- dir = 8
- },
/obj/effect/floor_decal/spline/plain{
dir = 8
},
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/corner/red/diagonal,
+/obj/machinery/light/floor{
+ dir = 8
+ },
/turf/simulated/floor/lino/grey,
/area/horizon/cafeteria)
"jid" = (
@@ -12151,6 +12225,25 @@
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/firing_range)
+"jRh" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/green{
+ dir = 10
+ },
+/obj/machinery/light/floor,
+/turf/simulated/floor/tiled/white,
+/area/hallway/medical/upper)
"jRy" = (
/obj/structure/displaycase/adhomai_map,
/turf/simulated/floor/wood,
@@ -13884,6 +13977,7 @@
dir = 10
},
/obj/structure/window/reinforced,
+/obj/machinery/light/floor,
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"lfv" = (
@@ -14126,7 +14220,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/obj/structure/railing/mapped{
dir = 8
},
@@ -14320,7 +14414,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 9
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1
},
/obj/structure/railing/mapped{
@@ -14589,7 +14683,7 @@
/area/horizon/hallway/deck_three/primary/starboard)
"lEP" = (
/obj/structure/lattice,
-/obj/machinery/light,
+/obj/machinery/light/spot,
/turf/simulated/open,
/area/horizon/hallway/deck_three/primary/central)
"lFe" = (
@@ -14894,7 +14988,6 @@
/obj/effect/floor_decal/corner/green/full{
dir = 4
},
-/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"lSX" = (
@@ -16367,7 +16460,7 @@
/area/horizon/hallway/deck_three/primary/starboard)
"nez" = (
/obj/structure/lattice,
-/obj/machinery/light{
+/obj/machinery/light/spot{
dir = 4
},
/turf/simulated/open,
@@ -17310,13 +17403,13 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
/obj/effect/floor_decal/corner/brown/diagonal,
/obj/structure/cable/green{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"nPk" = (
@@ -17601,7 +17694,7 @@
/area/horizon/longbow)
"ocK" = (
/obj/structure/lattice,
-/obj/machinery/light{
+/obj/machinery/light/spot{
dir = 8
},
/turf/simulated/open,
@@ -18156,9 +18249,6 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/starboard)
"ovx" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
/obj/effect/floor_decal/corner/brown{
dir = 10
},
@@ -18181,7 +18271,7 @@
pixel_y = 2
},
/obj/structure/window/reinforced,
-/obj/machinery/light/spot,
+/obj/machinery/light/floor,
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"owI" = (
@@ -18652,7 +18742,7 @@
/obj/machinery/camera/network/civilian_surface{
c_tag = "Surface - Emergency Services Dock - Aft";
dir = 8;
- network = list("Civilian Surface","Emergency Dock")
+ network = list("Civilian Surface","Emergency Dock")
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/hallway/deck_three/primary/port/docks)
@@ -19958,6 +20048,18 @@
"qhP" = (
/turf/simulated/wall,
/area/horizon/holodeck_control)
+"qhR" = (
+/obj/effect/floor_decal/corner/green{
+ dir = 9
+ },
+/obj/structure/railing/mapped{
+ dir = 8
+ },
+/obj/machinery/light/floor{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/port)
"qii" = (
/obj/machinery/alarm{
dir = 8;
@@ -22334,6 +22436,9 @@
c_tag = "Third Deck - Holodeck Beta 1";
dir = 8
},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"scO" = (
@@ -22417,6 +22522,20 @@
},
/turf/simulated/floor/tiled/dark,
/area/horizon/longbow)
+"sfi" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/green{
+ dir = 6
+ },
+/obj/machinery/light/floor{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"sfq" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -22714,14 +22833,14 @@
/turf/simulated/floor/reinforced/airless,
/area/template_noop)
"soS" = (
-/obj/machinery/light{
- dir = 8
- },
/obj/effect/floor_decal/spline/plain{
dir = 8
},
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/corner/red/diagonal,
+/obj/machinery/light/floor{
+ dir = 8
+ },
/turf/simulated/floor/lino/grey,
/area/horizon/cafeteria)
"spn" = (
@@ -23596,7 +23715,7 @@
/area/horizon/hallway/deck_three/primary/central)
"tcH" = (
/obj/effect/floor_decal/spline/fancy/wood,
-/obj/machinery/light,
+/obj/machinery/light/small/floor,
/turf/simulated/floor/wood,
/area/horizon/cafeteria)
"tcM" = (
@@ -24325,13 +24444,6 @@
"tGG" = (
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/horizon/security/washroom)
-"tHh" = (
-/obj/effect/floor_decal/corner/brown{
- dir = 10
- },
-/obj/structure/window/reinforced,
-/turf/simulated/floor/tiled/dark,
-/area/horizon/holodeck_control)
"tHF" = (
/obj/machinery/light{
dir = 4
@@ -26153,7 +26265,7 @@
dir = 10
},
/obj/structure/window/reinforced,
-/obj/machinery/light/spot,
+/obj/machinery/light/floor,
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control)
"vcu" = (
@@ -26897,9 +27009,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
-/obj/machinery/light{
- dir = 1
- },
+/obj/machinery/light/small/floor,
/turf/simulated/floor/wood,
/area/horizon/cafeteria)
"vFz" = (
@@ -27486,7 +27596,7 @@
/area/bridge/controlroom)
"wcO" = (
/obj/structure/railing/mapped,
-/obj/machinery/light{
+/obj/machinery/light/spot{
dir = 1
},
/obj/structure/lattice,
@@ -28026,6 +28136,9 @@
dir = 4
},
/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"wxE" = (
@@ -29664,6 +29777,15 @@
/obj/machinery/firealarm/north,
/turf/simulated/floor/tiled/white,
/area/medical/ward/isolation)
+"xNx" = (
+/obj/effect/floor_decal/corner/green{
+ dir = 5
+ },
+/obj/machinery/light/floor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/horizon/hallway/deck_three/primary/central)
"xOy" = (
/obj/effect/floor_decal/corner_wide/paleblue{
dir = 6
@@ -43712,7 +43834,7 @@ vLY
vLY
biw
lki
-mqJ
+eZr
oaY
xki
xki
@@ -44707,13 +44829,13 @@ lXW
vKa
rOF
wtd
-iiQ
+jRh
gPn
nHR
nHR
nHR
fFg
-iYu
+dSw
iBF
iBF
iBF
@@ -45919,7 +46041,7 @@ xPP
adQ
fND
eaF
-ksw
+bUB
gPn
nHR
nHR
@@ -47943,7 +48065,7 @@ gDJ
qhP
eYD
tfp
-tHh
+vbS
oVU
oVU
oVU
@@ -48538,7 +48660,7 @@ ruh
orG
rNN
xmD
-bbI
+leX
gDJ
gDJ
gDJ
@@ -50362,7 +50484,7 @@ aBD
rsD
wUC
hzz
-hzz
+sfi
hsf
hzz
kjs
@@ -50370,7 +50492,7 @@ bWh
vJP
vJP
vJP
-vJP
+ghN
vJP
frU
mBw
@@ -50965,7 +51087,7 @@ nCP
fuG
tzY
fDJ
-hOw
+cid
lrF
tlL
isT
@@ -50979,7 +51101,7 @@ nez
isT
tlL
ykD
-eod
+xNx
dHs
dHs
dHs
@@ -52177,7 +52299,7 @@ bJA
dtC
emd
iVb
-mfV
+ehN
lrF
tlL
eEz
@@ -52191,7 +52313,7 @@ vDR
kwr
tlL
ykD
-eod
+xNx
dHs
jWi
tcA
@@ -53187,7 +53309,7 @@ mTh
nVR
xaT
rIg
-qlt
+egb
kwr
isT
hNj
@@ -53201,7 +53323,7 @@ lbi
hNj
isT
eEz
-eod
+xNx
fWB
dCe
wWX
@@ -54209,7 +54331,7 @@ lbi
lbi
lbi
ozd
-fWT
+qhR
fWT
kyE
oWu
diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
index 1ec76fb3821..972bd9eb388 100644
--- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
+++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
@@ -3648,7 +3648,7 @@
/turf/unsimulated/floor,
/area/centcom/bar)
"aim" = (
-/obj/machinery/light/spot/weak,
+/obj/machinery/light/spot,
/obj/effect/floor_decal/corner/paleblue{
dir = 10
},
@@ -14438,7 +14438,7 @@
/obj/effect/floor_decal/corner/paleblue{
dir = 5
},
-/obj/machinery/light/spot/weak{
+/obj/machinery/light/spot{
dir = 1;
name = "adjusted spotlight";
pixel_x = -16