cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

partially fixes medical phobia by splitting dice bags off of pillbottles as a subtype (#61015)

Browse Source
This commit is contained in:
tralezab
2021-09-03 21:21:53 -07:00
committed by GitHub
parent b56758410c
commit 38000dfa10
19 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/RSF.dm
+1 -1
View File
@@ -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,
)
code/game/objects/items/dice.dm
+26 -20
View File
@@ -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'
code/game/objects/items/storage/firstaid.dm
+1 -1
View File
@@ -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!"))