From 37d9cc49dcf3b9723f8f3c9d263d55d81db00c4d Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 4 May 2016 00:34:28 -0400 Subject: [PATCH] removes from uplink until fixed renames old sniper icons to esniper and new sniper to just sniper --- code/datums/uplink_item.dm | 37 ------------------ .../projectiles/guns/energy/special.dm | 2 +- .../projectiles/guns/projectile/sniper.dm | 6 +-- icons/mob/back.dmi | Bin 90817 -> 90812 bytes icons/mob/inhands/guns_lefthand.dmi | Bin 42591 -> 42589 bytes icons/mob/inhands/guns_righthand.dmi | Bin 42732 -> 42730 bytes icons/obj/gun.dmi | Bin 82746 -> 82742 bytes 7 files changed, 4 insertions(+), 41 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 02df9a1821c..f62e63ea395 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -494,15 +494,6 @@ var/list/uplink_items = list() excludefrom = list(/datum/game_mode/nuclear) cost = 12 -/datum/uplink_item/dangerous/sniper - name = "Sniper Rifle" - desc = "Ranged fury, syndicate style. guaranteed to cause shock and awe or your TC back!" - item = /obj/item/weapon/gun/projectile/sniper_rifle/syndicate - cost = 16 - reference = "SNIPE" - gamemodes = list(/datum/game_mode/nuclear) - surplus = 25 - // Ammunition /datum/uplink_item/ammo @@ -596,34 +587,6 @@ var/list/uplink_items = list() gamemodes = list(/datum/game_mode/nuclear) surplus = 0 -/datum/uplink_item/ammo/sniper - name = "Sniper Magazine - .50" - desc = "An additional 6-round .50 magazine for use in the syndicate sniper rifle." - item = /obj/item/ammo_box/magazine/sniper_rounds - reference = "SAMO" - cost = 4 //70dmg rounds are no joke - gamemodes = list(/datum/game_mode/nuclear) - -/datum/uplink_item/ammo/sniper/soporific - name = "Sniper Magazine - Soporific Rounds" - desc = "A 3-round magazine of soporific ammo designed for use in the syndicate sniper rifle, put your enemies to sleep today!" - item = /obj/item/ammo_box/magazine/sniper_rounds/soporific - reference = "SOPA" - cost = 6 - -/datum/uplink_item/ammo/sniper/haemorrhage - name = "Sniper Magazine - Haemorrhage Rounds" - desc = "A 5-round magazine of haemorrhage ammo designed for use in the syndicate sniper rifle, causes heavy bleeding in the target." - reference = "BLUDA" - item = /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage - -/datum/uplink_item/ammo/sniper/penetrator - name = "Sniper Magazine - Penetrator Rounds" - desc = "A 5-round magazine of penetrator ammo designed for use in the syndicate sniper rifle. Can pierce walls and multiple enemies." - reference = "PENAMO" - item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator - cost = 5 - // STEALTHY WEAPONS /datum/uplink_item/stealthy_weapons diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 215749f553a..d6c0ad7beb3 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -148,7 +148,7 @@ obj/item/weapon/gun/energy/staff/focus name = "L.W.A.P. Sniper Rifle" desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope." icon = 'icons/obj/gun.dmi' - icon_state = "sniper" + icon_state = "esniper" fire_sound = 'sound/weapons/marauder.ogg' origin_tech = "combat=6;materials=5;powerstorage=4" projectile_type = "/obj/item/projectile/beam/sniper" diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index ad6eb172aa9..ee70bb3f80b 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -1,8 +1,8 @@ /obj/item/weapon/gun/projectile/sniper_rifle name = "sniper rifle" desc = "the kind of gun that will leave you crying for mummy before you even realise your leg's missing" - icon_state = "snipertg" - item_state = "snipertg" + icon_state = "sniper" + item_state = "sniper" recoil = 2 heavy_weapon = 1 mag_type = "/obj/item/ammo_box/magazine/sniper_rounds" @@ -19,7 +19,7 @@ if(magazine) icon_state = "sniper-mag" else - icon_state = "snipertg" + icon_state = "sniper" /obj/item/weapon/gun/projectile/sniper_rifle/syndicate name = "syndicate sniper rifle" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index b7149b63b04733677318393f811a4f8687b2d6ab..877f91de1f4943d53720b63360f6fa3d2a4dbf07 100644 GIT binary patch delta 1061 zcmV+=1ls$-#Ra^@1&}0v0(w+fbVOxyV{&P5bZKvH004NLotR6H<2DS(&&j7ScCX1| z@|aF9IczbDVu0@UQ1l!qGHr39hbz%}^walXd*f{D>OTXY4E)50L{bz#7QcM?_2paf z{PksiqL?`NVpnWGJ(3in7#XK3qkvt?+tA=jSY6LyaXC+y6Eq29vG5YS-iegZY ziNS~e_jPmAxLT|hh{T$WLteI8FHNZkTpYX!2jq>2x%XUUVOZnC5$ zhDPb*!&~509`-eV6Xe!+^7r4K^Kg{C4$diG0%1*2_T+2!M3H?B@vq9W1WdN0lC`oB zn@G2j<(h>nj-)P>KMxqJxsrpbVK9HXJ-E(;EsM%;rU|xWUr)!&(+`-GigwaP_>JuQf&-rALNPi`)=Jee1VBbuCFT+IrS>N3g|6c9bGpx$7 z=SfYY`{8l1UaaP`NN4utv?zS*di>p9zIWXza0%OZ3S1(Zwu|j;@llELDyze)L{Tg6 zr{w=Pn-BUCjAY&j2a<0@1Nk?iffVeo11Pb2HYw4D@;8WMhux;(a;+(UARV@^U@%|9 z8>^C25b3FZbqZ;9zmrQ*KJR?f+LXTln%1VN>Oabf&0_Pz8YCK<)+Xc0gbU1`IG?lwYp#HE`YHx!u!f!(s%*)B5CP|9h~&>dK4aj)w)uL|kud;| zzGR4`f8~NOs9%#89e_|VM4~NjtP3F6+KJuYj%((6u^D$Q$q-2$3CSKqBqjibp#u{J zqHnYgW(S@}h|1R>+qAI(9wx~U$zR|RN5vkQT68dwvW7?^Qn(C}q^mC(^ytigzcX&G zWG&=>A~@_wo*QIp&~d;(qyv$*phtnmpeKRWpeKRmAT^|7ZB1d~rN`E#BOWof4p>aLSs zKipQGl~9Cd*mtxN2bBH0C9et?CY;HZ6ft{$ShUH;`XONB6>Z2tU`-x-|4Fz&+=;tM zE-;>@SYP+xP~Z@fsH)26;-S^Y$=Df>vfHWx9u^(8Ojlnr(th_m+NurW(HU;fzrhj- z7xwws?&%Z9eA_noXvlGr2wPo~&)4UkHP;fi1bLhdMnfI!_|%m{I$5j(=&+?zllFcS fEWUhuE}p->%>M!VCN0V_QiptlGz7Oa1Obg+vR(<^ delta 1066 zcmV+_1l9Yz#Rb8|1&}0v2YOUkbVOxyV{&P5bZKvH004NLotR6H+cpr#&-SMflB*r8 zAKUH4hZGwW3pDAW=-HsDkvMBURC44;KYb69VmYnK|1NYA@Z$`JoEPU~@ynNAU%nO3 zUti`Yiiv|ScE$G7!+dt;QcSTcHtYG!5Z6Y!pCn4C*cBg?rzD1dg!PB{tmK%AU9p|d zs;C^LVpptg=t1dYqx2B~eHkoM%#$%3$wNZ5YUl>7M$prIR+3fMVppseqwj95CuO_sF8 z&?tR;cniGB!@g#Jg3S6({{Gu@9*(lt!8zqiz^y6Do_x)oD6+31{#ALFfXQ}LvQ`#i z6X`axT(fY+k<^9q_W^@7S8`A_4CZgQ2iJM9Wl{OVG{Kha>uG;^`XSPX?KefOaSY_@0cY2bF#3o~eFCKRF`q2r>92(4oSs`A?3?L-Wthl6>$^Jf@70by!>Sy6 zp42p|508uWVl|&dINr^U;uON;cR!zg@T2uZ)I&5FTU_OU8 zRwbt((o^ey6w>N`Czqmp-uR}qDPI7Z)~2cKKZ=RXV)Mfq#2cH|CZq^7txZS;Xj+?) z^dC9o`@+aU(AF>pr~Ez{CY#SUs2lg(QmY1M4LKMlAb}5TWmW#j1{evdfpr9**wTlH zTbC#wG6O5&0<$O12kpR`D`1?yiUAs|p(lniTQWp{z(1Ac#(1Ac(kQ!34wkjn+==<2w5MVU{i>j(n zX#<6fkfq2$@>2*Q*VL`w=eIkMxXk=$V<0y$xrNF6#SY|8F!=+2pI2OL5YRaN;|Jhb{a={w^gc3V}zlcK|x>FP^H8t?lf8giT@!n>}?=ks&Vnrn&g1bLPXn}&MV@vSR|^st^AiUPb2JvS5> kmrhNhAB!*Fo{Q(NFY|u@l&CC6$e~4*gD(WPF9ZRNUJxA$F#rGn diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 46b0465a7199a096bb68e558ca911db48f4a5a9c..63fbda7a4bd07e354ebeb3b69cdce47bc91ee518 100644 GIT binary patch delta 42 zcmV+_0M-BB%mUra0+1vD@3AG}0v0!YDY+C6&-dc~>9P0&=GiJh+3hI?vmOIMqrhtv AmH+?% delta 44 zcmV+{0Mq~7%mUxc0+1vD@v$Z00vM-!n7r6tiihWWasTvK`~gYND;rwark=AL13{wz CVHPt0 diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index e57b8ad170ad17ce8767377b3b99b632d46415c6..d8fada37744fe61a221704cc532b5f87fc56928c 100644 GIT binary patch delta 42 zcmV+_0M-BO%>wGp0+1vD?Xe}_0v1hQK`zC^^S!u#dMy3`^7|Na6QZnlvm67^qr8+9 ArT_o{ delta 44 zcmV+{0Mq~K%>wMr0+1vD@3AG{0vIVDCaH8Yai~Zj0MWbrr6F7?5oO zdz1ogjrVxJ>;mwv!Kr)r`rCL`xcR!= z{I#eTV?}f0>TQ0BQwH2!w_jJ_R2SY|wO?1@R1n@>wO?1@uQu)8^89AX?x_O-?|!o> zCV#BrwrXnYJ)xTT+_YWxBQ5lJtB1oWEj_~ zSLu(|yp!4Xm`;DJjOp|W*O*S<)No$x_hv5|RSU1c`bIA(kD>uLX9n6h3RlK}NDAyx z3bZNSvV^5l*7KPhX^i`234q-}g86JAW@RVyuT- zoE~m*dbq{urDm=K4m>!3sLcT-tqvqiUfO ztOvT zw^~kCpgS!mE69zOlNIDX%YVrVa+{^k^mMBDZft!tTE4W_{7;tNOlRwF;~C-R>q7I_ zqF#&@&5cX9`6W&naChB)U4c_wcz4x)U4c_Ucz4x)U4g&aw0q0*n<=}ejsm><&8C?A znTp%0sZIBUYT|R_wrXPc=eB6#B*tw~rWHGP=$aR_4K|?YS9CsT@_(Z@A29hXoe!A& zM9&8dj49?{lxR0|K)EyUD#8F`XW$iz0nT+s)wR*WgD;*BGWUpk)S)x(5hjP+BTG)X zM;85(Rvq?P(VO&%M!y<17G&V`a@3_Dt4_CXR9#bO0rvGi(ODJJ0`0MV;>nMzjd}9h zZIRFSGN<+#Ka8i9Y&YPPbi^X>2b|P>p!2FtTp#GnlRjZ#(}Sh3Mzzu|>gf%#-)DdQ d^JDho@1KwV2UCmr*IyiWeS;1Ow+;ybC^~RKEi3>4