From f3fd81af2486881aba4248be597bae9336589b78 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 6 Dec 2017 23:52:30 -0500 Subject: [PATCH] Adds games vendor resupply crate --- code/game/machinery/vending.dm | 17 +++++++++++++++++ .../circuitboards/machine_circuitboards.dm | 1 + code/game/objects/items/vending_items.dm | 6 ++++++ code/modules/cargo/packs.dm | 8 ++++++++ icons/obj/vending_restock.dmi | Bin 1454 -> 1777 bytes 5 files changed, 32 insertions(+) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index ec6a53f308..adc662f31b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1172,6 +1172,23 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/donksoft +<<<<<<< HEAD +======= +/obj/machinery/vending/games + name = "\improper Good Clean Fun" + desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..." + product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!" + icon_state = "games" + products = list( + /obj/item/toy/cards/deck = 5, + /obj/item/storage/pill_bottle/dice = 10, + /obj/item/toy/cards/deck/cas = 3, + /obj/item/toy/cards/deck/cas/black = 3) + contraband = list(/obj/item/dice/fudge = 9) + refill_canister = /obj/item/vending_refill/games + + +>>>>>>> 9460277... Merge pull request #33316 from ShizCalev/games-vendor #undef STANDARD_CHARGE #undef CONTRABAND_CHARGE #undef COIN_CHARGE \ No newline at end of file diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 1857a27593..8577c44b26 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -223,6 +223,7 @@ /obj/machinery/vending/snack = "Getmore Chocolate Corp", /obj/machinery/vending/cola = "Robust Softdrinks", /obj/machinery/vending/cigarette = "ShadyCigs Deluxe", + /obj/machinery/vending/games = "\improper Good Clean Fun", /obj/machinery/vending/autodrobe = "AutoDrobe", /obj/machinery/vending/clothing = "ClothesMate", /obj/machinery/vending/medical = "NanoMed Plus", diff --git a/code/game/objects/items/vending_items.dm b/code/game/objects/items/vending_items.dm index e84295f8ed..0d2015b01a 100644 --- a/code/game/objects/items/vending_items.dm +++ b/code/game/objects/items/vending_items.dm @@ -86,3 +86,9 @@ icon_state = "refill_donksoft" charges = list(32,28,0)// of 90 standard, 75 contraband, 0 premium init_charges = list(32,28,0) + +/obj/item/vending_refill/games + machine_name = "\improper Good Clean Fun" + icon_state = "refill_games" + charges = list(7, 3, 0) //of 21 standard, 9 contraband + init_charges = list(7, 3, 0) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 13325a23c8..de62ba465e 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1221,6 +1221,14 @@ /obj/item/vending_refill/cigarette) crate_name = "cigarette supply crate" +/datum/supply_pack/organic/vending/games + name = "Games Supply Crate" + cost = 1000 + contains = list(/obj/item/vending_refill/games, + /obj/item/vending_refill/games, + /obj/item/vending_refill/games) + crate_name = "games supply crate" + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Materials /////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi index 7f8289a0877ff2bd07cb43f6ce9f4a87438919a6..a59fdd0f520c93694e26e09cc4e7df8127996d9b 100644 GIT binary patch delta 1732 zcmV;#20Qt#3-JvliBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3dcabF@ ze}Di0z`($ZWgVgb07ytkkT3wuW&q^?0Ayrj*VorUK|%fg`;EqqEcbVe{} zR~}(f9ROm)$PG6DX8+<2Dr8?@ctJsNe@aRKNt4;x*{iFoK0ZFJ3o%<+Sz=91nqgtP zrlx#KN~TI3x?C>*|Nki|DOy@ucRxR*e}D4y^w_(*V@F4Se}AQ=rIM18w$_*&IB#W0 zNU@2Dosf{Ry1LJvo?KN`mBVW%KaX-oM*s8krJ$gup`rEVX&3>7Z(?CMMcTHyvwq(mt0(4N=h&=Fj7TDfk8o7KtRRC#gWA)f5X48|Nk>xnZCWf zy~aTRFKKx900001bW%=J06^y0W&i*Hs(MsdbVOxyV{&P5bZKvH004NLmC-#8!Y~X4 z;5j)()b5DCl?4@{4)h8rG;R}`)KY9f;`9_cA|$iDXMghI((Dh%x-r$M)_2Gha5Ou! zT`aYF1jl|Vo3&ORe?sqhF2t5$ibaMl#CWFBwnL$n3z??zN~`VRhVW9s;Hz9xf3-lctp%T;)>qXb_7-h5 z1pavUcK2v*U#XL0rZe5|bfzIyP1rUk&#iXET;r~We6WO|9SXWEQ|h^ zRdPF*a~wy_-AJ1GUZlL5zlt^Pfvk!81sr!A z`x?}6ce3E?e>ko`HKi~>M}cuqVSsYS28sfdyOSydlzVw@3*cBn(Gox%cYveizB{Jn zUVbXUGq5;lun6%MKph9Rqvd|V)z9a902Z$g2oD(dppH9&0RnE^V4Uv(#`Af`g&yDw z@NWU-uVcjqWc<4CviZ0NBpg@G#|HQwzyrK-`T|A+fB3h68OY^g1Hh4Rf3o0G?z^)2 z-h}5-j(b3FfPV|<1MvHwV_ReoF~FSz%)qoa&F0H`V9tf&di;IgDHLun{wN`yoS--vn>Pz)8sNdsJdFPD}|iEL*jIj%pe?h&sWza{H?d&iFu>O8%V};z6W@| zvbG^|xcTm8lk(N|ErGxH{s$j^#O4bwdwcs99e{g45-tNA@hM;15P7TJ+-$a6 ze}u1ZiTw7*p9G)Yq4RMMB;Nv3U}txCcaN(&)8Q8;O`JFolA|3>>1I#-IqJbth(4+>y{-O8-zWDO1ufO@0a{e3; zR$xiK0s&ir&cTt$@g9&Jz@C z2b*7o{HGv|`+-)Z=bX>gH}?ZZMn*5DJB=di-(-ZSQIy*Z5gu5uSGak?#jaH!y0xAK8G(_eMr9 aul@t7uNF9Qrj88&0000|b ze~V=uq5uGZ002lxNRTi9%w_;&WMtRZ*Fix+{r>xXeSKS7TOkt(#&K~>OiTd(1x7|j zz`(#?Ap>kD1<{KD>$m{_$N=R40DMX^bVe|mnwkJ&!~kah07;XkN*%gfF8}}ke}8|a zrKOURlD5{E|NH-y!)r!pEpu~og@uKb0+f`KY5^yI$PG8czpvsBD%siDtE;O%K0d7r zG5`NFDJdyhT3TJ1z8pAjy}i9BKaUnHR>na97Z(>WFfcsQK9v9f00DGTPE!Ct=GbNc z005?XR9JLGWpiV4X>fFDZ*Bkpc$}5dO$x#=5C!0Ma*ELI#lNi^X(?UUD@aVHCMM}X zW>oNh^cK4mA@1HAKHg?(b!@wSP|c~A56I+kQU|qPt)+N+%Wf{atrQOY)$vk@HNzaM z45N?nOp`XDlEV5-^LZo1n010Bf8m4yO7R8pRg4WrU21Rm$1L$ZmGg+~fJ%7+>y3`3 z+~O1nNB-q&)eg<)mv8?pj1=T=H{bvO1F=beL_t(&f$fzvxj7>vqc@d+a_~a| zFS?%bawd!aD=E2MsW^_K<}Q=w`j1re9xAE0Q>oat?I^ilWpV-kl*wYE_4D5VaL2KK zKVuDd7pgv181PkS-cuNG?$}6Sz`45s3~)Iowgs%?4sx{Icgw(_HvI)^m>v<P-O-(UiaPfdfJ1MVBpR38T>SG=KvbOyNDN{_kSgSJwm&{06quMKz>B@`LbVopf#X9fCko-*b(89 z$e97>jxFQ#8Fo1rdQhq@z3S@{Jp!!fj-2~$%6%WcifYSKs$o1MhxOs34zHh?&;GJ6 z;6_G9Mn?aQW_{&bK*IHJ!O~+2)cHPaps*1FZoTo9)wQ*?vZcJfnJ5TUywyg3t#+%C zH-Pn5SMvrS-_!c*>l)q&+hHzyT6s?EujuCkFUTJeB^EtvtW8e|567;d+Bc6PQor#+B_ z-wrLo`Q{c9(>2Z4P0!;CXb;4H0=s*Ad;94QP$=?FrxPS+P{UiOD>XRq4$}ND^ne-c zQ>7d{2aI<*nFHnBLz%%r^T5;eV0s5_`3^ei4!Va&viX1=5zqHx57_5)1L^$GXvyXS zX2AL3kv!iwy)@s`9!U7^?rzG%g82c~7xTYY!2fc7F!OK`9lD&GImr}YO)PRMz5@$(Gue7>jkd%FB@Q3ow2 z5y1)rzUsKA&;Nry*79Ew*3Sn$bg9k%13c7nf=R)AaCxQ8|9IGya6(ANNhFEy`1<$t zh-c5ss~c_pA9jZ#C%3nMw}f+YD(s+MAIGEXQ9Mo-T-`{2ADB#116p6;w0^`LYWRX+ zFXXbM$_&mTVF#A=yd3Yx%g;%^e|VJTe`_*JN#}#=lfcRA2B^U~ z>;cR7