i hope this works

This commit is contained in:
Cirno
2020-07-04 15:47:38 -03:00
parent 03d79a1b65
commit 020da9fa07
11 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -1453,7 +1453,7 @@
/area/ruin/space/has_grav/hotel/guestroom/room_2) /area/ruin/space/has_grav/hotel/guestroom/room_2)
"eu" = ( "eu" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice, /obj/item/storage/box/dice,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_2) /area/ruin/space/has_grav/hotel/guestroom/room_2)
"ev" = ( "ev" = (
@@ -5395,7 +5395,7 @@
/area/awaymission/research/interior/dorm) /area/awaymission/research/interior/dorm)
"kS" = ( "kS" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice, /obj/item/storage/box/dice,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/awaymission/research/interior/dorm) /area/awaymission/research/interior/dorm)
"kT" = ( "kT" = (
+2 -2
View File
@@ -8429,7 +8429,7 @@
/area/centcom/ferry) /area/centcom/ferry)
"tx" = ( "tx" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice, /obj/item/storage/box/dice,
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/centcom/ferry) /area/centcom/ferry)
"ty" = ( "ty" = (
@@ -10217,7 +10217,7 @@
/area/wizard_station) /area/wizard_station)
"xy" = ( "xy" = (
/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy,
/obj/item/storage/pill_bottle/dice{ /obj/item/storage/box/dice{
icon_state = "magicdicebag" icon_state = "magicdicebag"
}, },
/turf/open/floor/carpet, /turf/open/floor/carpet,
+1 -1
View File
@@ -307,7 +307,7 @@
"D" = ( "D" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/folder, /obj/item/folder,
/obj/item/storage/pill_bottle/dice, /obj/item/storage/box/dice,
/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/arrival) /area/shuttle/arrival)
+1 -1
View File
@@ -237,7 +237,7 @@
/area/shuttle/arrival) /area/shuttle/arrival)
"C" = ( "C" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/storage/pill_bottle/dice{ /obj/item/storage/box/dice{
pixel_x = -2; pixel_x = -2;
pixel_y = 8 pixel_y = 8
}, },
@@ -466,7 +466,7 @@
/obj/effect/spawner/lootdrop/cigars_cases/no_turf = 2, /obj/effect/spawner/lootdrop/cigars_cases/no_turf = 2,
/obj/effect/spawner/lootdrop/space_cash/no_turf = 5, /obj/effect/spawner/lootdrop/space_cash/no_turf = 5,
/obj/item/reagent_containers/food/snacks/grown/cannabis = 5, /obj/item/reagent_containers/food/snacks/grown/cannabis = 5,
/obj/item/storage/pill_bottle/dice = 5, /obj/item/storage/box/dice = 5,
/obj/item/toy/cards/deck = 5, /obj/item/toy/cards/deck = 5,
/obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5 /obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5
) )
@@ -485,7 +485,7 @@
/obj/effect/spawner/lootdrop/cig_packs/no_turf = 10, /obj/effect/spawner/lootdrop/cig_packs/no_turf = 10,
/obj/effect/spawner/lootdrop/cigars_cases/no_turf = 5, /obj/effect/spawner/lootdrop/cigars_cases/no_turf = 5,
/obj/item/reagent_containers/food/snacks/grown/cannabis = 5, /obj/item/reagent_containers/food/snacks/grown/cannabis = 5,
/obj/item/storage/pill_bottle/dice = 5, /obj/item/storage/box/dice = 5,
/obj/item/toy/cards/deck = 5, /obj/item/toy/cards/deck = 5,
/obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5, /obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5,
/obj/item/kitchen/knife = 5, /obj/item/kitchen/knife = 5,
+1 -1
View File
@@ -91,7 +91,7 @@ RSF
use_matter(50, user) use_matter(50, user)
if(4) if(4)
to_chat(user, "Dispensing Dice Pack...") to_chat(user, "Dispensing Dice Pack...")
new /obj/item/storage/pill_bottle/dice(T) new /obj/item/storage/box/dice(T)
use_matter(200, user) use_matter(200, user)
if(5) if(5)
to_chat(user, "Dispensing Cigarette...") to_chat(user, "Dispensing Cigarette...")
+3 -3
View File
@@ -1,10 +1,10 @@
/obj/item/storage/pill_bottle/dice /obj/item/storage/box/dice
name = "bag of dice" name = "bag of dice"
desc = "Contains all the luck you'll ever need." desc = "Contains all the luck you'll ever need."
icon = 'icons/obj/dice.dmi' icon = 'icons/obj/dice.dmi'
icon_state = "dicebag" icon_state = "dicebag"
/obj/item/storage/pill_bottle/dice/Initialize() /obj/item/storage/box/dice/Initialize()
. = ..() . = ..()
var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100") var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
if(special_die == "1") if(special_die == "1")
@@ -30,7 +30,7 @@
if(special_die == "100") if(special_die == "100")
new /obj/item/dice/d100(src) new /obj/item/dice/d100(src)
/obj/item/storage/pill_bottle/dice/suicide_act(mob/user) /obj/item/storage/box/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>") user.visible_message("<span class='suicide'>[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (OXYLOSS) return (OXYLOSS)
@@ -204,7 +204,7 @@
var/obj/item/reagent_containers/food/snacks/donkpocket/warm/W = new(src) var/obj/item/reagent_containers/food/snacks/donkpocket/warm/W = new(src)
load(W) load(W)
if(prob(50)) if(prob(50))
var/obj/item/storage/pill_bottle/dice/D = new(src) var/obj/item/storage/box/dice/D = new(src)
load(D) load(D)
else else
var/obj/item/instrument/guitar/G = new(src) var/obj/item/instrument/guitar/G = new(src)
+1 -1
View File
@@ -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!" 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" icon_state = "games"
products = list(/obj/item/toy/cards/deck = 5, products = list(/obj/item/toy/cards/deck = 5,
/obj/item/storage/pill_bottle/dice = 10, /obj/item/storage/box/dice = 10,
/obj/item/toy/cards/deck/cas = 3, /obj/item/toy/cards/deck/cas = 3,
/obj/item/toy/cards/deck/cas/black = 3, /obj/item/toy/cards/deck/cas/black = 3,
/obj/item/toy/cards/deck/unum = 3) /obj/item/toy/cards/deck/unum = 3)
@@ -11,7 +11,7 @@
/datum/gear/dice /datum/gear/dice
name = "Dice bag" name = "Dice bag"
category = SLOT_HANDS category = SLOT_HANDS
path = /obj/item/storage/pill_bottle/dice path = /obj/item/storage/box/dice
/datum/gear/eightball /datum/gear/eightball
name = "Magic eightball" name = "Magic eightball"