Merge pull request #1317 from Fox-McCloud/lampsssss

Moveable Desklamps

code/game/objects/items/devices/flashlight.dm

@@ -110,6 +110,44 @@
 	brightness_on = 2
 	w_class = 1
 
+// the desk lamps are a bit special
+/obj/item/device/flashlight/lamp
+	name = "desk lamp"
+	desc = "A desk lamp with an adjustable mount."
+	icon_state = "lamp"
+	item_state = "lamp"
+	brightness_on = 5
+	w_class = 4
+	flags = CONDUCT
+	m_amt = 0
+	g_amt = 0
+	on = 1
+
+
+// green-shaded desk lamp
+/obj/item/device/flashlight/lamp/green
+	desc = "A classic green-shaded desk lamp."
+	icon_state = "lampgreen"
+	item_state = "lampgreen"
+
+
+
+/obj/item/device/flashlight/lamp/verb/toggle_light()
+	set name = "Toggle light"
+	set category = "Object"
+	set src in oview(1)
+
+	if(!usr.stat)
+		attack_self(usr)
+
+//Bananalamp
+obj/item/device/flashlight/lamp/bananalamp
+	name = "banana lamp"
+	desc = "Only a clown would think to make a ghetto banana-shaped lamp. Even has a goofy pullstring."
+	icon_state = "bananalamp"
+	item_state = "bananalamp"
+
+
 // FLARES
 
 /obj/item/device/flashlight/flare