From eea9ae50ade156f693bb1b7c7924d6bf537639f8 Mon Sep 17 00:00:00 2001 From: paprka Date: Tue, 29 Jul 2014 16:50:21 -0700 Subject: [PATCH] merging --- code/game/gamemodes/cult/cult_items.dm | 8 ++--- code/game/gamemodes/cult/talisman.dm | 2 +- code/game/gamemodes/wizard/soulstone.dm | 2 +- code/game/mecha/mech_fabricator.dm | 34 +++++++++--------- code/game/mecha/mecha.dm | 4 +-- code/game/mecha/mecha_construction_paths.dm | 8 ++--- code/game/mecha/mecha_parts.dm | 20 +++++------ .../crates_lockers/closets/syndicate.dm | 2 +- code/modules/admin/admin.dm | 2 +- code/modules/admin/topic.dm | 4 +-- code/modules/clothing/suits/armor.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 4 +-- code/modules/clothing/suits/wiz_robe.dm | 4 +-- .../food&drinks/drinks/drinks/bottle.dm | 8 ++--- .../mob/living/carbon/human/examine.dm | 4 +-- .../mob/living/carbon/human/human_defense.dm | 2 +- .../mob/living/carbon/human/species.dm | 2 +- .../mob/living/simple_animal/constructs.dm | 8 ++--- icons/mecha/mech_construct.dmi | Bin 27587 -> 27586 bytes icons/mob/head.dmi | Bin 91644 -> 91652 bytes icons/mob/suit.dmi | Bin 183926 -> 183925 bytes icons/obj/clothing/hats.dmi | Bin 46104 -> 46112 bytes icons/obj/clothing/suits.dmi | Bin 63971 -> 63972 bytes 23 files changed, 60 insertions(+), 60 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 903732b6d17..8adbaa7f465 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -92,10 +92,10 @@ armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) /obj/item/clothing/suit/space/cult - name = "cult armour" - icon_state = "cult_armour" - item_state = "cult_armour" - desc = "A bulky suit of armour, bristling with spikes. It looks space proof." + name = "cult armor" + icon_state = "cult_armor" + item_state = "cult_armor" + desc = "A bulky suit of armor, bristling with spikes. It looks space proof." w_class = 3 allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen) slowdown = 1 diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 7c5fbe7f19f..ac5d17ceea4 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -76,7 +76,7 @@ dat += "Kla'atu barada nikt'o! - Allows you to conceal the runes you placed on the floor.
" dat += "O bidai nabora se'sma! - Allows you to coordinate with others of your cult.
" dat += "Fuu ma'jin - Allows you to stun a person by attacking them with the talisman.
" - dat += "Sa tatha najin - Allows you to summon armoured robes and an unholy blade
" + dat += "Sa tatha najin - Allows you to summon armored robes and an unholy blade
" dat += "Kal om neth - Summons a soul stone
" dat += "Da A'ig Osk - Summons a construct shell for use with captured souls. It is too large to carry on your person.
" usr << browse(dat, "window=id_com;size=350x200") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 965039774be..fc0d9721900 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -151,7 +151,7 @@ var/construct_class = alert(U, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer") switch(construct_class) if("Juggernaut") - makeNewConstruct(/mob/living/simple_animal/construct/armoured, A, U) + makeNewConstruct(/mob/living/simple_animal/construct/armored, A, U) if("Wraith") makeNewConstruct(/mob/living/simple_animal/construct/wraith, A, U) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 48d40a89e17..1fcb665b5fc 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -73,7 +73,7 @@ /obj/item/mecha_parts/part/gygax_right_arm, /obj/item/mecha_parts/part/gygax_left_leg, /obj/item/mecha_parts/part/gygax_right_leg, - /obj/item/mecha_parts/part/gygax_armour + /obj/item/mecha_parts/part/gygax_armor ), "Durand"=list( /obj/item/mecha_parts/chassis/durand, @@ -83,7 +83,7 @@ /obj/item/mecha_parts/part/durand_right_arm, /obj/item/mecha_parts/part/durand_left_leg, /obj/item/mecha_parts/part/durand_right_leg, - /obj/item/mecha_parts/part/durand_armour + /obj/item/mecha_parts/part/durand_armor ), "H.O.N.K"=list( /obj/item/mecha_parts/chassis/honker, @@ -291,7 +291,7 @@ /* New() ..() - src.add_part_to_set("Test",list("result"="/obj/item/mecha_parts/part/gygax_armour","time"=600,"metal"=75000,"diamond"=10000)) + src.add_part_to_set("Test",list("result"="/obj/item/mecha_parts/part/gygax_armor","time"=600,"metal"=75000,"diamond"=10000)) src.add_part_to_set("Test",list("result"="/obj/item/mecha_parts/part/ripley_left_arm","time"=200,"metal"=25000)) src.remove_part_set("Gygax") return @@ -355,11 +355,11 @@ /obj/machinery/mecha_part_fabricator/proc/build_part(var/obj/item/part) if(!part) return - + // critical exploit prevention, do not remove unless you replace it if( (part.loc != src) || !(hasvar(part, "construction_time")) || !(hasvar(part, "construction_cost")) ) // these 3 are the current requirements for an object being buildable by the mech_fabricator return - + src.being_built = new part.type(src) src.desc = "It's building \a [src.being_built]." src.remove_resources(part) @@ -610,17 +610,17 @@ /obj/machinery/mecha_part_fabricator/proc/exploit_prevention(var/obj/Part, mob/user as mob, var/desc_exploit) // critical exploit prevention, feel free to improve or replace this, but do not remove it - + if(!istype(Part) || !istype(user)) // sanity return 1 - + if( (Part.loc != src) || !(hasvar(Part, "construction_time")) || !(hasvar(Part, "construction_cost")) ) // these 3 are the current requirements for an object being buildable by the mech_fabricator - + var/turf/LOC = get_turf(user) message_admins("[key_name_admin(user)] tried to exploit an Exosuit Fabricator to [desc_exploit ? "get the desc of" : "duplicate"] [Part] ! ([LOC ? "JMP" : "null"])", 0) - log_admin("EXPLOIT : [key_name(user)] tried to exploit an Exosuit Fabricator to [desc_exploit ? "get the desc of" : "duplicate"] [Part] !") + log_admin("EXPLOIT : [key_name(user)] tried to exploit an Exosuit Fabricator to [desc_exploit ? "get the desc of" : "duplicate"] [Part] !") return 1 - + return null /obj/machinery/mecha_part_fabricator/Topic(href, href_list) @@ -637,24 +637,24 @@ screen = "parts" if(href_list["part"]) var/obj/part = filter.getObj("part") - + // critical exploit prevention, do not remove unless you replace it if(src.exploit_prevention(part, usr)) return - + if(!processing_queue) build_part(part) else add_to_queue(part) if(href_list["add_to_queue"]) var/obj/part = filter.getObj("add_to_queue") - + // critical exploit prevention, do not remove unless you replace it if(src.exploit_prevention(part, usr)) return - + add_to_queue(part) - + return update_queue_on_page() if(href_list["remove_from_queue"]) remove_from_queue(filter.getNum("remove_from_queue")) @@ -691,11 +691,11 @@ src.sync() if(href_list["part_desc"]) var/obj/part = filter.getObj("part_desc") - + // critical exploit prevention, do not remove unless you replace it if(src.exploit_prevention(part, usr, 1)) return - + if(part) temp = {"

[part] description:

[part.desc]
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 115333657e9..3433ab2aa95 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -465,7 +465,7 @@ qdel(src) /obj/mecha/attack_hand(mob/user as mob) - user.changeNext_move(8) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code. + user.changeNext_move(8) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code. src.log_message("Attack by hand/paw. Attacker - [user].",1) if ((HULK in user.mutations) && !prob(src.deflect_chance)) @@ -633,7 +633,7 @@ return /obj/mecha/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) - user.changeNext_move(8) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code. + user.changeNext_move(8) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code. src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 96f233152ef..f0874af38a4 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -316,7 +316,7 @@ "backkey"=/obj/item/weapon/crowbar, "desc"="External armor is installed."), //3 - list("key"=/obj/item/mecha_parts/part/gygax_armour, + list("key"=/obj/item/mecha_parts/part/gygax_armor, "backkey"=/obj/item/weapon/weldingtool, "desc"="Internal armor is welded."), //4 @@ -540,7 +540,7 @@ holder.icon_state = "gygax19" else user.visible_message("[user] pries Gygax Armour Plates from [holder].", "You pry Gygax Armour Plates from [holder].") - new /obj/item/mecha_parts/part/gygax_armour(get_turf(holder)) + new /obj/item/mecha_parts/part/gygax_armor(get_turf(holder)) holder.icon_state = "gygax17" if(1) if(diff==FORWARD) @@ -894,7 +894,7 @@ "backkey"=/obj/item/weapon/crowbar, "desc"="External armor is installed."), //3 - list("key"=/obj/item/mecha_parts/part/durand_armour, + list("key"=/obj/item/mecha_parts/part/durand_armor, "backkey"=/obj/item/weapon/weldingtool, "desc"="Internal armor is welded."), //4 @@ -1119,7 +1119,7 @@ holder.icon_state = "durand19" else user.visible_message("[user] pries Durand Armour Plates from [holder].", "You pry Durand Armour Plates from [holder].") - new /obj/item/mecha_parts/part/durand_armour(get_turf(holder)) + new /obj/item/mecha_parts/part/durand_armor(get_turf(holder)) holder.icon_state = "durand17" if(1) if(diff==FORWARD) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 0df7703bcc5..412fd17a424 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -132,11 +132,11 @@ construction_time = 200 construction_cost = list("metal"=15000, "diamond"=2000) -/obj/item/mecha_parts/part/gygax_armour +/obj/item/mecha_parts/part/gygax_armor gender = PLURAL - name = "\improper Gygax armour plates" - desc = "A set of armour plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction." - icon_state = "gygax_armour" + name = "\improper Gygax armor plates" + desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction." + icon_state = "gygax_armor" origin_tech = "materials=6;combat=4;engineering=5" construction_time = 600 construction_cost = list("metal"=25000,"diamond"=10000) @@ -200,11 +200,11 @@ construction_time = 200 construction_cost = list("metal"=15000,"silver"=4000) -/obj/item/mecha_parts/part/durand_armour +/obj/item/mecha_parts/part/durand_armor gender = PLURAL - name = "\improper Durand armour plates" - desc = "A set of armour plates for the Durand. Built heavy to resist an incredible amount of brute force." - icon_state = "durand_armour" + name = "\improper Durand armor plates" + desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force." + icon_state = "durand_armor" origin_tech = "materials=5;combat=4;engineering=5" construction_time = 600 construction_cost = list("metal"=50000,"uranium"=30000) @@ -401,9 +401,9 @@ construction_time = 130 construction_cost = list("metal"=7000) -/*/obj/item/mecha_parts/part/odysseus_armour +/*/obj/item/mecha_parts/part/odysseus_armor name="Odysseus Carapace" - icon_state = "odysseus_armour" + icon_state = "odysseus_armor" origin_tech = "materials=3;engineering=3" construction_time = 200 construction_cost = list("metal"=15000)*/ diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 79e6edcfe80..fbc52019f21 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -1,5 +1,5 @@ /obj/structure/closet/syndicate - name = "armoury closet" + name = "armory closet" desc = "Why is this here?" icon_state = "syndicate" icon_closed = "syndicate" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 560807e92a5..adfe4996dfd 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -133,7 +133,7 @@ var/global/floorIsLava = 0 body += "Coffee | " //body += "Parrot | " //body += "Poly | " - body += "\[ Construct: Armoured , " + body += "\[ Construct: Armoured , " body += "Builder , " body += "Wraith \] " body += "Shade" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 388d839471d..8335281cad1 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -229,7 +229,7 @@ if("coffee") M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob ) if("parrot") M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob ) if("polyparrot") M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob ) - if("constructarmoured") M.change_mob_type( /mob/living/simple_animal/construct/armoured , null, null, delmob ) + if("constructarmored") M.change_mob_type( /mob/living/simple_animal/construct/armored , null, null, delmob ) if("constructbuilder") M.change_mob_type( /mob/living/simple_animal/construct/builder , null, null, delmob ) if("constructwraith") M.change_mob_type( /mob/living/simple_animal/construct/wraith , null, null, delmob ) if("shade") M.change_mob_type( /mob/living/simple_animal/shade , null, null, delmob ) @@ -971,7 +971,7 @@ speech = sanitize(speech) // Nah, we don't trust them log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]") message_admins("\blue [key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]") - + else if(href_list["sendtoprison"]) if(!check_rights(R_ADMIN)) return diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 062b25f7362..855d888ca2c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -27,7 +27,7 @@ /obj/item/clothing/suit/armor/vest/warden name = "warden's jacket" - desc = "An armoured jacket with silver rank pips and livery." + desc = "An armored jacket with silver rank pips and livery." icon_state = "warden_jacket" item_state = "armor" body_parts_covered = CHEST|GROIN|ARMS diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 3209ec49b64..25ede04de7b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -9,7 +9,7 @@ * Lasertag */ /obj/item/clothing/suit/bluetag - name = "blue laser tag armour" + name = "blue laser tag armor" desc = "Blue Pride, Station Wide" icon_state = "bluetag" item_state = "bluetag" @@ -18,7 +18,7 @@ allowed = list (/obj/item/weapon/gun/energy/laser/bluetag) /obj/item/clothing/suit/redtag - name = "red laser tag armour" + name = "red laser tag armor" desc = "Pew pew pew" icon_state = "redtag" item_state = "redtag" diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index e7c7aeb259a..f3ebe41dcbd 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -59,13 +59,13 @@ /obj/item/clothing/suit/wizrobe/magusblue name = "\improper Magus robe" - desc = "A set of armoured robes that seem to radiate a dark power" + desc = "A set of armored robes that seem to radiate a dark power" icon_state = "magusblue" item_state = "magusblue" /obj/item/clothing/suit/wizrobe/magusred name = "\improper Magus robe" - desc = "A set of armoured robes that seem to radiate a dark power" + desc = "A set of armored robes that seem to radiate a dark power" icon_state = "magusred" item_state = "magusred" diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm index cd9bd1a89f0..90673de7f8b 100644 --- a/code/modules/food&drinks/drinks/drinks/bottle.dm +++ b/code/modules/food&drinks/drinks/drinks/bottle.dm @@ -45,20 +45,20 @@ var/obj/item/organ/limb/affecting = user.zone_sel.selecting //Find what the player is aiming at - var/armor_block = 0 //Get the target's armour values for normal attack damage. + var/armor_block = 0 //Get the target's armor values for normal attack damage. var/armor_duration = 0 //The more force the bottle has, the longer the duration. //Calculating duration and calculating damage. if(ishuman(target)) var/mob/living/carbon/human/H = target - var/headarmor = 0 // Target's head armour + var/headarmor = 0 // Target's head armor armor_block = H.run_armor_check(affecting, "melee") // For normal attack damage //If they have a hat/helmet and the user is targeting their head. if(istype(H.head, /obj/item/clothing/head) && affecting == "head") - // If their head has an armour value, assign headarmor to it, else give it 0. + // If their head has an armor value, assign headarmor to it, else give it 0. if(H.head.armor["melee"]) headarmor = H.head.armor["melee"] else @@ -70,7 +70,7 @@ armor_duration = (duration - headarmor) + force else - //Only humans can have armour, right? + //Only humans can have armor, right? armor_block = target.run_armor_check(affecting, "melee") if(affecting == "head") armor_duration = duration + force diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f7db2f18267..7766c7548e0 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -62,14 +62,14 @@ else msg += "[t_He] [t_is] wearing \icon[head] \a [head] on [t_his] head.\n" - //suit/armour + //suit/armor if(wear_suit) if(wear_suit.blood_DNA) msg += "[t_He] [t_is] wearing \icon[wear_suit] [wear_suit.gender==PLURAL?"some":"a"] blood-stained [wear_suit.name]!\n" else msg += "[t_He] [t_is] wearing \icon[wear_suit] \a [wear_suit].\n" - //suit/armour storage + //suit/armor storage if(s_store) if(s_store.blood_DNA) msg += "[t_He] [t_is] carrying \icon[s_store] [s_store.gender==PLURAL?"some":"a"] blood-stained [s_store.name] on [t_his] [wear_suit.name]!\n" diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 3f1707f38cd..35afcd97f8d 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -144,7 +144,7 @@ emp_act else return 0 - var/armor = run_armor_check(affecting, "melee", "Your armour has protected your [hit_area].", "Your armour has softened a hit to your [hit_area].") + var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].") if(armor >= 100) return 0 var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 572d5c258c5..ee4865b6ca4 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -836,7 +836,7 @@ else return 0 - var/armor = H.run_armor_check(affecting, "melee", "Your armour has protected your [hit_area].", "Your armour has softened a hit to your [hit_area].") + var/armor = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].") if(armor >= 100) return 0 var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 95b89e0701b..d1ce8e8fe59 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -117,10 +117,10 @@ -/mob/living/simple_animal/construct/armoured +/mob/living/simple_animal/construct/armored name = "Juggernaut" real_name = "Juggernaut" - desc = "A possessed suit of armour driven by the will of the restless dead." + desc = "A possessed suit of armor driven by the will of the restless dead." icon_state = "behemoth" icon_living = "behemoth" maxHealth = 250 @@ -129,7 +129,7 @@ harm_intent_damage = 0 melee_damage_lower = 30 melee_damage_upper = 30 - attacktext = "smashes their armoured gauntlet into" + attacktext = "smashes their armored gauntlet into" speed = 3 environment_smash = 2 attack_sound = 'sound/weapons/punch3.ogg' @@ -139,7 +139,7 @@ playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \ create shield walls and even deflect energy weapons, and rip apart enemies and walls alike." -/mob/living/simple_animal/construct/armoured/bullet_act(var/obj/item/projectile/P) +/mob/living/simple_animal/construct/armored/bullet_act(var/obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) var/reflectchance = 80 - round(P.damage/3) if(prob(reflectchance)) diff --git a/icons/mecha/mech_construct.dmi b/icons/mecha/mech_construct.dmi index 9213e418ff806dff330017f9777fa2b63947a5e0..4eb606b1aea31708b76be0195c80bc620679419e 100644 GIT binary patch delta 476 zcmV<20VDpy*8#%U0gxnr!g^F#bVOxyV{&P5bZKvH004NLm6*+H0x=YY*UnP}T^35K z-Oi>c#f83tL?=$d{6vzmt$q3~oDKV8h^kb7&&BK_hIWE%|`KM8s1_mFZ6qo3;Yw7HQiB~s}yHSTm_J6>y3E3(9clqDhU#QJ~t=7A3 S@eM!gFiTP52^q8S0n=&4s_Pp7 delta 477 zcmV<30V4jw*8#)V0gxnr!+KO$bVOxyV{&P5bZKvH004NLm6*$J!Y~v>*U48{u&h+I z&}}vqsA2)XfDAEll!uX>w54C)1!-ifQhV+Wq;tm;?u-#E)$8_ccTk)CE`K*Z)UH>B zdU<@xvyZwQtSZ!cm1ow}l^yPH!k`DE3bi=tb8~XNS>#z+`=APc^_*uHuRC*pJ%iP) z(w|4GeQ!d5bbHjkgRB>@?Xfi#*5#}_fP;$nT0nV$)Na@9qwOj%%r1uTZSHY-L9OMH`n#jwP;KwI`rq!gg^pR1#9KG&Kn*WH#EG~LFKylia7^g7pON?_PEYmU0jfk{a7bh6D>uU9v z>uIhc8nZZ8=>WxPu40_RG*>asjj-LvI5#5FX1Q|ZEd(=92Dbf#23BUCEhxoh`l5%W zYnlgG2vS_8FY-^LFb@pQ2PrPmhxgK@_9l$=KyF9v8`)n1zb0g-@So;?hkvQIhmG3o TclkF!_A#n%{t@W2?*Y?kif!$e diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 5061cea533df9dfaf87c8d3642e9208589faacc1..d19026fa8d8a5f9b65cd37da73634f1a30bc0dd2 100644 GIT binary patch delta 1213 zcmV;u1Va1#%LRnY1&}0vnR--MbVOxyV{&P5bZKvH004NLotZt4+c*%0Yx`FSNgEyP zd>pQEb4U=RNUpn97?ERfVv?gHDJ#yezrwp-XR!`n8Cxyz%*(IQeED_r_ovTazBM1e zepw$mWzpE|n)iQf)~i`;am}uI_jbKbOT3DEIc1XorN zUT2iwF61{I_`P5Bm+>1gabM&Y;hPSLI2Y{&@TRj+?7e8?c%G!RdR?I0@RM1Jadk<} zhQ_+9s~5w6j(z>>*?TJ8FPgU;S?69)Rcw@mM9Q9`rAYOYcp4_QYLG(HG1=?|2z@;# zprx3yqj(^zb3M8|uv7hU&SAIR)8Sqhx>bp?1w(p2#fU^W^;|&7nZ1=b+&=%xtBx<) zEU*ZaB-gzrw^8EvI(Jm5pUlvRd~?Rp=t*MdRO_ODaRR|4T6feqrOZf*?sfK963n^> zDx)*k?Y)d65O0UX9MMm|=ftJ!$pQ)J2S=b%2wW2K;v*O6HUo(dRF4g2@&$TqGjUJ; zMyvnVv!d_v_uFa0gD=3@^eT z^Vg=uOT9cv*)HTaEyqD3bNWp_d0~}%tTyc|KbM?j0ljI1#AQcVXs~JXDOy>uz%qW* zA|tjdb$~XLFR+77zI0C2BAtC=3x$mb4h|ZBy`LBoegv0gP)Pbh!rJF%5)ywxm+bt6 zZv3=J`P`&J+D|B~9wcDek07i(PHFU*_7e)LCz9BM&w0hd`c5;}Md^Moh7$(Qlq^S# zy$YIa#UQ1}Q`7`4dZsio5K4Xo%Fyi3i8*j|4E${HgQM1~pOHpR-K@z1KV)65j7rdd zJUUKdaI@`VGw%6TJ^RbNVjS!JXrAKU>kRZSK@~-#9tlK~28vxhT_r`D0t$W7EOeaw zKuK=i<|^?l(Y|bK`F45yqT$teOrmAr)K}9t(4zNb4q*CwAmOO9XR8V59sR_G25177 z*rMn`%B{)phZnlDXND3ZaC=@JN^-C(;CaaNVB41+1qM4rh2|b!;y@{A`u%=iH=n+J bY(9Sdvi={au$mcM$%amYz67_v1OYx_AW>*p delta 1205 zcmV;m1WNma%mw_*1&}0vk$O~EbVOxyV{&P5bZKvH004NLotVjv+c*%0&-POY$u%0t zSq5|QWso4qA(`7;g%VjNE9RmhDJ#y?&%xd91+C^U!zTk@{o+!r?QQe-m#^P`G@rkJ z+nzXOiJ{pyAOGmKn^|(li zDB(~f*B70DtIi{Tsrr5tjTo5EL5rfot!3w1lbFLzMy;lFTx%H<1+#jQ7pvZhvGp^3 z#df#WcyQC|#SV_t>T?+!spD;zaWTDlrLAYc2VXM0?Jh62>DG^OFmmHJIT&HU1!e-A zY^KtZTj7mWvc%B>UsiPF4x$#e`eD1#?C9L=o87x75x>}fDQHeQ`ub{T`ArG9LkfkE zZH==SAVC&ZMNU9C;wB z8Rd5?`K|}w`&EA(-+_tyD!&TvdL-gpwO7Dhuc6p`)yD87rj3tllLZ%c;`olRmD*Y49B_EFS5YJU?l!OGyfr6$$^_@5}6YHpu8q+fA>;#B<11F%H zn6jmCBpv5^V7X(b`sG|AZhN5P4c@cFu?7SAFol4`wdlBjk~2Fk!7Oim<6<0Nv{_-{ zDM_w7Om2gOpLOmOrM@#oBl6sorO}au-o{uL4HF1|CW&<)4O7aDB<3N`4oiJG9)No2 z!u1Cy;|N4qlb8eg>IY6-`hhf%c7AaH>I2UuAvZp9flkwtI8XJkpe9$K%T^N)RuMQ3&B-rMCmz0RF6jYzRG!RKAId07CPEH- zC2^O3b)7Q9gcP_2P1(wy^=tlYOgft+F5>stH!{t^%CIa;%wLEbI^jx!f4kb6S9jY0IJCq z*vTeWdK;rgdh)~?dir-9{O|`iF(iBsuFHadko1*=wJ&WTB>sS|S@{`V_<5D`rM-l- zA5d7`i^sI@L0Ea5(&#Yl2NYIMBw+xr^AQW{+nBK?C>{=?IAQQiNpry1OITzr3aA_| zaS?)oU$E53Q64SL*e9WWeBnq;)y^sMNgpza#%!)c=AJvS?Dx5LrE4-bCYqj#(&|+|;j$o?0BjE^hU>y_C>$!;w8E9CQSfl7s%F_Jy z(+l0yGeZdhI6WtKB{W#v+~stzP0N-eJcAuwgys}Zf}!MNdVRfbn=d~;H=n4 diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 8b769e13045ed35238e1f48d880f5f0b03453125..5bc9546152ed5a2f7ad6184da090c493e0b021a3 100644 GIT binary patch delta 951 zcmV;o14#V#oD21w3y>s#k$O~EbVOxyV{&P5bZKvH004NLotVvz8#fHc&+DfcB-eG( z-7e6RFU1DM9+FoWa3oryEr}{6*>Rq}2RpX=u@M#cWZ)-?qR2m~`8fUY>Cd+>)9dHA z)d8gtr)e|2{POGS;YhanX*2!yyn66R&e!vwQla9snLcbu@WbkV!IG3|Grg=HwgM5$ zw3(i6(1Nyj#M%WxB1@ODSkY8E;9AEEaewQjg@82+^R~|t&khp`1QmNA;lS>sf(x1^ zRCVwU5>-VA7UH=W!c?g!VnIBc$bF9EQW_}?UcmY2srK_lz;>CE!SpSaQ?g{B;(7^S z_M`mT31S*vwS+c*?Akh_;?VzE!ve{TZzVsm6(&a`JB>!p31V7XkdaIJiSsLN=D_q$ zd|p-$76Y87&Gh{E{P_HMr-Y>nkn?rkf!Qmxu6mTH5D<@W=!-!)LVrt(P<{EUDatFr zVpw7F8d{YG98jS?)#`GmT1_4w=^Kb$Z(-ke@yzz+39XWUEbByR2Wt*$R?8`B>jL)s z*@aY8-UU>cgjD-y*)^*u-)q0`k_J;X9J?F`Yar{U2R-Pq9~a2N{j19)nv%)^Ttmx7 zGXi)n+NxJIe-Ek>*pi@XMhLJddqyi6lSS#Dr!;Y76e1fzsPyyIK&~y3>4K^C&tW{| z0F-9WY!$tKm10Jr7U#&RU#d6Y>Al!cJ-4b^H?RDYpE)b;>U%;B!6x$90yoBv89z|J zw(i)$qk8PC)jd3BzVg=*R&Cq~YQtzenLQ?z1b7Z);gp3ma{^@Hq!Qi8X^$tB3#NrC zykK8jGAH9TGFfWtXV6`By7N(O_oF28XA z_8_)2s%zb|{fc99ln{kd-~H>NNNI>Kr(|j12=uK#79LO_gnsRt7V4~=3cm{qgnqz} zxGbuFAaGeiLuCq|6MlGsO>j6VSMYXA2Bkt$F7RAN?0YVH+ZSgB4t!ZL;?X%q|Krp< z;}%F{nFY52`{U!SDA20r*IQL6tbfI%cndfV_p`}6$1;!&2&g{BU7ds)xnz$*rtgR9 z>uo}@I`s{7(Mz3N1}KG$ve!F7OiEVJD#*u%C Z-x4#1dx61EV)BFGc delta 952 zcmV;p14sPzoD24x3y>s#l6q8FbVOxyV{&P5bZKvH004NLotVvT8#xTe&+$_X+G}R9 z$p+YyFGY$)4(%%pI1(+#_O5B4VBk5p9QlYyToks|-3=Hv9~^B*r?r{^y( zn}?F1s0 zX*)fjm1U;BNRG?=R4*yT7_16emc=s}PDxIh-}UtK2AlvEDj8d^4* z5x{fNR=ukEdr+0Yjs#URLV#7-Gg`@*EK1*>(!`Nbh-?I*($7}|xwb^63#Qih!+6L6 zC@r4ZDtaq_#f(BNE|F8eRNsJy_hLi!(yA8Syz)uax zb;Az2>anj@xA2(x%HKvTCgKnxTH_83ZiK$>xjcDE}+le55{GiSL{x2;$8cy^p>I&oYA{T$WH7ks@*4+W zAvY^u?Br%ljuN6!Qus!0j+C@$IVVfHK?lL-Q7Nt z}R=gO!l*ILkd*M999Dy;Z5Es>V8j4T~c#qmE{0Tk$fg( zctr~j5LI6r#XhT0w>CvI=K3T53-1#>q8sfSD{Hlm5G4mP7=nMJx8(- zt6Y8DNy2!L7;Ko25S&<*C>eua$V(0p6IQ}LORDGC6x@`5is0b5839h%JN~z=?}Z6T z(OSnSYD0M#k8Ew&Q2xG=A4UyX@j#QrbZ2)u4mw}v%X zQEb@O4Qy{Ik4QRgY&Bv_t3>2VnaFGMRF|_f7uG=`XW206WCifpi6c;emt@ENv|bp?EHj?5l54O)Ruoj7tHC(^)m;W$SmHD1|&16AY78Cr8kVjb1JM-`i)lu(5y zvh@@G4(47t49()fgAdP#r0WZ+9wWw)^*~rHF*bNWfKzC7>4~`6h{o+C~Ec? z`@xV|i$V&ft0RLE6H{Cnu$@;&33_-nq89dsfrrFb_Mu+YT$h2e3u!eRMd4xhZDBDu z@?+hzV?c`W56?N`H3N;vhu0!7VzQ(b(B;o0d>htS?S2C2o(`>M4)wdULj={Y Du(S~( delta 1077 zcmV-51j_rM=mMDN0+1ws7J5`zbVOxyV{&P5bZKvH004NLotRH=<2De*&&j6{cF!v0 zcCWb8)2`M2^Xc`9~d6cAQV&gB&L<7Rx8!Y~VMKA~}4V;pgtpZ{HuEy01ST z?~klSa_SzsFTV}EPMOn9LA@nCY>muH$!-3~HL4Hde0#-y5xd(OJcVWR$4-IF=5?6@nZs?Hv4-CK zrF~=|wSE?O+g`4Jv3l#EoSfV^CMPGnAqARb&9euN@JU`tZNH~OThel6Q{@Ouky0gO zctZysAgaAKhEp}UZEc3;O43f{>X&3$ZI0~;ALSs)wTJe+Z$gvgCZmAmPLfB*iIoDx zn%Ew9k~|(obI9%t!G+DDQZe|MlGLo2un|sGN;}7<9H+8>2o8=XFTe?V!~Y8Hz3{mh zn%fwu^;C!P%pv3x%I`Mv!)PH(zRGXHhY>X2tNb>80QcuAzX=~k#Qv|^2t1#pZ4Gk{ zV%T$N8`wTj9g%c8aj=Lj&7#PaGEuUWs4W-BEo`$v&a!8+B?#cL6Dv@FFU3UFKTop-;7fwKb!8mh;);yAgNNw9OOQ=vvn1v?_ z?dr`_sf%J+#@1x0wbuyLjoz(y$A8Yvm!GrGOQ~XbmelS*FDzKrTxh6Bxv*F_dx4Ql zK9XAsU@_`4bmFcge&zyMA>__Aq;|^c#`axxt%~L)&Ih1tx>iPL04G;wGCYDWY=$@C zDsJe1u?kSd?QnGHIXOwpij-I?ZnrgH=%XZ99A}6AB(LCVVBpY~bFzYI!syT=#mA}% zfMyAG^f_A!K$b0`qA50og`qS32Es>r^*>1a9o=?GL*iF*i}o3nK5tT9n?*?b9fj5B zMdyI2zoW3alB5aT&<`xG&lb~OIaoJJ#Mb104TP0_E?8fe_j@s{7QCydPKzyJ=K`Y>{-P?5xb2MIZ_${BhN_j z{Nd$Al4YQA`0%g;MofXs0d({W2`BuXZPs>AG=+sLIp{q|*`nw{D)1J2kXp}@64F2? v<~S*9`{np@g@APN6d6N({#Dohx%>9?wfp+x@%~>HS?XNggNR$RO9a)gBz`39 diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index a5c0649563b6983c36dd7db95a54f930b5c0a39a..8c9bdddf751ee422dfff31bcc966a811b2b14975 100644 GIT binary patch delta 914 zcmV;D18w}{^8@7b1CS&EjFBZFe_iahx%#q5vB;s_M;LGrj96Q@aqKoW~ed93IvopER51H$>Le^TWF)vz_x zQ2uS;_4O8TdRfXfdvZ{5Hw$9!<#!(B)Dgr2dG5(-imeX^*OSi_!JWE4eT{lcYP*Dn zllvv+4MhWY+Q}QX!aS3{QvmU$QQdLWw>UHD&_rxu#u+mTL=$@^;mEVzc@yzi&^4iI zgO8A@8XA8h9*ZN)m5Scme-o#vG_r%^B~Y~~UujhTF&vf{ghjxQmV>{`q)JAZ92?Z{ zep_`RUxf9Jb^#CirjRSxgjuDkw@FR)rsk~zG>1AK!JSYq-;qPk`VG(UOnT`sSI0@^ zIC=+*ZBClOWAg?*Tu3ZeWr;91^z1Ah9k^I;^XQVUX%~71@w)?@fAmCGR&P)AMzZWO z{Ki^2!!*5th6Y?o!&tw8`jP=m1v-%6?-Y3xxR!*?Qv66G$wT(j4W{*O`vCWX%^5Th;$uEjbUpAauP15rPn3r>@%VqB)! z(0Jbi7oXvLf3@QkvJvLPfgDOlHn)hLjBX+JtX4hfNNNq}$!U$Srv#E%M!`cgT*Mz8 zgx+MuzhgGM105_51WX?8o&wawWeF(c^c^yaw@IdpPzt$)vkUrcodq!)SwU|kSF8j` oo%a1VKk2?7zI=Ne9=|?q{{z$6HRJdwK(zn>AOJ~3v%Ui*_A=?Rwg3PC delta 914 zcmV;D18w}|^8@4a1CS&Ei;*QEf2Y{Cx#qG+vB;s_M;LGv za&ohQPaFVaxPE?tX3nz;fn*ky^4QQdI^$^LBf|Nre^T`V&G2Yw zvHs}b^>_<7y)5-wJUM7M20<)a`O$-%HXLGs61HSDr@jpbwzVUhe>>U1=@O~gM6Y&g{~9h!44NX~C(FgZD5Odzm>nC0@1;?7 z4PS)yVRjJ@`a_{KuxYYNHE&ay=1p_k1SrHd9l@PYFW-@4DSC$&cp|-YSeoOka-6(_ z#kL~N;IVsy6fPu|R#_5+j-H)mq9a#pH%~6>ns%Wl5I-K^q$j$vfBJZ$HLDYT3UnaBKPmDqa;pos;ePn?;q%>xUz@;aD7pl4mX&ss z@rq7mGYD1vvK%a}7t-UEZV^*h5>S~Uvp4t$$_onhJY_D1yY19gnVW2u>sNl_#c&tT zle-CanQaGV1c~Gge+&BtPB!;0#0JmMQ^K|gvpyZqZx%LGAz;~7wlnE!`-hLiF6v7&2x2j^g5F53SdEZ3 o`tm>gP5XZM`u$;e`1ZK}4@5g7CKIFrQvd)U07*nav%mu+_5dQUZvX%Q