- Desk lamps are now just fancy flashlights. Which means you can pick them up. They have w_class set to 4 and don't have the onbelt flag, meaning you can't put them in any container and you can't put them in a pocket. Click on them to pick them up, use the toggle-light verb to turn them on or off. They are no longer affected by light switches (desk lights generally aren't anyway)

- Updated lamp type path on both uterus and 2.0.8

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3115 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/devices/flashlight.dm

@@ -13,18 +13,36 @@
 		icon_on = "flight1"
 		icon_off = "flight0"
 
+/obj/item/device/flashlight/initialize()
+	..()
+	if (on)
+		icon_state = icon_on
+		src.sd_SetLuminosity(brightness_on)
+	else
+		icon_state = icon_off
+		src.sd_SetLuminosity(0)
+
+/obj/item/device/flashlight/proc/update_brightness(var/mob/user = null)
+	if (on)
+		icon_state = icon_on
+		if(src.loc == user)
+			user.total_luminosity += brightness_on
+		else if (isturf(src.loc))
+			src.sd_SetLuminosity(brightness_on)
+
+	else
+		icon_state = icon_off
+		if(src.loc == user)
+			user.total_luminosity -= brightness_on
+		else if (isturf(src.loc))
+			src.sd_SetLuminosity(0)
 
 /obj/item/device/flashlight/attack_self(mob/user)
 	if(!isturf(user.loc))
 		user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities.
 		return
 	on = !on
-	if (on)
-		icon_state = icon_on
-		user.total_luminosity += brightness_on
-	else
-		icon_state = icon_off
-		user.total_luminosity -= brightness_on
+	update_brightness(user)
 	return
 
 
@@ -64,8 +82,8 @@
 
 /obj/item/device/flashlight/pickup(mob/user)
 	if(on)
-		src.sd_SetLuminosity(0)
 		user.total_luminosity += brightness_on
+		src.sd_SetLuminosity(0)
 
 
 /obj/item/device/flashlight/dropped(mob/user)
@@ -133,10 +151,41 @@
 
 /obj/item/clothing/head/helmet/hardhat/pickup(mob/user)
 	if(on)
-		src.sd_SetLuminosity(0)
 		user.total_luminosity += brightness_on
+		user.UpdateLuminosity()
+		src.sd_SetLuminosity(0)
 
 /obj/item/clothing/head/helmet/hardhat/dropped(mob/user)
 	if(on)
 		user.total_luminosity -= brightness_on
+		user.UpdateLuminosity()
 		src.sd_SetLuminosity(brightness_on)
+
+// the desk lamps are a bit special
+/obj/item/device/flashlight/lamp
+	name = "desk lamp"
+	desc = "A desk lamp"
+	icon = 'lighting.dmi'
+	icon_state = "lamp0"
+	brightness_on = 5
+	icon_on = "lamp1"
+	icon_off = "lamp0"
+	w_class = 4
+	flags = FPRINT | TABLEPASS | CONDUCT
+	m_amt = 0
+	g_amt = 0
+	on = 1
+
+// green-shaded desk lamp
+/obj/item/device/flashlight/lamp/green
+	icon_state = "green0"
+	icon_on = "green1"
+	icon_off = "green0"
+	desc = "A green-shaded desk lamp"
+
+/obj/item/device/flashlight/lamp/verb/toggle_light(mob/user)
+	set name = "Toggle light"
+	set category = "Object"
+	set src in oview(1)
+
+	attack_self(user)

code/modules/power/lighting.dm

@@ -52,23 +52,6 @@
 	light_type = /obj/item/weapon/light/tube/large
 	brightness = 15
 
-// the desk lamp
-/obj/machinery/light/lamp
-	name = "desk lamp"
-	icon_state = "lamp1"
-	base_state = "lamp"
-	fitting = "bulb"
-	brightness = 5
-	desc = "A desk lamp"
-	light_type = /obj/item/weapon/light/bulb
-	var/switchon = 0		// independent switching for lamps - not controlled by area lightswitch
-
-// green-shaded desk lamp
-/obj/machinery/light/lamp/green
-	icon_state = "green1"
-	base_state = "green"
-	desc = "A green-shaded desk lamp"
-
 
 // create a new lighting fixture
 /obj/machinery/light/New()
@@ -392,38 +375,8 @@
 
 
 
