diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 43bdc773c66..c67fb27edcd 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -690,7 +690,7 @@ "vf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/item/stack/spacecash/c1000, /turf/open/floor/wood, /area/ruin/powered/beach) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index b359e18f208..9ca8b7ae9cf 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1207,7 +1207,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_2) "eu" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "ev" = ( diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 396fb7b04f9..18744ac612d 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -4745,7 +4745,7 @@ /area/awaymission/research/interior/dorm) "kS" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/iron, /area/awaymission/research/interior/dorm) "kT" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 35b2fed84d1..8944e50430b 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -24141,7 +24141,7 @@ pixel_x = 2; pixel_y = 8 }, -/obj/item/storage/pill_bottle/dice{ +/obj/item/storage/dice{ pixel_x = -4; pixel_y = 2 }, @@ -31731,7 +31731,7 @@ /area/maintenance/aft) "dNe" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -35104,7 +35104,7 @@ /area/hallway/secondary/exit/departure_lounge) "ecH" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/delivery, /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, @@ -43948,7 +43948,7 @@ /area/service/library) "gAD" = ( /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/effect/spawner/lootdrop/space/cashmoney, /turf/open/floor/iron/grimy, /area/service/abandoned_gambling_den) @@ -59932,7 +59932,7 @@ /obj/item/toy/beach_ball/holoball/dodgeball, /obj/effect/spawner/lootdrop/prison_contraband, /obj/item/instrument/harmonica, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/item/toy/cards/deck/tarot, /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -63182,7 +63182,7 @@ /area/commons/fitness/recreation) "mnS" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/carpet, /area/service/library/abandoned) "mnX" = ( @@ -78137,7 +78137,7 @@ /area/maintenance/starboard/aft) "qGH" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/machinery/computer/security/telescreen/entertainment/directional/south, /obj/structure/window/reinforced{ dir = 8 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 487a967b496..f52b9e1c94a 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -125,7 +125,7 @@ /area/security/prison) "aaO" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/iron, /area/security/prison) "aaP" = ( @@ -38852,7 +38852,7 @@ /area/service/kitchen) "pVh" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/iron, /area/commons/dorms) "pVj" = ( diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index f0461f7a777..16a0c759110 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -8033,7 +8033,7 @@ /area/mine/storage) "TG" = ( /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/wood/parquet, /area/service/bar/atrium) "TH" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index abcd6bfc8f8..0d76a804bcf 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -27931,7 +27931,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/storage/pill_bottle/dice{ +/obj/item/storage/dice{ pixel_x = -4 }, /obj/item/pen/red{ @@ -36143,7 +36143,7 @@ /obj/item/toy/cards/deck{ pixel_x = -9 }, -/obj/item/storage/pill_bottle/dice{ +/obj/item/storage/dice{ pixel_x = -8; pixel_y = 11 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2c75ef20d9e..b26b3eb029e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -26022,7 +26022,7 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -29756,7 +29756,7 @@ /area/engineering/atmos) "ipV" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/iron, /area/commons/locker) "ipW" = ( @@ -40661,7 +40661,7 @@ "moL" = ( /obj/structure/table, /obj/structure/extinguisher_cabinet/directional/east, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -47041,7 +47041,7 @@ /area/science/research) "oyB" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/iron, /area/commons/dorms) "oyN" = ( @@ -50905,7 +50905,7 @@ /area/security/brig) "pTE" = ( /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/wood, /area/service/bar) "pTH" = ( @@ -69151,7 +69151,7 @@ /area/maintenance/aft) "wtZ" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/security/prison) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 987d85b3a18..2f7f7edc161 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5680,7 +5680,7 @@ /area/syndicate_mothership/control) "tx" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/iron/grimy, /area/centcom/ferry) "ty" = ( @@ -7385,7 +7385,7 @@ /area/wizard_station) "xy" = ( /obj/structure/table/wood/fancy, -/obj/item/storage/pill_bottle/dice{ +/obj/item/storage/dice{ icon_state = "magicdicebag" }, /turf/open/floor/carpet, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index c1a17e6f6a3..01a93f8ce31 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -31763,7 +31763,7 @@ /area/command/bridge) "jld" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/iron, /area/security/prison) "jli" = ( @@ -59276,7 +59276,7 @@ /area/cargo/storage) "uLI" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/item/pen/fourcolor, /turf/open/floor/iron/grimy, /area/service/library) diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index 938a8e5b179..a8e910c6cfd 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -297,7 +297,7 @@ "D" = ( /obj/structure/table/reinforced, /obj/item/folder, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/shuttle/arrival) diff --git a/_maps/templates/holodeck_lounge.dmm b/_maps/templates/holodeck_lounge.dmm index 2320f361aa9..6bda6ab7ddd 100644 --- a/_maps/templates/holodeck_lounge.dmm +++ b/_maps/templates/holodeck_lounge.dmm @@ -278,7 +278,7 @@ /area/template_noop) "U" = ( /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dice, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index 4bfebaacc7c..9bb4c300d6a 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -33,7 +33,7 @@ RSF ///An associated list of atoms and charge costs. This can contain a seperate list, as long as it's associated item is an object var/list/cost_by_item = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 20, /obj/item/paper = 10, - /obj/item/storage/pill_bottle/dice = 200, + /obj/item/storage/dice = 200, /obj/item/pen = 50, /obj/item/clothing/mask/cigarette = 10, ) diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index d037731e6db..9a9466097c1 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -1,38 +1,45 @@ -/*****************************Dice Bags********************************/ -/obj/item/storage/pill_bottle/dice +///holding bag for dice +/obj/item/storage/dice name = "bag of dice" desc = "Contains all the luck you'll ever need." icon = 'icons/obj/dice.dmi' icon_state = "dicebag" - var/list/special_die = list( - /obj/item/dice/d1, - /obj/item/dice/d2, - /obj/item/dice/fudge, - /obj/item/dice/d6/space, - /obj/item/dice/d00, - /obj/item/dice/eightbd20, - /obj/item/dice/fourdd6, - /obj/item/dice/d100 - ) + w_class = WEIGHT_CLASS_SMALL -/obj/item/storage/pill_bottle/dice/PopulateContents() +/obj/item/storage/dice/Initialize(mapload) + . = ..() + var/datum/component/storage/storage = GetComponent(/datum/component/storage) + storage.allow_quick_gather = TRUE + storage.click_gather = TRUE + storage.set_holdable(list(/obj/item/dice)) + +/obj/item/storage/dice/PopulateContents() new /obj/item/dice/d4(src) new /obj/item/dice/d6(src) new /obj/item/dice/d8(src) new /obj/item/dice/d10(src) new /obj/item/dice/d12(src) new /obj/item/dice/d20(src) - var/picked = pick(special_die) + var/picked = pick(list( + /obj/item/dice/d1, + /obj/item/dice/d2, + /obj/item/dice/fudge, + /obj/item/dice/d6/space, + /obj/item/dice/d00, + /obj/item/dice/eightbd20, + /obj/item/dice/fourdd6, + /obj/item/dice/d100, + )) new picked(src) -/obj/item/storage/pill_bottle/dice/suicide_act(mob/user) +/obj/item/storage/dice/suicide_act(mob/user) user.visible_message(span_suicide("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!")) return (OXYLOSS) -/obj/item/storage/pill_bottle/dice/hazard +/obj/item/storage/dice/hazard -/obj/item/storage/pill_bottle/dice/hazard/PopulateContents() +/obj/item/storage/dice/hazard/PopulateContents() new /obj/item/dice/d6(src) new /obj/item/dice/d6(src) new /obj/item/dice/d6(src) @@ -42,9 +49,8 @@ else new /obj/item/dice/d6(src) -/*****************************Dice********************************/ - -/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6 +///this is a prototype for dice, for a real d6 use "/obj/item/dice/d6" +/obj/item/dice name = "die" desc = "A die with six sides. Basic and serviceable." icon = 'icons/obj/dice.dmi' diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c95f44d5133..249674cd19c 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -338,7 +338,7 @@ var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.allow_quick_gather = TRUE STR.click_gather = TRUE - STR.set_holdable(list(/obj/item/reagent_containers/pill, /obj/item/dice)) + STR.set_holdable(list(/obj/item/reagent_containers/pill)) /obj/item/storage/pill_bottle/suicide_act(mob/user) user.visible_message(span_suicide("[user] is trying to get the cap off [src]! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index e88f7758886..aa680b90ff1 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -19,7 +19,7 @@ /datum/job_department/service, ) - family_heirlooms = list(/obj/item/pen/fountain, /obj/item/storage/pill_bottle/dice) + family_heirlooms = list(/obj/item/pen/fountain, /obj/item/storage/dice) job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 467adc11c0a..563bb238142 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -210,7 +210,7 @@ var/obj/item/food/donkpocket/warm/W = new(src) load(W) if(prob(50)) - var/obj/item/storage/pill_bottle/dice/D = new(src) + var/obj/item/storage/dice/D = new(src) load(D) else var/obj/item/instrument/guitar/G = new(src) diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 32330d3a9af..da66d835e7c 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -4,7 +4,7 @@ product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!" icon_state = "games" products = list(/obj/item/toy/cards/deck = 5, - /obj/item/storage/pill_bottle/dice = 10, + /obj/item/storage/dice = 10, /obj/item/toy/cards/deck/cas = 3, /obj/item/toy/cards/deck/cas/black = 3, /obj/item/toy/cards/deck/kotahi = 3, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 7ee88aae5de..40920ba4edd 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -273,7 +273,7 @@ /obj/item/clothing/glasses/sunglasses/reagent = 1, /obj/item/clothing/neck/petcollar = 1, /obj/item/storage/belt/bandolier = 1, - /obj/item/storage/pill_bottle/dice/hazard = 1, + /obj/item/storage/dice/hazard = 1, /obj/item/storage/bag/money = 2) premium = list(/obj/item/storage/box/dishdrive = 1) refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe