cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1317 from Fox-McCloud/lampsssss

Browse Source 
Moveable Desklamps
This commit is contained in:
ZomgPonies
2015-06-16 08:02:27 -04:00
parent a762306163 bea4974d72
commit b5bf126222
14 changed files with 102 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/lighting.dm
-13
View File
@@ -165,19 +165,6 @@
desc = "A small lighting fixture."
light_type = /obj/item/weapon/light/bulb
// the desk lamps are a bit special
/obj/machinery/light/small/lamp
name = "desk lamp"
icon_state = "lamp1"
base_state = "lamp"
desc = "A desk lamp with an adjustable mount."
// green-shaded desk lamp
/obj/machinery/light/small/lamp/green
desc = "A classic green-shaded desk lamp."
icon_state = "lampgreen1"
base_state = "lampgreen"
/obj/machinery/light/spot
name = "spotlight"
fitting = "large tube"