From c447a7473fd211e6eadf4e1421a6625b0aa5f312 Mon Sep 17 00:00:00 2001 From: Shadowfire117 Date: Sat, 17 May 2025 18:42:01 +0200 Subject: [PATCH] Casino changes, attempt 2 electric booga whatever (#10906) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- .../code/modules/casino/casino_clothing.dm | 9 +++++++++ .../code/modules/casino/casino_items.dm | 5 ++++- .../icons/inventory/accessory/item.dmi | Bin 818 -> 2856 bytes .../icons/inventory/accessory/mob.dmi | Bin 0 -> 631 bytes .../icons/inventory/accessory/mob_teshari.dmi | Bin 0 -> 521 bytes vorestation.dme | 7 ++++--- 6 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 modular_chomp/code/modules/casino/casino_clothing.dm create mode 100644 modular_chomp/icons/inventory/accessory/mob.dmi create mode 100644 modular_chomp/icons/inventory/accessory/mob_teshari.dmi diff --git a/modular_chomp/code/modules/casino/casino_clothing.dm b/modular_chomp/code/modules/casino/casino_clothing.dm new file mode 100644 index 0000000000..1778e31b73 --- /dev/null +++ b/modular_chomp/code/modules/casino/casino_clothing.dm @@ -0,0 +1,9 @@ +// Collection of Casino specific clothing and accessories primarily meant for casino crew/volunteers and post-event temporary items part of volunteer rewards/prizes - Shadowfire117 + +/obj/item/clothing/accessory/armband/casino + name = "casino crew armband" + desc = "A gorgeous casino crew armband made of luxurious silky and golden threads interwoven with a luminous display. Show off that Golden Goose with pride!" + icon = 'modular_chomp/icons/inventory/accessory/item.dmi' + icon_state = "casino_armband" + icon_override = 'modular_chomp/icons/inventory/accessory/mob.dmi' + sprite_sheets = list(SPECIES_TESHARI = 'modular_chomp/icons/inventory/accessory/mob_teshari.dmi') diff --git a/modular_chomp/code/modules/casino/casino_items.dm b/modular_chomp/code/modules/casino/casino_items.dm index be3ad87ff5..084a423a27 100644 --- a/modular_chomp/code/modules/casino/casino_items.dm +++ b/modular_chomp/code/modules/casino/casino_items.dm @@ -38,7 +38,10 @@ /obj/item/spacecasinocash, /obj/item/casino_platinum_chip, /obj/item/deck, - /obj/item/book/codex/casino + /obj/item/book/codex/casino, + /obj/item/storage/pill_bottle/dice, + /obj/item/storage/pill_bottle/dice_nerd, + /obj/item/storage/dicecup/loaded ) /obj/item/storage/wallet/casino/verb/toggle_design() diff --git a/modular_chomp/icons/inventory/accessory/item.dmi b/modular_chomp/icons/inventory/accessory/item.dmi index 304fb1a07195df312c24c2b280fa23a41d229aee..db913cb780e4a2d84937f7db02b9a4b682e74f04 100644 GIT binary patch literal 2856 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 diff --git a/modular_chomp/icons/inventory/accessory/mob.dmi b/modular_chomp/icons/inventory/accessory/mob.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b12a088512874b4d732d714caa17e6d7161b0514 GIT binary patch literal 631 zcmV--0*L*IP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5Nr{UyC9|j)$TZ~QOe;#v zO@*-G3X&6xGxPG}6N_?_67y0J%1w}zn*l{ra}q0oOj8{=#ASvNb~|wxqO9QR=K}T` z0LJP*TK9RI;{X5wSxH1eRCt{2-P>w}FcbyQI`Mw}|GzDiLcz4gAu^72t;Ym&m^k>b z57Cbg008c$h(;bK*MCkZqoJxe=qEfvNUjv>yc(gbLOhhaE8ohhinnJ~tZvrzpH#%x zKQfp6S*Um<@4zqh0RR910B-5*d_TK>^U{33jfT3+`k`(P%J=K0NwptB+eQ6_w#%%4 zcD{dDeER@e7Kl<)V$LH&h(7~<_&6&t6G zF#ha(-}wOm0001h{m#z!v+GYU&G+YMXvsZ4Fir>M`{OiiwI9BU%}dl@m>1^<00000 z0JyF_`Tkp*mnCjLT*;n%AMPyGi#vNhB_zIf5)yAq3yHUxg~Vy7klRfy%4+i=Rn*P) zeA{i$_rv!5IAuO0&;E-X)XoL~0002^U#=dWhTPLcXDjCA;!Vnn-v9va005u}0{{R3yb+fl0000mP)t-sz`($i zUIoQ{2hUeLr7$q>wG_RcOpty$sLEJ%r$dOio?x1RSft8BjHjZ7nSg74-K0uB00001 zbW%=J06^y0W&i*HhI&+3bVOxyV{&P5bZKvH004NLQ&ww|{_X0sw$Usj1u~ zcQ|9p^KpHC{q#JaUOuC|NGdGe;B@YB3(w6L>UDX<00000ywT|VFB+7W59lS|k+~Z*Zx}|JJBybpF?23;+NC0KJXQ|HAoU>=n!FwW4V|u5Z!&6a|N|Yfb)F zS|k+~|28`R6AS_X008`NZ_WQY$lI-=X+N&-zwqhnttS5~Es_e0cP0M=0002^V59TD zXnx-B6^A^I>yHlaA3mNxH{5ITztSS9uy})KIDd5h=l_EM@W*@sguwzpNH)^x00000 LNkvXXu0mjf+EwMe literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 4a13bb92ee..bfe4c72f8f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -530,6 +530,7 @@ #include "code\datums\components\recursive_move.dm" #include "code\datums\components\resize_guard.dm" #include "code\datums\components\swarm.dm" +#include "code\datums\components\waddle.dm" #include "code\datums\components\crafting\crafting.dm" #include "code\datums\components\crafting\crafting_external.dm" #include "code\datums\components\crafting\recipes.dm" @@ -543,13 +544,12 @@ #include "code\datums\components\disabilities\nervousness.dm" #include "code\datums\components\disabilities\rotting.dm" #include "code\datums\components\disabilities\tourettes.dm" +#include "code\datums\components\species\shadekin.dm" +#include "code\datums\components\species\xenochimera.dm" #include "code\datums\components\traits\drippy.dm" #include "code\datums\components\traits\gargoyle.dm" #include "code\datums\components\traits\photosynth.dm" #include "code\datums\components\traits\weaver.dm" -#include "code\datums\components\species\shadekin.dm" -#include "code\datums\components\species\xenochimera.dm" -#include "code\datums\components\waddle.dm" #include "code\datums\diseases\_disease.dm" #include "code\datums\diseases\_MobProcs.dm" #include "code\datums\diseases\anxiety.dm" @@ -4930,6 +4930,7 @@ #include "modular_chomp\code\modules\artifice\deadringer.dm" #include "modular_chomp\code\modules\awaymissions\tank.dm" #include "modular_chomp\code\modules\casino\casino_book.dm" +#include "modular_chomp\code\modules\casino\casino_clothing.dm" #include "modular_chomp\code\modules\casino\casino_items.dm" #include "modular_chomp\code\modules\casino\casino_machines.dm" #include "modular_chomp\code\modules\casino\casino_map_atoms.dm"