From 3fdd863afbb70eb2d5c11c6505782cd2357084b7 Mon Sep 17 00:00:00 2001
From: Rykka <sorren15@gmail.com>
Date: Fri, 21 Aug 2020 05:42:43 -0400
Subject: [PATCH] Fixes conflicts with incoming Mirror #8756, Re-enables ecigs

At this point, ecigs have been arbitrarily disabled for who knows how long for... no idea why, honestly?

I've added the missing .dmi and re-added ecigs to the .dme, in the interest of not conflict-fixing a million problems with vending machines.

E-cigs will need to be added to loadouts manually later.
---
 code/game/machinery/vending_machines.dm |  30 ++++--------------------
 icons/obj/ecig.dmi                      | Bin 0 -> 2290 bytes
 vorestation.dme                         |   1 +
 3 files changed, 5 insertions(+), 26 deletions(-)
 create mode 100644 icons/obj/ecig.dmi

diff --git a/code/game/machinery/vending_machines.dm b/code/game/machinery/vending_machines.dm
index 63bf32947c4..5cd055c5a54 100644
--- a/code/game/machinery/vending_machines.dm
+++ b/code/game/machinery/vending_machines.dm
@@ -133,16 +133,12 @@
 					/obj/item/weapon/reagent_containers/food/drinks/greentea = 15,
 					/obj/item/weapon/reagent_containers/food/drinks/chaitea = 15)
 	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10)
-<<<<<<< HEAD
-	prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 2, /obj/item/weapon/reagent_containers/food/drinks/tea = 2, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2) //VOREStation Edit
-=======
-	prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 3,
+	prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 2,
 					/obj/item/weapon/reagent_containers/food/drinks/decaf = 3,
-					/obj/item/weapon/reagent_containers/food/drinks/tea = 3,
-					/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 3,
+					/obj/item/weapon/reagent_containers/food/drinks/tea = 2,
+					/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2,
 					/obj/item/weapon/reagent_containers/food/drinks/greentea = 10,
-					/obj/item/weapon/reagent_containers/food/drinks/chaitea = 5)
->>>>>>> 4a56ad2... Merge pull request #7449 from Cerebulon/vendEnhance
+					/obj/item/weapon/reagent_containers/food/drinks/chaitea = 5) // VOREStation Edit - Lowers Coffee/Hot Chocolate/Tea Prices from 3 -> 2.
 	vending_sound = "machines/vending/vending_coffee.ogg"
 
 /obj/machinery/vending/snack
@@ -152,15 +148,6 @@
 	product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
 	product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Get More with Getmore!;Best quality snacks from Centauri Provisions.;We love chocolate!;Try our new jerky!"
 	icon_state = "snack"
-<<<<<<< HEAD
-	products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 12,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,/obj/item/weapon/reagent_containers/food/snacks/chips =12,
-					/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 12,
-					/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 12, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 6)
-	contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,/obj/item/weapon/reagent_containers/food/snacks/unajerky = 12,)
-	prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,/obj/item/weapon/reagent_containers/food/snacks/chips = 1,
-					/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1,
-					/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 2)
-=======
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 12,
 					/obj/item/weapon/reagent_containers/food/snacks/candy/gummy = 12,
 					/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,
@@ -219,7 +206,6 @@
 				/obj/item/weapon/reagent_containers/food/snacks/cb09 = 10,
 				/obj/item/weapon/reagent_containers/food/snacks/cb10 = 8,
 				/obj/item/weapon/reagent_containers/food/snacks/tuna = 23)
->>>>>>> 4a56ad2... Merge pull request #7449 from Cerebulon/vendEnhance
 
 /obj/machinery/vending/cola
 	name = "Robust Softdrinks"
@@ -319,9 +305,6 @@
 					/obj/item/weapon/storage/chewables/tobacco = 5,
 					/obj/item/weapon/storage/chewables/tobacco/fine = 5,
 					/obj/item/weapon/storage/box/matches = 10,
-<<<<<<< HEAD
-					/obj/item/weapon/flame/lighter/random = 4)
-=======
 					/obj/item/weapon/flame/lighter/random = 4,
 					/obj/item/clothing/mask/smokable/ecig/util = 2,
 					///obj/item/clothing/mask/smokable/ecig/deluxe = 2,
@@ -336,7 +319,6 @@
 					/obj/item/weapon/reagent_containers/ecig_cartridge/coffee = 5,
 					/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico = 2,
 					/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico = 5)