-// special handling for desk lamps
 
 
-// if attack with hand, only "grab" attacks are an attempt to remove bulb
-// otherwise, switch the lamp on/off
-
-/obj/machinery/light/lamp/attack_hand(mob/user)
-
-	if(user.a_intent == "grab")
-		..()	// do standard hand attack
-	else
-		switchon = !switchon
-		user << "You switch [switchon ? "on" : "off"] the [name]."
-		seton(switchon && powered(LIGHT))
-
-
-// called when area power state changes
-// override since lamp does not use area lightswitch
-
-/obj/machinery/light/lamp/power_change()
-	spawn(rand(0,15))
-		var/area/A = src.loc.loc
-		A = A.master
-		seton(switchon && A.power_light)
-
-// returns whether this lamp has power
-// true if area has power and lamp switch is on
-
-/obj/machinery/light/lamp/has_power()
-	var/area/A = src.loc.loc
-	return switchon && A.master.power_light
-
 
 
 

maps/tgstation.2.0.8.dmm

@@ -717,7 +717,7 @@
 "anO" = (/turf/simulated/floor{dir = 9; icon_state = "carpetside"},/area/security/detectives_office)
 "anP" = (/obj/structure/table/woodentable,/obj/item/weapon/cigpacket,/obj/item/clothing/glasses/thermal,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/detectives_office)
 "anQ" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/security/detectives_office)
-"anR" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp/green{pixel_x = 1; pixel_y = 5},/obj/effect/deskclutter,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
+"anR" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/effect/deskclutter,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "anS" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/lawoffice)
 "anT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
 "anU" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
