diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index f9b4a3f4656..cf9ac1bdbec 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -1017,7 +1017,7 @@ "ajF" = ( /obj/structure/table/reinforced, /obj/item/folder, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ajI" = ( @@ -12184,7 +12184,7 @@ /area/station/security/permabrig) "aOY" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 8 }, @@ -12600,7 +12600,7 @@ /area/station/service/theatre) "aQb" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -44231,7 +44231,7 @@ /area/station/service/library) "crl" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/window/reinforced{ dir = 8 }, @@ -46823,7 +46823,7 @@ /area/station/service/library) "cxX" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -71486,7 +71486,7 @@ /area/station/hallway/secondary/exit) "dRH" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -77076,7 +77076,7 @@ /obj/item/deck/cards{ pixel_y = 6 }, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/wood{ icon_state = "wood-broken7" }, @@ -78301,7 +78301,7 @@ /area/station/science/break_room) "hDS" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 92e7b0969af..aaf4019e4b7 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6399,7 +6399,7 @@ pixel_x = 27 }, /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -6981,7 +6981,7 @@ /area/station/maintenance/fsmaint) "aIp" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel, /area/station/public/dorms) "aIq" = ( @@ -11137,7 +11137,7 @@ /area/station/maintenance/fsmaint) "aUy" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -23136,7 +23136,7 @@ /area/station/service/hydroponics) "byM" = ( /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/wood, /area/station/service/bar) "byP" = ( @@ -30628,7 +30628,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/dice/d20, /obj/item/dice, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bWF" = ( @@ -31837,7 +31837,7 @@ name = "south bump"; pixel_y = -24 }, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/table/wood, /obj/machinery/camera{ c_tag = "Library Quiet Room"; @@ -74686,7 +74686,7 @@ /area/station/maintenance/fore) "pcD" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -93618,7 +93618,7 @@ /area/station/science/toxins/mixing) "xUA" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index dc504da2eda..968ecdaa3c0 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -14429,7 +14429,7 @@ /area/station/medical/reception) "bBs" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/carpet, /area/station/public/locker) "bBt" = ( @@ -77253,7 +77253,7 @@ /area/station/maintenance/fore) "rUL" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/wood, /area/station/service/library) "rUQ" = ( diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 365eba255fe..d97f522e972 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -2714,7 +2714,7 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "akI" = ( @@ -91852,7 +91852,7 @@ /area/station/maintenance/asmaint) "weF" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel{ icon_state = "bar" }, diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index e048d4023b3..e73b4f24693 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -12575,7 +12575,7 @@ /area/syndicate_mothership/jail) "Sh" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/wood, /area/ghost_bar) "Si" = ( diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index f3c9a997ea0..66951e2e044 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -25,7 +25,7 @@ var/static/list/rsf_items = list("Drinking Glass" = /obj/item/reagent_containers/food/drinks/drinkingglass, "Paper" = /obj/item/paper, "Pen" = /obj/item/pen, - "Dice Pack" = /obj/item/storage/pill_bottle/dice, + "Dice Pack" = /obj/item/storage/bag/dice, "Cigarette" = /obj/item/clothing/mask/cigarette, "Newdles" = /obj/item/reagent_containers/food/snacks/chinese/newdles, "Donut" = /obj/item/reagent_containers/food/snacks/donut, diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 7b3db4429a6..043a11d59f9 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -1,13 +1,15 @@ -/obj/item/storage/pill_bottle/dice //But why is this a pill bottle +/obj/item/storage/bag/dice //Thankfully no longer a pill bottle. name = "bag of dice" desc = "Contains all the luck you'll ever need." icon = 'icons/obj/dice.dmi' icon_state = "dicebag" - can_hold = list(/obj/item/dice) - allow_wrap = FALSE use_sound = "rustle" + storage_slots = 50 + max_combined_w_class = 50 + can_hold = list(/obj/item/dice) + resistance_flags = FLAMMABLE -/obj/item/storage/pill_bottle/dice/populate_contents() +/obj/item/storage/bag/dice/populate_contents() var/special_die = pick("1","2","fudge","00","100") if(special_die == "1") new /obj/item/dice/d1(src) @@ -26,7 +28,7 @@ if(special_die == "100") new /obj/item/dice/d100(src) -/obj/item/storage/pill_bottle/dice/suicide_act(mob/user) +/obj/item/storage/bag/dice/suicide_act(mob/user) user.visible_message("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!") return (OXYLOSS) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index afb885b7c27..b7f65bf4fdc 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -228,7 +228,7 @@ var/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak/W = new(src) load(W) if(prob(50)) - var/obj/item/storage/pill_bottle/dice/D = new(src) + var/obj/item/storage/bag/dice/D = new(src) load(D) else var/obj/item/instrument/guitar/G = new(src)