From 23d33051fb28e3ca4fd99ab55c83d9f9d459e6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Sun, 21 Feb 2016 13:19:18 +0100
Subject: [PATCH 01/14] Beep Boop IPC booze

---
 code/modules/reagents/newchem/drinks.dm       | 114 ++++++++++++++++++
 .../reagents/reagent_containers/food/cans.dm  |  10 +-
 .../reagent_containers/food/drinks.dm         |  13 +-
 .../food/drinks/drinkingglass.dm              |  18 +++
 icons/obj/drinks.dmi                          | Bin 66265 -> 67286 bytes
 5 files changed, 149 insertions(+), 6 deletions(-)

diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 637b101f32d..6ac0f02b94a 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -62,3 +62,117 @@
 	result = "jackrose"
 	required_reagents = list("applejack" = 4, "lemonjuice" = 1)
 	result_amount = 5
+
+
+// ROBOT ALCOHOL PAST THIS POINT
+// WOOO!
+
+
+/datum/reagent/alkasine //Gloriously copied over from ethanol
+	name = "Alkasine"
+	id = "alkasine"
+	description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
+	reagent_state = LIQUID
+	color = "#1BB1FF"
+	process_flags = SYNTHETIC
+	metabolization_rate = 0.4
+	can_grow_in_plants = 0	//Alcoholic drinks won't be grown in plants (would "water down" random seed chems too much)
+	var/datum/martial_art/drunk_brawling/F = new
+	var/dizzy_adj = 3
+	var/slurr_adj = 3
+	var/confused_adj = 2
+	var/slur_start = 65			//amount absorbed after which mob starts slurring
+	var/brawl_start = 75
+	var/confused_start = 130	//amount absorbed after which mob starts confusing directions and sparking
+	var/collapse_start = 200	//amount absorbed after wich mob starts collapsing
+	var/braindamage_start = 300 //amount absorbed after which mob starts taking small amount of brain damage
+
+
+/datum/chemical_reaction/alkasine
+	name = "Alkasine"
+	id = "alkasine"
+	result = "alkasine"
+	required_reagents = list("lube" = 1, "plasma" = 1, "fuel" = 1)
+	result_amount = 3
+	mix_message = "The chemicals mix to create shiny, blue substance."
+
+/datum/reagent/alkasine/on_mob_life(var/mob/living/M as mob, var/alien)
+	if(!src.data) data = 1
+	src.data++
+
+	var/d = data
+
+	// make all the alkasine children work together
+	for(var/datum/reagent/alkasine/A in holder.reagent_list)
+		if(isnum(A.data)) d += A.data
+
+	M.dizziness += dizzy_adj.
+	if(d >= slur_start)
+		if (!M:slurring) M:slurring = 1
+		M:slurring += slurr_adj
+	if(d >= brawl_start && ishuman(M))
+		var/mob/living/carbon/human/H = M
+		F.teach(H,1)
+		if(src.volume < 3)
+			if(H.martial_art == F)
+				F.remove(H)
+	if(d >= confused_start && prob(33))
+		if (!M:confused) M:confused = 1
+		M.confused = max(M:confused+confused_adj,0)
+		if (prob(20))
+			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+			s.set_up(3, 1, M)
+			s.start()
+	if(d >= collapse_start && prob(10))
+		M.emote("collapse")
+	if(d >= braindamage_start && prob(33))
+		M.adjustBrainLoss(1)
+	..()
+	return
+
+/datum/reagent/alkasine/robottears
+	name = "Robot Tears"
+	id = "robottears"
+	description = "An oily substance that an IPC could technically consider a 'drink'."
+	reagent_state = LIQUID
+	color = "#363636"
+
+/datum/chemical_reaction/alkasine/robottears
+	name = "Robot Tears"
+	id = "robottears"
+	result = "robottears"
+	required_reagents = list("alkasine" = 1, "oil" = 1, "sodawater" = 1)
+	result_amount = 3
+	mix_message = "The ingredients combine into a stiff, dark goo."
+
+/datum/reagent/alkasine/trinary
+	name = "Trinary"
+	id = "trinary"
+	description = "A fruit drink meant only for synthetics, however that works."
+	reagent_state = LIQUID
+	color = "#adb21f"
+
+/datum/chemical_reaction/alkasine/trinary
+	name = "Trinary"
+	id = "trinary"
+	result = "trinary"
+	required_reagents = list("alkasine" = 1, "limejuice" = 1, "orangejuice" = 1)
+	result_amount = 3
+	mix_message = "The ingredients mix into a colorful substance."
+
+/datum/reagent/alkasine/servo
+	name = "Servo"
+	id = "servo"
+	description = "A drink containing some organic ingredients, but meant only for synthetics."
+	reagent_state = LIQUID
+	color = "#5b3210"
+
+/datum/chemical_reaction/alkasine/servo
+	name = "Servo"
+	id = "servo"
+	result = "servo"
+	required_reagents = list("alkasine" = 2, "cream" = 1, "hot_coco" = 1)
+	result_amount = 4
+	mix_message = "The ingredients mix into a dark brown substance."
+
+// ROBOT ALCOHOL ENDS
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index f22392fe2aa..b8c742dd73c 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -223,4 +223,12 @@
 	icon_state = "sodawater"
 	New()
 		..()