->>>>>>> 4a56ad2... Merge pull request #7449 from Cerebulon/vendEnhance
 	contraband = list(/obj/item/weapon/flame/lighter/zippo = 4)
 	premium = list(/obj/item/weapon/storage/fancy/cigar = 5,
 					/obj/item/weapon/storage/fancy/cigarettes/carcinomas = 5,
@@ -351,9 +333,6 @@
 					/obj/item/weapon/storage/chewables/tobacco = 10,
 					/obj/item/weapon/storage/chewables/tobacco/fine = 20,
 					/obj/item/weapon/storage/box/matches = 1,
-<<<<<<< HEAD
-					/obj/item/weapon/flame/lighter/random = 2)
-=======
 					/obj/item/weapon/flame/lighter/random = 2,
 					/obj/item/clothing/mask/smokable/ecig/util = 100,
 					///obj/item/clothing/mask/smokable/ecig/deluxe = 300,
@@ -369,7 +348,6 @@
 					/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico = 15,
 					/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico = 15)
 
->>>>>>> 4a56ad2... Merge pull request #7449 from Cerebulon/vendEnhance
 
 /obj/machinery/vending/medical
 	name = "NanoMed Plus"
diff --git a/icons/obj/ecig.dmi b/icons/obj/ecig.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1b6dde8c4bff2ea09453a90b981aa7a55939e15d
GIT binary patch
literal 2290
zcmaJ@eK^x=AOERPR3zzz`sIldg>!mQ92+6wkQkMh=8784>u`p~5526?lZsx=sOF`@
znqp}uo6r<Pc{?pkh7D(!VPkL4I_F%^bM;*3^v8YQ-|PO~*Z2BdpYQkcx$eu}Ual*&
zHfR9=u)^(-vybXzs8-=p4b>iC78<NNSSg5O3C^eDLopGt2@x^T0FXqex=zu0W3BJP
z8?vxW{P&=T#mlf82BU>aT{dY&c;L-KiFoB;VO6(F|I7eEx(S;ROtH#t(lMp41A{n@
z#)0MgX|HUny$_k9%Huo@L61we8_Z0KF`gV#LRYJ%nJ%h({P{BPrhQLYZk$4g%q7d%
zOYhazbbmzU9V{fM<L^0l&;77G_57k!nWS~J9M{u*mkp{P84yK#Di?f7Rq)R8)R~It
zmK^~RV1!#<TOn>f$I9C%eh7b)qgEDI`g`xxtq%a8IpF5(h)5y`@{!?wiAD^%>+{&C
zGaXm2REIA+{t$Ci&pvXkdrDKR?vTgOTu9{oT<y^Z5kp!g+ry~{zGK!>y-Y2n^SMt>
z=LZ@|a2?S>OY_q%qKUl(NHS~PdaVAp8Xn<ntsPG~{}YRmIx$J)@Cf6t`zD1Nnwshi
zbI}VBNZ+~yC^iPHSE!{&ECqgc0zx({0y=boyB7h*Zi<HYV?<DqPh6bBOC~|PMXDjp
z*YvcvZ)UMr4}~TJRDq7i4mC+u&mwvhr2j8XZ!`Vg2TpirXA*^Sq_qHUH9I?dV#xI(
z2suEx^huX_x+68Z&(;)KgDFZ#Of-F!B$LPs#FHHGz2Sn^z#Z%WBjd5M_y{ab)}ajA
z`CyTmL6&bNk+^Bqs!z44XHRA^v*DIdmsQ4<#)s&rs5Pr@WMpI<nzkNbf+bKI3WYLD
z4h?-2RD*G`wY5bUWP^~Af?<_$`h7MCx2y^BiV{kM%r83n4*qMiL1md*%Y{ZVl76C#
zeyZ8PPkC*l9YW4#(r+uC^sBq42s=I`O_$^}4<qDJQBhCQR`qd_7EmEJLq^Si@wIlj
z>;`O^#vwZ#`2W0phth9StI<GTUup%7X0_)Lg?sR<T=G=RG;qLT3(#i*Oq*|eDvWw2
zJ+;~6Ot2O70CJ|geuOFVJG;uSaE}&WnV5iKn|ETLl!H(bGz74fEwtidzaL>~{$peQ
z%~MlY%+$d6Wlx=O<t}ncm9Pg6DaaTBJKtPYt{>c<-p?}Zt(Ie(D7=;K!F}fIH^K7w
zgQ;}?C35?X(PF%(@3>MriCi5FSMU|>p+{0|Vq$fuJ8lkVMdxY{H&6F>bB2a0>zr-q
z#dLZ}y?y1$8@<*1t?RcRZX%-a!jg7yOv^f6l<I5#G+IHD?<$ay@lz#T$V8y$GcE>-
zMI?&0jneyb=;I8O#CMEr4hUE!f;M&?6X^o5^A3M5Xgrq<4*_21*}SB}_l-qFr+Grq
zVZ5D?TRK(;apyGrly=zB3Z)2(<`&Eb7mlL(Wm$N8XxCd~oy=-z;U4O<tJCyv?@iC3
zYBeF630Vd!9%)0aySX;)Lm-6exgLpwoq!507#%eDoMo<+$H%;w3W*r^!;US(mm6&8
zZL8O8`ztE;$QeJJB9i_pdqaXxu&nf^;=j^IxMZ?W8EQE%J!?z2RBD8iRn5jjDlKs|
z|0|(y`u(lC{w@_ZrT`>~@|w`(J9fo3W&5tecZoF_<ngwR&9sX&ml6BD^YH;PN*}nn
zT=Yfg%H-gby%rczO~dSs|J{a;j2KFflO#!)bC^d9Thy;#n4gl=bCZeEh>rDDED#T$
zIhI@2f@gv&+eE#CjafxSMK10|H+x0z*bO!+&3GS8-@(E&k@mZ6IE`6r{cIq8s7oy@
z(cM}R5)>oa&+{4o+OBONJP#fX4FE3+aI#26fMl_HJE!A|*K*kXck@$@a<)jgM^5C`
zRL}j=#ezD}ZJiBpG@!W0dwr+%eKpnpY5x35Fu*uJ*y)U-ZrH*Esv~mXBLBB<Nwp6g
z1uaSj58fm;oXqY6`C89-a{N{vmq%~u#Yr}Yw=sL>$j52^D%7~d>9B`+9G=f)j*t1R
zu)(hElVZ&Uqs`4Kg4(X}lD(V}d!cf9uS%u$Vl~F@zoY#xzxz&#qH+DLip3~tsP-S!
zf1YFNIo#*fbE$%CBM0`M!R|G0z<`8FB)V&)p34Lq!38brRDW(w5vud6Vdz7p77qTJ
zMT1lxc|q%XQ6ra$^aG9u{*)%mSll!?DCE+OOL3!yf{(J%yX?V0a&;E^gNWK^v-#Gm
z`qMq+R2h1>U{>XmJ*qqba*u)i8fde%f4e<YH1Vu68+$*PJ|`sKg1S{6wNO!;yj9pJ
zRdhcUV4@!r>4I9d`8jd$pJhgMX7+~P{sXkmObk$dL4^bj|EIBC&5s9~Ea!12q{gLh
z)_m9Oavn<;0|<}P6FPwI#m;`P(A(@~Z7uA;xkIFB1#sa&U3nnYtGn#@7H8ndCH-_>
z@<fRzsx$f;pnFU8I;1XB-Ad3$!(x4EYu>iz+bNG#hP?yX*;@qXwFXkox#z${RzWYP
zMov=hlBVI$)Sf$bAuoL(>izC(c}HxtA7c_B(3j2$Xo(34on>$fl1fcLT+V$Jrp`=;
zSTnXYdFRfZ(Uy^lg@u&;iDS7}uU>6xXgJ?ppT6804Ro~1CT2!Eh@g|6&V-UbHa7Tv
zF-4be+Ro>f9#xH&Wn^0VzI%HB9)Xuk>`42x*jw8t4g%5x>i%i2WZD{b&zE9-%=xNM
O4B+PC<y>(fB=bLot$B|C

literal 0
HcmV?d00001

diff --git a/vorestation.dme b/vorestation.dme
index dfb286d6722..9757d55bc1c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1198,6 +1198,7 @@
 #include "code\game\objects\items\weapons\clown_items.dm"
 #include "code\game\objects\items\weapons\cosmetics.dm"
 #include "code\game\objects\items\weapons\dna_injector.dm"
+#include "code\game\objects\items\weapons\ecigs.dm"
 #include "code\game\objects\items\weapons\explosives.dm"
 #include "code\game\objects\items\weapons\explosives_vr.dm"
 #include "code\game\objects\items\weapons\extinguisher.dm"