From 74c19d4ec81b9c666541f97d438d37280e2321f6 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sun, 1 Sep 2013 13:24:13 +0100 Subject: [PATCH] Added vacuum flask to bar. --- .../reagent_containers/food/drinks.dm | 6 ++++++ icons/obj/drinks.dmi | Bin 59748 -> 60012 bytes maps/tgstation2.dmm | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 66a1b3e343..02215e98c5 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -395,6 +395,12 @@ icon_state = "barflask" volume = 60 +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask + name = "vacuum flask" + desc = "Keeping your drinks at the perfect temperature since 2321." + icon_state = "vacuumflask" + volume = 60 + /obj/item/weapon/reagent_containers/food/drinks/britcup name = "cup" desc = "A cup with the british flag emblazoned on it." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 6e4d355c5bdf42f72c22b4300d557da7eec97bb3..89e27c1919ca84e4712497c43f9c0817af30d905 100644 GIT binary patch delta 3605 zcmV+w4(jpb(gW<&1CS&Exv?ds1RNl?r!Y~zkI)6-+%kM`VS810&@-I6T-9L z1ijaPoqKFk_Z7##_xfJHV&_#8@}vudZX%#kpo5l)&_UZ!8BH4$TtoKEd0YtBtwN@gb^#3-3_D33XvCa$KCfs%{72(7& zC|K5l{K5i!Dgj%5^Q!E61OWhBA9|4c`+KLPJ4+Yb^nGqeFSb7PpzL<7;k7@1GH)M! zLjr(*pPgKE{^{M5_l4@|A3(!v(?@DEp(xLax867sJC@4RaI5+`Ft=K3@{iX+5XXF z(89$<@DD393F)&KAuu8Mf+iS)0B0Eir{{rjvm$x~0RVq}=eX6;>ukH!-ECX8V)?Bl z3o2kV79cDz@Vf(WTphyaAHLtl={eg*+@nYvzIx9_X5yzJ_rDoRIUwYJ0Avv?!$Ju5 zNUUK2!}Gw*BLMQ;CtJDbzJh|)7D!8dSTt4vquB~^-Z&&q02EFG=o|FltY;LrJ=_U~ zjZFRMSRfPti3bLDK2L z=s1}3%;0sB?#U;2sq43*yk8 z1G0Morw8@u@s1;(lVA)Ffa7=+czFnG7RoI}5J`Dr=MR)i^UpEJ0mvdAFprnN{aKwe zMSelrOZViuPqtEjacv%g-T*HCs}Jm07=HDfLM@$tY->X{^qU}vxd9~s<~A8e0FoIW zwL|f0>dd4KN{+;*>o-LK2!bGpbjZj7NHi|dW37yFHcUe#yQbFXk*xpO;204EK@i!` zj0yoIOM+9==w*wMqbUG_AZ9Z(1(4gM?Eo|mhMk$**j}QOwdOqOYpb74GzE-FKMS?? zIUs$1ZS`}RmX;RDK?!EWk84U`^0myCAssz|L7R@s z*nu`2oOC_@oRa#eN0FO8ZA8l&y`juMx1VMapW>g4h zC3a+VtOQZx7q2y)QI=afQD2RICu@U$TH2g74~-wSr~DTg0V+$#<0=Dyy1Ji8j>_dy z{Lkn$B?&{c0ym655OD}x+v{T2<}%Sf?iul-!eTnKXT%$OoeTXZh`B^s5rBHrSot$e ztOLtv14+|5II8H4ge#GTwtVoMf5nC@rj)i!!vd)($!Bj`c_LnehOkz-&N9AyZ`CZ z)ZV3v6EJ!7KZ0$G3YC%~Qcz(rVb6#cy&`X~clI`(0oKc{QC3!l;^Ja-baZ6&I{@Hv zx#Vt6*3i_{6pH|C+O$c3>*f%%l=KY+!{F1)C#QX&v%#8MvN z{rGlhp`U8Bub6(COc;F?$`Q9sasqONded0>-V?3PU%u}v`O`g?*s!
FYtDz3vX z7J2)5zb6uMVS#1leES*n`jpaJzI-`&o}YBCpr9b-`#U;1WDUQ6XB+kP^|1&5LClo2 zlK?mO9{t+!!I}^!iXk9%^4&YbOM^aD&YB2-vR0DxguXgu%tG{&L<3L^-@6el3w5lH0}5Ck!m zjOL2N5+5AV6*CAUB#A%)@8;TY5T0;Bh+!B;lq5#SC^!FqoJ=1qG}X_g{-;Azz$n$L zqO=3RP5>(>e&!bO;eRc7vCxWoXK!P%$lEI{CMe|qxLhs*M5a5x;%-y;a(CS+tR>P=(i?_FCkC^2j({yZaz8~{iR8&Wd-O#0gDPe=XI$b4i| zdzYeB0S%Ua*AX%NKy(EFp&l(Gqj+Rw6h|v7?0ZJMnzSL_35bsfB)p!pIRFG92N{nR z?>7falxPU)&kp^Y(bV1rK#h{X(eVGv3Fink_+N-^0f4pLF7$HZn#i$1iB*6Al1Bl6 zsnY=fFg!dQy++2LAf`dna4|9WP}=x!F10Yb|GY1MNn+PNY%aAZ{=mOaAF!U>{kx>Y z-uv_cRVv|e*1RcYe?9c3z3~|03W6urzv2Dcz_OkmmcQtQa5&Vk+bS z5NT6y8e_1tMbpiI0H|WTFn$P+{= zv^4gAsg@OLJ>AgN)up98F-su_fFKAW4Fo}u;!6_GpMRqyb~cqCCWv$)2Y?_5A`NP5 zYbTW?b~qfd*Bdu(M00a9L&=B4Y=RsBf*^=AsjaPzy^iiVkXVdJDLOkl71tng3+D9c z(^|KIAP6GsvDs{smLkTlG#D5dKwn><;!^-*Z@&4a)X~uq+YZ=bv7ofH6#Mq=o00DN z_3LGBAu*ev2mnD4L>eU4BZ$@@7#<#m%jII!SbDg1>sFdxAY_9a0D>ThG)Y#EfR-Q< bvz7k?>DZ1oY+6>F00000NkvXXu0mjf(hk3h delta 3339 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 VKe~~tzzYBX002ovPDHLkV1kUTVBY`$ diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 313780f04b..8c9225e159 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -1898,7 +1898,7 @@ "aKz" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) "aKA" = (/obj/structure/reagent_dispensers/beerkeg,/obj/machinery/requests_console{announcementConsole = 0; department = "Bar"; departmentType = 2; name = "Bar RC"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) "aKB" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/camera{c_tag = "Bar North"; dir = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/table/reinforced,/obj/item/weapon/book/manual/barman_recipes,/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) -"aKC" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) +"aKC" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,/obj/machinery/door/firedoor/border_only{dir = 2},/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar) "aKD" = (/obj/machinery/power/apc{dir = 1; name = "Bar APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/stool/bed/chair/comfy/brown{icon_state = "comfychair_brown"; dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/bar) "aKE" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/carpet,/area/crew_quarters/bar) "aKF" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/structure/stool/bed/chair/comfy/brown{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/bar) @@ -10171,7 +10171,7 @@ "dNE" = (/obj/machinery/mineral/stacking_machine,/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/production) "dNF" = (/obj/machinery/conveyor{icon_state = "conveyor0"; dir = 10; id = "mining_internal"},/obj/machinery/mineral/input,/turf/simulated/floor{dir = 8; icon_state = "loadingarea"},/area/mine/production) "dNG" = (/turf/space,/area/vox_station/mining) - + (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -11719,3 +11719,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} +