@@ -755,7 +755,7 @@
 "aoA" = (/obj/machinery/computer/security/wooden_tv,/obj/machinery/newscaster{pixel_x = 28},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aoB" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
 "aoC" = (/obj/structure/stool/chair{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
-"aoD" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
+"aoD" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
 "aoE" = (/obj/structure/stool/chair{dir = 8},/obj/effect/landmark/start{name = "Lawyer"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
 "aoF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/lawoffice)
 "aoG" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore)
@@ -1551,7 +1551,7 @@
 "aDQ" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 9; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/effect/landmark{name = "blobstart"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "aDR" = (/obj/structure/crematorium,/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
 "aDS" = (/obj/machinery/crema_switch{pixel_x = 25},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
-"aDT" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp{pixel_y = 10},/obj/structure/disposalpipe/segment,/obj/item/weapon/paper{layer = 6},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
+"aDT" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp{pixel_y = 10},/obj/structure/disposalpipe/segment,/obj/item/weapon/paper{layer = 6},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aDU" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aDV" = (/obj/structure/table/woodentable,/obj/item/device/soulstone,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aDW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
@@ -2136,9 +2136,9 @@
 "aPd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/security/vacantoffice)
 "aPe" = (/obj/machinery/camera{c_tag = "Vacant Office"; dir = 4; network = "SS13"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/security/vacantoffice)
 "aPf" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/security/vacantoffice)
-"aPg" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp,/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/security/vacantoffice)
+"aPg" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aPh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/security/vacantoffice)
-"aPi" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp/green,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/security/vacantoffice)
+"aPi" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/security/vacantoffice)
 "aPj" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/pen/red,/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aPk" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/security/vacantoffice)
 "aPl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/vacantoffice)
@@ -2758,7 +2758,7 @@
 "bbb" = (/obj/structure/rack,/obj/item/weapon/tank/jetpack,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "bbc" = (/obj/structure/stool/bed,/obj/machinery/light_switch{pixel_y = -25},/obj/item/weapon/bedsheet/captain,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "bbd" = (/obj/structure/closet/secure_closet/captains,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
-"bbe" = (/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/obj/machinery/light,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
+"bbe" = (/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/obj/machinery/light,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "bbf" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "bbg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/crew_quarters/captain)
 "bbh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai)
@@ -5772,7 +5772,7 @@
 "cgZ" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/syndicate_station/start)
 "cha" = (/obj/structure/table,/obj/machinery/microwave,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "chb" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"chc" = (/obj/structure/table,/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"chc" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "chd" = (/obj/machinery/computer/syndicate_station,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "che" = (/obj/structure/table,/obj/item/weapon/pen/sleepypen,/obj/item/weapon/paper,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "chf" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
@@ -6787,7 +6787,7 @@
 "cAA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/obj/machinery/camera{c_tag = "Main Computer Room"; dir = 2; network = "Tcomsat"},/turf/simulated/floor,/area/tcommsat/computer)
 "cAB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/tcommsat/computer)
 "cAC" = (/turf/simulated/floor,/area/tcommsat/computer)
-"cAD" = (/obj/structure/table,/obj/machinery/light/lamp,/turf/simulated/floor,/area/tcommsat/computer)
+"cAD" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor,/area/tcommsat/computer)
 "cAE" = (/obj/item/weapon/syntiflesh{name = "Cuban Pete-Meat"},/turf/simulated/floor/engine,/area/tcommsat/computer)
 "cAF" = (/obj/item/weapon/beach_ball,/turf/simulated/floor,/area/tcommsat/lounge)
 "cAG" = (/turf/simulated/floor,/area/tcommsat/lounge)
@@ -7153,7 +7153,7 @@
 "cHC" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
 "cHD" = (/obj/machinery/light_switch{pixel_y = 28},/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
 "cHE" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/light{dir = 1},/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
-"cHF" = (/obj/structure/table,/obj/machinery/light/lamp,/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
+"cHF" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
 "cHG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/djstation)
 "cHH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/djstation)
 "cHI" = (/obj/structure/table,/obj/machinery/microwave{pixel_y = 8},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/djstation)

maps/uterus.dmm

@@ -400,7 +400,7 @@
 "ahJ" = (/obj/item/weapon/camera_test,/obj/item/weapon/storage/photo_album{pixel_y = -10},/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "ahK" = (/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/melee/chainofcommand,/obj/machinery/light_switch{pixel_y = 24},/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "ahL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
-"ahM" = (/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
+"ahM" = (/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "ahN" = (/obj/machinery/computer/card,/obj/item/weapon/card/id/captains_spare,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "ahO" = (/obj/machinery/computer/communications,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "ahP" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/stamp/captain,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
@@ -1303,7 +1303,7 @@
 "azc" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Chaplain's Office"; req_access_txt = "22"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/chapel/office)
 "azd" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aze" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
-"azf" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp{pixel_y = 10},/obj/item/weapon/paper{info = "Glauds! How rorm it would be to pell back to the bewl and distunk them, distunk the whole delcot, let the drokes discren them. But you are the gostak. The gostak distims the doshes. And no glaud will vorl them from you."},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
+"azf" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp{pixel_y = 10},/obj/item/weapon/paper{info = "Glauds! How rorm it would be to pell back to the bewl and distunk them, distunk the whole delcot, let the drokes discren them. But you are the gostak. The gostak distims the doshes. And no glaud will vorl them from you."},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "azg" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "azh" = (/obj/structure/table/woodentable,/obj/item/device/multitool,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "azi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
@@ -1946,7 +1946,7 @@
 "aLv" = (/obj/structure/closet/secure_closet/warden,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aLw" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aLx" = (/obj/structure/table/woodentable,/obj/item/weapon/cigpacket,/obj/item/clothing/glasses/thermal,/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/security/detectives_office)
-"aLy" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp/green{pixel_x = 1; pixel_y = 5},/obj/effect/deskclutter,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
+"aLy" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/energy/sword/green{pixel_x = 1; pixel_y = 5},/obj/effect/deskclutter,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aLz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aLA" = (/obj/machinery/door/airlock{name = "Restroom"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar)
 "aLB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/crew_quarters/bar)
@@ -4660,7 +4660,7 @@
 "bLF" = (/obj/structure/closet/secure_closet/engineering_chief,/obj/machinery/light,/turf/simulated/floor,/area/engine/chiefs_office)
 "bLG" = (/obj/structure/table/woodentable,/obj/item/weapon/lighter/zippo,/obj/item/weapon/stamp/ce,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/engine/chiefs_office)
 "bLH" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/engineering_hacking{pixel_x = 6; pixel_y = 6},/obj/item/weapon/book/manual/engineering_guide,/obj/item/weapon/book/manual/robotics_cyborgs{pixel_x = -3; pixel_y = -3},/turf/simulated/floor,/area/engine/chiefs_office)
-"bLI" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp/green,/turf/simulated/floor,/area/engine/chiefs_office)
+"bLI" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/energy/sword/green,/turf/simulated/floor,/area/engine/chiefs_office)
 "bLJ" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig,/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor,/area/engine/engine_smes)
 "bLK" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/engine/engine_smes)
 "bLL" = (/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil,/obj/item/weapon/module/power_control,/obj/item/weapon/module/power_control,/turf/simulated/floor,/area/engine/engine_smes)
@@ -4951,7 +4951,7 @@
 "bRk" = (/obj/structure/stool/chair,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/living)
 "bRl" = (/obj/structure/table,/obj/machinery/microwave,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "bRm" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
-"bRn" = (/obj/structure/table,/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
+"bRn" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "bRo" = (/obj/machinery/computer/syndicate_station,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "bRp" = (/obj/structure/table,/obj/item/weapon/pen/sleepypen,/obj/item/weapon/paper,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "bRq" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
@@ -6082,7 +6082,7 @@
 "cmX" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
 "cmY" = (/obj/machinery/light_switch{pixel_y = 28},/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
 "cmZ" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/light{dir = 1},/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
-"cna" = (/obj/structure/table,/obj/machinery/light/lamp,/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
+"cna" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/unsimulated/floor{dir = 2; icon_state = "grimy"},/area/djstation)
 "cnb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/djstation)
 "cnc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/djstation)
 "cnd" = (/obj/structure/table,/obj/machinery/microwave{pixel_y = 8},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/djstation)