From f1d83d3f94c91ccd41fa680d889aa9dc83d59072 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 1 Jul 2014 07:29:30 +0930 Subject: [PATCH] Fixed some vox icons. --- code/modules/clothing/clothing.dm | 4 ---- code/modules/clothing/head/collectable.dm | 1 + code/modules/clothing/suits/jobs.dm | 9 ++++++++- code/modules/clothing/suits/labcoat.dm | 1 + code/modules/mob/holder.dm | 1 + icons/mob/species/vox/head.dmi | Bin 1997 -> 3363 bytes 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 80ce70964d3..805f85f8755 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -158,8 +158,6 @@ BLIND // can't see anything body_parts_covered = HEAD slot_flags = SLOT_HEAD w_class = 2.0 - sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') - //Mask /obj/item/clothing/mask @@ -196,7 +194,6 @@ BLIND // can't see anything var/blood_overlay_type = "suit" siemens_coefficient = 0.9 w_class = 3 - sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Spacesuit //Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together. @@ -214,7 +211,6 @@ BLIND // can't see anything min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 species_restricted = list("exclude","Diona","Vox") - sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/suit/space name = "Space suit" diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index ba498495a4e..c944fbd63b6 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -9,6 +9,7 @@ name = "ultra rare hat" desc = "an ultra rare hat. It commands a certain respect." icon_state = "petehat" + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/head/collectable/slime name = "collectable slime cap!" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 4130812d386..8ad2e7751eb 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -11,7 +11,7 @@ blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/nutrient,/obj/item/weapon/minihoe) - + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Captain /obj/item/clothing/suit/captunic name = "captain's parade tunic" @@ -20,6 +20,7 @@ item_state = "bio_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') /obj/item/clothing/suit/captunic/capjacket name = "captain's uniform jacket" @@ -36,6 +37,7 @@ icon_state = "chaplain_hoodie" item_state = "chaplain_hoodie" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Chaplain /obj/item/clothing/suit/nun @@ -45,6 +47,7 @@ item_state = "nun" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS flags_inv = HIDESHOES|HIDEJUMPSUIT + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Chef /obj/item/clothing/suit/chef @@ -56,6 +59,7 @@ permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list (/obj/item/weapon/kitchenknife,/obj/item/weapon/butch) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') //Chef /obj/item/clothing/suit/chef/classic @@ -76,6 +80,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') /obj/item/clothing/suit/storage/det_suit/black icon_state = "detective2" @@ -110,6 +115,8 @@ /obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/weapon/tank/emergency_oxygen, \ /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') + //Lawyer /obj/item/clothing/suit/storage/lawyer/bluejacket name = "Blue Suit Jacket" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index ca6d5cc5976..4cb25f57cf9 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -7,6 +7,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') verb/toggle() set name = "Toggle Labcoat Buttons" diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index d65679d947a..747467a66f9 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -4,6 +4,7 @@ desc = "You shouldn't ever see this." icon = 'icons/obj/objects.dmi' slot_flags = SLOT_HEAD + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/weapon/holder/New() ..() diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi index 7149efa9d50535f20580c6ed495bbe98513c6b92..d0097e8d00d1f31c0cf66f571a1328a81c0a9966 100644 GIT binary patch delta 3298 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 JR9tb3{tqOSbV~pL literal 1997 zcmb7FdpOho9{+BWxrWjiGxy1`vv^b%vN5+&CRUbyZYiQ+E-?~v&8@j~a!Kje<%<_lw2m;H1gXz&-r!!JJ0#&^?rTc@8|P=zuvFs`8=OoPY)Mm1-JqL z0LnyHM=t;XNhk=AgGj>3S_)Yb@;vvEoj4p03Wd@zH^*QwC|5i{qXFgRz{{7eB9Zp4 zoq(q&u(*hEb-_|7cs!m$p;-I+I@sIqw^B#zDeXn8hPfjWee_IBOb`f!q@}*TK1y2= zi^XOc8r?)=UH}jun1&xg!^z1hLR)7AkfDM{BooaeeT)w~J6}!F?jJn*=`%L%xO(Y@ z%AU0;sm3@j4{refaX3VBs7xYL;vA312FHZa;=-aL0f1iReTWuwO8Cv2wzM*3>i&1r zp6*_6=0Wp*%LyL3cb`co5K~ad##(w=4qCeDRq;yNOUQcOf1ukOtoAgZ8uTpo9L&wP zG-|x9aic8X@-E84YFqnmnehF@*ThcHrdpS{k=IY0|0I)yFFaujJW}TtUJ-so=mU$dO1IS1gn}IfeB;ncknR^>;Ng< zhu->qVIxV*C}`}sI7JRYYHw!djoSw&fgCMUHF zWjx`M2G#u65w6J)Wl)P8)U~`xb4Tb&d2c^y0u5QlHJ`6vTc5!AWQm7Y6P5 z>htlspn({^b{IZh@WRT9|2KhN%jGw2k*PXucU_E|o*4D9s&6Eiw5DF-4K8qADYPTf zpx1)pPO}O`HMeutUBMT=8h0uQj28nx!Wg)5cJHNLd#G2!U8C83Jc)_7)piEIl*SYk>vVGc zTq+;3ZNm7dg%MDf;AAvTEc!9mQ#M<%RcXXdKU38~?%x2*i9h4dZB3Dal-Y?Pm=@es zOrNm6m(ZUWQD@qlumY_@h&Bms`OFB+mgiIgQvoq#SXb5lkzIX6K#LUGBvAcV&&;BH z!q1vC9Ux`Z>!3Lm&v})Jh5y{<`~U<{CJz7Ve~ZDdZoqE87P5AHytEGb2jrIk=l@Fp zY)sd)Y)1Tc#xJpTRSdZUK64*;b@%w7-M-wrv0|Sglys?|vNHSYdQWnF>Lu__3dXiW;ueya?YTeTdj%3AToue}=6q|<+UN@S$I#pniW7KsjhSxMSe6d#y?`URy7I%+m~Ou)_&}CgE;8`+c+p$CF8-_SaxTKY2Zg23+Ef1eXL9FtOisOHpJK(TGq51i7B42)#C;t$NN+u)IV{@G2Cr_9e; zJyM(p%uZ`)**+$0fvrb2QFS0C6wNY(Osj9;5YsV`(GdJA;W6#b2SfB7mx=t zL!!V-)l)S^k2xa_Au-L$te(UKMiE!9{cT{iy3RHXq*zpgeaIt??miI!Zs@=T%`1mg z^ksPD*p81NROGSKceMNnpCe1KhD+#TZp8e-Nkrj8Q6B1h+9zgSaZNkVzAu~qp*3{+ z!n0~Y=~b=W&1WjC@wG=LU+x;#Pl)9Yw{7D8p6ws>zA*&}(&mS6z9M|=U27}1*#<;> zcVH>+dV6K!35KKNhOvQ3(u`rje?46*nrN4=ZFq7p;W}D{lyh&cMg~W^dqRce(MJ;6 zc&DUdRHm1OMPIQKr7JZv83A@HpA78QozJ?uwy2%IF>)d_HH3X=U-ziB*?G ztYm5qWUc*(tG^q(ihG+ihCSa`E#y@L3(kix9B+8!BKM;4KmPOt0zp{?$s#8o}d{q8Ryy})|-NvDA V>;U0dpjiL_