mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Make dicebag not a pillbottle subtype. (#23121)
* Make dicebag not a pillbottle * Fix all other references * Map update --------- Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
This commit is contained in:
co-authored by
adrermail@gmail.com <adrermail@gmail.com>
parent
325cd3abf4
commit
a169176829
@@ -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,
|
||||
|
||||
@@ -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("<span class='suicide'>[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
return (OXYLOSS)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user