From 47a072742ee897c8d29974f772481f0ebd889cef Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Sun, 14 Dec 2014 16:46:42 -0500 Subject: [PATCH] Removes Snowmobiles, Fixes Ion Inhand --- code/modules/projectiles/guns/energy/pulse.dm | 2 +- .../modules/projectiles/guns/energy/special.dm | 1 + icons/mob/in-hand/guns.dmi | Bin 941 -> 2585 bytes maps/RandomZLevels/clown3.dmm | 8 +++----- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 46affe1165c..e11a604b45e 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -2,7 +2,7 @@ name = "pulse rifle" desc = "A heavy-duty, pulse-based energy weapon, preferred by front-line combat personnel." icon_state = "pulse" - item_state = "pulse" //so the human update icon uses the icon_state instead. + item_state = null //so the human update icon uses the icon_state instead. force = 10 fire_sound = 'sound/weapons/pulse.ogg' charge_cost = 200 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 6826924c6e5..6bfb4193800 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -3,6 +3,7 @@ desc = "A man portable anti-armor weapon designed to disable mechanical threats" icon_state = "ionrifle" item_state = null //so the human update icon uses the icon_state instead. + icon_override = 'icons/mob/in-hand/guns.dmi' fire_sound = 'sound/weapons/Laser.ogg' origin_tech = "combat=2;magnets=4" w_class = 4.0 diff --git a/icons/mob/in-hand/guns.dmi b/icons/mob/in-hand/guns.dmi index 9f0b1ae7ae8f06223db37094b053b95f7fedd4cb..77aa1761adcd942276949d043d087c6e3bf8c06b 100644 GIT binary patch literal 2585 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 literal 941 zcmV;e15*5nP)C0000&P)t-sz`(#J zB`HBbL^Lxt8W|gIZEs#(V2g{4PEAo16clA;WkyCu^6~&yR#r1JGaeouJUl!Q5D+gf zFFidyPE=SvK0X-aJ_P^(00DGTPE!Ct=GbNc004e^R9JLGWpiV4X>fFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+ zsWc}iB|kkrM~RCwC9|j)q>+m=ttc@!6~s2gR9Qq&WwNC~dJYjLLe$|jPg%j$&jsu$ z0O+?qIToaDhyVZrk4Z#9RCt{2SkZE$Fc34?p(PMZp!fg3dbUFo1H1N`Fw?t^^wJjA zl59w(l2QNw008hGq55h4`YZ=o9$Kl^#++jy%cC!p1Kmg+q;}}NTZRz5EnnwK}@I>|MZPbYq@# zTA4;Fy{w2<$NENkhTg%aSze|}nNMw$5q}6xy!wTOr^LZxplIE8b!4EBCp?AlOH-^L zt&T30@|fp4aOC^P5bwZA-(vs(000000Pyej1aBIvYT2AInx1^KJ*Y0S*yi-SmwaSn+VpO1F3#+u)jFZOrmL9I(UAcOs5UEij{l{C4#q&kd=ri2Xk zYRTrjfzTWX!{6OG;O}mO{YzougYnWFNYm$i@RM8%W9fDx1YFj@qdAa00*5c}fN5dY z!9FsO3b-ZBL4f627!SIgNCw>U_-&berle8|2jVxg&#csmOVAkrz;D4{V&)aYGqPX_ P00000NkvXXu0mjfA62E> diff --git a/maps/RandomZLevels/clown3.dmm b/maps/RandomZLevels/clown3.dmm index 99171f4c52e..3ced37e67d7 100644 --- a/maps/RandomZLevels/clown3.dmm +++ b/maps/RandomZLevels/clown3.dmm @@ -249,9 +249,7 @@ "eO" = (/obj/structure/stool/bed/chair/wood/normal{tag = "icon-wooden_chair (WEST)"; icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/planet/clown) "eP" = (/obj/item/flag/mime,/turf/simulated/floor{icon_state = "dark"},/area/planet/clown) "eQ" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/planet/clown) -"eR" = (/obj/structure/stool/bed/chair/segway/snowmobile{dir = 1},/turf/unsimulated/floor/plating/snow,/area/planet/clown) -"eS" = (/obj/effect/landmark{name = "awaystart"},/turf/unsimulated/floor/plating/snow,/area/planet/clown) -"eT" = (/obj/structure/stool/bed/chair/segway/snowmobile/blue{dir = 1},/turf/unsimulated/floor/plating/snow,/area/planet/clown) +"eR" = (/obj/effect/landmark{name = "awaystart"},/turf/unsimulated/floor/plating/snow,/area/planet/clown) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -503,8 +501,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeahadadadadadadadadadadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeafadadadadadadadadadadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeafadadadadadadadadadadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeahadadadeRadadeSeSeSadadeTadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeafadadadadadadeSeSeSadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeahadadadadadadeReReRadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeafadadadadadadeReReRadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeafadadadadadadadadadadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabagagagagagagagagagagagagadadadaeahadadadadadadadadadadadadadadadadagagagagagagagagagagagagabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa