From ed2c3f3cbd871f3a5eaada16111bb64459ed5698 Mon Sep 17 00:00:00 2001 From: Sishen Date: Mon, 19 Aug 2019 13:53:05 -0400 Subject: [PATCH] Fixes spelling mistakes, adds pharaoh gear to chaplain vendor --- code/game/objects/items/holy_weapons.dm | 4 ++-- code/modules/clothing/head/misc.dm | 4 ++-- code/modules/clothing/suits/miscellaneous.dm | 8 ++++---- code/modules/vending/wardrobes.dm | 3 +++ icons/mob/head.dmi | Bin 177856 -> 177856 bytes icons/mob/inhands/weapons/staves_lefthand.dmi | Bin 19155 -> 19155 bytes .../mob/inhands/weapons/staves_righthand.dmi | Bin 18572 -> 18572 bytes icons/mob/suit.dmi | Bin 354884 -> 354884 bytes icons/obj/clothing/hats.dmi | Bin 88442 -> 88442 bytes icons/obj/clothing/suits.dmi | Bin 123258 -> 123258 bytes icons/obj/guns/magic.dmi | Bin 15321 -> 15321 bytes .../code/game/gamemodes/gangs/gang_datums.dm | 4 ++-- 12 files changed, 13 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index ad4384f9f5..6e3deaa694 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -704,8 +704,8 @@ name = "egyptian staff" desc = "A tutorial in mummification is carved into the staff. You could probably craft the wraps if you had some cloth." icon = 'icons/obj/guns/magic.dmi' - icon_state = "pharoah_sceptre" - item_state = "pharoah_sceptre" + icon_state = "pharaoh_sceptre" + item_state = "pharaoh_sceptre" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 73fde5d50f..041f0ba012 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -312,8 +312,8 @@ /obj/item/clothing/head/pharaoh name = "pharaoh hat" desc = "Walk like an Egyptian." - icon_state = "pharoah_hat" - icon_state = "pharoah_hat" + icon_state = "pharaoh_hat" + icon_state = "pharaoh_hat" /obj/item/clothing/head/jester/alt name = "jester hat" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index dc1b2b6dc3..8a3dbbf274 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -468,11 +468,11 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT allowed = list(/obj/item/clothing/mask/facehugger/toy) -/obj/item/clothing/suit/nemes - name = "pharoah tunic" +/obj/item/clothing/suit/pharaoh + name = "pharaoh tunic" desc = "Lavish space tomb not included." - icon_state = "pharoah" - icon_state = "pharoah" + icon_state = "pharaoh" + icon_state = "pharaoh" body_parts_covered = CHEST|GROIN diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 08ed655297..015890419d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -320,6 +320,9 @@ /obj/item/clothing/suit/nun = 2, /obj/item/clothing/head/nun_hood = 2, /obj/item/clothing/suit/holidaypriest = 2, + /obj/item/clothing/suit/pharaoh = 2, + /obj/item/clothing/head/nemes = 1, + /obj/item/clothing/head/pharaoh = 1, /obj/item/storage/fancy/candle_box = 3) refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index ea13294dfe71a10ab765302dd8b04a68bcc3e042..c57bc1bb21aaf5f468a5dd3c125af1ea4ca537ec 100644 GIT binary patch delta 37 tcmX@`mg~Sg@bW>3kQ?UIshjS4qyNP diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi index ecc92c7d2034f301bdd02bea9b64ea37e363ee78..8b96b842361b935135facb73a4692f17e04823a5 100644 GIT binary patch delta 47 zcmV+~0MP%_l>yV00kAd!AdqO^;!zJNtoP92aj^$Rwy--?Q0;5-4Xy3}+EiR(X0uiS FeMu<87d8L@ delta 47 zcmV+~0MP%_l>yV00kAd!AV6u~;!zJNtoP92aj^$Rwy--?Q0;5-4XykC+K#2Z^|Mw1 FeMu-U7-Ikc diff --git a/icons/mob/inhands/weapons/staves_righthand.dmi b/icons/mob/inhands/weapons/staves_righthand.dmi index 92e5b91323dad600181171eac3c2158553dcf782..202bab9e2152f55358e253ef3a39f02982a911e8 100644 GIT binary patch delta 46 zcmV+}0MY-9kpYa60kAOvAIDKY`$i7I?GM>u^UIJ&IA2RBFBSO!l{xs;3LYeTvrqv% EN5w}Hpa1{> delta 46 zcmV+}0MY-9kpYa60kAOvABS8&`$i7I?GM>u^UIJ&IA2RBFBSO!l}Gs1ZgSVbvrqv% EN6Q@)DgXcg diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 2a777b9af5a4901c956955e0e6dd7fb7f26fe19a..2721932f8d00d8e0bc22f7ef509a2573af86dc48 100644 GIT binary patch delta 49 zcmX?dMfAuO(GAUPOjBM@Ze`17xApn-{;Rxb^KZ8H-)xLP%ml>DK+LlJHyf*GG5|TG B6;l8J delta 49 zcmX?dMfAuO(GAUPOfz3iZe`17_xAbpeTn|Q=HG1Xzu6dpm