From 4fe39dd49bae2f57d7eb57879bef9324b558812b Mon Sep 17 00:00:00 2001 From: Incoming Date: Tue, 9 Jul 2013 19:31:01 -0400 Subject: [PATCH 1/4] Adds additional dice! Places where the D6 and D20 spawned (the library and perma) now spawn with a dice bottle. Said dice bottles now contains a D2, D4, D8, D10, and D12 in addition to the preexisting D6 and D20 for a richer meta-roleplaying experience. This also fixes an obscure bug where dice could be generated invisible because their initial value was set to 0. Additionally this fixes the grammer of dice descriptions, which were not using the singular "die". --- code/game/objects/items/weapons/dice.dm | 36 ++++++++++++++++-- .../objects/items/weapons/storage/firstaid.dm | 5 +++ icons/obj/dice.dmi | Bin 2933 -> 6245 bytes maps/tgstation.2.1.2.dmm | 9 ++--- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 501cd781fdb..02f9bf45dd3 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -1,17 +1,47 @@ /obj/item/weapon/dice name = "d6" - desc = "A dice with six sides." + desc = "A die with six sides. Basic and servicable." icon = 'icons/obj/dice.dmi' icon_state = "d6" w_class = 1 var/sides = 6 /obj/item/weapon/dice/New() - icon_state = "[initial(icon_state)][rand(sides)]" + icon_state = "[initial(icon_state)][rand(1, sides)]" + +/obj/item/weapon/dice/d2 + name = "d2" + desc = "A die with two sides. Coins are undignified!" + icon_state = "d2" + sides = 2 + +/obj/item/weapon/dice/d4 + name = "d4" + desc = "A die with four sides. The nerd's caltrop." + icon_state = "d4" + sides = 4 + +/obj/item/weapon/dice/d8 + name = "d8" + desc = "A die with eight sides. It feels... lucky." + icon_state = "d8" + sides = 8 + +/obj/item/weapon/dice/d10 + name = "d10" + desc = "A die with ten sides. Useful for percentages." + icon_state = "d10" + sides = 10 + +/obj/item/weapon/dice/d12 + name = "d12" + desc = "A die with twelve sides. There's an air of neglect about it." + icon_state = "d12" + sides = 12 /obj/item/weapon/dice/d20 name = "d20" - desc = "A dice with twenty sides." + desc = "A die with twenty sides. The prefered die to throw at the GM." icon_state = "d20" sides = 20 diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index a5874f09855..6b74eaaff0d 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -179,6 +179,11 @@ New() ..() + new /obj/item/weapon/dice/d2( src ) + new /obj/item/weapon/dice/d4( src ) new /obj/item/weapon/dice( src ) + new /obj/item/weapon/dice/d8( src ) + new /obj/item/weapon/dice/d10( src ) + new /obj/item/weapon/dice/d12( src ) new /obj/item/weapon/dice/d20( src ) diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi index 283c3d11aea46cefc0de005627da075e8e752750..fda6ab2550ca32746dbf3171565de146eca8edfe 100644 GIT binary patch literal 6245 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 WgMYpJb>GT68k{_Ciz_+m75^V}g}@R3 diff --git a/maps/tgstation.2.1.2.dmm b/maps/tgstation.2.1.2.dmm index aa723c75e21..449e71075e6 100644 --- a/maps/tgstation.2.1.2.dmm +++ b/maps/tgstation.2.1.2.dmm @@ -20,12 +20,12 @@ "aat" = (/obj/machinery/washing_machine,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison) "aau" = (/obj/machinery/librarycomp{pixel_y = 0},/obj/structure/table,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "aav" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) -"aaw" = (/obj/structure/table,/obj/item/weapon/dice/d20,/turf/simulated/floor,/area/security/prison) +"aaw" = (/obj/structure/table,/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor,/area/security/prison) "aax" = (/obj/structure/table,/obj/item/weapon/pen,/turf/simulated/floor,/area/security/prison) "aay" = (/obj/structure/table,/obj/structure/bedsheetbin,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison) "aaz" = (/obj/machinery/computer/arcade,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "aaA" = (/obj/structure/table,/turf/simulated/floor,/area/security/prison) -"aaB" = (/obj/structure/table,/obj/item/weapon/dice,/turf/simulated/floor,/area/security/prison) +"aaB" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor/wood,/area/library) "aaC" = (/obj/structure/window/reinforced,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison) "aaD" = (/obj/machinery/washing_machine,/obj/structure/window/reinforced,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison) "aaE" = (/obj/machinery/vending/snack,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) @@ -1338,7 +1338,6 @@ "azL" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 6; icon_state = "intact-b-f"; initialize_directions = 6; level = 1; name = "pipe"},/turf/simulated/wall,/area/library) "azM" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 9; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/library) "azN" = (/obj/machinery/door/airlock/maintenance{name = "Library Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/library) -"azO" = (/obj/structure/table/woodentable,/obj/item/weapon/dice/d20,/obj/item/weapon/dice,/turf/simulated/floor/wood,/area/library) "azP" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/packageWrap,/turf/simulated/floor/wood,/area/library) "azQ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/wood,/area/library) "azR" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_access_txt = "27"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/chapel/office) @@ -8065,7 +8064,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaaiaaiaajaakaalaakaalaakaamaaiaaiaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaiaaiaanaaoaapaaqaaraaqaaqaasaataaiaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaauaavaaqaaqaawaaxaavaaqaasaayaaiaaaaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaagaaiaazaaqaaqaaqaavaaAaaBaaqaaqaaCaaDaaiaaiaaiaafaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaagaaiaazaaqaaqaaqaavaaAaaAaaqaaqaaCaaDaaiaaiaaiaafaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaiaaEaaqaaFaaqaaqaaqaaqaaqaaqaaGaaqaaHaaIaaiaafaaaaaaaaaaaaaaaaafaaaaafaaaaafaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaiaaJaaqaaqaaKaaqaaqaaqaaLaaqaaGaaqaaMaaNaaiaafaafaafaaaaafaafaafaafaafaafaafaafaafaafaahaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaiaaOaaPaaOaaQaaOaaRaaOaaSaaOaaTaaOaaOaaUaaVaaVaaVaaVaaVaaVaaVaaVaaVaaVaaWaaXaaYaaZaaWaaWaafaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -8105,7 +8104,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaareaskauiaujaujaujaujaukaskareaulamjaumaunauoauoauoauoauoauoauoauoapBaupatCasrauqaurausasrautauuautautautautautautautautauvaaaatIauwauxauyauzauAatIaaaartarxaryatJauBauCauDatJaryalgafCaqAauEauFauGauHauIasNauJauKasNasNauLasNauMarMajKasPaeAarOalWapaapbauNamGanBatYasYauOauaauPauPasYatZauQaubasYauRauSauRauTauUaqhaafauVauWauWauWauWauWauXaaaaqhauYauZavaaqhaqhaaaaaaaaaaafaueavbavcavdaueaafaaaaaaaveavfavfavfavfavgavhavfavfavfavfaviavjavfavkavlavmavnavoaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaavpavqavravqavqavsavtavqavqavravuavvamjaslavwavxavyavzavAavBavCavDauoapBavEanaasrasravFavGauvavHavIavJavKavLavMavNavOavPavQauvaafatIavRavSavTavUavVatIaafartarxaryavWavXavYavXavZaryalgawaaqAawbawcatQawdatQaweawfawgawhawiaqCawjaqCarMajKasPaeAasQanwanxanyanzawkanBatYasYawlauaauaauaasZawmawnawoasYawpawqawqawrauUaqhaaaaafaaaaafaaaaafaaaaafaaaaqhawsawtawuawvaqhaaaaaaaaaaafaueawwawxawyaueaqhawzawAawBawCawDawDawDawDawDawDawEawFawFawGawHawIawFawFawJawKawLaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavpavuavqawMawNawNawOawPawQawRawSawNawNawTawUaqjaslawVauoawWawXawYawZawYaxaaxbaxcaxdampaxeaxfaxgatAaxhaxiaxjaxkaxkaxkaxlaxkaxkaxmavIauvaaaatIaxnaxoaxpavUaxqatIaaaartarxaryaxraxsaxtaxuaxvaryalgaxwaqAaqAaxxaxyaxzaxyaxAaqAaqAaxBaxCaqCaxDaqCarMajKasPaeAasQaxEaxFaxFaxFaxFaxGaxHaxIaxJaxKaxLaxLaxLaxMaxLaxNaxLaxOaxPaxQaxRaxSaqhaqhaqhaqhaqhaqhaqhaqhaqhaqhaqhaqhaqhaqhaxTaqhawzaxUaqhaqhaueaueaxVaxWaueasjaxXaxYaxZayaaybaybaybaybaybasjaycaydaydayeayfaygaydayhayiayjayhayhayhayhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawTaykaylaymawNaynawNaynawNaynawNaynawNayoaypatqaslayqauoayraysaytayuayvaywauoatzayxatAayyatAayzampautayAaxmaxkaxkaxkaxkaxkaxkayBayCayDayEayFayGayHayIayJayKatIaafartayLayMayNayOayPayQayRayMaySayTayUayVayWayXayYayXasMayZaqCazaazaaqCaxBaqCazbazcazdaeAazeazfazfazfazgazhaziazjazkazlazmazkaznazkazoazkazpazqazrawqazsauTaztazuazvazwazwazuazxazyazyazyazyazyazzazAazyazBazCazDazEazFazGawFazHazIazJazJazJazKazLazMazNaybazOazPazQaybaydazRaydazSazTazUazVazWazXazYazZaAaaAbaAcaAdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAeaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawTaykaylaymawNaynawNaynawNaynawNaynawNayoaypatqaslayqauoayraysaytayuayvaywauoatzayxatAayyatAayzampautayAaxmaxkaxkaxkaxkaxkaxkayBayCayDayEayFayGayHayIayJayKatIaafartayLayMayNayOayPayQayRayMaySayTayUayVayWayXayYayXasMayZaqCazaazaaqCaxBaqCazbazcazdaeAazeazfazfazfazgazhaziazjazkazlazmazkaznazkazoazkazpazqazrawqazsauTaztazuazvazwazwazuazxazyazyazyazyazyazzazAazyazBazCazDazEazFazGawFazHazIazJazJazJazKazLazMazNaybaaBazPazQaybaydazRaydazSazTazUazVazWazXazYazZaAaaAbaAcaAdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAeaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAfawNawNaAgawNaynawNaynaAhaynawNaynawNayoaypatqaslaAiauoaAjaAkaAlaAmaAlavxavxaAnaAoaAnaApaAqaApaApaAraAsaAtaAuaAuaAuaAvaAuaAuaAwaAxauvaaaaAyatIaAzaAAaAzatIatIaaaartaABaryaACaADaAEaAFaAGaAHaAIaAJaAKaALauFaxBaxBaxBaAMaANaqCaAOaAPaqCawjaqCaAQaARaASaeAaATaeAaeAaeAaAUaeAaAVaAWasYaAXauaasYaAYasYaAZasYaBaaBbaBcaBdaBeaBfaBgaBhaBiawuaBjaBkaBlaBjaBjaBmavfawuaBnawuaviaBoawuaBpaBqaBraBsaBsaBtaBuaBvaBwaBsaBxaByaBzaBAaBBaBCaBDaBEaybaBFaBGaydaBHaBIaBJaBKazWaBLaAaazZaBMayhayhayhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawTaBNaylaymawNaynawNaynawNaynawNaynawNayoaypatqaBOaBPaBQaBRaBRaBRaBRaBPaBSaBTaBUaBVaBWampaBXaobaobautaBYaBZavIaCaaCbaCcaCdaCeaCfaCgauvaaaaChaaaaCiaCjaCiaaaaafaaaartaABaryaCkaClaCmaCnaCoaryakEagAaqCaCpaCqaxBaxBaxBaCraCsaqCaaaaaaaCtaCuaCvaCwaCxaCyaCzaCAaCtaaaaaaaCBaCCaCDaCEasYaCFauaauaauaawnauaauaauaaCGauTaCHauTaCIaCJaCKaCLaCKaCKaCMaCNaCOaCKaCPaCQaCQaCRaCQaCSaCQaCTaCUaCUaCVaCUaCUaCWaCUaCUaCUaCUaCXaCYaBAaCZaDaaDbaDcaDdaybaDeaDfaDgaDhaDiaDjaBKaDkaBLaAaazZaAaaDlaDmaDnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDoaDoaDoaDoaDoaDoaDoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDpaDqavqawMawNawNawNaDrawNawNaDsawNawNawTaDtareaslargaDuaDvaDvaDvaDvaDvaDvaDvaDwaDxanaanaaDyanaanaautaDzaDAaDBaDCaDCaDCaDCaDDaDEaDFauvaDGaDHaDIaDJaDKaDLaDIaDIaDMartaDNaryaryaryaDOaDParyaryaDQakmaqCaqCaqCaDRaDSaDTaqCaqCaqCaDUaDVaDWaDXaCxaCxaCxaCxaCxaDYaDZaDVaEaaCBaEbaCDaEcasYasYasYasYasYasYasYasYasYaCGaEdaEeaEfaEgaEhaEiaEjaEkaCKaElaEmaEnaEoaEpaCQaEqaEraCQaEsaCQaEtaEuaEvaEwaExaEyaEzaEAaEBaECaCUaEDaEEaEFaCZaEGaDbaDcaEHaybaEIaEJaEKaELaEMaBKaBKaydayhaENazZaAaaEOaEPaEQaaaaaaaaaaaaaaaaaaaaaaaaaaaaDoaDoaDoaDoaDoaDoaDoaDoaDoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 67ee2fd661d413f7b6b99acf54d74564fc9b30f0 Mon Sep 17 00:00:00 2001 From: Incoming Date: Thu, 11 Jul 2013 17:31:59 -0400 Subject: [PATCH 2/4] tweaks to the dice: *the dice now all have different colors, to make them easy to tell the difference between them at a glance. *the d2 has been swapped out for a d00, though you can still create a d2 if someone demands it. *the generic pill bottle full of dice has been replaced with a proper dice bag. *actually throwing a die will now cause it to roll until the throw ends, at which point it will state the result of the throw. The old method still works as well. *most new dice have had their sprites edited to be smaller. *minor grammer corrections. --- code/game/objects/items/weapons/dice.dm | 24 +++++++++++++++--- .../objects/items/weapons/storage/firstaid.dm | 8 +++--- icons/obj/dice.dmi | Bin 6245 -> 2819 bytes 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 02f9bf45dd3..d6733dce656 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -33,6 +33,12 @@ icon_state = "d10" sides = 10 +/obj/item/weapon/dice/d00 + name = "d00" + desc = "A die with ten sides. Works better for d100 rolls than a golfball." + icon_state = "d00" + sides = 10 + /obj/item/weapon/dice/d12 name = "d12" desc = "A die with twelve sides. There's an air of neglect about it." @@ -46,6 +52,13 @@ sides = 20 /obj/item/weapon/dice/attack_self(mob/user as mob) + diceroll(user) + +/obj/item/weapon/dice/throw_at(atom/target, range, speed, mob/user as mob) + ..() + diceroll(user) + +/obj/item/weapon/dice/proc/diceroll(mob/user as mob) var/result = rand(1, sides) var/comment = "" if(sides == 20 && result == 20) @@ -53,6 +66,11 @@ else if(sides == 20 && result == 1) comment = "Ouch, bad luck." icon_state = "[initial(icon_state)][result]" - user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ - "You throw [src]. It lands on a [result]. [comment]", \ - "You hear [src] landing on a [result]. [comment]") \ No newline at end of file + if(initial(icon_state) == "d00") + result = (result - 1)*10 + if(user != null) //Dice was rolled in someone's hand + user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ + "You throw [src]. It lands on [result]. [comment]", \ + "You hear [src] landing on [result]. [comment]") + else if(src.throwing == 0) //Dice was thrown and is coming to rest + src.loc.visible_message("[src] rolls to a stop, landing on [result]. [comment]") \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 6b74eaaff0d..e51deddd3ce 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -174,16 +174,18 @@ /obj/item/weapon/storage/pill_bottle/dice - name = "pack of dice" - desc = "It's a small container with dice inside." + name = "bag of dice" + desc = "Contains all the luck you'll ever need." + icon = 'icons/obj/dice.dmi' + icon_state = "dicebag" New() ..() - new /obj/item/weapon/dice/d2( src ) new /obj/item/weapon/dice/d4( src ) new /obj/item/weapon/dice( src ) new /obj/item/weapon/dice/d8( src ) new /obj/item/weapon/dice/d10( src ) + new /obj/item/weapon/dice/d00( src ) new /obj/item/weapon/dice/d12( src ) new /obj/item/weapon/dice/d20( src ) diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi index fda6ab2550ca32746dbf3171565de146eca8edfe..f4562b6d972d06fbd9884a0644a13b850d3ba82d 100644 GIT binary patch literal 2819 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 Date: Fri, 12 Jul 2013 21:42:02 -0400 Subject: [PATCH 3/4] Final Sprite Tweaks *D12 has been turned a more vibrant shade of orange *The dicebag sprite has been improved with some help from Cheridan *Let's roll --- icons/obj/dice.dmi | Bin 2819 -> 2849 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi index f4562b6d972d06fbd9884a0644a13b850d3ba82d..00e3eb127d47055450e269b01e789b7d24bbc493 100644 GIT binary patch delta 2698 zcmZWr3pA8l8y@$|5h?dNMwI)dT$)17Al(i_3gtE-BDpKK;TwdC4pK+sHlr}<6w9^L zFv(@6!c0-fFeD?tQZplFFyHr&*7?`@&;PIWu4ljdeb-*=efEC$vv-zSm0ICWvD~6v zzRu?I-qD(a9?GTbp+@V+H+>y$B08&u?c7>~GE6fyq=z1h(}z178hdNV}BYd@?SB^a2 zXLSUn2qjm{zuF0lxv>{WmPqrb1G?7!zxD};46M@E8YTh0Q(Q}?)P}K>m@KBnDB1P~ z$DTl~L=n>v49YgxRE{ip%L)CvW|=Pw_1KP#?EAk2s(&<>47f_(oU&sX2xDekxg#+t zan&HkQ`b8~^C(gK>|yC$=iTE(;9;pTrXamHD|P^-5kn?_^rRkOnv_XOqb@TD1`cNRKtIfHKNec85eOwC~Y<2m2*i+RP7v7x^RobaA7 zAVp|Q_$t6hX)2L~P=OFWcu4)JiE@!53?|DvcF5sWQu)^kCEt(xHusshdykF3^Hf(h zJ}v3@qZ68YcI@q4dJ+ER-r-x^&X~$X$~qpeZ$w+OKc^|_uvyZ<-6BElWomtw<^kO# zmW_soSPoXox-vxXUMIJ?oJ+40ZwKH&I8y;YulAuis@R08CAh!!rxt5N2#Z4IcFKp5 z<$;7)Z~z{pfzWI!w;d-v7pO?Aj*H#dQr7G6ApMIsYR0-tFk9owxfvSv%Js?~;Q*|W zS3qWNx9}9}ci@dMU3O~^sp!k=E#bDYLKS)%q4vT72l>v{j13=hViBv52gR?nzG8 z{$^NayESMSinaB*FPz}-v z^f0dUBYeJNioI1GY0*9F`SB{+ND6J!;Qpwr_(kbSWN~Q(SV`kVW@rF~JnE=m7nCo& z*mj^YLZ}K9e88}iTYIn|@ide_<0*Y(?a!HKCZq59$+H39@#;ZBtF*Z{Aik3q2Dz}3 zTL7T;oBbqmC{gN*Ql9i#4+Km7ICH1ow9?K%=m|<4 zbfk>3Os9c>b{BFhZNZJ=yN&XQU%VFmbnt&*Xe0I$nwP+`dfrbk?SN_*w*S4OI`^Y( zIp0R!RttjB{;Mkytqt&r**K0NJ)QNe$E9ssJY8rt+IA*wDJ*17= z1?Oz(6%Kun(8nCwmM(WCrZE#)A7#|(yEm)a4@x&HA$q}DaUK~_u1VgHFN)hzIy!F5 zcyAw}U>0^uZBeYUix>3Uke^2MM@j*De6!a-M3vJEkEVN5Eq2{kb2mZ-*RKVC=*&y= zI}2QKUX?Ts8afQ)I2{ zM4FdO`w1M9J)F%&{e6Ct6?f9J^7t#C9uG@mEsK20?FpmOTY>uCI^J5{^l(s$(&B9K zgRY)&aVFPjL^t1!G_>#FwJ$6!`l3I0(%Xp+b0F8BJ$cZxeGB1586BfUR7IH)x1fUR z)vkUeOaMzHwMwzfC*6+FgBOvU@CaeEF%<5ZaR{3zWs3l#aMvum>f(5o+~Vg4N|__2 zxMs83DN_VsR=Wh7vr%49rXX4TyY@J>Vh!6!!FsK37ZeIVwGNE3KZ zO#gT%xik(cPzSr$t+KpSP@spoJ4YPW-+Q5FBKUnq$4qPfVSQd@9m!_Ot2DYw68Gd-t*?9^`Kxtsw<+UqwSI=KarF97rxyJ5wOBS=@jrPNY zdx8k96(C?t_N!_&-z!xPyD8C^(cQc(w6O#N-T}%V`1W$uv*ua1z_Od-)!jv>Ja8d% ze3HUjezc)!iVq%RNA;IB5+Z7@MTdB;#?R+j*d%IJFR^avA8Kac`5rvutZHyu>QVWL zlkxu%c#+Z*_1>m5k45b*YfY{n^Qsdfj0Ei25Fxi|k6S%TG!1X}xAOuT! z!25>ivJvl;PQh9tlQ7f?o$pA#H_JPIzNnyfnN`ikn=mf_CdJiu5G}3SA09DC{JL;? zW;`gDJJRynyVgMuD0t7JseBd+f21vp2iXDn6-U0)Y2-#oKfmFDy!AJXrSL{u3vO~= zA!TKvPw`Vj_!y=6fia*nifI8&0I1(o$Mzm;-h6q{u0}#=bsQ!JR^))?S*lmBS^PN| z)`^ngj-2AOeqzO%p#DV{q_%)~Ux!mV#zl#FqIZEO1;U?YewIy{xR|yg7zWFRnJP5$ z5Whql6c?p`@_96QJ+f_bMQejW@*f?M@7YS)<2FceCFtb_C(qB3&jKiWX6vY*Tacv4 fpY6pknn#-2hxc_m7F39SkFaCT=tK36XEXl|!W(i4 delta 2668 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 Date: Fri, 12 Jul 2013 21:50:53 -0400 Subject: [PATCH 4/4] Whoops the dicebag sprite got more awesome at the last second, this is all Cheridan's fault :0 --- icons/obj/dice.dmi | Bin 2849 -> 2842 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi index 00e3eb127d47055450e269b01e789b7d24bbc493..7801e542c3d577f84edbcad93be375c2d1ba7c79 100644 GIT binary patch delta 2366 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