From 747114793c56ce1d44f126239037f26b248113d9 Mon Sep 17 00:00:00 2001 From: drexample Date: Sat, 11 Jan 2020 05:28:00 +0300 Subject: [PATCH 1/3] WE ALWAYS DELIVER! --- code/datums/supplypacks/contraband_vr.dm | 13 ++++ code/game/objects/items/falling_object.dm | 66 +++++++++++++++++++++ code/game/objects/items/pizza_voucher.dm | 61 +++++++++++++++++++ code/game/objects/random/maintenance.dm | 3 +- code/game/objects/structures/trash_pile.dm | 1 + icons/obj/items.dmi | Bin 65640 -> 65877 bytes vorestation.dme | 2 + 7 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 code/game/objects/items/falling_object.dm create mode 100644 code/game/objects/items/pizza_voucher.dm diff --git a/code/datums/supplypacks/contraband_vr.dm b/code/datums/supplypacks/contraband_vr.dm index 3d13903d47a..ae0edc071f4 100644 --- a/code/datums/supplypacks/contraband_vr.dm +++ b/code/datums/supplypacks/contraband_vr.dm @@ -19,3 +19,16 @@ containertype = /obj/structure/largecrate/animal/catgirl containername = "Catgirl crate" contraband = 1 + +/datum/supply_pack/randomised/hospitality/pizzavouchers //WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER + num_contained = 3 + contains = list( + /obj/item/pizzavoucher, + /obj/item/pizzavoucher, + /obj/item/pizzavoucher + ) + name = "FANTASTIC PIZZA PIE VOUCHER CRATE!" + cost = 40 + containertype = /obj/structure/closet/crate + containername = "WE ALWAYS DELIVER!" + contraband = 1 diff --git a/code/game/objects/items/falling_object.dm b/code/game/objects/items/falling_object.dm new file mode 100644 index 00000000000..3c8c6e39aa5 --- /dev/null +++ b/code/game/objects/items/falling_object.dm @@ -0,0 +1,66 @@ +/obj/effect/falling_effect + name = "you should not see this" + desc = "no data" + invisibility = 101 + anchored = TRUE + density = FALSE + unacidable = TRUE + var/falling_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita + var/crushing = TRUE + +/obj/effect/falling_effect/Initialize(mapload, type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita) + ..() + falling_type = type + return INITIALIZE_HINT_LATELOAD + +/obj/effect/falling_effect/LateInitialize() + new falling_type(src) + var/atom/movable/dropped = pick(contents) // Stupid, but allows to get spawn result without efforts if it is other type(Or if it was randomly generated). + dropped.loc = get_turf(src) + var/initial_x = dropped.pixel_x + var/initial_y = dropped.pixel_y + dropped.plane = 1 + dropped.pixel_x = rand(-150, 150) + dropped.pixel_y = 500 // When you think that pixel_z is height but you are wrong + dropped.density = FALSE + dropped.opacity = FALSE + animate(dropped, pixel_y = initial_y, pixel_x = initial_x , time = 7) + spawn(7) + dropped.end_fall(crushing) + qdel(src) + +/atom/movable/proc/end_fall(var/crushing = FALSE) + if(crushing) + for(var/atom/movable/AM in loc) + if(AM != src) + AM.ex_act(1) + + for(var/mob/living/M in oviewers(3, src)) + shake_camera(M, 2, 2) + + playsound(loc, 'sound/effects/meteorimpact.ogg', 50, 1) + density = initial(density) + opacity = initial(opacity) + plane = initial(plane) + +/obj/effect/falling_effect/singularity_act() + return + +/obj/effect/falling_effect/singularity_pull() + return + +/obj/effect/falling_effect/ex_act() + return + + +/obj/effect/falling_effect/pizza_delivery + name = "PIZZA PIE POWER!" + crushing = FALSE + +/obj/effect/falling_effect/pizza_delivery/Initialize(mapload) + ..() + falling_type = pick(prob(25);/obj/item/pizzabox/meat, + prob(25);/obj/item/pizzabox/margherita, + prob(25);/obj/item/pizzabox/vegetable, + prob(25);/obj/item/pizzabox/mushroom) + return INITIALIZE_HINT_LATELOAD diff --git a/code/game/objects/items/pizza_voucher.dm b/code/game/objects/items/pizza_voucher.dm new file mode 100644 index 00000000000..c7e75680e11 --- /dev/null +++ b/code/game/objects/items/pizza_voucher.dm @@ -0,0 +1,61 @@ +/obj/item/pizzavoucher + name = "free pizza voucher" + desc = "A pocket-sized plastic slip with a button in the middle. The writing on it seems to have faded." + icon = 'icons/obj/items.dmi' + icon_state = "pizza_voucher" + var/spent = FALSE + var/special_delivery = FALSE + w_class = ITEMSIZE_SMALL + +/obj/item/pizzavoucher/New() + var/list/descstrings = list("24/7 PIZZA PIE HEAVEN", + "WE ALWAYS DELIVER!", + "24-HOUR PIZZA PIE POWER!", + "TOMATO SAUCE, CHEESE, WE'VE BOTH BOTH OF THESE!", + "COOKED WITH LOVE INSIDE A BIG OVEN!", + "WHEN YOU NEED A SLICE OF JOY IN YOUR LIFE!", + "WHEN YOU NEED A DISK OF OVEN BAKED BLISS!", + "EVERY TIME YOU DREAM OF CIRCULAR CUISINE!", + "WE ALWAYS DELIVER! WE ALWAYS DELIVER! WE ALWAYS DELIVER!") + desc = "A pocket-sized plastic slip with a button in the middle. \"[pick(descstrings)]\" is written on the back." + +/obj/item/pizzavoucher/attack_self(mob/user) + add_fingerprint(user) + if(!spent) + user.visible_message("[user] presses a button on [src]!") + desc = desc + " This one seems to be used-up." + spent = TRUE + if(special_delivery) + var/delivery = pick(prob(25);/obj/item/pizzabox/meat, + prob(25);/obj/item/pizzabox/margherita, + prob(25);/obj/item/pizzabox/vegetable, + prob(25);/obj/item/pizzabox/mushroom) + command_announcement.Announce("SPECIAL DELIVERY PIZZA ORDER #[rand(1000,9999)]-[rand(100,999)] HAS BEEN RECIEVED. SHIPMENT DISPATCHED VIA BALLISTIC SUPPLY POD FOR IMMEDIATE DELIVERY! THANK YOU AND ENJOY YOUR PIZZA!", "WE ALWAYS DELIVER!") + var/crash_x = user.x + var/crash_y = user.y + var/crash_z = user.z + spawn(rand(30, 75)) + new /datum/random_map/droppod/pizza(null, crash_x, crash_y, crash_z, automated = TRUE, supplied_drop = delivery) // Splat. + else + user.visible_message("A small bluespace rift opens just above your head and spits out a pizza box!") + new /obj/effect/falling_effect/pizza_delivery(user.loc) + else + to_chat(user, "The [src] is spent!") + +/obj/item/pizzavoucher/emag_act(var/remaining_charges, var/mob/user) + if(spent) + to_chat(user, "The [src] is spent!") + return + if(!special_delivery) + to_chat(user, "You activate the special delivery protocol on the [src]!") + special_delivery = TRUE + return 1 + else + to_chat(user, "The [src] is already in special delivery mode!") + + +/datum/random_map/droppod/pizza + placement_explosion_dev = 0 + placement_explosion_heavy = 1 + placement_explosion_light = 2 + placement_explosion_flash = 4 \ No newline at end of file diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index e7e45a87916..8254b33e1a5 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -106,7 +106,8 @@ something, make sure it's not in one of the other lists.*/ prob(1);/obj/item/weapon/card/emag_broken, prob(2);/obj/item/device/camera, prob(3);/obj/item/device/pda, - prob(3);/obj/item/device/radio/headset) + prob(3);/obj/item/device/radio/headset, + prob(5);/obj/item/pizzavoucher) /obj/random/maintenance/security /*Maintenance loot list. This one is for around security areas*/ diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index 1c118a18fd5..8e603d913ac 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -131,6 +131,7 @@ prob(5);/obj/item/weapon/storage/backpack, prob(5);/obj/item/weapon/storage/backpack/satchel/norm, prob(5);/obj/item/weapon/storage/box, + prob(5);/obj/item/pizzavoucher, // prob(5);/obj/random/cigarettes, prob(4);/obj/item/broken_device/random, prob(4);/obj/item/clothing/head/hardhat, diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 62df1721365bc0ea6dded9c39946abda827da741..4d346eda5d49797ba71c46a46f14a0b709f5fb18 100644 GIT binary patch delta 7488 zcmXYV1y~f{_x|j%bS#QA5|RcWB})m23WCH3q`MJt>1G)O6b!n%OS(HHq>+?HQlzD8 z`3>Lyf1jP5yZ4#7=bZPv=e_aA7cuUK2x9|jJ>O_KKR0(Wb$n~@{MHT)0PacI@okRF zPe?uv?W~HvMe$syF27P~wM8-xTUnC|NHl9?48_ zn;F0qV^7Z~Yg!6;7h1So86qhSB{V}@9#Ok_**I!SXl@2}>UURf|2tLgjjHo3ep&^( zMoMz;d=1X`EY|qapqQ1?y`VWvl)=bst)HbDvZ6~CPH|EG{z6U~mx$p@p0TAH1M*s` zQp3ZlHt3z;i_uR446#m&yx;p2j z6y%=g`<%auSypW$cF=q9E1p5~V6mJQRE*;G8h`AFBcXlWF535~+BQHd)r(Cp0cA#( zRr8{p)$Xu#DoUNdli@y4EE>K_G5p;k^Ei266?lEu$zvhkbTF7+3Uj-shM9iK$cVsRW_yVumv6$|U^3t?wkqZ}A#*2Kh~5 zC=dF%M!Am)tE-dR%Na!fdM(Dk-HK7?Ec5Td&HS1=UD*n)Eg9!r|V{J zpyqp^woJ3E`7~{F0)?}8)nF<#1G9^%L zQfkOqm0_DDS9qo!`5Bd2WjA%%#X>@Q>$t*>v>llEd+){iu$7g&nn@r<;GNTQ{_1-K zrs;g;TGan!c!!O?{u%u2e@-<83q=#jSmn%*w2sCf1_jFT~K8}dF z?!JdpFDKPTJ)&D`{r3kwMG=UDW~e>Auj?y+H#_ApOu%Tf>!rqJLXjPQqNvsJp+=V8 zs95jibePkUy8rXZ=vH#Imj>Uzygq{y!-_Ih01lQ{Tr{pY_93shviyaszaCG_NVdc% zo38ZAhM6M+uH!BR-@RW74kk(l>~7cLx!cNc*6Hoo{1u6~ZImRK(dq)aO0nC=uM8OV z<+>T$y>3e7x!W&;IZqVaNo=E6Z1puRB(FMLWhshjF4NBP*8O@V6@d8F1zP0quX7Mo{H#hQI?cQ_R17yk8_<^0o< zoR4X4c{gAuxsV||w-@RKT0N~^WhJz|Qe!eG`8$5d(L%mg%pX7eX&updeTO%7M5KPc zD=s|ULEHunJlTl&vbeDoC&sJ#Nw8P69P%q zq%z!>`*PNt{yS)D#ngfl5X^7(zOFt+?oeVv+yyAsD`apr7UA@n6^W~(IN)ARZ$&5= zIyN%F!Pb}_=W0eQFFd14ZXM|KOn>TwR$wfF?I@p%(;u<@h-j9PPgSMkspjsV=>PpK zi2js_svB1SBPRNwP~L`;s}jQm8d=As@slGCwjYfT~fx?9;>Os{qxq1ux8)R0eJ8l!A*am-})?hOlpAM?GyNpjyi z8#Iyt@4@<=7`BWYaf%^{UYvj@sk=x@v~|i_U!7ySI*K@mBdKy26q2D}LLy`1ex5uA zc`-ws_sm94vZ`vs$0vmrQ_c;$)YX5t&g;J}nfz{jm#qBI^JM6kb(P7^Kuu`R5c_;d zDsvZ|&n`U9@m)mR+|_x$GqCp-t7_eg-}wM0nKJ6&&YZ`KD>G=@^{BW<4)3^DgXPe? zS#|KZ>Wj9hBqI<2etl^46x)+sz#D%c!i)(O$&mTU^l4)0<%Cluvbv3N*3&-U#PC=* z<-X}dru&q&`>zxEI5WDI^6jd0I^PznKZqVWIpzPMG9)%%A~~UzR1*aAeeg zkbz=S;Vb464;a!^ro;izE3EO7f%vdi`$Ygi@}elmz|XJ1K%y6zw=cJcE>W|H_r}Y3 zzD`coJlt0gdFUr%%?_nEkYt($gBaTL`oH-_Nd9%9;vN@OT_&^fht$gf2NgkYfNF8I zE~-abK*2a2rNGp`*R*{D1C*%>q{aF9gml4pc>cy63%~7ADwT)1Ecmc}@2fJYv@YHc ze!!9{a~cr{@UDhhV3QIYC*P!vjDRRgz@V3L;1Xqdp;y!Dz)B*F6Do^QR+X%a7qQ%> zbUy~?>bv(O%{xD90Pbs36B8U3N#TNRI9_g_uJKP*YnvY@4*c2P#s#bd>8z@DUK&?S z?L|@|@iBw@K38R}ON}r3M^CvWGE0t|OI8=zJ;0{t-nUeckV`|qyC}!8{ zJ*-LFbbPQpWZ<2GXqe<{`>QJ)pT_OSD%_L0Py)yXn?sHEkc|EX5-=82j8 z!ck!}S|lgiheFJ!g24@orofAB>^fIY_FEg(m}=Q`ug+J^A08V+WQKzifm&>@Rjixq zz`8of<6-M6v_*foMcXX7=2KO=36ZXgBZc4EC`*&S(FWa(dJT#bLmi`+x{sJ}fCvgT zS#QIo+I`0qJZY}3JU1A^2J6@q%PJ(f$q_lD+-lyAH6Ru=C3|jYXiK66{Y2>-e$G9+ znBfe33Xt&JH<8tO6qlFm`!;`}gAiP|Jl*M)gzIuf@iJ%24FSR#iIM{k-!fO!o1Qg-x2) z=oclsIoUkkolq94Toy;Ibi7Goa$dSj8(rUA$4`#BqKGBQ!~+_Wn23Hi#)9Abrc_NS z2WrWs(o-kdc1blC>U-`~HoHW=dV;y%{B?f8#_y)N^*&}>k9>jx*U#xcx;lS=g&Yk|c6L0?Z(;w4c)j_n?+$M(Lh3tQI zcReS+dx^S9H0Bd`3CBNyGF<0Hoxz1S0z)}b>M8@$mSZn5sH#o-&CTRf zhoO7U$P^j$0t?W3q^V+-4lB2XCm!ec{wz|M8k8P%H&)x zfhV=bBui7x4VvKl{4-5D8^1zfP8^@}6D)S6Mhne}Rxo#qdgM%d=2ePhNf~u8`f7E= z_BeS5clTv%WUfdiKnWsjA6oqxYjHeMhW!~LL^XT2QbXT3_%yK5s81}CoT zGNJ5jW1pr}uXWAF=Sz9LStIHc)PjQgp{&#utKI_Q7#869{Q=|FFI-%N3N;E$YI@!Z(v@JmNoLLXJ%pO3Y@d{|C@C%Np9^p(Q8J0)*&67d zj(nD~9zi%rBH=542*W}y6cnygFaZ8j8|H&hirO=rR^bOV%ZGD)`qEOXp}*qUL5;&* zUwW`*9or)?t^uIlOwWqsJ`$U|NN%oMfdlCBiDwjAyNU)Els}_L9wNT&eggsw{X*HG z^nG2JKbfw%ZbjFwy)bTz!JqQOx~4Iq>W*FeJwc|eZiZUXhs0KI+m7cA9u<4tvQXnJ zw^Wij2&Vvit+^-=T15?U^4ZUz*c_cer_Qy?oE#3VA`Om7Ho->NkkR8HcDD^~`$h%> zL&H#NgQ;8Lyw~mxKIrq=SzcwDP>@uAPc%dmzCs4iif<`#gaTgTJGi!A@FD@|=;%tn znPo0bwp{a)7XD5x{_Ko((;rwRy|(>6P3?30=a7Ll_F#S?IFaAw77~u)<_5bD&y_R} zxRHP#ds@D)DQt*C98-2H52mubUd5L)M3{rmtmPSU{2Q7JiT)S*vSE`WUr1%`n)IJC z@6Xpt3IU$=M3R$?Zn!X@KS$~C_*Z&--pk|ux216{ts9Z4ndgfK<*}V>^WF_$7Z8g5h5V9uX0(z$PA&gF6fcYT;ei;d2KGzrX3fcr(XLxGHW>$# zab}pZIA^?DAlxc49LTt?U1IA0bN!AoUEpMnbw`o=2NdCo;Y3I9wsYEfXALx2uT$zYu71-c2ygC9QE{^I**it(c24o9TuZY~i96^F^3!TTGU+OXKO1?*+}p@{j^hEs3( zXbZ|@5~o;-IWFDT7w)T)aJFIvthhg^_(bX!Q8+W|ylUn9g%UHQ>cb4_wJz3<8*L^$ zc83T6?FVwiVfJ&!ZqU5;Sip|Q(-!ksH~Cb1lDYoaRYpSpLliamzESe(r636WNWS9U zcY8qjKXragLjo1Mm5q&zni>TI8NQ>F6J?9+yk@3umcOriolml;e&f19!r2889Mwp~ zT!a_Us~(w~2>}I2MSf>N1H)U+8B^fK^T_Y-*V=cVj|Da8DEvx4&qTce?+h@_QvUZ2 zjm2OvkLiMMj2Id+J&7&R+!C+eE+)UZfV4x)ZUCsiKbg_6{J36>OjeK}>|e*Y@ZzUP zm(#_V8T++a`xdIr4Nbj^H*N(BlZ8!dzTi+E46s9xbPZz^5qBPV^Mi>Mm~C|YlWwP3 zeM8$j1H$IsryzA%#_mIcFtqAvS=%F$4#m{S>2qd_g``+H`pETodvl6@~AV6_+boANkRd<^Q)z;M3 zar;BD0Lwnc;9t}~L9G@am(Nto6cK4^xeY?F5M{aBOraX2VKU%}xwe&See88&vXWVD z&OI?9brSe|f9fD~6`!_%nl^-DlP-8)cJgmi&8e|hCVH~cAp`{l(@KVprZhA)Ss}CQ zgUOLi`{UFzu9^fzx%$^sb9V#N6CI0AQ4!uF>vU^LCmLWmn{Y^M zN@)G{;dl*xU#?|I08ug|f%k_Nqu)0007rbF+xwED&FO=LAqR-#Lh}c2$#Kpx$@9g3t+z3wwkIo0uP6 zvProDE<<3=uli1Z|4Dtb-hd06%Fj0lb>e;U^1)q1mcAN~*^rmarDW5elm|8I@)eLE z841$y8T%Eqw-2;zO>y562|PoBT$L%V8Ao6x1wN7y0q~KlB!ooJ8IKn*0W@Ur6qI)0 z)w{VRKBwzLj{b-9>MIpmS1%pT@fE>QoYux!-6Bf2cYh0OZPaor`NEK-h;uP>rq+mx z!(Al0(!|uD?7!LWirv1hVET%4)?4!H*K%xw*K(*jjA(=B8Q<^mklkkjKh<|)Ex;>0 z(|RpZVDXqnWvv)!6=L*R%DX6ZpADFZdP*6?n7a7UvazYD38rZIFxH3p>*^+$yRUET zGZFmAbmX3b%epXiH+bS>-K?~i@xovkO`3~QPM3JE>LkCeY1z`Xnu&lKJ|qM%}1 z$`WO2SicPWP{7pZZHYw&46JU(gBk_Fd1p>*l9$F~PbY5>koRDj@!l1;t!E+bbm6`! zB!J5X+Z-3`RiK{zig45IRG-*aV0D^p&5qW{P)-x!z4LRh^a0>&qjY(|YtyK)6lpO# z(rtM$9qxU`d|t!Ba@IUwy51T}h#56@V3$&Rw;I${-v`j5d> zz#c|1^^!LsG)d~CG5=1>$y5+FcW(b5@z&r4Bayb6=%@kLm#KgPCLYt(^EyJD)(`10 z=NYkdC5JgOE+Ov_L9MXwz7j_z)xxz+KB~zjc~5U8?lJow6r9kpT3~MyhR}ln3zI*m zit&Ao%0cFU1^|57yT=-SbwHx4gFfkRX3=|UaU|Qjw>pT$I9xXk5v8nxXza+9g<7tz zj8RtIL33chUEUUQN0BG9GaK#W$k;N+s|y`6qQ+Zci8dzB_-|80v{g85;MIQB;SoPV z{KuFn|zZ#fuicGZH zq$qnO3%&|&t+D!ZAZ2t!-ziNmX*tFM7`eYS+EDT36(5kC{U;g78!T4JDf6iFVvL%B z#@z!RL8W7+4HsTJkPx`vVICEq2cs z!gw#%X&fyoU^%Ylbzb~{l%UDR0rAFp81-VE*&)6@j2el^8j2o4QZ;jtBY}+na2HqC zu6S1{eRY7rYetm^78~w8EPZAm=Y8H`JWIT+&ZvCh()7N8APM#c^QS z!3z}mx8UKz&F+(&&;bL_yJutousCf;M*}cm`xz(?Sg!v3r9eoN$MV2%fmtiR7d)o- z{(qM#vIQoUm$MvdG!S%{S)fdgkpB9voes{-gBelHtgr%aNs}XP>H8TF`$9IEgA|yE z0O(F|kBrdz!Qz#=UB%808fe{L?uId&*htH&CEh&NMF-OaYGIqsq70Hg3?d>TTwGjI z8wt^$OI)cG-$AeY(R@LSA%2j?S96W=I{1&Co?8O;_Zt~X*nW<2+;~{ln@8!J z9IYF#l#2t@kR)Y}ZnP#ItZ*bumk~I*BE}Dxvy{@)Z$VD9bFv--QN`Llj*gCLqZ^GR zaiIgLqAo;gxk^VKuTjs{#59b-L9!SPXMDyVeK>$1HshAZbu?%5{I6O{4`^EeJc%kI z<^s|f0m$yDSqI=tzdh2xWG@hLV}HuFYj~La{Nf@!BEl~q06{~7S7Iu|e&fdwcJ%X( zl;*ghL*Kd^a3Z{P^-aLN@$i)`mu{f$=jM=;g2ABObO3@J^xF$uV1!uhrF77ZA19fq z?|Fjr3~IJF3-KmQ$HGHnpAyb4a9Lac&-lTc#Q4xw5vq88nZtgo(bm_$``}4TX?i*f zvqWOpJaws9LvmanMQAv8??uLbRJf+^oq*NS&_LjlKL<{2;ZYXg zq5}IxLqh{}Lefh5>$g1sKuftw9d6qv^bBOOTEQMa$H+b`SM8Q2`E`D_m}$Hm>c(cz zsvf$mtV#eI3eavE8Y}a64Ze}(sz!~Y7v%Y``6e$uLBW73^C1FCdWE<-wCq%cZor7p z!+4#duD?gC?W5VDr4V4V-UkEVk7hJl?&TfDZ7GqxlNLVU^xx@4?Y(s>pmlb4;agBn z#N725jugbvR74}gW4q=^x}rIBpiU7LC{L;8y97 zLaPb@I@dTo998DCOTQck{vWIB2(5*rqUAq)4rc!c_qaNac>6G58ynStkP|p`A!l(zf6BzRHUfWX*yeRnkOY z$ulkovJ^H>PF6|D1)CO#R4vz6cF_O6;-23FK9{-cK17Hc-b)dp067JP?+}0n+2#hf z!pc1{bzw0vR6BKN<9bcadU?OJ+E3SZX+#F4dq*;M%eH4~GIMgeHmjiG&1`DAJ5yuV z4fWqw#SPN{ythwCNT6Xsf_5etHy#4e*Vq5$^>a(JP>0hV+F~{9E%yB@)~Zr+uRpw{ zQC1c(kRU`nWt@^EsaU+ZDdCvvALX<@m|j&y2`z1Z9Q+Jl`1OmRVXjzi^}X`(_l@&u z!}q*;p~6u;JhC^X>;NwY_GUJ-mbZY?cL$M6rW>dxhMHyE3^4ytL@xgwio@RNx?2+a zy9!op{AK#1X}K^Q&852@v*D$IlXrO|TL_s}n3RSF)s|}mY7Gg{($bb{J^JzE2YIM2 z1g=rdOn7uO<#A7NRvl#EtDSs`KW7zbcK|Zfo8ynOXx_NB!{~D~`ZzuRj_5=}t7 z?+SYk2O$gyOxWOLfR2t1P+PtY@sfm;^ix-($+)Pol@$RYA)(2W!BAx2PrSe38nUtlarAft5p1&N4 zRzhS&`8<+30B*|9k-{E#F(-o^Y%e$OGb+<6g_7AS;0R=#6&o1xXg#8Oq+9*^$wBnr zZ*LyRxp*9;=R)%=(?feTZferC;V#t|T=_q;^pK!{%mmNSa7K7od4=P{zTVz; zUArdsnBTG7x*s8Gb>=J_jp6F8Ei5b`fuI1aR=~%b*Y}{fCAlrr6O^2he$xm1>8&?L8t&YB&Y;_K{8mTJ3dcd V{XoklQ~}WE)eEKP#m|iV{tt_1WHSH& delta 7272 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 E4>pV*<^TWy diff --git a/vorestation.dme b/vorestation.dme index 1f4cc0a7cfa..2aab0a43dd2 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1008,12 +1008,14 @@ #include "code\game\objects\items\contraband.dm" #include "code\game\objects\items\contraband_vr.dm" #include "code\game\objects\items\crayons.dm" +#include "code\game\objects\items\falling_object.dm" #include "code\game\objects\items\glassjar.dm" #include "code\game\objects\items\godfigures.dm" #include "code\game\objects\items\gunbox.dm" #include "code\game\objects\items\gunbox_vr.dm" #include "code\game\objects\items\latexballoon.dm" #include "code\game\objects\items\paintkit.dm" +#include "code\game\objects\items\pizza_voucher.dm" #include "code\game\objects\items\poi_items.dm" #include "code\game\objects\items\robobag.dm" #include "code\game\objects\items\shooting_range.dm" From 041db96898fa844e4de22a69fae1b07ca24802ed Mon Sep 17 00:00:00 2001 From: drexample Date: Sat, 11 Jan 2020 23:22:18 +0300 Subject: [PATCH 2/3] WE ALWAYS DELIVER --- .../objects/items/{falling_object.dm => falling_object_vr.dm} | 0 .../objects/items/{pizza_voucher.dm => pizza_voucher_vr.dm} | 0 code/game/objects/random/maintenance.dm | 2 +- code/game/objects/structures/trash_pile.dm | 4 ++-- vorestation.dme | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename code/game/objects/items/{falling_object.dm => falling_object_vr.dm} (100%) rename code/game/objects/items/{pizza_voucher.dm => pizza_voucher_vr.dm} (100%) diff --git a/code/game/objects/items/falling_object.dm b/code/game/objects/items/falling_object_vr.dm similarity index 100% rename from code/game/objects/items/falling_object.dm rename to code/game/objects/items/falling_object_vr.dm diff --git a/code/game/objects/items/pizza_voucher.dm b/code/game/objects/items/pizza_voucher_vr.dm similarity index 100% rename from code/game/objects/items/pizza_voucher.dm rename to code/game/objects/items/pizza_voucher_vr.dm diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index 8254b33e1a5..4ee11fb8cb5 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -107,7 +107,7 @@ something, make sure it's not in one of the other lists.*/ prob(2);/obj/item/device/camera, prob(3);/obj/item/device/pda, prob(3);/obj/item/device/radio/headset, - prob(5);/obj/item/pizzavoucher) + prob(1);/obj/item/pizzavoucher) /obj/random/maintenance/security /*Maintenance loot list. This one is for around security areas*/ diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index 8e603d913ac..fd9a0bff511 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -131,7 +131,6 @@ prob(5);/obj/item/weapon/storage/backpack, prob(5);/obj/item/weapon/storage/backpack/satchel/norm, prob(5);/obj/item/weapon/storage/box, - prob(5);/obj/item/pizzavoucher, // prob(5);/obj/random/cigarettes, prob(4);/obj/item/broken_device/random, prob(4);/obj/item/clothing/head/hardhat, @@ -213,7 +212,8 @@ prob(1);/obj/item/weapon/spacecash/c100, prob(1);/obj/item/weapon/spacecash/c50, prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie, - prob(1);/obj/item/weapon/storage/box/cups) + prob(1);/obj/item/weapon/storage/box/cups, + prob(1);/obj/item/pizzavoucher) var/obj/item/I = new path() return I diff --git a/vorestation.dme b/vorestation.dme index 2aab0a43dd2..259c045f33a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1008,14 +1008,14 @@ #include "code\game\objects\items\contraband.dm" #include "code\game\objects\items\contraband_vr.dm" #include "code\game\objects\items\crayons.dm" -#include "code\game\objects\items\falling_object.dm" +#include "code\game\objects\items\falling_object_vr.dm" #include "code\game\objects\items\glassjar.dm" #include "code\game\objects\items\godfigures.dm" #include "code\game\objects\items\gunbox.dm" #include "code\game\objects\items\gunbox_vr.dm" #include "code\game\objects\items\latexballoon.dm" #include "code\game\objects\items\paintkit.dm" -#include "code\game\objects\items\pizza_voucher.dm" +#include "code\game\objects\items\pizza_voucher_vr.dm" #include "code\game\objects\items\poi_items.dm" #include "code\game\objects\items\robobag.dm" #include "code\game\objects\items\shooting_range.dm" From 7344a6f953cfa631d7c014f3836a4a232c729308 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 12 Jan 2020 22:02:04 -0500 Subject: [PATCH 3/3] WE ALWAYS DELIVER!! --- code/datums/supplypacks/contraband_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/supplypacks/contraband_vr.dm b/code/datums/supplypacks/contraband_vr.dm index ae0edc071f4..e5e1d256988 100644 --- a/code/datums/supplypacks/contraband_vr.dm +++ b/code/datums/supplypacks/contraband_vr.dm @@ -28,7 +28,7 @@ /obj/item/pizzavoucher ) name = "FANTASTIC PIZZA PIE VOUCHER CRATE!" - cost = 40 + cost = 60 containertype = /obj/structure/closet/crate containername = "WE ALWAYS DELIVER!" contraband = 1