-		reagents.add_reagent("sodawater", 50)
\ No newline at end of file
+		reagents.add_reagent("sodawater", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/alkasine
+	name = "Beep's Classic Alkasine"
+	desc = "A can of IPC booze, however that works."
+	icon_state = "alkasinecan"
+	New()
+		..()
+		reagents.add_reagent("alkasine", 50)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 663158d0757..7597dfe1058 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -31,10 +31,13 @@
 			if(istype(M,/mob/living/carbon/human))
 				var/mob/living/carbon/human/H = M
 				if(!H.check_has_mouth())
-					user << "Where do you intend to put \the [src]? You don't have a mouth!"
-					return
-
-			M << "\blue You swallow a gulp of [src]."
+					if(!H.get_species() == "Machine")
+						user << "Where do you intend to put \the [src]? You don't have a mouth!"
+						return
+					else
+						M << "\blue You pour a bit of liquid from [src] into your connection port."
+				else
+					M << "\blue You swallow a gulp of [src]."
 			if(reagents.total_volume)
 				reagents.reaction(M, INGEST)
 				spawn(0)
@@ -45,7 +48,7 @@
 		else if( istype(M, /mob/living/carbon/human) )
 
 			var/mob/living/carbon/human/H = M
-			if(!H.check_has_mouth())
+			if(!H.check_has_mouth() && !H.get_species() == "Machine")
 				user << "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!"
 				return
 
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index caab1e519c1..904619950da 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -564,6 +564,24 @@
 					icon_state = "patronglass"
 					name = "Jack Rose"
 					desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
+				if("alkasine")
+					icon_state = "alkasineglass"
+					name = "Glass of Alkasine"
+					desc = "The equivalent of alcohol for synthetic crewmembers. They'd find it awful if they had tastebuds too."
+				if("robottears")
+					icon_state = "robottearsglass"
+					name = "Glass of Robot Tears"
+					desc = "No robots were hurt in the making of this drink."
+				if("trinary")
+					icon_state = "trinaryglass"
+					name = "Glass of Trinary"
+					desc = "Colorful drink made for synthetic crewmembers. It doesn't seem like it would taste well."
+				if("servo")
+					icon_state = "servoglass"
+					name = "Glass of Servo"
+					desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe."
+
+
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 5bb37da57df25ed3d312dc805502c8530a5b6b4e..1089fa7430f85fcf7c3bcfb7b7bf3b77852c57f4 100644
GIT binary patch
delta 10036
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

delta 9008
zcmZu%WmFu&vR>R>gF|o$BxsNz!QFzpySohu8WNm9u;35~4q4nua0u=Y+*#ar_igU|
z@&4R7b7sy=_e@t;bye5*b<f44E=HjyF(VPxu^^#Qc80m1`$5k~Vy<H*^7P=yw$48J
z-?SF48w}CbmVk<JD73QUHZ#ThRZ21kdjtx8IJuUyw$?}TY9oxsC0Mm9T1_n2$eotU
zjA!m6*r;;wWLEo!Z|fjgaM8OggAPS9-AH9AMhg)vB?j;D=GzCTrwHSy(%>65#-sZX
zhP}#$30P;ay?qxXXufUE3`ebwtc5i0d4cdRdyFLocVHm@OPJR+!EY(w8w@6-)O4~{
zxoK3v$(Mz!;vWw2g?~=Iw2JXf|Bly^TAv5&ZfKI^DWoMrj;||hNYt6X@H{l4Qg^YO
z?-yG0he!N-BX_FbPRlv4;kBvg=^G}T3Fbn7;kicw2?aO#yDK|dhS6m{JFu~_t+TyM
z@3<)et}qf{7Sgt$2O^4+NNn?E&0`JEmIeQxYu`x2u4ls@sA=1lthgXwi50SN#smnd
zFnMm6do|nSpnGCxyUpj@4=FBHR{7rfGnYNFWd+p!HIbQ_L@G-3N}NUqZ2ABn!|=#R
zs%wOdr-9qUmPRp~Skz6c9*sJle<?;Jx?&-aypXf32ZX0F(k(R!*WKC8KI&h63k}Y%
zEu)~q{XJ(ImniMeLKQ!?u=2Uf58{gzlohS_Ff>cg{T(D#pvjKk+j+1xIx6u4cxX2R
z87(h?99&#hj@m*ue9{nlP4v?R<!iE&V*g^0B}3vQ?bzN8hNN{FwHv?!*4m{FZ2+Ik
zYyRSe^Gel&fKW}kE~~Str*rMh$+POwwfh7Y_;CqRF!TqaseKkZ@7SMtRV88GzV&KK
z*!DSo;(1l;s#WF^ar!Tt7bfdJB`9Lr$HgQdwQt8}q2+5{rC7@KWr{cw*K|G@{rklC
zn)Y*7$g6CjFr};@rWz~4^Py;f6?T6>t}TJ@QQ{2~PI1+OXd;EnOsX9E3)Y_e;4v8Q
z$yEID<FX;}av;aQ=Uqq#APtuBoJmQ|8^YtC7&uYhI#};YcJU61#|Dvh*vSt4DsbHy
zF&P3sH<XpJd;@b3OtxTHEM>;RDMl%K<G_pbi(x1G7m2~$(*U8%P8I|(S2C@~J7kGy
zIP!}8%-#|JN_@DYjaa-#2~fYVFe7A!7UtMwr;w_SAgkh*Wx1A6nna>VhtOe^<@kta
z)uy<r*JvS0@$M5OXrM6;DVWgh_9*1#-<3|MxGHN0>_t?Czy}}&d#1^R9V)yXKHYl8
zTnR6nIxDOmTC7F(Dy@NXlSjw;u>(N`QV^~mTiWQBh9BXp1>pAQq|<@K?*UD%{{9bE
zZqTO$>AjpBc}!VSekvs}2PjSV4X28b1g8ooJ*`g{j-1ud=!<T_Lz=1IYPN%ebwfgB
z^E6s`Qm=9~0ZKp}90rJB4CQnGy`ldukv#D_;PeN}cA~0+RSJ-uBKKQ3#KM}R`$F_G
zd?19cbng)S?NcCs*^s-v4b%JZfxq77>Fo#a*<5IG3|f84o3Ex+cBV>HZl^iQLv%N1
zn(dFz#qVrcSm6F$+>)1X1ceG}qi!@~XZ_8`g8CRvrdk{hV&Lk4O*c7`8<+X6aw!T;
z<+!l=)55g<_zfW3)yQs{;2)TKkoU$`cLYh&xMkeEX$!?br@@F^omK|S8!ub|B<?s`
z%gW;uJY9wbLcVwUi`H4wtrvm1$GtuGY^S#u=b=d|VOP(!b#%@iv;&TS;pWSF$BTmb
zwffZqIzCWZN}B@xK!mZd=fu9J_yVkD)s8(yap?3{6EM6trV@~Jdrxv{6Zhxkm6iYo
z^8Sd~KzRp`sqoWdIF3m0Ptr3BzcAB83Bx^0^RjFQG2)Y}Hf?f`$Gu#M&cEN_rtcac
z_R+kvH{9JC@EiJ9JZc`jqZ`}Bb{kW)jS3%pB0sn+Y7Hd%tt!Ty?oU%o8+M-n-+k)g
zH~PkE0Pq0>qUBYRmDbhsd0aRarP#1&pa~o`V6w#FnN?C(f3ZkMYgvL^yXihMnfqqh
zEpp^Y6%MgCH>>qIi5{*#VF6m)R$LDx%g=G)&OH%F^KYGFFO+U^o2kA0IXF3&oWB-T
zRB#pyWVt}=!;O*Cf<9nPLtQqwGZ%?$_C23}1w=0GrWCeibcrig)fWrx9V%8;Q<Hll
zjl;w&s@u#Eaq;aTfbgm>%flJ*Dvg&%6<>~}7^<^X_wp(&{z`Q$*MlSuS#Hx;u%0P0
z|8&Izi3mp2k}<NF+V@G$zx3QkHTEgfcqUoXwwzwIJayt4tSsO}^f7YC)9$Z_sMI9`
zAefX4Dzz<GX2IQGBdrdzc{!qAt#Y&kn;u<u!Zqh42z!U6b@bgA<~i_Ko!q4VIK#xe
z0Eyjtc=zrdhO>q&x?<Q5AFpHIMb6Av28*qyA0-1N1s@5G-@re+erX_*>D%zzAjbb-
zN1ABKV8fp$5mF?+W3O>tuI7h_bQ6SW0hlYSEJJBHhJ4zG8W}@(U4Z(jGgCp5Dr#3p
zb`bkb`mz50&yWGHvjEqo0y}Go1TCr;V@Oi{amWmPRA$dd{Gc}4<`6bu|D|I0j+Z56
zup479--6**nMGPCN@0&;8k+u>tohN77K>990@L~HhI(J)-HgP$A)@sFm0=ZTV24Fh
zTRl)IunUVhE-r4nGeJ_lJ=BS4>IIvLt}gSf?~~`|Nn2ChNzNCvm5X(C`mw&Yb#oKZ
z*NoCqKW3%D$<h3Tvh#gklL@m9WR0j8)i$LtdPM}JOWWK(y+5WwKK2C>`opBO+;1n1
zSMQE&(C8mU*JMTiUS&2wP0iVgfLq!o#%BY(1bXWoR5l;5J-rlmnN;xv6a`lr6(S6#
zWEy;ahgvgxIj<jn3HlJ_pI&t#sVf?&C+EA$AG6%)vYH;~hZj|ub*aONqW<b9dAmBj
z8^Z)9f6&d(kn{e$@1L4E?tX--JRg8ublv^pCCm!YBl&y%;Na|xw%~5?y$leq?=UbE
zknjC^7ktyY2@7?Qn?nA87_u*aV!j5pjX|nwuuza5o@uYCahb21by=8}mR1?epUbLg
zjUtYVq%cplx0J#8qNVtrMnpms@0wOXI6LwK>zV+?VvA#Q4!T&^nzYB(@S9nokaALj
zk&?2v;e_H(eiDLqh>+8D4h%zVB(E<3NINU9B->hg>?T(@LO0KWpo{W{>Lm+c);p(p
zP0-u@c&2MK!|!kH3i^k(pDR^7<l#pOP1(}sO9fp%qzC@>R9^*gzAc^**dy_>$crwg
zO3R{xl#H3lPhzUriB?r(VfH80_n@-k=u_ob3kqxjrEkKrqAyl}NY7(8xYy*Rh>7NQ
zz5hGemSy@TmG=c=gKD1Bb92fJ9(UQR8_k>azb-P?C9cBg%GuM0aFIc$OQP}j&)2PH
z|FGn`3WxC#hXeFRU-+ODakpuf%*ycT!yu7RfmHB7n8s||vhu*4%j~S+P+ggNe*N!a
zCsP(`As5@;1GaNuZTMY|*Au1Jrv&S(J8LYXosf=)&<odE%ZF!dYl(!!j#z|>Bcvdi
z>0;E#KcW${r}#)W?4Z~(CU9uSq@?q3lX`!F0+QXTsPJVbn#K|xDt8S(w1Fnb=OOJJ
z)|iWTZx?3fFjwWxk3?Jw9IcFkb!)zX8>ADD{AE?ojgWy4`8&R)fL^UcyYV{T<)ut{
zkDn-0sWaa`L~iANA`6WMtg}+KeTQvu3*`N&f7PG3zBC?J=k`X7pVqSied}bBbm|qd
z+B=f@rsi)#`=I<F{XU4g1F&wA8TJv0ujKyvyB+3xU#}twy>4}!5Yc8NoHNjPwcip;
zdv*Z&_vZjjPd&(S;}uUxXQwx)FS?cBVbS)Nbag<1LFYyMHY(D&*<GPMYn|^>()bOv
zlByrm;sXU5n9nOVPk)VaoQ%J7cPE3NqYcJ#%AV)^qnZWPl4msOGwyE_4|L)2j%YuQ
z`*{cu<1o`(AciSt{Kp3)tM)(ulab3=%r5&y;vNvGdhT36or~Yq6eocVLPR{0hACEw
z2P?z0z^(;I!)Y;10%~7|a@da3ExkFnSX3E&y7&|H;|y^1tDgPOyLH`%n<I!^N{*yd
z=isjns7bV{df$^CYo6pe>N@p33VCHfKNtjJ{9eiZNxhC)hD1@N@R>~I?YAl%2A(Ab
zeW29bO4Tt;BCb@S=i9G9A1P$|{b!inANSia$N8yA2toa)fpUfi0>@7MGlE%y809Cf
zp{1TH<GC(_<7+k0C54TQ^%MR~GyaRJ=#I64;PnV;_-;0rLBmZL>$fK)YT>X?b=L6T
zBpRg4)ju3lG)3b27@zsM5WVsyrH5_fmjbX;4w>t0OyNhO-u~YHlIxS>hhBP<(52i@
z@MgbpLlW{Tyc3y3RD*d=a@!2vWVh9R$pdWFM17k|1Ey(ho))L$rtAUe&2RD3rxVND
zRcjTUrR73>-S(g6k2vel`EREc`s~o2s&%EZ%S5Pn85!}lta_88rQ<`YZioID4`6P$
zK}ol}NB{JBtJ6EhHH#nI<#BU#k#e1ZzZgsQ<rO(9gU0?{cUoHna`?PoJV8d#NjCNY
z^W5@RC!r10wQ2s>6Dz46in<^|O!V{OfLLtWCQF9rH=O$J1YQq}uTVY~TbX3DS6>Y$
zy9@f<^pd>hPF96pT(nqi4&5p>hXV-hptp|=u}%CmT`n+0jUcMO3{46qUKeXf)4_{C
z+Y5_Xrh^OWT=3T|E!P%D7hIoUKeBb*Rj#iWDA3|9SALFT=`DCaV97|Ea>!pplFsjE
zDwIA>oW=ttY;^>GU8PDq_5=~~g#`V=($8KpOARH?z|(n%Fa`*M#o)4qz$1-pB=ZWL
zUC(}yC==tWqBr7ZdmCLVD!oO#%anMBV|u!!SZWN73rZQ}+We9GxY#~Cq$=af5%R}P
zv_I80{`4nSs!@LBiN|!ODi1$67TarQ6w5w5!5X!rMS8yO^tas6BWd%gNFAP$ZM4(g
z8f9wqVmD*tO^W~LI`<Q-a3B`#L|W-vNrBj_mh;HE%0;~~{|<Fl8{wi)0;-3Y*;?F=
zedaN-WL?EA%<p3vC}(R4y%u67Cg~;>efwdrjC}f1TFGgle;}>CB>REr-A4<HbQL49
zU$$b$jk_A7mtI5l54fPAiV2q(iez+^V7^TA&)pXW+p(lfogj|r0YJ}GN3>ThNN@B!
zn?WFnn2{OttwTCT$qQ9u{o9$?_`VG4XR5;4qRZ=xxmdNKM6lIopbS>b1JSCgs-$%F
zxIWLXyncCGey28ze>!47tk(_U3~M;+qOOYCoRHKK;INjabbGtb<@WK@`@gj`$8=#n
zEhY@KHa5k?4~Oqye}IJ^xhOZ78JnYdYg*=XLLWA{g)&}DZP9av?QC8NdS9ok4eu-_
z%2`FvuZ_{ZDhz^1s7%qBr}#>Qt1$j!t?I%V67KfL)kG%A_5#`U`q22wrA{Na#ZDt3
zH99lE(rMvFIiN(c`Fg9l-7ID2390ava<D>@6npr*au2RN77)GcI?r>BiUV);mfc!z
zi#vob>FUzM@8@%$Q?0vEb{^HJ$zAWYp5)?|Bjr8I%&`_C`Y?V4543v@+0XP-MhT7s
zp~Q=Q3~DbfDNZ`_%8z;QyXpD$_;i%$!_!O6{g9_O-%uZh(b5L5s$3_^erCZhtwV?x
z^HMMsS3l_y0yJY9apxqXvj&AmIzhjV>qVx;eEqQ!tSr&fJDmDrzqYtmYEwuR*;4H;
zM+;TPPgX#D9FuFnbZRP<qZ{SM5ER!lvL%k*{p*o5jQ*VY%#FBK2Gw6S;IV7utfeEe
zQ2G>l{rs!Ia<v2xOOA8fpd}@JJlSLJeXokc3yNMo1HgO82NCF8c~RmuPy~EX91R1+
z>5O`bkd4-DLFmJTQuTW)Y;WN+mak`awom5m{L#Bp>Jon9`V(TgZH{%#)bTS7CVbTu
zcInQPh_ZZZW%#<!aRQXdN3-GMk6KJ<sgs%o;t(7oB+js$BKBesSUnyBnbshOdk^H<
zPuc#x1(w%aiiO(_1eJla!->J$IAJr<({RR{&mrzIZi)%D9|c(4GDzH&Ip5fGzBMs>
zN{31$+mH~~dEOCvjJeuU_C~P!gyk?m1NMebd^Y@AFnxS9=ZT8>${?GC5qL-;jkGV0
z_{rql?;2ab<$<`4{6TyyY>DP97PR5IO(-hzfTK&oS<kTiFc&Q0hgMQX*4w^{Tn9%+
zY=wi!=R`g+5`rQ!)1y=ad?SQY7b4t5pD_!t7;}SkWh0YlEjtEoyXY`LCEqL<0h8_Z
z8XoC?p_bsI_Z7zT;!GQn`ae19M$1M-S@J!DAx3X~hXlA7BUxnSj)w+n+@4JBNt-zV
zo|j}7OQ(zYwAH$e9!ag5kpdZ?a?(1D<AdM&-Gn*9o&I`!LghFf$eonGzG3M581M7W
zonUj^0p%DEBpxj{<CFBI)O$|Op8qBd%LV#?GnHHZnKC_stu4GXK|ZM$oU*U2QCsUW
zdLXD+P82U1Nm#F=>X1&Fm09<<6!|m|XkUIjeuvI5DI8K#bM;7K-ZW3RNVc<dRBaz{
zLl_-TGn`@W#wt>bMJ&c5w&Bn}hs^ihKh&+=3i6sER1C=pz*XD21hq;PnI1ZnALJjo
zI39@Yi4#u2Bfik@k;a<WgqWT#+cmkdJ20t!^4F`h9Z0BB{mS<~@y*&`lM1gDu#uAS
z+HKT8J=cR1UyZQVQ`xDUO&4@_(f)dKI1q=WJ1c5F?xXj&#N1Rm5kONAge{l2I8*<A
zqbxq(0_stL;8IL=o|ommOdiWTx(isQVtx5?k#$KPgUWcBcH5C>U!9)z7|I=fO+=CE
zI@86iL*5AvT1BG&Jf;8s;PCAza0_v7Ktg~1(c|usSdftrJLSv9M%sBvJKPNIIkxwK
z!?K(-jE_}aJXb21pNZ;M{c#>4nLiAaJKja{kAd1}{4$oUly@wb;J&r+S968qO=S+@
zRBX4F8Tud3AzZt$Ott7_bvGkXx+dy^C?v`odW}Cfz4R_kJ*T)c1r;#h#|f$4m2oeT
zba7P_(Ex7Q#iyU!ctbMt7RIx7uO!r|oSUoy#3N;h=RrX<DF}`yj&8~YEt!@T?b&@m
zadv(iSv;XD4-uy`S7w_3l^rMtKQ}FnR5k$Omzf#^iZngSXA6HwczmBn>xanzHdSI$
z)xIM6z}hGTDfG4H>8l4;_8nxIh_GK>CYMGz8tS^QOBa_%fyqBXDN;`J{@cU1{=0;3
zc$)XORE_x`Nl=o@x1KqBs4nf>WZUz;AkdnYo=FM_6-^Kj##az+{Zq&N3F#Ql!OKC!
z0>3}AoG#yCVL`cLC+jF|p}qX^v)u@W&k;?{RbgpJ#i&vUP+NRt530yMzjwSd_EA>_
zcdW{yA&g8AaBM6|F|rn>0)s3=l2R(Hi%W>(6^*iu`JNMv2OM7&Exk4g+!5T|&F<v#
z_MU!ydF*|+U-Zs_%7H0&VlJeYL<8z6Mc?Ih8i%rx&T)LDaF$6I`_*Bp{}qq6xZ4UH
z0kQ)=7S$6V9o>BVBI-m;HZU---t`|<7$uWzp^Gk6K-r&`md3n{ig;#5SFe^qu#KeH
za(M;FAi0`m+ncERlPYSPWn<w57)T@vQF<legef)2HTs*~EU}8<o6f&q#UnI0$<<3+
zmjJk~&Tq3VruPi?4p0n!s%g!!1;Tzd0IuV%O%>RFQ8JURGlb!V`Yyix>1{49`YJ`N
z5&vp=PlzQV?lj@Ec_G6D)zD6=1TA*bRe3Z}oSCPIdSydkPn12|VoJ|Yy=2#Lod4R!
zkU6i-HCrC?nfU}S5ho@>>Q%XawUZ44&@c4@?lyFIhJ<YYoc{^E9ZCn%?ez3?`K*5j
zs%Cj`zD7e6_gN1ezULy1b1QN}Fp8UX)+3A{h(@c}Vks`wCO#}%XJQuu>6|!c%azjE
zdf|oR1sdcTWaQz=jY{NAs-Q!VvNQ>97@(1(QIt0yE-h3iW-+e$w-WuPutAI>z7EE{
z0tEheteaVnXMF^=Du4=3wvcOKOH1Zw1ZepDtnYp=&;3WA>D?Xj{R}@&;CTtf(BP=m
z?;ZHmy<tyn2zK<2f9DHPzZ`621gUFzpa-gLAHUMbd)29c)P3>g=qc3m?TZ(kRXR<D
zo9B@jWJ7b17c49+u#1a}-WQOuiwiGfI@J#7Z^!z8P*i?m8{mjwVzY$+;H@!lU(vI_
zl>A8q@5=GLV65rsY~96|cXh4Gc@ru+J3HG51{34QaBy>P=Xj4>&Q`qhy4W59e~Zwv
z*4VBNrniBi+=7ylGv(y%$kpQ8M4MWIc4sS}0^)P+*h%AxBHhqH(Y#+aEn8M#!*Oow
zCV1wY9yVl~KyVI($wKJYucmvFgUHk>Ao94@y6l~Ps0vt6k#79_tYL|hbG^K9VX<fP
zsBD=EH8KaE6@TdK8NGWu@Mr7rlXJDCj<J5kXXVq@TWKR>BL@O7iNn&?lf*N_!S9?X
z|Eyo6APAZ+`<yqw>N+y#dT;}dVciYcl57(ro%9DJdTfpcL~`7egY3*gvdgNw#3!oP
zx?&ZXh;2w#b|~drK{e=~>)*N(Xv@TnOa^^-u7y;$z?8z=kOadd5hq$y)ZNt7_k+zd
zTU}xo=VA**@?|I2k8p%_v}C)uk-1;o_+{quWiOitMk>^N#p}M}*xI6BNXJ(P!@?d9
zf!~CqR;IWg-5U%j-lorIf{Xir!|@FYjrIP<20M!Y?S-oejk_HUNWSf;V<^v03K=OM
zh1>~W2udQ2Pf_OjQSEFjGeQ9<Qngh?C*}6}U?h0gs#?D9yxH=sz_I9`c{1!ME8bQz
z5Q6&qAM_279*CH}YjQQ@<g&?vuLCwt1wwjGYWg9MM^1iSBHOS;X4)JVD9Xu^$6LO6
z@u$z7Av>+T3A?}BkMhE7V@wauBs<Q;4G#`No?s0DIO-UagY<eKgSoe>b9+Y6ctPj6
zvlZ_NB23h?N2rgF&)F{u^RpqgyxP!5KUR%zF4=&eii)>A!TQPA_UdF=p98x|YwT=U
zu7<q4{2o|MtqQz|2s;UML0^#W+E;xkx|PZc?n9l&VY<5FW)62Nuoz{wN3PDbI!Z?7
zDPo4CbPiBtsS*}uf$#3yN6vqeSF1{H^*<8Hggx^Z1&Pc(3*fJYXXmY7p79Wj=G|rk
z!H}Tsbd24J1}@s_*8()^xzpp1!s7VC(E_!YsX{Krv|hO;$#NU*8b6*c=~{&$sbcgC
z6Ma0{_Z<n(u|(TOtP>^VeSHPpJMUSS!LHUb-?dBvHlnzV!J}@Dpp`Y%53cbv!ePi}
zH56-b^NW~xriHnM7B%^3UPds&FWv)ciOAvUSz`k=H6$AHtI>VWToNkX_l63udFNen
ze4v=&bw4QFQ5edKAv|b=GJ11<qe7;16Ihv>^D@Gsv~DuHVk}zb@=I*-LVjuw#*c(1
zOxRKjDbpH01LT`68+*5xzM9-YUNG10aXG26p4+)#RAd}lHIe(h)-O5YVc0;{fz8x;
z-*M9NCq$m)u~zmDw#gV39M~LJu47EH@zkcRr#F|0)O^;9L&6cioQ);*aEX&&msy}O
zVSjz~L#zRmEeRDbxcS!?B}7+l*8@vB9rC~xBsJV15A^Kk@7T-?H5*|&Z~VohB%2=^
z#VFvOCpitQ+(y((QFK^9ZS_0u;TPsitF0e_DYCD0HG>9qvZW<PUb74C!ikS3@qsJ%
z#>Urs&DCgs%YT=Z9Gu6s9MwcAdFYSTP(5mQA>dDrd7b)N;P}Uo=@o3n1==9lqBAoF
zf^f#5B(kcv3t(4%zt{b@^VNSlsdq2SBzgX3IlH0#rFVw+oUK>`Vy^Y6|H%*!b>W?^
zH(U^F1xH7FbOs^;-~MRt&9|V%#YN5K?l%5vtHU>j;nwOBA0H^pm19j2ZuNKS1eA{u
zfO~}F9BAkiU-=no9s|G4A+|SPPtpiGH|*+qn<z>JHhe~=68RP-u}?;ndDh;Hjk}CG
z{P&dMhx%XSfQ;}M`E=u3;Pk=S8tp@>RUTC6PF%0m7$p93<DHvX=xf{)<IwOMcCljS
ziO*U6;#K>qVmT)jtEnG6y7{%7Jg!O}=*GpaWlpW%kd&s?F9KL@8>O}RNyAlNW?br6
z4r=KU{=ETj6n#>Es}Xmp!FtXJx}Cl(sLL!YWD2kbAl%`@AcXZ!|M1!)(GU_HnV0?#
zq<whv|45r#>?#wrat%t*>^SwaZa($K#VMu}b);UEo1ZwC*ZRwO-8{L>ab|NqBkd&b
z+Fbk=@BTCcDnsRf4~>XO=@})c0&09_OTo+y0_|f0Q65wrSkp%uxI^^#@nh{`Tb$tr
z<bUHO{q2wvUSBh7J_AL`cv1$@fEt^<bNwj20wO~$OZJM?)%Ziybx@0_IPg>FYTdAk
zS;M9J`KDJHv3jFz8j}LKTCZUG{`UwDQ_nr-&E~bRS?P09xp~y|Gy`o52V_&sNOBx(
zAG}K7N{7i$1OS!MNj74dyFVarj9C~+BWYdkn}(Nl5o*B8)+I3Vy+^ygf5!|jAb@_J
zU2l^fL;g3d6e=J|m9rTb{KksONp#a!1|vqo(})s<z_;d8S6;<c*RQC(t!J-`>LpwT
z6JlAlbBOd3+KP8%s9o3*cpFIX%0J&&0*tNwS0hB=Vot!cN5MQf^usIln=;@*UfO<w
z{yloX7+j`%{CwKEem(TbpmgHEnFJIYX>D~KUzPKkL+He{0pL&eu+q<;?*D7F+u2!a
zSMvq7mg_ldrUTzJ1Zg&a5GmX3z9%|Erge3%N96P>QIbrgnwk@G@r=M*MU!YiNoDZ;
zA0LuJ@PU8n!`3*E=Mql2cKhIqLlL*~+M8J_IKPB{l~)Y@$&#4b_wMOO{O*C2r{~A-
z-`OEL6URO>a`)OHbLv7N^*KTtC>y6LAKhM3Qncd<oE+vL{h7V*`^F9W?)x7pC`AN8
z;eP}ge!m=j71=0`uY&qq#sQE~ETbbMVzf~(X!>c)E-)7I0Ed|`5KisS!1+oi24uid
z*PT^j3u-I(D3Lnet++5qM=q+*UyP<FR@^`H<C4+udHva)=Q|br=FYbhsfV&|GtN&A
z;7hmKF)|<0BDiqRY;1@emVTN;5DP1;Qnvp@@u$@Mujzz#fh(%wnOJ#R8O%jP=nDZA
z?6FY;4;`di@vy7IypXW50w<c|i9fQQTXs`Q_M10%wKU`;<2mw$kJ~c+PITxb<{_=o
zg@uJ3L64@0<+j3#3g!Q_(1d6Kgcu$F3(2*hWaqd8)4<IQSK|>t7y4^SW8F?@)eG;M
z+9{T@{I8S3bbGOF@udb<2K4Y2?9?^K{*<0p+?*rwnO#Q8uzS@oHDz?8oW~fvP+jLW
zJ3Ky*fsI^IQ2}yTS}bDoN2IRO!{Iof&Hh|oslps{U@8$o^c^(?uFA@$fon1RDRJFN
zqNkA<AIr8)(*X{DvAa8MQpRP$M;!R|6S3!_T*jbzUD6{x6wN%O<vM(M)&Ftz^BYeZ
zL}^OTJC<@y_Mp*lJP_$n&tB5;)Jo)AHQ8%!6IZ0H+=QO(PpQA1fk0D`iQgm(2HxG~
z^1r<Y8;CXiLWQ*X*NbyhOk+vSW3-gf5m$N`$@~d`64(*k;5c1slMP~LtI=eCK-V%e
z`{qJTit_o_yhesj3_4~DZlQK9Y{A`YcC-y6N+;-kCu8T~`bdl(<M=vgXkuay_6VU*
z8Zg(^PH`bYm^bC$7J`?tTK}#AllWa9{{vm(isIn}uVC=){5iGXAjF|0r!HHKB4hF4
F{{U<{yaoUO


From a34a6943a7daa6bdcad16907d2076c678acfa599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Sun, 21 Feb 2016 13:39:10 +0100
Subject: [PATCH 02/14] Added files via upload

---
 code/game/machinery/vending.dm | 121 ++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 46 deletions(-)

diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index fbc80b869ad..51af34bfb8c 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -323,9 +323,7 @@
  */
 /obj/machinery/vending/proc/pay_with_card(var/obj/item/weapon/card/id/I)
 	visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
-	return pay_with_account(get_card_account(I))
-
-/obj/machinery/vending/proc/pay_with_account(var/datum/money_account/customer_account)
+	var/datum/money_account/customer_account = attempt_account_access_nosec(I.associated_account_number)
 	if (!customer_account)
 		src.status_message = "Error: Unable to access account. Please contact technical support if problem persists."
 		src.status_error = 1
@@ -340,7 +338,7 @@
 	// empty at high security levels
 	if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2)
 		var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
-		customer_account = attempt_account_access(customer_account, attempt_pin, 2)
+		customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2)
 
 		if(!customer_account)
 			src.status_message = "Unable to access account: incorrect credentials."
@@ -353,18 +351,28 @@
 		return 0
 	else
 		// Okay to move the money at this point
-		var/paid = customer_account.charge(currently_vending.price,
-			transaction_purpose = "Purchase of [currently_vending.product_name]",
-			terminal_name = name,
-			terminal_id = name,
-			dest_name = vendor_account.owner_name)
 
-		if(paid)
-			// Give the vendor the money. We use the account owner name, which means
-			// that purchases made with stolen/borrowed card will look like the card
-			// owner made them
-			credit_purchase(customer_account.owner_name)
-		return paid
+		// debit money from the purchaser's account
+		customer_account.money -= currently_vending.price
+
+		// create entry in the purchaser's account log
+		var/datum/transaction/T = new()
+		T.target_name = "[vendor_account.owner_name] (via [src.name])"
+		T.purpose = "Purchase of [currently_vending.product_name]"
+		if(currently_vending.price > 0)
+			T.amount = "([currently_vending.price])"
+		else
+			T.amount = "[currently_vending.price]"
+		T.source_terminal = src.name
+		T.date = current_date_string
+		T.time = worldtime2text()
+		customer_account.transaction_log.Add(T)
+
+		// Give the vendor the money. We use the account owner name, which means
+		// that purchases made with stolen/borrowed card will look like the card
+		// owner made them
+		credit_purchase(customer_account.owner_name)
+		return 1
 
 /**
  *  Add money for current purchase to the vendor account.
@@ -463,28 +471,38 @@
 
 	if (href_list["pay"])
 		if(currently_vending && vendor_account && !vendor_account.suspended)
-			var/paid = 0
-			var/handled = 0
-			var/datum/money_account/A = usr.get_worn_id_account()
-			if(A)
-				paid = pay_with_account(A)
-				handled = 1
-			else if(istype(usr.get_active_hand(), /obj/item/weapon/card))
-				paid = pay_with_card(usr.get_active_hand())
-				handled = 1
-			if(paid)
-				src.vend(currently_vending, usr)
-				return
-			else if(handled)
-				nanomanager.update_uis(src)
-				return // don't smack that machine with your 2 credits
+			if(istype(usr, /mob/living/carbon/human))
+				var/paid = 0
+				var/handled = 0
+				var/mob/living/carbon/human/H = usr
+				var/obj/item/weapon/card/card = null
+				if(istype(H.wear_id,/obj/item/weapon/card))
+					card = H.wear_id
+					paid = pay_with_card(card)
+					handled = 1
+				else if(istype(H.get_active_hand(), /obj/item/weapon/card))
+					card = H.get_active_hand()
+					paid = pay_with_card(card)
+					handled = 1
+				if(paid)
+					src.vend(currently_vending, usr)
+					return
+				else if(handled)
+					nanomanager.update_uis(src)
+					return // don't smack that machine with your 2 credits
 
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
 		if ((href_list["vend"]) && (src.vend_ready) && (!currently_vending))
 
-			if(issilicon(usr) && !isrobot(usr))
-				usr << "<span class=warning>The vending machine refuses to interface with you, as you are not in its target demographic!</span>"
-				return
+			if(istype(usr,/mob/living/silicon))
+				if(istype(usr,/mob/living/silicon/robot))
+					var/mob/living/silicon/robot/R = usr
+					if(!(R.module && istype(R.module,/obj/item/weapon/robot_module/butler) ))
+						usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
+						return
+				else
+					usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
+					return
 
 			if((!allowed(usr)) && !emagged && scan_id)	//For SECURE VENDING MACHINES YEAH
 				usr << "<span class='warning'>Access denied.</span>"	//Unless emagged of course
@@ -693,16 +711,27 @@
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
 	icon_state = "boozeomat"        //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
 	icon_deny = "boozeomat-deny"
-	products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,/obj/item/weapon/reagent_containers/food/drinks/cans/beer = 6,
-					/obj/item/weapon/reagent_containers/food/drinks/cans/ale = 6,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
-					/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
-					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9)
+	products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/beer = 6,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/ale = 6,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/alkasine = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,
+					/obj/item/weapon/reagent_containers/food/drinks/ice = 9)
 	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10)
 	vend_delay = 15
 	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
@@ -818,11 +847,11 @@
 	icon_deny = "cart-deny"
 	products = list(/obj/item/device/pda =10,/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/chemistry = 10,
 					/obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/atmos = 10,/obj/item/weapon/cartridge/janitor = 10,
-					/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/weapon/cartridge/signal = 10)
+					/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/weapon/cartridge/signal = 10,/obj/item/weapon/cartridge = 10)
 	contraband = list(/obj/item/weapon/cartridge/clown = 1,/obj/item/weapon/cartridge/mime = 1)
 	prices = list(/obj/item/device/pda =300,/obj/item/weapon/cartridge/medical = 200,/obj/item/weapon/cartridge/chemistry = 150,/obj/item/weapon/cartridge/engineering = 100,
 					/obj/item/weapon/cartridge/atmos = 75,/obj/item/weapon/cartridge/janitor = 100,/obj/item/weapon/cartridge/signal/toxins = 150,
-					/obj/item/weapon/cartridge/signal = 75)
+					/obj/item/weapon/cartridge/signal = 75,/obj/item/weapon/cartridge = 50)
 
 
 /obj/machinery/vending/liberationstation
@@ -1078,7 +1107,7 @@
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "11" //Engineering Equipment access
-	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10,/obj/item/weapon/camera_assembly = 10)
+	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10)
 	contraband = list(/obj/item/weapon/stock_parts/cell/potato = 3)
 	premium = list(/obj/item/weapon/storage/belt/utility = 3)
 

From 905fb6863ccc4161d85d31990d8d4e513531c415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Sun, 21 Feb 2016 13:39:36 +0100
Subject: [PATCH 03/14] Added files via upload

---
 icons/obj/drinks.dmi | Bin 67286 -> 67288 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 1089fa7430f85fcf7c3bcfb7b7bf3b77852c57f4..41b76bd18c27257c1032721e4ffc27769def9b95 100644
GIT binary patch
delta 9977
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
SxtR+>m?A_?wock4<bMEkJD#in

delta 9975
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


From 2c2217a10b4b7118fe6eb549c8ba67014b6e7152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Sun, 21 Feb 2016 13:43:48 +0100
Subject: [PATCH 04/14] Adds canned alkasine to the vendor

---
 code/game/machinery/vending.dm | 90 ++++++++++++++--------------------
 1 file changed, 36 insertions(+), 54 deletions(-)

diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 51af34bfb8c..b97007d627b 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -323,7 +323,9 @@
  */
 /obj/machinery/vending/proc/pay_with_card(var/obj/item/weapon/card/id/I)
 	visible_message("<span class='info'>[usr] swipes a card through [src].</span>")
-	var/datum/money_account/customer_account = attempt_account_access_nosec(I.associated_account_number)
+	return pay_with_account(get_card_account(I))
+
+/obj/machinery/vending/proc/pay_with_account(var/datum/money_account/customer_account)
 	if (!customer_account)
 		src.status_message = "Error: Unable to access account. Please contact technical support if problem persists."
 		src.status_error = 1
@@ -338,7 +340,7 @@
 	// empty at high security levels
 	if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2)
 		var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
-		customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2)
+		customer_account = attempt_account_access(customer_account, attempt_pin, 2)
 
 		if(!customer_account)
 			src.status_message = "Unable to access account: incorrect credentials."
@@ -351,28 +353,18 @@
 		return 0
 	else
 		// Okay to move the money at this point
+		var/paid = customer_account.charge(currently_vending.price,
+			transaction_purpose = "Purchase of [currently_vending.product_name]",
+			terminal_name = name,
+			terminal_id = name,
+			dest_name = vendor_account.owner_name)
 
-		// debit money from the purchaser's account
-		customer_account.money -= currently_vending.price
-
-		// create entry in the purchaser's account log
-		var/datum/transaction/T = new()
-		T.target_name = "[vendor_account.owner_name] (via [src.name])"
-		T.purpose = "Purchase of [currently_vending.product_name]"
-		if(currently_vending.price > 0)
-			T.amount = "([currently_vending.price])"
-		else
-			T.amount = "[currently_vending.price]"
-		T.source_terminal = src.name
-		T.date = current_date_string
-		T.time = worldtime2text()
-		customer_account.transaction_log.Add(T)
-
-		// Give the vendor the money. We use the account owner name, which means
-		// that purchases made with stolen/borrowed card will look like the card
-		// owner made them
-		credit_purchase(customer_account.owner_name)
-		return 1
+		if(paid)
+			// Give the vendor the money. We use the account owner name, which means
+			// that purchases made with stolen/borrowed card will look like the card
+			// owner made them
+			credit_purchase(customer_account.owner_name)
+		return paid
 
 /**
  *  Add money for current purchase to the vendor account.
@@ -471,38 +463,28 @@
 
 	if (href_list["pay"])
 		if(currently_vending && vendor_account && !vendor_account.suspended)
-			if(istype(usr, /mob/living/carbon/human))
-				var/paid = 0
-				var/handled = 0
-				var/mob/living/carbon/human/H = usr
-				var/obj/item/weapon/card/card = null
-				if(istype(H.wear_id,/obj/item/weapon/card))
-					card = H.wear_id
-					paid = pay_with_card(card)
-					handled = 1
-				else if(istype(H.get_active_hand(), /obj/item/weapon/card))
-					card = H.get_active_hand()
-					paid = pay_with_card(card)
-					handled = 1
-				if(paid)
-					src.vend(currently_vending, usr)
-					return
-				else if(handled)
-					nanomanager.update_uis(src)
-					return // don't smack that machine with your 2 credits
+			var/paid = 0
+			var/handled = 0
+			var/datum/money_account/A = usr.get_worn_id_account()
+			if(A)
+				paid = pay_with_account(A)
+				handled = 1
+			else if(istype(usr.get_active_hand(), /obj/item/weapon/card))
+				paid = pay_with_card(usr.get_active_hand())
+				handled = 1
+			if(paid)
+				src.vend(currently_vending, usr)
+				return
+			else if(handled)
+				nanomanager.update_uis(src)
+				return // don't smack that machine with your 2 credits
 
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
 		if ((href_list["vend"]) && (src.vend_ready) && (!currently_vending))
 
-			if(istype(usr,/mob/living/silicon))
-				if(istype(usr,/mob/living/silicon/robot))
-					var/mob/living/silicon/robot/R = usr
-					if(!(R.module && istype(R.module,/obj/item/weapon/robot_module/butler) ))
-						usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
-						return
-				else
-					usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
-					return
+			if(issilicon(usr) && !isrobot(usr))
+				usr << "<span class=warning>The vending machine refuses to interface with you, as you are not in its target demographic!</span>"
+				return
 
 			if((!allowed(usr)) && !emagged && scan_id)	//For SECURE VENDING MACHINES YEAH
 				usr << "<span class='warning'>Access denied.</span>"	//Unless emagged of course
@@ -847,11 +829,11 @@
 	icon_deny = "cart-deny"
 	products = list(/obj/item/device/pda =10,/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/chemistry = 10,
 					/obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/atmos = 10,/obj/item/weapon/cartridge/janitor = 10,
-					/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/weapon/cartridge/signal = 10,/obj/item/weapon/cartridge = 10)
+					/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/weapon/cartridge/signal = 10)
 	contraband = list(/obj/item/weapon/cartridge/clown = 1,/obj/item/weapon/cartridge/mime = 1)
 	prices = list(/obj/item/device/pda =300,/obj/item/weapon/cartridge/medical = 200,/obj/item/weapon/cartridge/chemistry = 150,/obj/item/weapon/cartridge/engineering = 100,
 					/obj/item/weapon/cartridge/atmos = 75,/obj/item/weapon/cartridge/janitor = 100,/obj/item/weapon/cartridge/signal/toxins = 150,
-					/obj/item/weapon/cartridge/signal = 75,/obj/item/weapon/cartridge = 50)
+					/obj/item/weapon/cartridge/signal = 75)
 
 
 /obj/machinery/vending/liberationstation
@@ -1107,7 +1089,7 @@
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "11" //Engineering Equipment access
-	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10)
+	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10,/obj/item/weapon/camera_assembly = 10)
 	contraband = list(/obj/item/weapon/stock_parts/cell/potato = 3)
 	premium = list(/obj/item/weapon/storage/belt/utility = 3)
 

From a95ea9589345c1cedf7c39cd240eefad264f3541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Sun, 21 Feb 2016 14:19:24 +0100
Subject: [PATCH 05/14] Update drinks.dm

---
 code/modules/reagents/newchem/drinks.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 6ac0f02b94a..20a996120d4 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -94,7 +94,7 @@
 	result = "alkasine"
 	required_reagents = list("lube" = 1, "plasma" = 1, "fuel" = 1)
 	result_amount = 3
-	mix_message = "The chemicals mix to create shiny, blue substance."
+	mix_message = "The chemicals mix to create a shiny, blue substance."
 
 /datum/reagent/alkasine/on_mob_life(var/mob/living/M as mob, var/alien)
 	if(!src.data) data = 1
@@ -175,4 +175,4 @@
 	result_amount = 4
 	mix_message = "The ingredients mix into a dark brown substance."
 
-// ROBOT ALCOHOL ENDS
\ No newline at end of file
+// ROBOT ALCOHOL ENDS

From 90d90f357162d283b232da1aa32fd8d552b95e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Sun, 21 Feb 2016 18:48:54 +0100
Subject: [PATCH 06/14] Added files via upload

---
 code/modules/reagents/newchem/drinks.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 20a996120d4..eeadd48a815 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -94,7 +94,7 @@
 	result = "alkasine"
 	required_reagents = list("lube" = 1, "plasma" = 1, "fuel" = 1)
 	result_amount = 3
-	mix_message = "The chemicals mix to create a shiny, blue substance."
+	mix_message = "The chemicals mix to create shiny, blue substance."
 
 /datum/reagent/alkasine/on_mob_life(var/mob/living/M as mob, var/alien)
 	if(!src.data) data = 1
@@ -108,8 +108,8 @@
 
 	M.dizziness += dizzy_adj.
 	if(d >= slur_start)
-		if (!M:slurring) M:slurring = 1
-		M:slurring += slurr_adj
+		if (!M.slurring) M.slurring = 1
+		M.slurring += slurr_adj
 	if(d >= brawl_start && ishuman(M))
 		var/mob/living/carbon/human/H = M
 		F.teach(H,1)
@@ -117,8 +117,8 @@
 			if(H.martial_art == F)
 				F.remove(H)
 	if(d >= confused_start && prob(33))
-		if (!M:confused) M:confused = 1
-		M.confused = max(M:confused+confused_adj,0)
+		if (!M.confused) M.confused = 1
+		M.confused = max(M.confused+confused_adj,0)
 		if (prob(20))
 			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 			s.set_up(3, 1, M)
@@ -175,4 +175,4 @@
 	result_amount = 4
 	mix_message = "The ingredients mix into a dark brown substance."
 
-// ROBOT ALCOHOL ENDS
+// ROBOT ALCOHOL ENDS
\ No newline at end of file

From 3aa923b7dac5fc5f13cbd4ed063238822793b33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Mon, 22 Feb 2016 16:29:55 +0100
Subject: [PATCH 07/14] Fixed spans when drinking/feeding

---
 .../reagent_containers/food/drinks.dm         | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 7597dfe1058..46a9d43b9df 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -23,7 +23,7 @@
 		var/fillevel = gulp_size
 
 		if(!R.total_volume || !R)
-			user << "\red None of [src] left, oh no!"
+			user << "<span class = 'warning'> None of [src] left, oh no!</span>"
 			return 0
 
 		if(M == user)
@@ -35,9 +35,9 @@
 						user << "Where do you intend to put \the [src]? You don't have a mouth!"
 						return
 					else
-						M << "\blue You pour a bit of liquid from [src] into your connection port."
+						M << "<span class = 'notice'> You pour a bit of liquid from [src] into your connection port.</span>"
 				else
-					M << "\blue You swallow a gulp of [src]."
+					M << "<span class = 'notice'> You swallow a gulp of [src].</span>"
 			if(reagents.total_volume)
 				reagents.reaction(M, INGEST)
 				spawn(0)
@@ -53,10 +53,10 @@
 				return
 
 			for(var/mob/O in viewers(world.view, user))
-				O.show_message("\red [user] attempts to feed [M] [src].", 1)
+				O.show_message("<span class = 'warning'> [user] attempts to feed [M] [src].</span>", 1)
 			if(!do_mob(user, M)) return
 			for(var/mob/O in viewers(world.view, user))
-				O.show_message("\red [user] feeds [M] [src].", 1)
+				O.show_message("<span class = 'warning'> [user] feeds [M] [src].</span>", 1)
 
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [key_name(user)] Reagents: [reagentlist(src)]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [M.name] by [key_name(M)] Reagents: [reagentlist(src)]</font>")
@@ -98,23 +98,23 @@
 		if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
 
 			if(!target.reagents.total_volume)
-				user << "\red [target] is empty."
+				user << "<span class = 'warning'> [target] is empty.</span>"
 				return
 
 			if(reagents.total_volume >= reagents.maximum_volume)
-				user << "\red [src] is full."
+				user << "<span class = 'warning'> [src] is full.</span>"
 				return
 
 			var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
-			user << "\blue You fill [src] with [trans] units of the contents of [target]."
+			user << "<span class = 'notice'> You fill [src] with [trans] units of the contents of [target].</span>"
 
 		else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it.
 			if(!reagents.total_volume)
-				user << "\red [src] is empty."
+				user << "<span class = 'warning'> [src] is empty.</span>"
 				return
 
 			if(target.reagents.total_volume >= target.reagents.maximum_volume)
-				user << "\red [target] is full."
+				user << "<span class = 'warning'> [target] is full.</span>"
 				return
 
 
@@ -126,7 +126,7 @@
 				refillName = reagents.get_master_reagent_name()
 
 			var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
-			user << "\blue You transfer [trans] units of the solution to [target]."
+			user << "<span class = 'notice'> You transfer [trans] units of the solution to [target].</span>"
 
 			if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
 				if(refill in drinks) // Only synthesize drinks
@@ -155,15 +155,15 @@
 		if(!..(user, 1))
 			return
 		if(!reagents || reagents.total_volume==0)
-			user << "\blue \The [src] is empty!"
+			user << "<span class = 'notice'> \The [src] is empty!</span>"
 		else if (reagents.total_volume<=src.volume/4)
-			user << "\blue \The [src] is almost empty!"
+			user << "<span class = 'notice'> \The [src] is almost empty!</span>"
 		else if (reagents.total_volume<=src.volume*0.66)
-			user << "\blue \The [src] is half empty!" // Pessimism is the real order of the day.
+			user << "<span class = 'notice'> \The [src] is half full!</span>" // We're all optimistic, right?!
 		else if (reagents.total_volume<=src.volume*0.90)
-			user << "\blue \The [src] is almost full!"
+			user << "<span class = 'notice'> \The [src] is almost full!</span>"
 		else
-			user << "\blue \The [src] is full!"
+			user << "<span class = 'notice'> \The [src] is full!</span>"
 
 
 ////////////////////////////////////////////////////////////////////////////////

From 10202ac78d8819470bae8dc2c8635cdc0262eb31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Mon, 22 Feb 2016 23:19:00 +0100
Subject: [PATCH 08/14] Made it child of ethanol

Synthanol is now a child of ethanol. Cheers!
---
 code/modules/reagents/newchem/drinks.dm | 70 +++++++++----------------
 1 file changed, 25 insertions(+), 45 deletions(-)

diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index eeadd48a815..09c09ceba14 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -68,110 +68,90 @@
 // WOOO!
 
 
-/datum/reagent/alkasine //Gloriously copied over from ethanol
-	name = "Alkasine"
-	id = "alkasine"
+/datum/reagent/ethanol/synthanol
+	name = "Synthanol"
+	id = "synthanol"
 	description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
 	reagent_state = LIQUID
 	color = "#1BB1FF"
 	process_flags = SYNTHETIC
 	metabolization_rate = 0.4
-	can_grow_in_plants = 0	//Alcoholic drinks won't be grown in plants (would "water down" random seed chems too much)
-	var/datum/martial_art/drunk_brawling/F = new
-	var/dizzy_adj = 3
-	var/slurr_adj = 3
-	var/confused_adj = 2
-	var/slur_start = 65			//amount absorbed after which mob starts slurring
-	var/brawl_start = 75
-	var/confused_start = 130	//amount absorbed after which mob starts confusing directions and sparking
+	vomit_start = INFINITY		//
+	blur_start = INFINITY		//
+	pass_out = INFINITY			//INFINITY, so that IPCs don't puke and stuff
 	var/collapse_start = 200	//amount absorbed after wich mob starts collapsing
 	var/braindamage_start = 300 //amount absorbed after which mob starts taking small amount of brain damage
 
 
-/datum/chemical_reaction/alkasine
-	name = "Alkasine"
-	id = "alkasine"
-	result = "alkasine"
+/datum/chemical_reaction/synthanol
+	name = "Synthanol"
+	id = "synthanol"
+	result = "synthanol"
 	required_reagents = list("lube" = 1, "plasma" = 1, "fuel" = 1)
 	result_amount = 3
 	mix_message = "The chemicals mix to create shiny, blue substance."
 
-/datum/reagent/alkasine/on_mob_life(var/mob/living/M as mob, var/alien)
+/datum/reagent/ethanol/synthanol/on_mob_life(var/mob/living/M as mob, var/alien)
 	if(!src.data) data = 1
 	src.data++
 
 	var/d = data
 
-	// make all the alkasine children work together
-	for(var/datum/reagent/alkasine/A in holder.reagent_list)
+	// make all the synthanol children work together
+	for(var/datum/reagent/ethanol/synthanol/A in holder.reagent_list)
 		if(isnum(A.data)) d += A.data
 
-	M.dizziness += dizzy_adj.
-	if(d >= slur_start)
-		if (!M.slurring) M.slurring = 1
-		M.slurring += slurr_adj
-	if(d >= brawl_start && ishuman(M))
-		var/mob/living/carbon/human/H = M
-		F.teach(H,1)
-		if(src.volume < 3)
-			if(H.martial_art == F)
-				F.remove(H)
-	if(d >= confused_start && prob(33))
-		if (!M.confused) M.confused = 1
-		M.confused = max(M.confused+confused_adj,0)
-		if (prob(20))
-			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-			s.set_up(3, 1, M)
-			s.start()
 	if(d >= collapse_start && prob(10))
 		M.emote("collapse")
+		var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+		s.set_up(3, 1, M)
+		s.start()
 	if(d >= braindamage_start && prob(33))
 		M.adjustBrainLoss(1)
 	..()
-	return
 
-/datum/reagent/alkasine/robottears
+/datum/reagent/ethanol/synthanol/robottears
 	name = "Robot Tears"
 	id = "robottears"
 	description = "An oily substance that an IPC could technically consider a 'drink'."
 	reagent_state = LIQUID
 	color = "#363636"
 
-/datum/chemical_reaction/alkasine/robottears
+/datum/chemical_reaction/synthanol/robottears
 	name = "Robot Tears"
 	id = "robottears"
 	result = "robottears"
-	required_reagents = list("alkasine" = 1, "oil" = 1, "sodawater" = 1)
+	required_reagents = list("synthanol" = 1, "oil" = 1, "sodawater" = 1)
 	result_amount = 3
 	mix_message = "The ingredients combine into a stiff, dark goo."
 
-/datum/reagent/alkasine/trinary
+/datum/reagent/ethanol/synthanol/trinary
 	name = "Trinary"
 	id = "trinary"
 	description = "A fruit drink meant only for synthetics, however that works."
 	reagent_state = LIQUID
 	color = "#adb21f"
 
-/datum/chemical_reaction/alkasine/trinary
+/datum/chemical_reaction/synthanol/trinary
 	name = "Trinary"
 	id = "trinary"
 	result = "trinary"
-	required_reagents = list("alkasine" = 1, "limejuice" = 1, "orangejuice" = 1)
+	required_reagents = list("synthanol" = 1, "limejuice" = 1, "orangejuice" = 1)
 	result_amount = 3
 	mix_message = "The ingredients mix into a colorful substance."
 
-/datum/reagent/alkasine/servo
+/datum/reagent/ethanol/synthanol/servo
 	name = "Servo"
 	id = "servo"
 	description = "A drink containing some organic ingredients, but meant only for synthetics."
 	reagent_state = LIQUID
 	color = "#5b3210"
 
-/datum/chemical_reaction/alkasine/servo
+/datum/chemical_reaction/synthanol/servo
 	name = "Servo"
 	id = "servo"
 	result = "servo"
-	required_reagents = list("alkasine" = 2, "cream" = 1, "hot_coco" = 1)
+	required_reagents = list("synthanol" = 2, "cream" = 1, "hot_coco" = 1)
 	result_amount = 4
 	mix_message = "The ingredients mix into a dark brown substance."
 

From 2de6d5fbdd9c2c4b9596b39170731176a62f1d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Tue, 23 Feb 2016 00:02:21 +0100
Subject: [PATCH 09/14] Name to synthanol, again.

---
 code/modules/reagents/reagent_containers/food/cans.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index b8c742dd73c..4a4479c8b1e 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -225,10 +225,10 @@
 		..()
 		reagents.add_reagent("sodawater", 50)
 
-/obj/item/weapon/reagent_containers/food/drinks/cans/alkasine
-	name = "Beep's Classic Alkasine"
+/obj/item/weapon/reagent_containers/food/drinks/cans/synthanol
+	name = "Beep's Classic Synthanol"
 	desc = "A can of IPC booze, however that works."
-	icon_state = "alkasinecan"
+	icon_state = "synthanolcan"
 	New()
 		..()
-		reagents.add_reagent("alkasine", 50)
\ No newline at end of file
+		reagents.add_reagent("synthanol", 50)

From 8fd46ab5661868dd40a98aebf67339e47eb13815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Tue, 23 Feb 2016 00:03:15 +0100
Subject: [PATCH 10/14] Synthanol can sprite

---
 icons/obj/drinks.dmi | Bin 67288 -> 67291 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 41b76bd18c27257c1032721e4ffc27769def9b95..4ec1ce7cc3be68794db065e30ac900ab77d79d9c 100644
GIT binary patch
delta 1252
zcmV<A1RML<jRf0`1dt>FFOelAe@v#`+guhc7Cp3=eE@@&7@K2C^ip(O_v!cGooU)>
zB4&{s65x|eQPi(r^4sm7AOHIFW&7dtr_B+ykmT*-_TBGyo12-U_1nko!+vwqBXzy4
ze~N+O_Hp~>?-2qvNv3Q-xtS@)rei4O&E_VOmhI#AesgnBNVxufX$ftie{4OrV#Zj<
z1I03uUFiH_a}$wa**<O`?soUP`^}BwOgaA4Q%sawk#A=ny8qtI``yDyI}UQ&^5lq>
zgWLv2P#=nEw8e*ZikN+<V)TJ?Pv#kvd#V_nCBRHrf`q|<*nx}V;Ry-`=ks#}o(h43
zG&(5axtcjeO%jDxQhOnYe|O(&?0$E@yWgF3(Ec`7AJV?x`-a%A)vh>SSL`kHkf2GB
z>d9##L-u05<iQ)d9vI3{2NB0IEG0qdeL3In_PhOV|3eq`wb~-8Gjvp4o+b+Qa%maD
zpi?OX+1WXZ#3g|)PF|$*j84oL<&edC%3YmTIAS|7JEKstFgYq)e`Rne+=?|$MQT;%
zT+E@z0S?$Om_rZ)sEYY!IrNY_WXfH!v&nsbA_{lAlkaIi5`@8=0vqITKu2`aWeCn(
zuCVv{T-Sx52&qm@Eikp}9C^efxwI^DW)uA5l>+~$!V%4<J`s<^Wgt&b5=^v2Wa|1$
zPUil#R{iR8(z7-lJGE^+f|YYxw5Wu|5~xuoUlYuz-O@y*Tu&V;4NxW>l}f$veA97Y
zC_^J$_dXqH$JjCyyQu3AKh4ESlYasxe<$qT3H#jf%KGf_%KH5A%8Ekn9COD|O5<_U
zE9tY-E4v`GoUvv<z%o<r&byRzHm(znm>bW=+X=@KdWH_wTh%8`oK>aL`N$sm%!#0;
z+&zsWp+{v;+6XT`ed)!TAVI1i1#AqV2~e*`3K$!|y`+F~-P+x}8#Ju%*rZhYe*oG_
zs&6?fd`+}Ur4NdbeEgF`NS;8Ogr-9ERs00n%sp5Y9H8e3oNHx;eIpu3p^O*^&MbjT
z$4AB_`IafwV`5B_Av!@{>`V!Lo|q+fR2XukfYH#IoCGmZPQYg-=$sTL$UT^OPgw~v
zFH!X1#kB(^a}VMQPn8g&lO(PyNLV5sN)JPQhLSvy)s-&eq+;@wE~WNFwIA+w53gn0
zd+yBB08J3Sl<7<BW8L+AB|3tscs<?<`zC4>Dw40bCKy$o8czvd8k6e-GJm2zN4v5K
z9b3_gs<idhx}rXlT6!29^Hq9r`m92XIk@vmxtsXhkoK=C{pZg~Pg!Q?kR`$lo+>S}
zIB$xIEG}g(BLuv4c=cz{d5$lyU((du80bL7QF;>vik^HeIZ^;amu)lz&#A@mpNW{g
zF6<fi<?Wd+Q&uWY`)WO@A%EtEWvH*lA86-vTCa$S7+3f7KQ{xD1SY=S$6VJDCSNI+
z|BUN}s7~%Ve{q#%N+V++)2W_{BWjY#dgt^%<Gwr}B@W)gI!YYiipv<E#LQr*uG9Mq
z+0<j5!Q4muxu-JVavfc9XRjMv1s93e_5RYJemOPwWO&uvn3=Noy+G(p*{va{Nj%1b
zvh&`eEZKU<;(T4B(ux^^7H7mt+5JZ9B^HkpEvQGi*zeoz$1fkYA3lHD{0lo+x{c-S
OvjBrx1-DrR0e=AsKzGyt

delta 1249
zcmV<71Rnd_jRe?@1dt>FERiK7e<W%5HkU<<MGx&|AHbj`#^#t3y%Zfcefm9kr_FSl
zh*>0u1o$LV6!q(u{C554$G<*(S%3KaX>~*`BzgU~e)s#s>TafJ{rYje->vR?q^`H+
zPcblDKd#^WJwm`H$&?K!H#6nfbPT1uS=~j_vVL4|S9b@6gv;;mEuk%xf33$>%oyu<
zpjbw-E1mCGcM%y*>&Nx}VYA(AS9gjt<@i%iF;Q+szFm0e?ngK8H~X`89OS;`$q_3D
zxett>J`~evCm-4=V)mhm(Fe{wnP*V$sbX}N05f3;5(Wce2QH3>Cny-4&(9HfDg+MF
z=%9#~YUUg@NfcU1?Uf+jfBmSj?Pj~#Zq7Pre;cb0Y2WXBLu{97SDbGv_7-|b&?HFp
z<g}0>d$C^f;0;|53}vW;h+`Q}B|+(ZIp1w|o84yjqKo=kZ4uQOI;x(YCJOa(X&J(x
zQz-=5**S~EQvy9Xd6CXDIx%CELl)~PcXeLji0#Dej6%u6<fv?wf5D+}3)VOlsa2VC
zF^3)pIAFtI4nYi{D(0Kz&_nK!DR;##CinfBC_HS=zUTc&5C(G!Y>>kN9nndbAvkln
zz~1L`T^E8Pq&hXVz|^X9<PnqP(z3{fP4JIb3j9)qBbrZrA|8p$K%Sr^m}rT})b-b#
z%=Wcb{pxepvo;;II&D3Ig>zc8sD#B5s8J?g6U?aHsfkLto;p+-piDX{m3ra%rsKd+
zhDNyVeLB#Nv1KTBRoC}F&Ba-hfC46eXY9@i``q!u`t0$-`uy?2ibC!jbH`9h<8jjq
z>9f-ddqQTpV9j2@GE?p@yOc{dt`m-!8_&ku3C9w8h7Q$R)n`qdRi)DT$R7E^iJ+$3
zJ&hxwM`h322%miV(u*}gf>c2Y*cd_+pk9v@FgAXBNde=swYzyYXjtE|NvZUI0koA=
z-*OiCmS~kq9~2?^_$P;uJb^X|O@->K_zAR`d$1}vK+h96*UAF>Ml_H@88HxCSOV9M
zkBmw3JyWX3#F!*Qbb`LvnG*UuF-z{KFyu%9qoFf731Xt0fG<qYB`Hjhdoc5!vJzxI
zMbU#7*AA4-J%}4TRYHhPlDMu&V2OArJq-03O7cWjSGtUoipf{HmfADb-al;iuVveN
z?#$BwO%T48>1*p_+4X%TI)bTqJ>CNQCTbKal5e;s7*(DcPYGWelk5XBf1o}`yRZoz
zThW55wDr}xpgxmYdKet@ReEvytU`=AxbsT6oA}a@cCRY^=g(PBS!U;uCBh7zDlKwy
z-V_x%xs<t#5b)mN)t^D<IljDpNmFlQpaT_0=}i<Udh&J3kpdXHY@;D~PA!K2OvLPU
zVb8cPZ_jj@vQlx{SL;a)e=#>KLwz;Apq<lcy&@)JT-?+D+zd<-nD}-db6rQ6e5G9e
zGp<*nI=kom#Z{Imjf{azr+O-ms7WU4ozwq}`|^C0ICu-|C~<%rE@ONWGlQYJPVe8z
zrXK4I=04)jJ(U4Zx6u`M_PW7MaFKXh@828LFQ?|73~zcHGgJ1yJ{O%SyEOzgiN|<Q
zcHUb64^Z3zsI+2+pv4)mQg*+PdJe_oLksFru6Fx&{qf6(^@q=&R{sKN)VW>suAKdY
LTm`pW1p$8n)YEKp


From 7efbab93e841a1bde7f8eb8a85d082aa31097343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Tue, 23 Feb 2016 00:22:33 +0100
Subject: [PATCH 11/14] names.

Changed can to synthanol.
---
 code/game/machinery/vending.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index b97007d627b..83cf9225bab 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -704,7 +704,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/cans/beer = 6,
 					/obj/item/weapon/reagent_containers/food/drinks/cans/ale = 6,
-					/obj/item/weapon/reagent_containers/food/drinks/cans/alkasine = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/synthanol = 15,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,

From d3573135d2121e8fc4b54eff18ecfb92898fd301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Tue, 23 Feb 2016 00:27:05 +0100
Subject: [PATCH 12/14] Fixed fixed spans.

Turns out they weren't fixed afterall...
---
 .../reagent_containers/food/drinks.dm         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 46a9d43b9df..589ae649256 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -23,7 +23,7 @@
 		var/fillevel = gulp_size
 
 		if(!R.total_volume || !R)
-			user << "<span class = 'warning'> None of [src] left, oh no!</span>"
+			user << "<span class='warning'> None of [src] left, oh no!</span>"
 			return 0
 
 		if(M == user)
@@ -35,9 +35,9 @@
 						user << "Where do you intend to put \the [src]? You don't have a mouth!"
 						return
 					else
-						M << "<span class = 'notice'> You pour a bit of liquid from [src] into your connection port.</span>"
+						M << "<span class='notice'> You pour a bit of liquid from [src] into your connection port.</span>"
 				else
-					M << "<span class = 'notice'> You swallow a gulp of [src].</span>"
+					M << "<span class='notice'> You swallow a gulp of [src].</span>"
 			if(reagents.total_volume)
 				reagents.reaction(M, INGEST)
 				spawn(0)
@@ -53,10 +53,10 @@
 				return
 
 			for(var/mob/O in viewers(world.view, user))
-				O.show_message("<span class = 'warning'> [user] attempts to feed [M] [src].</span>", 1)
+				O.show_message("<span class='warning'> [user] attempts to feed [M] [src].</span>", 1)
 			if(!do_mob(user, M)) return
 			for(var/mob/O in viewers(world.view, user))
-				O.show_message("<span class = 'warning'> [user] feeds [M] [src].</span>", 1)
+				O.show_message("<span class='warning'> [user] feeds [M] [src].</span>", 1)
 
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [key_name(user)] Reagents: [reagentlist(src)]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [M.name] by [key_name(M)] Reagents: [reagentlist(src)]</font>")
@@ -98,23 +98,23 @@
 		if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
 
 			if(!target.reagents.total_volume)
-				user << "<span class = 'warning'> [target] is empty.</span>"
+				user << "<span class='warning'> [target] is empty.</span>"
 				return
 
 			if(reagents.total_volume >= reagents.maximum_volume)
-				user << "<span class = 'warning'> [src] is full.</span>"
+				user << "<span class='warning'> [src] is full.</span>"
 				return
 
 			var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
-			user << "<span class = 'notice'> You fill [src] with [trans] units of the contents of [target].</span>"
+			user << "<span class='notice'> You fill [src] with [trans] units of the contents of [target].</span>"
 
 		else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it.
 			if(!reagents.total_volume)
-				user << "<span class = 'warning'> [src] is empty.</span>"
+				user << "<span class='warning'> [src] is empty.</span>"
 				return
 
 			if(target.reagents.total_volume >= target.reagents.maximum_volume)
-				user << "<span class = 'warning'> [target] is full.</span>"
+				user << "<span class='warning'> [target] is full.</span>"
 				return
 
 
@@ -126,7 +126,7 @@
 				refillName = reagents.get_master_reagent_name()
 
 			var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
-			user << "<span class = 'notice'> You transfer [trans] units of the solution to [target].</span>"
+			user << "<span class='notice'> You transfer [trans] units of the solution to [target].</span>"
 
 			if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
 				if(refill in drinks) // Only synthesize drinks
@@ -155,15 +155,15 @@
 		if(!..(user, 1))
 			return
 		if(!reagents || reagents.total_volume==0)
-			user << "<span class = 'notice'> \The [src] is empty!</span>"
+			user << "<span class='notice'> \The [src] is empty!</span>"
 		else if (reagents.total_volume<=src.volume/4)
-			user << "<span class = 'notice'> \The [src] is almost empty!</span>"
+			user << "<span class='notice'> \The [src] is almost empty!</span>"
 		else if (reagents.total_volume<=src.volume*0.66)
-			user << "<span class = 'notice'> \The [src] is half full!</span>" // We're all optimistic, right?!
+			user << "<span class='notice'> \The [src] is half full!</span>" // We're all optimistic, right?!
 		else if (reagents.total_volume<=src.volume*0.90)
-			user << "<span class = 'notice'> \The [src] is almost full!</span>"
+			user << "<span class='notice'> \The [src] is almost full!</span>"
 		else
-			user << "<span class = 'notice'> \The [src] is full!</span>"
+			user << "<span class='notice'> \The [src] is full!</span>"
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -407,4 +407,4 @@
 	desc = "A flask with a Lithium Atom symbol on it."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "lithiumflask"
-	volume = 50
\ No newline at end of file
+	volume = 50

From c184c6a65a9233a557108535e53837de1b8abb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Tue, 23 Feb 2016 00:41:26 +0100
Subject: [PATCH 13/14] Names. Again.

---
 .../reagent_containers/food/drinks/drinkingglass.dm         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index 904619950da..1ce5be29367 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -564,9 +564,9 @@
 					icon_state = "patronglass"
 					name = "Jack Rose"
 					desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
-				if("alkasine")
-					icon_state = "alkasineglass"
-					name = "Glass of Alkasine"
+				if("synthanol")
+					icon_state = "synthanolglass"
+					name = "Glass of Synthanol"
 					desc = "The equivalent of alcohol for synthetic crewmembers. They'd find it awful if they had tastebuds too."
 				if("robottears")
 					icon_state = "robottearsglass"

From 2812daf59b37345264dec4f907a3e15934be895f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Tue, 23 Feb 2016 00:55:46 +0100
Subject: [PATCH 14/14] Removed some redundant code that was already under
 ethanol

---
 code/modules/reagents/newchem/drinks.dm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 09c09ceba14..28237207995 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -92,14 +92,8 @@
 	mix_message = "The chemicals mix to create shiny, blue substance."
 
 /datum/reagent/ethanol/synthanol/on_mob_life(var/mob/living/M as mob, var/alien)
-	if(!src.data) data = 1
-	src.data++
 
-	var/d = data
-
-	// make all the synthanol children work together
-	for(var/datum/reagent/ethanol/synthanol/A in holder.reagent_list)
-		if(isnum(A.data)) d += A.data
+	var/d = data 
 
 	if(d >= collapse_start && prob(10))
 		M.emote("collapse")
@@ -155,4 +149,4 @@
 	result_amount = 4
 	mix_message = "The ingredients mix into a dark brown substance."
 
-// ROBOT ALCOHOL ENDS
\ No newline at end of file
+// ROBOT ALCOHOL ENDS