diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 616764e9d8f..21f65a941d8 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -146,18 +146,11 @@ containertype = "/obj/structure/closet/crate" containername = "Janitorial supplies" -/obj/item/weapon/storage/lightbox/tubes - /datum/supply_packs/lightbulbs name = "Replacement lights" - contains = list("/obj/item/weapon/storage/lightbox/tubes", - "/obj/item/weapon/storage/lightbox/tubes", - "/obj/item/weapon/storage/lightbox/tubes", - "/obj/item/weapon/storage/lightbox/tubes", - "/obj/item/weapon/storage/lightbox/tubes", - "/obj/item/weapon/storage/lightbox/tubes", - "/obj/item/weapon/storage/lightbox/bulbs", - "/obj/item/weapon/storage/lightbox/bulbs") + contains = list("/obj/item/weapon/storage/lightbox/mixed", + "/obj/item/weapon/storage/lightbox/mixed", + "/obj/item/weapon/storage/lightbox/mixed") cost = 5 containertype = "/obj/structure/closet/crate" containername = "Replacement lights" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 1703d82c599..0dd8cd14a31 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -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) \ No newline at end of file diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 99422636cba..600c2bf5c6d 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 0fdc75f2fec..5471e88593a 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -2012,7 +2012,7 @@ "aMJ" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/locker) "aMK" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/plating,/area/storage/emergency) "aML" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/storage/emergency) -"aMM" = (/obj/item/weapon/storage/lightbox/bulbs,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/storage/emergency) +"aMM" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor/plating,/area/storage/emergency) "aMN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) "aMO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aMP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) @@ -2275,8 +2275,8 @@ "aRM" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 9; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aRN" = (/turf/simulated/wall,/area/storage/auxillary) "aRO" = (/obj/machinery/power/apc{dir = 8; name = "Aux. Storage APC"; pixel_x = -25},/obj/structure/cable,/turf/simulated/floor/plating,/area/storage/auxillary) -"aRP" = (/obj/item/weapon/storage/lightbox/tubes,/turf/simulated/floor/plating,/area/storage/auxillary) -"aRQ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/weapon/storage/lightbox/bulbs,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor/plating,/area/storage/auxillary) +"aRP" = (/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor/plating,/area/storage/auxillary) +"aRQ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/weapon/storage/lightbox/mixed,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor/plating,/area/storage/auxillary) "aRR" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Theatre"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/theatre) "aRS" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Theatre"},/turf/simulated/floor,/area/crew_quarters/theatre) "aRT" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/theatre) @@ -3761,8 +3761,8 @@ "buq" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/nuke_storage) "bur" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/security/nuke_storage) "bus" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/hallway/primary/aft) -"but" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/weapon/storage/lightbox/tubes,/turf/simulated/floor,/area/janitor) -"buu" = (/obj/item/weapon/mop,/obj/item/weapon/storage/lightbox/bulbs,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r-f"; initialize_directions = 6; level = 1; name = "pipe"},/turf/simulated/floor,/area/janitor) +"but" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor,/area/janitor) +"buu" = (/obj/item/weapon/mop,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r-f"; initialize_directions = 6; level = 1; name = "pipe"},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor,/area/janitor) "buv" = (/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = 29},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/janitor) "buw" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/janitor) "bux" = (/obj/machinery/light{dir = 1},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j2s"; sortType = 22},/turf/simulated/floor,/area/janitor) @@ -5488,7 +5488,7 @@ "cbB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/engine/engineering) "cbC" = (/obj/structure/closet/radiation,/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/engine/engineering) "cbD" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/device/flashlight{pixel_y = 5},/obj/item/clothing/ears/earmuffs{pixel_x = -5; pixel_y = 6},/turf/simulated/floor,/area/engine/engineering) -"cbE" = (/obj/structure/table,/obj/item/weapon/storage/lightbox/tubes,/obj/item/weapon/book/manual/engineering_guide,/obj/item/weapon/book/manual/engineering_particle_accelerator{pixel_y = 6},/turf/simulated/floor,/area/engine/engineering) +"cbE" = (/obj/structure/table,/obj/item/weapon/book/manual/engineering_guide,/obj/item/weapon/book/manual/engineering_particle_accelerator{pixel_y = 6},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor,/area/engine/engineering) "cbF" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/head/helmet/hardhat,/turf/simulated/floor,/area/engine/engineering) "cbG" = (/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/engine/engineering) "cbH" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) @@ -7133,7 +7133,7 @@ "cHi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/unsimulated/floor{name = "plating"},/area/djstation) "cHj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/unsimulated/floor{name = "plating"},/area/djstation) "cHk" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/unsimulated/floor{name = "plating"},/area/djstation) -"cHl" = (/obj/machinery/light/small,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/item/weapon/storage/lightbox/tubes,/turf/unsimulated/floor{name = "plating"},/area/djstation) +"cHl" = (/obj/machinery/light/small,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/item/weapon/storage/lightbox/mixed,/turf/unsimulated/floor{name = "plating"},/area/djstation) "cHm" = (/obj/structure/cable,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/unsimulated/floor{name = "plating"},/area/djstation) "cHn" = (/obj/machinery/light/small,/turf/unsimulated/floor{name = "plating"},/area/djstation) "cHo" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/item/clothing/mask/breath,/turf/unsimulated/floor{name = "plating"},/area/djstation) @@ -7474,7 +7474,7 @@ "cNL" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/arrival) "cNM" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/derelict/arrival) "cNN" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/derelict/medical/chapel) -"cNO" = (/obj/item/weapon/storage/lightbox/bulbs,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"cNO" = (/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "cNP" = (/obj/item/weapon/disk/data/demo,/turf/simulated/floor/plating/airless,/area) "cNQ" = (/turf/simulated/floor/airless{icon_state = "damaged4"},/area) "cNR" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/floor,/area/derelict/arrival) @@ -8182,7 +8182,7 @@ "dbr" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/meter,/turf/simulated/floor/plating,/area/mine/west_outpost) "dbs" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/mine/west_outpost) "dbt" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/mine/west_outpost) -"dbu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/item/weapon/storage/lightbox/bulbs,/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/turf/simulated/floor/plating,/area/mine/west_outpost) +"dbu" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/obj/item/weapon/storage/lightbox/bulbs,/turf/simulated/floor/plating,/area/mine/west_outpost) "dbv" = (/obj/machinery/conveyor_switch{id = "mining_west"},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"; tag = ""},/area/mine/explored) "dbw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{dir = 8},/turf/simulated/floor,/area/mine/lobby) "dbx" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area/mine/lobby) @@ -8234,7 +8234,7 @@ "dcr" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor{icon_state = "white"},/area/mine/sleeper) "dcs" = (/obj/machinery/power/apc{dir = 4; name = "Mining Station Medical APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "white"},/area/mine/sleeper) "dct" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/maintenance) -"dcu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/lightbox/bulbs,/obj/item/weapon/storage/lightbox/tubes,/turf/simulated/floor/plating,/area/mine/maintenance) +"dcu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/lightbox/mixed,/turf/simulated/floor/plating,/area/mine/maintenance) "dcv" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/mine/maintenance) "dcw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor/plating,/area/mine/maintenance) "dcx" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Mining Station Maintenance APC"; pixel_x = 26; pixel_y = 0},/turf/simulated/floor/plating,/area/mine/maintenance)