cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- lightbulb and light tube w_class is now 1, large tube (used for floodlights) remains at 2.

Browse Source 
- bulb and tube boxes now contain 21 bulbs or tubes, but can only store bulbs or tubes.
- added a mixed box of lights, which contains 14 tubes and 7 bulbs
- most of the areas which contained light boxes now contain these large mixed boxes.

Screenshot:
http://www.kamletos.si/bulbs.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3105 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-02-11 20:41:18 +00:00
parent aa3f28d3d6
commit cc67d26201
4 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
code/modules/power/lighting.dm
View File

@@ -438,7 +438,7 @@
flags = FPRINT | TABLEPASS
force = 2
throwforce = 5
w_class = 2
w_class = 1
var/status = 0 // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
var/base_state
var/switchcount = 0 // number of times switched
@@ -456,6 +456,7 @@
brightness = 8
large
w_class = 2
name = "large light tube"
brightness = 15
@@ -536,18 +537,17 @@
name = "replacement bulbs"
icon = 'storage.dmi'
icon_state = "light"
desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
storage_slots=21
can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb")
max_combined_w_class = 21
/obj/item/weapon/storage/lightbox/bulbs/New()
..()
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
for(var/i = 0; i < 21; i++)
new /obj/item/weapon/light/bulb(src)
/obj/item/weapon/storage/lightbox/tubes
name = "replacement tubes"
@@ -555,10 +555,16 @@
/obj/item/weapon/storage/lightbox/tubes/New()
..()
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/tube(src)
for(var/i = 0; i < 21; i++)
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/tube(src)
/obj/item/weapon/storage/lightbox/mixed
name = "replacement lights"
icon_state = "lightmixed"
/obj/item/weapon/storage/lightbox/mixed/New()
..()
for(var/i = 0; i < 14; i++)
new /obj/item/weapon/light/tube(src)
for(var/i = 0; i < 7; i++)
new /obj/item/weapon/light/bulb(src)