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 9213e418ff8..4eb606b1aea 100644
Binary files a/icons/mecha/mech_construct.dmi and b/icons/mecha/mech_construct.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 5061cea533d..d19026fa8d8 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 8b769e13045..5bc9546152e 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 3077bf009e1..4b83e7b0727 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index a5c0649563b..8c9bdddf751 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