From d2c355a937e935ea38894cea42d9b1762207dd94 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Wed, 30 Sep 2015 17:56:35 -0500 Subject: [PATCH] Adds in KillerKickthroats --- code/game/machinery/vending.dm | 2 +- .../objects/items/weapons/storage/fancy.dm | 10 ++++++++++ icons/obj/cigarettes.dmi | Bin 2814 -> 3160 bytes 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 6a6d4df1fd..b55a034fe1 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -780,7 +780,7 @@ icon_state = "cigs" products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/flame/lighter/random = 4) contraband = list(/obj/item/weapon/flame/lighter/zippo = 4) - premium = list(/obj/item/weapon/storage/fancy/cigar = 5) + premium = list(/obj/item/weapon/storage/fancy/cigar = 5,/obj/item/weapon/storage/fancy/cigarettes/killthroat = 5 ) prices = list(/obj/item/weapon/storage/fancy/cigarettes = 15,/obj/item/weapon/storage/box/matches = 1,/obj/item/weapon/flame/lighter/random = 2) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 0ed8ad7b7b..a2fd0a9a0d 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -177,6 +177,16 @@ icon_state = "Dpacket" item_state = "Dpacket" +/obj/item/weapon/storage/fancy/cigarettes/killthroat + name = "\improper KickerKillthroats packet" + desc = "A packet of six KickerKillthroats. For those who somehow want to obtain the record for the most amount of cancerous tumors." + icon_state = "Bpacket" + item_state = "Bpacket" //Doesn't have an inhand state, but neither does dromedary, so, ya know.. + + New() + ..() + fill_cigarre_package(src,list("fuel" = 15)) + /obj/item/weapon/storage/fancy/cigar name = "cigar case" desc = "A case for holding your cigars when you are not smoking them." diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index 3da8e52c6ba9b95b6ae453ee59b75b8ff29d98e0..74bb7a7beb572a0f49e791121558e26a61e906c4 100644 GIT binary patch delta 2757 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 LNkvXXu0mjf>JVEc delta 2408 zcmY*aXHb*r7XA`C8bFFjAe03~DWZVV3An6T8%02HSwK(}FH&4WiAnfCnxGgk(gQ(M zdI_sE4NZzDCAv~XAb>Q3AYej5NJ19(?vHzCPCw6?Idf*7_x-qUTWNoavm**74VMN0 z0CwtEhx0qW{fA15?AQP(=@& zX(_33nEZ;`tm5MIq_~v0Xi|PL4u?xmPDqN0EG$ecDk{#rmy(s0RZvirnU<0q6G=>o zzZ-vxL@LhB&C5tm$jc?=lSmMV$QFws_vZsahbrr-gh@liI_d#wJp{DW)u>_(gm6{w&Oiv+`GKpglU6JGjJW(8K zg3QXw?zwsMjJbKq#fujD`oebLpt|}-6Y#YT_*?-D7XkEAU?30Zeh3^w$k-X|J9i9W zqO%8eRMpK=(?nZ=xCY$^^61!w2MUZ@zwT$42RrwKpwBzH0(J`@ukOThx7<9@4gukp z|F|B8z8)F^0MVq(p@Gy_M-;`TBbbWzjh#i+gH;o|J-WI#rT?fdhY`2aCoH$vNmBhM z4yiK^NcqbDDtoP>Z6tri@dM{VL7Hqs(8g&a`ZYaXJ*s^6NiXPrK^0rE|J-d#jydTe zdnlZH`AYGhk2kbx2HY=TLe9dGZ!H|dNqfz`r_m`NWJ!aCeEsGcq(#(1x3FE(?-Rd~v|#|J-}pQOn`42tmX)tQAi6 z8WJ`20s!%{Qx5iS(WDhpRJ3b=VsfZgP#_$8IbT$y`kY>83U-FhC~k^!kqXK9+y!ak z^t9}eNNwUkIduJ@)V&AqynAlUA6*6MIyxbUu4DOCs1|`9z$9`C(Ee3LY{CR_6d!sCtx9Cg$OOg zv?K#)^sGUV6I1z?KY*xRL!#&=<@6O-)Sa(pHN$Vboa999{}sVWwD7PhPFT43g~vIs z3F0{qDQ%ULR6?!cfr?FS+{lk7!ulI=OG<~zW>&Sk(0@U^{2 z($Z42JN;D{Z7(+TS zN-l;D4hiJ?`4k(7VM^3FR$0ICj?TM|CzfZMdjsFTqn3j!4WOX znK@TSn-!MHpqkB+L9Y|ZeEo(O{>u6BxueUr_qv(n%YxCxLS-8yyk+{;A=hGMZ`_-w z+9mfD)(m{_+ZqSo^70y=>pP5+{{4~P{u(unmZhbjnhl>QPyjQdqnTf3T)jePcwV6| z5v<=@)r9!D`zjy4kxcQ%dC2wa3pFoSn>npKjp(&U$r>2+LVqryzF`pVTJU8A%+FH!d>ptr< z%QBMtLCV{j+ofITIgE?{F7&4W42dmj-BQFdOB4H-m9eN(6CL~7>~ej8wUGX7KRRqv z5rI(acva~fm$MiJYxlTBkLOCagSw0_o|_Vj(4+3|kDw3mP(vY^w5x3CM5NfZa{6*a zEI;*=icD1G_o-G?!>H%;J7ixMcQUOM>TCDsHMDUP*ELjK1P5s@tczZMupgIC1vtCk zvf+2*_~m4ge>mAe2Y+qQ{qN2@cI%gHvF7M8w4wKleg_XWXdBlhpc;yirf60Zc2jLH z(*@MNVWEIJE5_n*P;6#Mqe)czeetdB$@t|(8zs!|?O6h9mw3bSVxn{o<1Kys898~g zPhM5^BZVx%H1geU%vDl>RQGm_*O6&9przgDX_LuZTNx~t&1_!qZ8!|{O$Gn-fy3(2 zsx^N}25EXir1;jHZ@r}q1~wzWpM4)gxUoU}l*A7j@#iM`In@;`UmW>7tlk&uqM6OF z6h_!0^_>w721WB`#4|CG+XXb*Afb_nC*(_4$qi18o5*qNq08c)iWD7fa#3S#>~GaA zZpO+-+7kS#C|D)f|pokMuNw~<|_VqqvnvsJPgAp%<#bY8ClI%kB0@Z zA#p5G^sXnml-a$K!Hoe}u2h2RB_4;$S2HP*SFQXRCMTn9k3pmHqU_~PT#RTh=GN;BB z%xb37c$nEc^-hE^{2!v