cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Large Bulb Replacements (#11965)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-11 13:38:09 -07:00
committed by GitHub
parent 894ed32c5f
commit 3bc63ff7bf
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -458,19 +458,27 @@
use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try
/obj/item/storage/box/lights/bulbs
starts_with = list(/obj/item/light/bulb = 24)
starts_with = list(
/obj/item/light/bulb = 20,
/obj/item/light/bulb/large = 4
)
/obj/item/storage/box/lights/tubes
name = "box of replacement tubes"
icon_state = "lighttube"
starts_with = list(/obj/item/light/tube = 24)
starts_with = list(
/obj/item/light/tube = 20,
/obj/item/light/tube/large = 4
)
/obj/item/storage/box/lights/mixed
name = "box of replacement lights"
icon_state = "lightmixed"
starts_with = list(
/obj/item/light/tube = 16,
/obj/item/light/bulb = 8
/obj/item/light/tube = 12,
/obj/item/light/tube/large = 2,
/obj/item/light/bulb = 8,
/obj/item/light/bulb/large = 2
)
/obj/item/storage/box/freezer

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

@@ -1017,6 +1017,8 @@ GLOBAL_LIST_EMPTY(light_type_cache)
/obj/item/light/tube/large
w_class = ITEMSIZE_SMALL
name = "large light tube"
icon_state = "ltube_large"
base_state = "ltube_large"
brightness_range = 15
brightness_power = 4
@@ -1050,6 +1052,8 @@ GLOBAL_LIST_EMPTY(light_type_cache)
// For 'floor lamps' in outdoor use and such
/obj/item/light/bulb/large
name = "large light bulb"
icon_state = "lbulb_large"
base_state = "lbulb_large"
brightness_range = 7
brightness_power = 1.5

BIN
icons/obj/lighting.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 64 KiB

2
vorestation.dme
View File

@@ -690,8 +690,8 @@
#include "code\datums\components\species\shadekin\powers\regenerate_other.dm"
#include "code\datums\components\species\shadekin\powers\dark_tunnel\dark_tunnel_structures.dm"
#include "code\datums\components\species\shadekin\powers\dark_tunnel\dark_tunneling.dm"
#include "code\datums\components\traits\absorbent.dm"
#include "code\datums\components\structures\bluespace_connection.dm"
#include "code\datums\components\traits\absorbent.dm"
#include "code\datums\components\traits\burninlight.dm"
#include "code\datums\components\traits\crowd_detection.dm"
#include "code\datums\components\traits\drippy.dm"