diff --git a/_maps/map_files/austranderlin/austranderlin.dmm b/_maps/map_files/austranderlin/austranderlin.dmm index 7470b780996..554fa98cace 100644 --- a/_maps/map_files/austranderlin/austranderlin.dmm +++ b/_maps/map_files/austranderlin/austranderlin.dmm @@ -2151,8 +2151,8 @@ /area/indoors/town/vault) "baX" = ( /obj/structure/rack/shelf/biggest, -/obj/item/storage/backpack/satchel/otavan, -/obj/item/storage/backpack/satchel/otavan, +/obj/item/storage/backpack/satchel/grenzel, +/obj/item/storage/backpack/satchel/grenzel, /obj/item/flashlight/flare/torch/lantern, /obj/item/flashlight/flare/torch/lantern, /turf/open/floor/church/purple, diff --git a/_maps/map_files/daftmarsh/daftmarsh.dmm b/_maps/map_files/daftmarsh/daftmarsh.dmm index 7949a30de96..020b5889acd 100644 --- a/_maps/map_files/daftmarsh/daftmarsh.dmm +++ b/_maps/map_files/daftmarsh/daftmarsh.dmm @@ -17859,8 +17859,8 @@ /obj/structure/rack/shelf/biggest, /obj/item/flashlight/flare/torch/lantern, /obj/item/flashlight/flare/torch/lantern, -/obj/item/storage/backpack/satchel/otavan, -/obj/item/storage/backpack/satchel/otavan, +/obj/item/storage/backpack/satchel/grenzel, +/obj/item/storage/backpack/satchel/grenzel, /turf/open/floor/churchmarble/purple, /area/indoors/town/church/inquisition) "pAq" = ( diff --git a/_maps/map_files/vanderlin/vanderlin_bog.dmm b/_maps/map_files/vanderlin/vanderlin_bog.dmm index 2a56bf65da9..880bf377da4 100644 --- a/_maps/map_files/vanderlin/vanderlin_bog.dmm +++ b/_maps/map_files/vanderlin/vanderlin_bog.dmm @@ -5908,7 +5908,7 @@ /obj/item/clothing/head/crown/circlet/sleepless, /obj/item/clothing/neck/mana_star, /obj/structure/carpet/blue, -/obj/item/weapon/polearm/woodstaff/naledi, +/obj/item/weapon/polearm/woodstaff/psydonian, /turf/open/floor/abyss_tile{ color = "#7D9BAE" }, @@ -17494,10 +17494,10 @@ /obj/item/ingot/gold, /obj/item/clothing/ring/silver/noc, /obj/item/weapon/shield/tower/metal/psy, -/obj/item/clothing/armor/plate/full/holysee, -/obj/item/clothing/pants/platelegs/holysee, -/obj/item/clothing/head/helmet/heavy/holysee, -/obj/item/clothing/cloak/holysee, +/obj/item/clothing/armor/plate/full/grandmaster, +/obj/item/clothing/pants/platelegs/grandmaster, +/obj/item/clothing/head/helmet/heavy/grandmaster, +/obj/item/clothing/cloak/grandmaster, /obj/item/clothing/cloak/templar/undivided, /turf/open/floor/abyss_tile/three{ color = "#547285" @@ -22155,7 +22155,7 @@ /area/outdoors/bog/north) "vsS" = ( /obj/structure/closet/crate/chest/neu_fancy, -/obj/item/clothing/face/lordmask/naledi, +/obj/item/clothing/face/lordmask/preceptor, /turf/open/floor/abyss_sand, /area/under/cavewet) "vtP" = ( diff --git a/_maps/map_files/vanderlin/vanderlin_forest.dmm b/_maps/map_files/vanderlin/vanderlin_forest.dmm index 73ca9566400..bc8bbf5b037 100644 --- a/_maps/map_files/vanderlin/vanderlin_forest.dmm +++ b/_maps/map_files/vanderlin/vanderlin_forest.dmm @@ -5327,7 +5327,7 @@ /obj/item/clothing/pants/trou/leather/gronn, /obj/item/clothing/gloves/angle/gronnfur, /obj/item/clothing/gloves/angle/gronn, -/obj/item/clothing/gloves/angle/atgervi, +/obj/item/clothing/gloves/angle/furlined, /turf/open/floor/wood, /area/indoors/wilderness/gallowband/ship) "DJ" = ( @@ -6033,9 +6033,9 @@ /obj/item/clothing/shirt/tunic/colored/red, /obj/item/clothing/gloves/angle/gronnfur, /obj/item/clothing/pants/trou/leather/gronn, -/obj/item/clothing/shoes/boots/leather/atgervi, -/obj/item/clothing/pants/trou/leather/atgervi, -/obj/item/clothing/gloves/angle/atgervi, +/obj/item/clothing/shoes/boots/leather/furlined, +/obj/item/clothing/pants/trou/leather/furpants, +/obj/item/clothing/gloves/angle/furlined, /turf/open/floor/wood, /area/indoors/wilderness/gallowband/ship) "Hu" = ( @@ -6085,8 +6085,8 @@ "HI" = ( /obj/structure/closet/crate/crafted_closet/crafted, /obj/item/clothing/pants/trou/leather/gronn, -/obj/item/clothing/armor/leather/atgervi, -/obj/item/clothing/gloves/plate/atgervi, +/obj/item/clothing/armor/leather/shamancoat, +/obj/item/clothing/gloves/plate/beastclaws, /obj/item/clothing/neck/psycross/great_hunt, /obj/item/clothing/head/helmet/leather/shaman_hood, /turf/open/floor/ruinedwood/darker, @@ -7642,7 +7642,7 @@ /area/outdoors/wilderness/safe) "Qr" = ( /obj/structure/closet/crate/coffin, -/obj/item/weapon/axe/steel/atgervi, +/obj/item/weapon/axe/steel/bearded, /turf/open/floor/herringbone, /area/indoors/wilderness/saint_crypt) "Qt" = ( diff --git a/_maps/map_files/vanderlin/vanderlin_mountain.dmm b/_maps/map_files/vanderlin/vanderlin_mountain.dmm index 6492bbfbd00..4ab68c376a6 100644 --- a/_maps/map_files/vanderlin/vanderlin_mountain.dmm +++ b/_maps/map_files/vanderlin/vanderlin_mountain.dmm @@ -2732,8 +2732,8 @@ /area/indoors/mountains/anvil/upperkeep) "ane" = ( /obj/structure/rack/shelf/biggest, -/obj/item/storage/backpack/satchel/otavan, -/obj/item/storage/backpack/satchel/otavan, +/obj/item/storage/backpack/satchel/grenzel, +/obj/item/storage/backpack/satchel/grenzel, /obj/item/flashlight/flare/torch/lantern, /obj/item/flashlight/flare/torch/lantern, /turf/open/floor/church/purple, diff --git a/code/datums/components/storage/storage_types.dm b/code/datums/components/storage/storage_types.dm index 78e02f55547..b44e9684a9b 100644 --- a/code/datums/components/storage/storage_types.dm +++ b/code/datums/components/storage/storage_types.dm @@ -41,7 +41,7 @@ . = ..() set_holdable(list(/obj/item/weapon/sword), list(/obj/item/weapon/sword/long/exe, /obj/item/weapon/sword/long/greatsword, /obj/item/weapon/sword/long/daewalker)) -/datum/component/storage/concrete/scabbard/kazengun/New(list/raw_args) +/datum/component/storage/concrete/scabbard/blackmeadow/New(list/raw_args) . = ..() set_holdable(list(/obj/item/weapon/sword/katana)) diff --git a/code/datums/loadouts/cloak_loadout_items.dm b/code/datums/loadouts/cloak_loadout_items.dm index 38ccde8bb72..b38a1e55f51 100644 --- a/code/datums/loadouts/cloak_loadout_items.dm +++ b/code/datums/loadouts/cloak_loadout_items.dm @@ -135,9 +135,9 @@ ui_category = "Cloaks" triumph_cost_permanent = 100 -/datum/loadout_item/kazengun_coat +/datum/loadout_item/blackmeadow_coat name = "Jinbaori" - item_path = /obj/item/clothing/cloak/kazengun + item_path = /obj/item/clothing/cloak/blackmeadow ui_category = "Cloaks" triumph_cost_permanent = 250 @@ -155,7 +155,7 @@ /datum/loadout_item/lirvan_silk name = "Warrior Silks" - item_path = /obj/item/clothing/cloak/ordinatorcape/lirvas + item_path = /obj/item/clothing/cloak/ordinatorcape/warrior ui_category = "Cloaks" triumph_cost_permanent = 1000 diff --git a/code/datums/loadouts/pants_loadout_items.dm b/code/datums/loadouts/pants_loadout_items.dm index 20675f33027..2b80d66d328 100644 --- a/code/datums/loadouts/pants_loadout_items.dm +++ b/code/datums/loadouts/pants_loadout_items.dm @@ -40,9 +40,9 @@ triumph_cost_permanent = 75 -/datum/loadout_item/kazengunpants +/datum/loadout_item/blackmeadowpants name = "Gamebson Trousers" - item_path = /obj/item/clothing/pants/trou/leather/kazengun + item_path = /obj/item/clothing/pants/trou/leather/blackmeadow ui_category = "Pants" triumph_cost_permanent = 150 diff --git a/code/datums/stress/negative_events.dm b/code/datums/stress/negative_events.dm index c61e7183039..54b01733b55 100644 --- a/code/datums/stress/negative_events.dm +++ b/code/datums/stress/negative_events.dm @@ -869,11 +869,6 @@ return 0 return ..() -/datum/stress_event/shamanhoodlost - stress_change = 3 - desc = span_boldred("I have lost my hood! My failure to protect it leaves open the defilement my future reincarnations!") - timer = 999 MINUTES - /datum/stress_event/black_briar1 timer = 999 MINUTES stress_change = 5 diff --git a/code/datums/world_factions/coastal.dm b/code/datums/world_factions/coastal.dm index 83e64428d96..9d5857772eb 100644 --- a/code/datums/world_factions/coastal.dm +++ b/code/datums/world_factions/coastal.dm @@ -93,8 +93,8 @@ /datum/supply_pack/apparel/grenzel_shirt, /datum/supply_pack/apparel/buckle_boots, /datum/supply_pack/apparel/Puritan_shirt, - /datum/supply_pack/apparel/otavan_boots, - /datum/supply_pack/apparel/otavan_gloves, + /datum/supply_pack/apparel/grenzel_boots, + /datum/supply_pack/apparel/grenzel_gloves, /datum/supply_pack/apparel/leathercollar, /datum/supply_pack/apparel/thigh_boots, /datum/supply_pack/apparel/black_gloves, diff --git a/code/datums/world_factions/mountain.dm b/code/datums/world_factions/mountain.dm index acb80023053..5f3ee8067a4 100644 --- a/code/datums/world_factions/mountain.dm +++ b/code/datums/world_factions/mountain.dm @@ -172,12 +172,12 @@ ) exotic_pool = list( /datum/supply_pack/armor/steel/coatofplates, - /datum/supply_pack/apparel/atgervi_trousers, - /datum/supply_pack/apparel/atgervi_boots, - /datum/supply_pack/armor/steel/atgervihelm, - /datum/supply_pack/armor/steel/atgervichest, - /datum/supply_pack/armor/steel/atgervigloves, - /datum/supply_pack/weapons/shield/atgervishield, + /datum/supply_pack/apparel/furlined_trousers, + /datum/supply_pack/apparel/furlined_boots, + /datum/supply_pack/armor/steel/dwarvenhelm, + /datum/supply_pack/armor/steel/dwarvenchest, + /datum/supply_pack/armor/steel/beastclaws, + /datum/supply_pack/weapons/shield/dwarvenshield, /datum/supply_pack/armor/steel/buckethelm, /datum/supply_pack/armor/steel/chainmail_hauberk, /datum/supply_pack/armor/steel/visorsallet, diff --git a/code/datums/world_factions/traders/trade_data_types/artifact.dm b/code/datums/world_factions/traders/trade_data_types/artifact.dm index b2128e87cd0..dead67472da 100644 --- a/code/datums/world_factions/traders/trade_data_types/artifact.dm +++ b/code/datums/world_factions/traders/trade_data_types/artifact.dm @@ -23,7 +23,7 @@ /obj/item/weapon/sword/long/martyr = list(1, PRICE_SUBGOD_ARTIFACT, 1), /obj/item/weapon/greataxe/dreamscape = list(1, PRICE_SUBGOD_ARTIFACT, 1), /obj/item/weapon/greataxe/steel/doublehead/graggar = list(1, PRICE_SUBGOD_ARTIFACT, 1), - /obj/item/weapon/polearm/woodstaff/naledi = list(1, PRICE_BOSS_ARTIFACT, 1), + /obj/item/weapon/polearm/woodstaff/psydonian = list(1, PRICE_BOSS_ARTIFACT, 1), /obj/item/weapon/polearm/halberd/bardiche/woodcutter/gorefeast = list(1, PRICE_GOD_ARTIFACT, 1), /obj/item/weapon/polearm/neant = list(1, PRICE_GOD_ARTIFACT, 1), /obj/item/gun/ballistic/bow/turbulenta = list(1, PRICE_GOD_ARTIFACT, 1), diff --git a/code/datums/world_factions/zalad.dm b/code/datums/world_factions/zalad.dm index ac308379824..c8dfc6f8241 100644 --- a/code/datums/world_factions/zalad.dm +++ b/code/datums/world_factions/zalad.dm @@ -150,7 +150,7 @@ /datum/supply_pack/weapons/iron/iassegai, /datum/supply_pack/weapons/ranged/shortbow, /datum/supply_pack/weapons/ranged/bow, - /datum/supply_pack/weapons/steel/atgervi, + /datum/supply_pack/weapons/steel/bearded, /datum/supply_pack/weapons/ranged/crossbow, /datum/supply_pack/weapons/ammo/quivers, /datum/supply_pack/weapons/ammo/arrowquiver, diff --git a/code/game/objects/items/weapons/melee/axes.dm b/code/game/objects/items/weapons/melee/axes.dm index d1f4192fa32..4449f9be1e4 100644 --- a/code/game/objects/items/weapons/melee/axes.dm +++ b/code/game/objects/items/weapons/melee/axes.dm @@ -289,7 +289,7 @@ //.................. Bearded Axe ...............// -/obj/item/weapon/axe/steel/atgervi +/obj/item/weapon/axe/steel/bearded name = "bearded axe" desc = "A large axe easily wielded in one hand or two, With a large hooked axe head to tearing into flesh and armor and ripping it away brutally." icon_state = "atgervi_axe" @@ -300,7 +300,7 @@ experimental_onhip = TRUE item_weight = 2.2 KILOGRAMS -/obj/item/weapon/axe/steel/atgervi/getonmobprop(tag) +/obj/item/weapon/axe/steel/bearded/getonmobprop(tag) . = ..() if(tag) switch(tag) diff --git a/code/game/objects/items/weapons/melee/polearms.dm b/code/game/objects/items/weapons/melee/polearms.dm index c85e0d1c784..d909fe1fb9d 100644 --- a/code/game/objects/items/weapons/melee/polearms.dm +++ b/code/game/objects/items/weapons/melee/polearms.dm @@ -893,7 +893,7 @@ if("wielded") return list("shrink" = 0.6,"sx" = 4,"sy" = -2,"nx" = -3,"ny" = -2,"wx" = -5,"wy" = -1,"ex" = 3,"ey" = -2,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 7,"sturn" = -7,"wturn" = 16,"eturn" = -22,"nflip" = 8,"sflip" = 0,"wflip" = 8,"eflip" = 0) -/obj/item/weapon/polearm/woodstaff/naledi +/obj/item/weapon/polearm/woodstaff/psydonian name = "psydonian warstaff" desc = "A staff carrying the black and gold insignia of the war scholars." icon_state = "naledistaff" @@ -904,7 +904,7 @@ max_integrity = INTEGRITY_STRONG item_weight = 1 KILOGRAMS -/obj/item/weapon/polearm/woodstaff/naledi/getonmobprop(tag) +/obj/item/weapon/polearm/woodstaff/psydonian/getonmobprop(tag) . = ..() if(tag) switch(tag) diff --git a/code/game/objects/items/weapons/scabbard.dm b/code/game/objects/items/weapons/scabbard.dm index c259d48c6df..f5c3059b8f0 100644 --- a/code/game/objects/items/weapons/scabbard.dm +++ b/code/game/objects/items/weapons/scabbard.dm @@ -206,7 +206,7 @@ -/obj/item/weapon/scabbard/kazengun +/obj/item/weapon/scabbard/blackmeadow name = "simple eastern scabbard" desc = "A piece of steel lined with wood. Great for batting away blows." icon_state = "kazscab" @@ -222,12 +222,12 @@ sellprice = 10 item_weight = 400 GRAMS -/obj/item/weapon/scabbard/kazengun/apply_components() +/obj/item/weapon/scabbard/blackmeadow/apply_components() . = ..() AddElement(/datum/element/update_icon_updates_onmob, slot_flags|ITEM_SLOT_HANDS) - AddComponent(/datum/component/storage/concrete/scabbard/kazengun) + AddComponent(/datum/component/storage/concrete/scabbard/blackmeadow) -/obj/item/weapon/scabbard/kazengun/steel +/obj/item/weapon/scabbard/blackmeadow/steel name = "hwang scabbard" desc = "A cloud-patterned scabbard with a cloth sash. Used for blocking." icon_state = "kazscab_steel" @@ -235,7 +235,7 @@ max_integrity = INTEGRITY_STRONG item_weight = 450 GRAMS -/obj/item/weapon/scabbard/kazengun/gold +/obj/item/weapon/scabbard/blackmeadow/gold name = "gold-stained scabbard" desc = "An ornate, wooden scabbard with a sash. Great for parrying." icon_state = "kazscab_gold" diff --git a/code/modules/antagonists/villain/vampire/daewalker.dm b/code/modules/antagonists/villain/vampire/daewalker.dm index 3532ac6b29a..6b25fecd7a4 100644 --- a/code/modules/antagonists/villain/vampire/daewalker.dm +++ b/code/modules/antagonists/villain/vampire/daewalker.dm @@ -173,7 +173,7 @@ belt = /obj/item/storage/belt/leather/knifebelt/black/psydon beltl = /obj/item/gun/ballistic/powder/wheellock/puffer beltr = /obj/item/ammo_holder/bullet/bullets - backl = /obj/item/storage/backpack/satchel/otavan + backl = /obj/item/storage/backpack/satchel/grenzel backr = /obj/item/weapon/scabbard/sword/noble r_hand = /obj/item/weapon/sword/long/daewalker backpack_contents = list(/obj/item/reagent_containers/glass/bottle/aflask = 1, /obj/item/smokebomb = 2, /obj/item/needle/blessed = 1) diff --git a/code/modules/cargo/supply_packs/apparel.dm b/code/modules/cargo/supply_packs/apparel.dm index a9210878551..856c4cde3ea 100644 --- a/code/modules/cargo/supply_packs/apparel.dm +++ b/code/modules/cargo/supply_packs/apparel.dm @@ -417,10 +417,10 @@ cost = 25 contains = /obj/item/clothing/pants/trou/beltpants -/datum/supply_pack/apparel/atgervi_trousers - name = "Atgervi Trousers" +/datum/supply_pack/apparel/furlined_trousers + name = "Fur Pants" cost = 35 - contains = /obj/item/clothing/pants/trou/leather/atgervi + contains = /obj/item/clothing/pants/trou/leather/furpants // SHOES @@ -464,10 +464,10 @@ cost = 50 contains = /obj/item/clothing/shoes/anklets -/datum/supply_pack/apparel/otavan_boots - name = "Otavan Boots" +/datum/supply_pack/apparel/grenzel_boots + name = "Grenzelhoftian Leather Boots" cost = 30 - contains = /obj/item/clothing/shoes/otavan + contains = /obj/item/clothing/shoes/grenzel /datum/supply_pack/apparel/buckle_boots name = "Buckled Boots" @@ -484,10 +484,10 @@ cost = 20 contains = /obj/item/clothing/shoes/boots/clothlinedanklets -/datum/supply_pack/apparel/atgervi_boots - name = "Atgervie Boots" +/datum/supply_pack/apparel/furlined_boots + name = "Fur-Lined Boots" cost = 30 - contains = /obj/item/clothing/shoes/boots/leather/atgervi + contains = /obj/item/clothing/shoes/boots/leather/furlined /datum/supply_pack/apparel/watch_boots name = "Watch Boots" @@ -519,12 +519,12 @@ /datum/supply_pack/apparel/fur_gloves name = "Fur Gloves" cost = 15 - contains = /obj/item/clothing/gloves/angle/atgervi + contains = /obj/item/clothing/gloves/angle/furlined -/datum/supply_pack/apparel/otavan_gloves - name = "Otavan Gloves" +/datum/supply_pack/apparel/grenzel_gloves + name = "Grenzelhoftian Leather Gloves" cost = 25 - contains = /obj/item/clothing/gloves/leather/otavan + contains = /obj/item/clothing/gloves/leather/grenzel /datum/supply_pack/apparel/black_gloves name = "Black Gloves" diff --git a/code/modules/cargo/supply_packs/armor.dm b/code/modules/cargo/supply_packs/armor.dm index 3a3edf49347..137dc9688ad 100644 --- a/code/modules/cargo/supply_packs/armor.dm +++ b/code/modules/cargo/supply_packs/armor.dm @@ -96,7 +96,7 @@ /datum/supply_pack/armor/light/shamaniccoat name = "Shamanic Coat" cost = 30 - contains = /obj/item/clothing/armor/leather/atgervi + contains = /obj/item/clothing/armor/leather/shamancoat // SHIRT ARMOR @@ -202,10 +202,10 @@ cost = 90 contains = /obj/item/clothing/head/helmet/sallet/elven -/datum/supply_pack/armor/steel/atgervihelm - name = "Atgervi Helm" +/datum/supply_pack/armor/steel/dwarvenhelm + name = "Owl Helmet" cost = 60 - contains = /obj/item/clothing/head/helmet/bascinet/atgervi + contains = /obj/item/clothing/head/helmet/bascinet/owl /datum/supply_pack/armor/steel/steppehelm name = "Steppe Bascinet" @@ -273,10 +273,10 @@ // SHIRT ARMOR -/datum/supply_pack/armor/steel/atgervichest - name = "Atgervi Hauberk" +/datum/supply_pack/armor/steel/dwarvenchest + name = "Dwarven Hauberk" cost = 95 - contains = /obj/item/clothing/armor/chainmail/hauberk/atgervi + contains = /obj/item/clothing/armor/chainmail/hauberk/dwarven /datum/supply_pack/armor/steel/chainmail name = "Steel Chainmail" @@ -305,10 +305,10 @@ cost = 50 contains = /obj/item/clothing/gloves/plate -/datum/supply_pack/armor/steel/atgervigloves - name = "Atgervi Gloves" +/datum/supply_pack/armor/steel/beastclaws + name = "Beast Claws" cost = 55 - contains = /obj/item/clothing/gloves/plate/atgervi + contains = /obj/item/clothing/gloves/plate/beastclaws // PANTS diff --git a/code/modules/cargo/supply_packs/weapons.dm b/code/modules/cargo/supply_packs/weapons.dm index 3b726ead656..5cea5722e55 100644 --- a/code/modules/cargo/supply_packs/weapons.dm +++ b/code/modules/cargo/supply_packs/weapons.dm @@ -26,10 +26,10 @@ cost = 35 contains = /obj/item/weapon/shield/tower -/datum/supply_pack/weapons/shield/atgervishield - name = "Atgervi Shield" +/datum/supply_pack/weapons/shield/dwarvenshield + name = "Dwarven Kite Shield" cost = 30 - contains = /obj/item/weapon/shield/atgervi + contains = /obj/item/weapon/shield/dwarvenkite /datum/supply_pack/weapons/shield/iron name = "Iron Buckler" @@ -211,10 +211,10 @@ cost = 60 contains = /obj/item/weapon/polearm/spear/assegai/steel -/datum/supply_pack/weapons/steel/atgervi - name = "Steel Atgervi Axe" +/datum/supply_pack/weapons/steel/bearded + name = "Steel Bearded Axe" cost = 60 - contains = /obj/item/weapon/axe/steel/atgervi + contains = /obj/item/weapon/axe/steel/bearded /datum/supply_pack/weapons/steel/paxe name = "Pickaxe" diff --git a/code/modules/clothing/belt/misc.dm b/code/modules/clothing/belt/misc.dm index 416a0f39565..ac01753dc4b 100644 --- a/code/modules/clothing/belt/misc.dm +++ b/code/modules/clothing/belt/misc.dm @@ -370,7 +370,7 @@ salvage_result = /obj/item/natural/cloth component_type = /datum/component/storage/concrete/grid/satchel/cloth/big -/obj/item/storage/backpack/satchel/otavan +/obj/item/storage/backpack/satchel/grenzel name = "grenzelhoftian leather satchel" examine_name = "satchel" desc = "A made to last leather bag from the Psydonian heart of Grenzelhoft. It's Grenzelhoft's finest." diff --git a/code/modules/clothing/cloak/inquistion.dm b/code/modules/clothing/cloak/inquistion.dm index ddb54e5e3fc..5ec27217242 100644 --- a/code/modules/clothing/cloak/inquistion.dm +++ b/code/modules/clothing/cloak/inquistion.dm @@ -157,7 +157,7 @@ inhand_mod = TRUE has_storage = TRUE -/obj/item/clothing/cloak/ordinatorcape/lirvas +/obj/item/clothing/cloak/ordinatorcape/warrior name = "warrior silks" desc = "Fine silks. Only the best for me, of course. You need to look good while beating someone to death." icon_state = "lirvastabard" diff --git a/code/modules/clothing/cloak/misc.dm b/code/modules/clothing/cloak/misc.dm index d0912d84c06..19e2aae11de 100644 --- a/code/modules/clothing/cloak/misc.dm +++ b/code/modules/clothing/cloak/misc.dm @@ -415,7 +415,7 @@ nodismemsleeves = TRUE detail_tag = null -/obj/item/clothing/cloak/kazengun +/obj/item/clothing/cloak/blackmeadow name = "jinbaori" desc = "A simple kind of Blackmeadow surcoat, worn here in the distant battlefields of Azuria to differentiate friend from foe." icon_state = "kazenguncoat" diff --git a/code/modules/clothing/face/masks.dm b/code/modules/clothing/face/masks.dm index 94f1091ce42..9421a8604de 100644 --- a/code/modules/clothing/face/masks.dm +++ b/code/modules/clothing/face/masks.dm @@ -349,7 +349,7 @@ icon_state = "steppemask_snout" desc = "A steel mask shaped like a beast's face, worn by steppe riders to intimidate their enemies." -/obj/item/clothing/face/facemask/steel/kazengun +/obj/item/clothing/face/facemask/steel/blackmeadow name = "soldier's half-mask" desc = "\"The first lesson of war is that it would be better to live in peace.\"" block2add = null @@ -357,7 +357,7 @@ icon_state = "kazengunmouthguard" item_state = "kazengunmouthguard" -/obj/item/clothing/face/facemask/steel/kazengun/full +/obj/item/clothing/face/facemask/steel/blackmeadow/full name = "ogre mask" desc = "\"The second lesson: Rich men have dreams. Poor men die to make them come true.\"" icon_state = "kazengunfaceguard" diff --git a/code/modules/clothing/gloves/leather.dm b/code/modules/clothing/gloves/leather.dm index da95706c0fe..f97fe860eca 100644 --- a/code/modules/clothing/gloves/leather.dm +++ b/code/modules/clothing/gloves/leather.dm @@ -54,7 +54,7 @@ desc = "Thick leather gloves for pulling thorny plants... or cracking skulls." icon_state = "apothgloves" -/obj/item/clothing/gloves/leather/otavan +/obj/item/clothing/gloves/leather/grenzel name = "grenzelhoftian leather gloves" examine_name = "leather gloves" desc = "A pair of heavy Grenzelhoftian leather gloves, commonly used by fencers, renowned for their quality." @@ -73,7 +73,7 @@ salvage_result = /obj/item/natural/hide/cured dyeable = TRUE -/obj/item/clothing/gloves/leather/otavan/inqgloves +/obj/item/clothing/gloves/leather/grenzel/inqgloves name = "inquisitorial leather gloves" examine_name = "leather gloves" desc = "Gloves of worn leather. Alas, the psydonian fetish wrapped around one is but a powerless replica." diff --git a/code/modules/clothing/head/helmets/misc.dm b/code/modules/clothing/head/helmets/misc.dm index 719b5b94e1f..16190b184cb 100644 --- a/code/modules/clothing/head/helmets/misc.dm +++ b/code/modules/clothing/head/helmets/misc.dm @@ -286,8 +286,7 @@ /obj/item/clothing/head/helmet/sallet/iron/banded name = "banded iron helmet" - desc = "A menacing horned half-face iron helmet worn primarily by mercenaries hailing from an unaligned conflict-ridden enclave near the borders of Ossland. \ - A helmet of this kind was notoriously worn by an unknown person said to kill the last Great Drakyn inhabiting the mountains of Hammerhold." + desc = "A menacing horned half-face iron helmet worn primarily by mercenaries hailing from an unaligned conflict-ridden enclave near the borders of Ossland." max_integrity = ARMOR_INT_HELMET_HEAVY_IRON armor_class = AC_MEDIUM flags_inv = HIDEEARS|HIDEFACE @@ -795,10 +794,7 @@ /obj/item/clothing/head/helmet/bronzegladiator name = "bronze murmillo" - desc = "A bronze helmet that veils the wearer's face behind a perforated visor; a distant ancestor to both the sallet and sayovard, \ - providing excellent coverage while ensuring one doesn't suffocate on their own adrenal huffs.
Out of all actorial labors, none surpass \ - the reenactment of Ravox's duel against Graggar atop Ur-Syon's ruins - mythologized not as a tentacled star, but as a towering doppelganger-champion; \ - sculpted by the followers of evil to be the inverse to all who stood for justice and chivalry." + desc = "A bronze helmet that veils the wearer's face behind a perforated visor; a distant ancestor to both the sallet and sayovard, providing excellent coverage." icon_state = "bronzemurmillo" item_state = "bronzemurmillo" max_integrity = ARMOR_INT_HELMET_IRON - 100 diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 7b5c31b03c7..de796657491 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -49,8 +49,8 @@ /obj/item/clothing/head/headband/colored/red color = CLOTHING_BLOOD_RED -/obj/item/clothing/head/headband/naledi - name = "sojourner's headband" +/obj/item/clothing/head/headband/preceptor + name = "preceptor's headband" desc = "A traditional monk's headband, for those disciples who prefer the sweat out of their eyes." icon_state = "headband" color = "#48443b" diff --git a/code/modules/clothing/neck/misc.dm b/code/modules/clothing/neck/misc.dm index 5f801af7caa..0eb71e40c5a 100644 --- a/code/modules/clothing/neck/misc.dm +++ b/code/modules/clothing/neck/misc.dm @@ -416,7 +416,7 @@ . = ..() ADD_TRAIT(src, TRAIT_HARD_TO_STEAL, TRAIT_GENERIC) -/obj/item/clothing/neck/gorget/kazengun +/obj/item/clothing/neck/gorget/blackmeadow name = "blackmeadow gorget" desc = "A series of interlocking rings of metal set around the throat. Used by the kouken of Blackmeadow for precisely the same reason as the knights of Psydonia." icon_state = "kazengunneckguard" diff --git a/code/modules/clothing/outfits/atveri.dm b/code/modules/clothing/outfits/atveri.dm index 074162c1837..ec3d673e3b0 100644 --- a/code/modules/clothing/outfits/atveri.dm +++ b/code/modules/clothing/outfits/atveri.dm @@ -1,12 +1,12 @@ -/obj/item/clothing/armor/chainmail/hauberk/atgervi +/obj/item/clothing/armor/chainmail/hauberk/dwarven name = "dwarven-make hauberk" desc = "The pride of mercenaries from the Dwarven Federation, a well crafted blend of chain and leather into a dense protective coat." icon_state = "atgervi_raider_mail" item_state = "atgervi_raider_mail" max_integrity = 400 -/obj/item/clothing/armor/leather/atgervi +/obj/item/clothing/armor/leather/shamancoat name = "shaman's coat" desc = "A furred protective coat, often made by hand from a beast killed in the bearer's hunt." icon_state = "atgervi_shaman_coat" @@ -15,57 +15,57 @@ prevent_crits = ALL_EXCEPT_STAB max_integrity = ARMOR_INT_CHEST_LIGHT_MASTER -/obj/item/clothing/armor/leather/atgervi/advanced +/obj/item/clothing/armor/leather/shamancoat/advanced name = "hardened shaman's coat" desc = "A thick, furred protective coat, often made by hand expertly from a beast killed in the bearer's hunt." max_integrity = INTEGRITY_STRONG prevent_crits = ALL_EXCEPT_CHOP_AND_STAB armor_type = /datum/armor/leather/advanced -/obj/item/clothing/armor/leather/atgervi/masterwork +/obj/item/clothing/armor/leather/shamancoat/masterwork name = "masterwork shaman's coat" - desc = "This coat was masterfully hand crafted with dendors blessing, and interwined with the fur and hide of beasts of the true, untamed wilds, often made by hand masterfully from a dangerous beast killed in the bearer's many hunts." + desc = "This coat was masterfully hand crafted with Dendor's blessing, and interwined with the fur and hide of beasts of the true, untamed wilds, often made by hand masterfully from a dangerous beast killed in the bearer's many hunts." max_integrity = INTEGRITY_STRONG + 100 prevent_crits = ALL_EXCEPT_STAB armor_type = /datum/armor/leather/master -/obj/item/clothing/armor/leather/atgervi/masterwork/Initialize() +/obj/item/clothing/armor/leather/shamancoat/masterwork/Initialize() . = ..() filters += filter(type="drop_shadow", x=0, y=0, size=0.5, offset=1, color=rgb(218, 165, 32)) -/obj/item/clothing/pants/trou/leather/atgervi +/obj/item/clothing/pants/trou/leather/furpants name = "fur pants" desc = "Thick fur pants made to endure the coldest winds, offering a share of protection from fang and claw of beast or men alike." icon_state = "atgervi_pants" item_state = "atgervi_pants" -/obj/item/clothing/pants/trou/leather/atgervi/advanced +/obj/item/clothing/pants/trou/leather/furpants/advanced name = "hardened fur chausses" desc = "Expertly made thick fur pants made to endure the coldest winds, offering a measure of protection from fang and claw of beast or men alike." max_integrity = INTEGRITY_STRONG prevent_crits = list(BCLASS_CUT, BCLASS_BLUNT, BCLASS_TWIST) armor_type = /datum/armor/pants/leather/advanced -/obj/item/clothing/pants/trou/leather/atgervi/masterwork +/obj/item/clothing/pants/trou/leather/furpants/masterwork name = "masterwork fur chausses" desc = "Masterfully made thick fur pants made to endure extreme winter winds, offering a reliable amount of protection from fang, and claw of beast or men alike." max_integrity = INTEGRITY_STRONG + 100 prevent_crits = list(BCLASS_CUT, BCLASS_BLUNT, BCLASS_TWIST, BCLASS_CHOP) armor_type = /datum/armor/pants/leather/master -/obj/item/clothing/pants/trou/leather/atgervi/masterwork/Initialize() +/obj/item/clothing/pants/trou/leather/furpants/masterwork/Initialize() . = ..() filters += filter(type="drop_shadow", x=0, y=0, size=0.5, offset=1, color=rgb(218, 165, 32)) -/obj/item/clothing/gloves/angle/atgervi +/obj/item/clothing/gloves/angle/furlined name = "fur-lined leather gloves" desc = "Thick, padded gloves made for the harshest of climates, and wildest of beasts encountered in the untamed lands." icon_state = "atgervi_raider_gloves" item_state = "atgervi_raider_gloves" -/obj/item/clothing/gloves/angle/atgervi/advanced +/obj/item/clothing/gloves/angle/furlined/advanced name = "hardened fur-lined leather gloves" desc = "Thick, well padded gloves made for the harshest of climates, and wildest- and most dangeress- of beasts encountered in the untamed lands." icon_state = "atgervi_raider_gloves" @@ -74,24 +74,24 @@ prevent_crits = list(BCLASS_CUT, BCLASS_BLUNT, BCLASS_TWIST) armor_type = /datum/armor/gloves/leather/advanced -/obj/item/clothing/gloves/angle/atgervi/masterwork +/obj/item/clothing/gloves/angle/furlined/masterwork name = "masterwork fur-lined leather gloves" desc = "Thick, masterfully padded gloves made for the harshest, most extreme of climates, and wildest- and most dangeress- of beasts encountered in the untamed lands." max_integrity = INTEGRITY_STRONG + 100 prevent_crits = list(BCLASS_CUT, BCLASS_BLUNT, BCLASS_TWIST, BCLASS_CHOP) armor_type = /datum/armor/gloves/leather/master -/obj/item/clothing/gloves/angle/atgervi/masterwork/Initialize() +/obj/item/clothing/gloves/angle/furlined/masterwork/Initialize() . = ..() filters += filter(type="drop_shadow", x=0, y=0, size=0.5, offset=1, color=rgb(218, 165, 32)) -/obj/item/clothing/gloves/plate/atgervi +/obj/item/clothing/gloves/plate/beastclaws name = "beast claws" desc = "A menacing pair of plated claws, a ceremonial weapon of the Osslandic hunters. The four claws symbolize the four godly aspects they revere." icon_state = "atgervi_shaman_gloves" item_state = "atergvi_shaman_gloves" -/obj/item/clothing/head/helmet/bascinet/atgervi +/obj/item/clothing/head/helmet/bascinet/owl name = "owl helmet" desc = "A carefully forged steel helmet in the shape of an owl's face, with added chain to cover the face and neck against many blows." icon_state = "atgervi_raider" @@ -104,7 +104,7 @@ worn_x_dimension = 32 worn_y_dimension = 48 -/obj/item/clothing/head/helmet/leather/saiga/atgervi +/obj/item/clothing/head/helmet/leather/saiga/moose name = "moose hood" desc = "A deceptively strong hood of hide with a pair of large heavy antlers. A suitable memorial for a worthy beast." icon_state = "atgervi_shaman" @@ -118,13 +118,13 @@ experimental_inhand = TRUE experimental_onhip = FALSE -/obj/item/clothing/shoes/boots/leather/atgervi - name = "atgervi leather boots" +/obj/item/clothing/shoes/boots/leather/furlined + name = "fur-lined leather boots" desc = "A pair of strong leather boots, designed to endure battle and the chill of the frozen north both." icon_state = "atgervi_boots" item_state = "atgervi_boots" -/obj/item/weapon/shield/atgervi +/obj/item/weapon/shield/dwarvenkite name = "kite shield" desc = "A large but light wooden shield with a steel boss in the center to deflect blows more easily." icon_state = "atgervi_shield" @@ -140,14 +140,13 @@ max_integrity = 300 experimental_inhand = FALSE -/obj/item/weapon/shield/atgervi/getonmobprop(tag) +/obj/item/weapon/shield/dwarvenkite/getonmobprop(tag) . = ..() if(tag) switch(tag) if("onback") return list("shrink" = 0.7,"sx" = -17,"sy" = -15,"nx" = -15,"ny" = -15,"wx" = -12,"wy" = -15,"ex" = -18,"ey" = -15,"nturn" = 0,"sturn" = 0,"wturn" = 180,"eturn" = 0,"nflip" = 8,"sflip" = 0,"wflip" = 1,"eflip" = 0,"northabove" = 1,"southabove" = 0,"eastabove" = 0,"westabove" = 0) -// Gronnic subtypes of atgervi clothes /obj/item/clothing/head/helmet/leather/shaman_hood name = "moose hood" desc = "A deceptively strong hood of hide with a pair of large heavy antlers. A suitable memorial for a worthy beast." @@ -180,21 +179,6 @@ light_power = 1 toggle_icon_state = TRUE -/obj/item/clothing/head/helmet/leather/shaman_hood/equipped(mob/user, slot) - . = ..() - if(ishuman(user)) - var/mob/living/carbon/human/H = user - H.remove_status_effect(/datum/status_effect/debuff/lost_shaman_hood) - H.remove_stress(/datum/stress_event/shamanhoodlost) - -/obj/item/clothing/head/helmet/leather/shaman_hood/dropped(mob/user) - . = ..() - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.merctype == 1) //Atgervi - H.apply_status_effect(/datum/status_effect/debuff/lost_shaman_hood) - H.add_stress(/datum/stress_event/shamanhoodlost) - /obj/item/clothing/head/helmet/leather/shaman_hood/Initialize(mapload) . = ..() set_light_on(FALSE) @@ -285,7 +269,7 @@ update_icon() -/obj/item/clothing/head/helmet/bascinet/atgervi/gronn +/obj/item/clothing/head/helmet/bascinet/owl/gronn name = "osslandic skull-helm" desc = "A helmet of hardened leather with a carefully preserved animal skull. \ The skull integrated is a trophy of the bearer's great hunt, and a symbol of their reincarnation after death." @@ -299,7 +283,7 @@ worn_x_dimension = 32 worn_y_dimension = 32 -/obj/item/clothing/head/helmet/bascinet/atgervi/gronn/ownel +/obj/item/clothing/head/helmet/bascinet/owl/gronn/ownel name = "osslandic scout's helmet" desc = "A full helmet that adequately protect the eyes and head; \ The slits are decorated with a harsh gold dye - it is rumoured in Ossland to grant one the ability to see as keenly as The Hunter himself." diff --git a/code/modules/clothing/outfits/matyr.dm b/code/modules/clothing/outfits/matyr.dm index f623d3ed4c9..656d6e62d85 100644 --- a/code/modules/clothing/outfits/matyr.dm +++ b/code/modules/clothing/outfits/matyr.dm @@ -12,7 +12,7 @@ slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK flags_inv = HIDEBOOB -/obj/item/clothing/armor/plate/full/holysee +/obj/item/clothing/armor/plate/full/grandmaster name = "holy silver plate" desc = "Silver-clad plate for the guardians and the warriors, for the spears and shields of the Ten." icon = 'icons/roguetown/clothing/special/martyr.dmi' @@ -26,7 +26,7 @@ melting_material = /datum/material/silver melt_amount = 350 -/obj/item/clothing/pants/platelegs/holysee +/obj/item/clothing/pants/platelegs/grandmaster name = "holy silver chausses" desc = "Plate leggings of silver forged for the grandmaster. A sea of silver to descend upon evil." icon = 'icons/roguetown/clothing/special/martyr.dmi' @@ -40,7 +40,7 @@ melting_material = /datum/material/silver melt_amount = 250 -/obj/item/clothing/head/helmet/heavy/holysee +/obj/item/clothing/head/helmet/heavy/grandmaster name = "holy silver bascinet" desc = "Branded by the faithful of the Ten, these helms are worn by its chosen warriors. A bastion of hope in the dark nite." icon = 'icons/roguetown/clothing/special/martyr.dmi' @@ -59,7 +59,7 @@ melt_amount = 250 -/obj/item/clothing/cloak/holysee +/obj/item/clothing/cloak/grandmaster name = "holy silver vestments" desc = "A set of vestments worn by the grandmaster, silver embroidery and seals of light ordain it as a bastion against evil." icon = 'icons/roguetown/clothing/special/martyr.dmi' @@ -77,7 +77,7 @@ sellprice = 300 has_storage = TRUE -/obj/item/clothing/cloak/holysee/MiddleClick(mob/user) +/obj/item/clothing/cloak/grandmaster/MiddleClick(mob/user) overarmor = !overarmor to_chat(user, span_info("I [overarmor ? "wear the tabard over my armor" : "wear the tabard under my armor"].")) if(overarmor) @@ -87,23 +87,8 @@ user.update_inv_cloak() user.update_inv_armor() -/datum/stress_event/naledimasklost - stress_change = 3 - desc = span_boldred("The mask! Anyone here could be unholy. I'm exposed.") - timer = 999 MINUTES - -/datum/status_effect/debuff/lost_naledi_mask - id = "naledimask" - alert_type = /atom/movable/screen/alert/status_effect/debuff/naledimask - effectedstats = list(STAT_ENDURANCE = -3, STAT_FORTUNE = -3) - -/atom/movable/screen/alert/status_effect/debuff/naledimask - name = "Lost Mask" - desc = "The unholy and daemons may claim me at any moment without the mask. It is not safe." - icon_state = "muscles" - -/obj/item/clothing/face/lordmask/naledi - name = "war scholar's mask" +/obj/item/clothing/face/lordmask/preceptor + name = "preceptor's mask" item_state = "naledimask" icon_state = "naledimask" desc = "Runes and wards, meant for daemons; the gold has somehow rusted in unnatural, impossible agony. The most prominent of these etchings is in the shape of the psycross. Armored to protect the wearer's face." @@ -113,25 +98,8 @@ prevent_crits = list(BCLASS_CUT, BCLASS_STAB, BCLASS_CHOP, BCLASS_BLUNT) sellprice = 0 -/obj/item/clothing/face/lordmask/naledi/equipped(mob/user, slot) - . = ..() - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.merctype == 14) //Naledi - H.remove_status_effect(/datum/status_effect/debuff/lost_naledi_mask) - H.remove_stress(/datum/stress_event/naledimasklost) - -/obj/item/clothing/face/lordmask/naledi/dropped(mob/user) - . = ..() - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.merctype == 14) //Naledi - if(!istiefling(user)) //Funny exception - H.apply_status_effect(/datum/status_effect/debuff/lost_naledi_mask) - H.add_stress(/datum/stress_event/naledimasklost) - -/obj/item/clothing/face/lordmask/naledi/sojourner - name = "sojourner's mask" +/obj/item/clothing/face/lordmask/preceptor/gold + name = "preceptor's mask" item_state = "naledimask" icon_state = "naledimask" desc = "A golden mask, hiding the face of those who prefer their fists and agility to speak for them." diff --git a/code/modules/clothing/pants/trousers.dm b/code/modules/clothing/pants/trousers.dm index 36391960ab3..14094a071eb 100644 --- a/code/modules/clothing/pants/trousers.dm +++ b/code/modules/clothing/pants/trousers.dm @@ -189,7 +189,7 @@ desc = "A pair of white pants decorated with red stripes and traditional patterning." icon_state = "shepherdpants" -/obj/item/clothing/pants/trou/leather/kazengun //no, not 'eastpants3', silly! +/obj/item/clothing/pants/trou/leather/blackmeadow //no, not 'eastpants3', silly! name = "gambeson trousers" desc = "A form of Blackmeadow peasant's trousers. The fabric used in their manufacture is strong, and could probably turn away a few blows." icon_state = "baggypants" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index dbf5452c239..208d428893e 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -336,7 +336,7 @@ sleeved = 'icons/roguetown/clothing/special/onmob/gronn.dmi' -/obj/item/clothing/shoes/boots/leather/kazengun +/obj/item/clothing/shoes/boots/leather/blackmeadow name = "armored sandals" desc = "Leather sandals, with steel ankle-protectors and socks of sturdy cloth." icon_state = "kazengunboots" @@ -344,7 +344,7 @@ detail_tag = "_detail" detail_color = CLOTHING_WHITE -/obj/item/clothing/shoes/boots/leather/kazengun/attack_hand_secondary(mob/user, list/modifiers) +/obj/item/clothing/shoes/boots/leather/blackmeadow/attack_hand_secondary(mob/user, list/modifiers) . = ..() var/choice = tgui_input_list(user, "Choose a color.", "Uniform colors", GLOB.noble_dyes) if(!choice) diff --git a/code/modules/clothing/shoes/misc.dm b/code/modules/clothing/shoes/misc.dm index 53edfcaa322..f2b628e0561 100644 --- a/code/modules/clothing/shoes/misc.dm +++ b/code/modules/clothing/shoes/misc.dm @@ -158,7 +158,7 @@ item_state = "freiboots" max_integrity = ARMOR_INT_SIDE_HARDLEATHER + 50 -/obj/item/clothing/shoes/otavan +/obj/item/clothing/shoes/grenzel name = "grenzelhoftian leather boots" desc = "Boots of outstanding craft, your fragile feet have never felt so protected and comfortable before." body_parts_covered = FEET @@ -170,7 +170,7 @@ armor_type = /datum/armor/boots/leather/good wetable = FALSE -/obj/item/clothing/shoes/otavan/inqboots +/obj/item/clothing/shoes/grenzel/inqboots name = "inquisitorial boots" examine_name = "boots" desc = "The steel-lined heels click." diff --git a/code/modules/clothing/wrists/bracer.dm b/code/modules/clothing/wrists/bracer.dm index 0449b9f6383..3e6ec740b6c 100644 --- a/code/modules/clothing/wrists/bracer.dm +++ b/code/modules/clothing/wrists/bracer.dm @@ -16,7 +16,7 @@ max_integrity = INTEGRITY_STRONG item_weight = 1.2 KILOGRAMS -/obj/item/clothing/wrists/bracers/naledi +/obj/item/clothing/wrists/bracers/preceptor name = "sojourner's wrappings" desc = "Sheared burlap and cloth, meticulously fashioned around the forearms. It provides more freedom of movement than the traditional steel thorns." slot_flags = ITEM_SLOT_WRISTS diff --git a/code/modules/crafting/anvil_recipes/armor.dm b/code/modules/crafting/anvil_recipes/armor.dm index 4d120552545..a5b45652ab9 100644 --- a/code/modules/crafting/anvil_recipes/armor.dm +++ b/code/modules/crafting/anvil_recipes/armor.dm @@ -1243,38 +1243,38 @@ craftdiff = 2 -/datum/anvil_recipe/armor/holysee_plate +/datum/anvil_recipe/armor/grandmaster_plate name = "holy silver plate" required_material = /obj/item/ingot/silverblessed additional_items = list(/obj/item/ingot/silverblessed, /obj/item/ingot/silverblessed) - created_item = /obj/item/clothing/armor/plate/full/holysee + created_item = /obj/item/clothing/armor/plate/full/grandmaster craftdiff = 4 -/datum/anvil_recipe/armor/holysee_chausses +/datum/anvil_recipe/armor/grandmaster_chausses name = "holy silver chausses" required_material = /obj/item/ingot/silverblessed additional_items = list(/obj/item/ingot/silverblessed) - created_item = /obj/item/clothing/pants/platelegs/holysee + created_item = /obj/item/clothing/pants/platelegs/grandmaster craftdiff = 3 -/datum/anvil_recipe/armor/holysee_bascinet +/datum/anvil_recipe/armor/grandmaster_bascinet name = "holy silver bascinet" required_material = /obj/item/ingot/silverblessed additional_items = list(/obj/item/ingot/silver) - created_item = /obj/item/clothing/head/helmet/heavy/holysee + created_item = /obj/item/clothing/head/helmet/heavy/grandmaster craftdiff = 3 -/datum/anvil_recipe/armor/naledi_mask - name = "war scholar's mask" +/datum/anvil_recipe/armor/preceptor_mask + name = "preceptor's mask" required_material = /obj/item/ingot/gold - created_item = /obj/item/clothing/face/lordmask/naledi + created_item = /obj/item/clothing/face/lordmask/preceptor craftdiff = 3 -/datum/anvil_recipe/armor/sojourner_mask - name = "sojourner's mask" +/datum/anvil_recipe/armor/gold_preceptor_mask + name = "gold preceptor's mask" required_material = /obj/item/ingot/gold additional_items = list(/obj/item/ingot/gold) - created_item = /obj/item/clothing/face/lordmask/naledi/sojourner + created_item = /obj/item/clothing/face/lordmask/preceptor/gold craftdiff = 4 @@ -1333,23 +1333,23 @@ created_item = /obj/item/clothing/head/helmet/heavy/volfplate/puritan craftdiff = 4 -/datum/anvil_recipe/armor/atgervi_hauberk - name = "vagarian hauberk" +/datum/anvil_recipe/armor/dwarven_hauberk + name = "dwarven hauberk" required_material = /obj/item/ingot/steel additional_items = list(/obj/item/ingot/steel) - created_item = /obj/item/clothing/armor/chainmail/hauberk/atgervi + created_item = /obj/item/clothing/armor/chainmail/hauberk/dwarven craftdiff = 3 -/datum/anvil_recipe/armor/atgervi_claws +/datum/anvil_recipe/armor/beast_claws name = "beast claws" required_material = /obj/item/ingot/steel - created_item = /obj/item/clothing/gloves/plate/atgervi + created_item = /obj/item/clothing/gloves/plate/beastclaws craftdiff = 3 -/datum/anvil_recipe/armor/atgervi_helmet +/datum/anvil_recipe/armor/owl_helmet name = "owl helmet" required_material = /obj/item/ingot/steel - created_item = /obj/item/clothing/head/helmet/bascinet/atgervi + created_item = /obj/item/clothing/head/helmet/bascinet/owl craftdiff = 3 /datum/anvil_recipe/armor/psydonboots diff --git a/code/modules/crafting/anvil_recipes/weapons.dm b/code/modules/crafting/anvil_recipes/weapons.dm index ea353a58242..2e7924e1060 100644 --- a/code/modules/crafting/anvil_recipes/weapons.dm +++ b/code/modules/crafting/anvil_recipes/weapons.dm @@ -1092,19 +1092,19 @@ // ------------------ Miscellaneous Weapons ------------------ -/datum/anvil_recipe/weapons/atgervi_shield +/datum/anvil_recipe/weapons/dwarven_shield name = "kite shield" required_material = /obj/item/ingot/steel additional_items = list(/obj/item/grown/log/tree) - created_item = /obj/item/weapon/shield/atgervi + created_item = /obj/item/weapon/shield/dwarvenkite category = "Shields" craftdiff = 2 -/datum/anvil_recipe/weapons/atgervi_axe +/datum/anvil_recipe/weapons/bearded_axe name = "Bearded axe (+Small Log)" required_material = /obj/item/ingot/steel additional_items = list(/obj/item/grown/log/tree/small) - created_item = /obj/item/weapon/axe/steel/atgervi + created_item = /obj/item/weapon/axe/steel/bearded craftdiff = 3 /datum/anvil_recipe/weapons/mace/cane/noble diff --git a/code/modules/crafting/quality_of_crafting/leatherworking.dm b/code/modules/crafting/quality_of_crafting/leatherworking.dm index fdc56aaac6e..d0ff316cf4d 100644 --- a/code/modules/crafting/quality_of_crafting/leatherworking.dm +++ b/code/modules/crafting/quality_of_crafting/leatherworking.dm @@ -214,13 +214,13 @@ ) output = /obj/item/clothing/gloves/leather/apothecary -/datum/repeatable_crafting_recipe/leather/gloves/otavan_gloves +/datum/repeatable_crafting_recipe/leather/gloves/grenzel_gloves name = "grenzelhoftian gloves" requirements = list( /obj/item/natural/hide/cured = 2, /obj/item/natural/fibers = 1 ) - output = /obj/item/clothing/gloves/leather/otavan + output = /obj/item/clothing/gloves/leather/grenzel /datum/repeatable_crafting_recipe/leather/gloves/inquisitor_gloves name = "inquisitor gloves" @@ -228,10 +228,10 @@ /obj/item/natural/hide/cured = 2, /obj/item/natural/fibers = 1, ) - output = /obj/item/clothing/gloves/leather/otavan/inqgloves + output = /obj/item/clothing/gloves/leather/grenzel/inqgloves /datum/repeatable_crafting_recipe/leather/gloves/apothecary_pants - name = "apothecary trou" + name = "apothecary trousers" requirements = list( /obj/item/natural/hide/cured = 2, /obj/item/natural/fibers = 1 @@ -239,7 +239,7 @@ output = /obj/item/clothing/pants/trou/apothecary /datum/repeatable_crafting_recipe/leather/gloves/artipants - name = "artificer trou" + name = "artificer trousers" requirements = list( /obj/item/natural/hide/cured = 2, /obj/item/natural/fibers = 1 @@ -896,16 +896,16 @@ /obj/item/natural/fibers = 1) craftdiff = 4 -/datum/repeatable_crafting_recipe/leather/standalone/otavan_shoes +/datum/repeatable_crafting_recipe/leather/standalone/grenzel_shoes name = "grenzelhoftian shoes" - output = /obj/item/clothing/shoes/otavan + output = /obj/item/clothing/shoes/grenzel requirements = list(/obj/item/natural/hide/cured = 3, /obj/item/natural/fibers = 1) craftdiff = 4 /datum/repeatable_crafting_recipe/leather/standalone/inqboots name = "inquisitorial shoes" - output = /obj/item/clothing/shoes/otavan/inqboots + output = /obj/item/clothing/shoes/grenzel/inqboots requirements = list(/obj/item/natural/hide/cured = 3, /obj/item/natural/fibers = 1) craftdiff = 5 @@ -1001,9 +1001,9 @@ ) craftdiff = 4 -/datum/repeatable_crafting_recipe/leather/standalone/atgervi_gloves/advanced +/datum/repeatable_crafting_recipe/leather/standalone/furlined_gloves/advanced name = "hardened fur-lined leather gloves" - output = /obj/item/clothing/gloves/angle/atgervi/advanced + output = /obj/item/clothing/gloves/angle/furlined/advanced requirements = list(/obj/item/natural/hide/cured = 2, /obj/item/natural/fur = 2, /obj/item/natural/fibers/sinew = 1) @@ -1022,9 +1022,9 @@ requirements = list(/obj/item/natural/hide/cured = 2) craftdiff = 4 -/datum/repeatable_crafting_recipe/leather/standalone/atgervi_coat +/datum/repeatable_crafting_recipe/leather/standalone/shaman_coat name = "hardened shamanic coat" - output = /obj/item/clothing/armor/leather/atgervi/advanced + output = /obj/item/clothing/armor/leather/shamancoat/advanced requirements = list( /obj/item/natural/hide/cured = 2, /obj/item/natural/fur = 2, @@ -1083,9 +1083,9 @@ /obj/item/natural/fibers/sinew = 1) craftdiff = 4 -/datum/repeatable_crafting_recipe/leather/atgervi_pants/advanced +/datum/repeatable_crafting_recipe/leather/fur_pants/advanced name = "hardened fur chausses" - output = /obj/item/clothing/pants/trou/leather/atgervi/advanced + output = /obj/item/clothing/pants/trou/leather/furpants/advanced requirements = list(/obj/item/natural/fur = 2, /obj/item/natural/hide/cured = 1, /obj/item/natural/fibers/sinew = 1,) @@ -1139,11 +1139,11 @@ /obj/item/natural/fibers/sinew = 1) craftdiff = 5 -/datum/repeatable_crafting_recipe/leather/standalone/atgervi_gloves/masterwork +/datum/repeatable_crafting_recipe/leather/standalone/furlined_gloves/masterwork name = "masterwork fur-lined leather gloves" - output = /obj/item/clothing/gloves/angle/atgervi/masterwork - attacked_atom = /obj/item/clothing/gloves/angle/atgervi - requirements = list(/obj/item/clothing/gloves/angle/atgervi = 1, + output = /obj/item/clothing/gloves/angle/furlined/masterwork + attacked_atom = /obj/item/clothing/gloves/angle/furlined + requirements = list(/obj/item/clothing/gloves/angle/furlined = 1, /obj/item/natural/cured/essence = 1, /obj/item/natural/fibers/sinew = 1) craftdiff = 5 @@ -1196,11 +1196,11 @@ /obj/item/natural/fibers/sinew = 1) craftdiff = 5 -/datum/repeatable_crafting_recipe/leather/standalone/atgervi_coat/masterwork +/datum/repeatable_crafting_recipe/leather/standalone/shaman_coat/masterwork name = "masterwork shamanic coat" - output = /obj/item/clothing/armor/leather/atgervi/masterwork - attacked_atom = /obj/item/clothing/armor/leather/atgervi - requirements = list(/obj/item/clothing/armor/leather/atgervi = 1, + output = /obj/item/clothing/armor/leather/shamancoat/masterwork + attacked_atom = /obj/item/clothing/armor/leather/shamancoat + requirements = list(/obj/item/clothing/armor/leather/shamancoat = 1, /obj/item/natural/cured/essence = 1, /obj/item/natural/fibers/sinew = 1) craftdiff = 4 @@ -1233,11 +1233,11 @@ /obj/item/natural/fibers = 1) craftdiff = 5 -/datum/repeatable_crafting_recipe/leather/standalone/atgervi_pants/masterwork +/datum/repeatable_crafting_recipe/leather/standalone/fur_pants/masterwork name = "masterwork fur chausses" - output = /obj/item/clothing/pants/trou/leather/atgervi/masterwork - attacked_atom = /obj/item/clothing/pants/trou/leather/atgervi - requirements = list(/obj/item/clothing/pants/trou/leather/atgervi = 1, + output = /obj/item/clothing/pants/trou/leather/furpants/masterwork + attacked_atom = /obj/item/clothing/pants/trou/leather/furpants + requirements = list(/obj/item/clothing/pants/trou/leather/furpants = 1, /obj/item/natural/cured/essence = 1, /obj/item/natural/fibers/sinew = 1,) craftdiff = 4 @@ -1252,9 +1252,9 @@ craftdiff = 1 category = "Shoes" -/datum/repeatable_crafting_recipe/leather/atgervi_coat +/datum/repeatable_crafting_recipe/leather/shaman_coat name = "shamanic coat" - output = /obj/item/clothing/armor/leather/atgervi + output = /obj/item/clothing/armor/leather/shamancoat requirements = list( /obj/item/natural/hide/cured = 2, /obj/item/natural/fur = 2 @@ -1262,9 +1262,9 @@ craftdiff = 2 category = "Armor" -/datum/repeatable_crafting_recipe/leather/atgervi_pants +/datum/repeatable_crafting_recipe/leather/fur_pants name = "fur pants" - output = /obj/item/clothing/pants/trou/leather/atgervi + output = /obj/item/clothing/pants/trou/leather/furpants requirements = list( /obj/item/natural/fur = 2, /obj/item/natural/hide/cured = 1, @@ -1272,9 +1272,9 @@ craftdiff = 1 category = "Pants" -/datum/repeatable_crafting_recipe/leather/atgervi_gloves +/datum/repeatable_crafting_recipe/leather/furlined_gloves name = "fur-lined leather gloves" - output = /obj/item/clothing/gloves/angle/atgervi + output = /obj/item/clothing/gloves/angle/furlined requirements = list( /obj/item/natural/hide/cured = 1, /obj/item/natural/fur = 1 @@ -1282,9 +1282,9 @@ craftdiff = 1 category = "Gloves" -/datum/repeatable_crafting_recipe/leather/atgervi_moose_hood +/datum/repeatable_crafting_recipe/leather/moose_hood name = "moose hood" - output = /obj/item/clothing/head/helmet/leather/saiga/atgervi + output = /obj/item/clothing/head/helmet/leather/saiga/moose requirements = list( /obj/item/natural/hide/cured = 2, /obj/item/alch/bone = 2 // For antlers @@ -1292,9 +1292,9 @@ craftdiff = 3 category = "Hat" -/datum/repeatable_crafting_recipe/leather/atgervi_boots - name = "atgervi leather boots" - output = /obj/item/clothing/shoes/boots/leather/atgervi +/datum/repeatable_crafting_recipe/leather/furlined_boots + name = "fur-lined leather boots" + output = /obj/item/clothing/shoes/boots/leather/furlined requirements = list( /obj/item/natural/hide/cured = 1 ) diff --git a/code/modules/crafting/quality_of_crafting/sewing.dm b/code/modules/crafting/quality_of_crafting/sewing.dm index 7fb0b6651c4..fa442441897 100644 --- a/code/modules/crafting/quality_of_crafting/sewing.dm +++ b/code/modules/crafting/quality_of_crafting/sewing.dm @@ -214,9 +214,9 @@ requirements = list(/obj/item/natural/cloth = 2,) category = "Hat" -/datum/repeatable_crafting_recipe/sewing/headband_naledi +/datum/repeatable_crafting_recipe/sewing/headband_preceptor name = "headband" - output = /obj/item/clothing/head/headband/naledi + output = /obj/item/clothing/head/headband/preceptor requirements = list(/obj/item/natural/cloth = 2, /obj/item/natural/fibers = 1) category = "Hat" @@ -1768,9 +1768,9 @@ craftdiff = 2 category = "Cloak" -/datum/repeatable_crafting_recipe/sewing/holysee_vestments +/datum/repeatable_crafting_recipe/sewing/grandmaster_vestments name = "holy silver vestments" - output = /obj/item/clothing/cloak/holysee + output = /obj/item/clothing/cloak/grandmaster requirements = list( /obj/item/natural/cloth = 3, /obj/item/ingot/silver = 1, diff --git a/code/modules/inquisitor_supplies/general.dm b/code/modules/inquisitor_supplies/general.dm index 4acd36362e1..f0f9fcbaedf 100644 --- a/code/modules/inquisitor_supplies/general.dm +++ b/code/modules/inquisitor_supplies/general.dm @@ -307,9 +307,9 @@ item_type = /obj/item/clothing/face/facemask/steel/confessor marquescost = 6 -/datum/inqports/equipment/otavansatchel +/datum/inqports/equipment/grenzelsatchel name = "1 Grenzelhoftian Leather Satchel" - item_type = /obj/item/storage/backpack/satchel/otavan + item_type = /obj/item/storage/backpack/satchel/grenzel marquescost = 2 /datum/inqports/equipment/surgerybag @@ -391,7 +391,7 @@ detail_tag = "_detail" color = "#5058c1" -/obj/item/clothing/armor/gambeson/heavy/otavan/inq +/obj/item/clothing/armor/gambeson/heavy/grenzel/inq color = "#8b1414" detail_color = "#99b2b1" @@ -401,11 +401,11 @@ marquescost = 8 /obj/structure/closet/crate/chest/inqcrate/wardrobe/fencerset/populate_contents() - new /obj/item/clothing/armor/gambeson/heavy/otavan/inq(src) + new /obj/item/clothing/armor/gambeson/heavy/grenzel/inq(src) new /obj/item/clothing/neck/fencerguard/inq(src) - new /obj/item/clothing/gloves/leather/otavan(src) + new /obj/item/clothing/gloves/leather/grenzel(src) new /obj/item/clothing/pants/tights/colored/black(src) - new /obj/item/clothing/shoes/otavan(src) + new /obj/item/clothing/shoes/grenzel(src) /datum/inqports/wardrobe/confessionalcombo name = "The Confessional Combination" @@ -434,8 +434,8 @@ /obj/structure/closet/crate/chest/inqcrate/wardrobe/inspector/populate_contents() new /obj/item/clothing/head/leather/inqhat(src) new /obj/item/clothing/armor/medium/scale/inqcoat/armored(src) - new /obj/item/clothing/gloves/leather/otavan/inqgloves(src) - new /obj/item/clothing/shoes/otavan/inqboots(src) + new /obj/item/clothing/gloves/leather/grenzel/inqgloves(src) + new /obj/item/clothing/shoes/grenzel/inqboots(src) /datum/inqports/wardrobe/fencersthree name = "The Fencer's Gambeson Three-Pack" @@ -444,7 +444,7 @@ /obj/structure/closet/crate/chest/inqcrate/wardrobe/fencersthree/populate_contents() for(var/i in 1 to 3) - new /obj/item/clothing/armor/gambeson/heavy/otavan/inq(src) + new /obj/item/clothing/armor/gambeson/heavy/grenzel/inq(src) /datum/inqports/wardrobe/psydonianstandard name = "The Inquisitorial Standard" @@ -454,7 +454,7 @@ /obj/structure/closet/crate/chest/inqcrate/wardrobe/psydonian/populate_contents() new /obj/item/clothing/pants/tights/colored/black(src) new /obj/item/clothing/armor/gambeson/heavy/inq(src) - new /obj/item/clothing/gloves/leather/otavan(src) + new /obj/item/clothing/gloves/leather/grenzel(src) new /obj/item/clothing/shoes/psydonboots(src) /datum/inqports/wardrobe/nobledressup diff --git a/code/modules/jobs/job_types/gallowband/forestguard.dm b/code/modules/jobs/job_types/gallowband/forestguard.dm index bc9318f3c15..7e95e2dd395 100644 --- a/code/modules/jobs/job_types/gallowband/forestguard.dm +++ b/code/modules/jobs/job_types/gallowband/forestguard.dm @@ -303,7 +303,7 @@ /datum/outfit/forestguard/ossland_scout name = JOB_FOREST_GUARD_HUSKARL_SCOUT - head = /obj/item/clothing/head/helmet/bascinet/atgervi/gronn/ownel + head = /obj/item/clothing/head/helmet/bascinet/owl/gronn/ownel shirt = /obj/item/clothing/armor/chainmail/hauberk/gronn gloves = /obj/item/clothing/gloves/angle/gronnfur pants = /obj/item/clothing/pants/trou/leather/gronn @@ -362,7 +362,7 @@ /datum/outfit/forestguard/ossland_fighter name = JOB_FOREST_GUARD_HUSKARL_FIGHTER - head = /obj/item/clothing/head/helmet/bascinet/atgervi/gronn + head = /obj/item/clothing/head/helmet/bascinet/owl/gronn shirt = /obj/item/clothing/armor/chainmail/hauberk/gronn gloves = /obj/item/clothing/gloves/chain/gronn beltl = /obj/item/weapon/sword/short/gronn diff --git a/code/modules/jobs/job_types/gallowband/forestpreacher.dm b/code/modules/jobs/job_types/gallowband/forestpreacher.dm index 7363bad4a40..9fc8238047b 100644 --- a/code/modules/jobs/job_types/gallowband/forestpreacher.dm +++ b/code/modules/jobs/job_types/gallowband/forestpreacher.dm @@ -80,13 +80,13 @@ /datum/outfit/forestpreacher name = JOB_FOREST_PREACHER - armor = /obj/item/clothing/armor/leather/atgervi + armor = /obj/item/clothing/armor/leather/shamancoat neck = /obj/item/clothing/neck/psycross/great_hunt pants = /obj/item/clothing/pants/trou/leather/gronn shoes = /obj/item/clothing/shoes/boots wrists = /obj/item/clothing/wrists/bracers/leather head = /obj/item/clothing/head/helmet/leather/shaman_hood - gloves = /obj/item/clothing/gloves/plate/atgervi + gloves = /obj/item/clothing/gloves/plate/beastclaws belt = /obj/item/storage/belt/leather beltr = /obj/item/storage/belt/pouch/coins/mid backl = /obj/item/storage/backpack/satchel diff --git a/code/modules/jobs/job_types/inquistion/absolver.dm b/code/modules/jobs/job_types/inquistion/absolver.dm index e867b6080e9..001fd74b0c2 100644 --- a/code/modules/jobs/job_types/inquistion/absolver.dm +++ b/code/modules/jobs/job_types/inquistion/absolver.dm @@ -105,12 +105,12 @@ /datum/outfit/absolver name = JOB_ABSOLVER wrists = /obj/item/clothing/wrists/bracers/psythorns - gloves = /obj/item/clothing/gloves/leather/otavan/inqgloves + gloves = /obj/item/clothing/gloves/leather/grenzel/inqgloves beltr = /obj/item/flashlight/flare/torch/lantern/psycenser beltl = /obj/item/storage/belt/pouch/coins/rich neck = /obj/item/clothing/neck/psycross/silver cloak = /obj/item/clothing/cloak/absolutionistrobe - backr = /obj/item/storage/backpack/satchel/otavan + backr = /obj/item/storage/backpack/satchel/grenzel belt = /obj/item/storage/belt/leather pants = /obj/item/clothing/pants/trou/leather/advanced/colored/duelpants armor = /obj/item/clothing/armor/cuirass/psydon diff --git a/code/modules/jobs/job_types/inquistion/adept_classes/rehabilitated_minstrel.dm b/code/modules/jobs/job_types/inquistion/adept_classes/rehabilitated_minstrel.dm index 345e1c469d6..174ace421a7 100644 --- a/code/modules/jobs/job_types/inquistion/adept_classes/rehabilitated_minstrel.dm +++ b/code/modules/jobs/job_types/inquistion/adept_classes/rehabilitated_minstrel.dm @@ -66,11 +66,11 @@ /datum/outfit/psyaltrist name = "Psyaltrist (Adept)" armor = /obj/item/clothing/armor/leather/studded/psyaltrist - backl = /obj/item/storage/backpack/satchel/otavan + backl = /obj/item/storage/backpack/satchel/grenzel neck = /obj/item/clothing/neck/gorget/explosive cloak = /obj/item/clothing/cloak/psyaltrist shirt = /obj/item/clothing/armor/gambeson/heavy/inq - gloves = /obj/item/clothing/gloves/leather/otavan + gloves = /obj/item/clothing/gloves/leather/grenzel pants = /obj/item/clothing/pants/tights/colored/black shoes = /obj/item/clothing/shoes/psydonboots belt = /obj/item/storage/belt/leather/knifebelt/black/psydon diff --git a/code/modules/jobs/job_types/inquistion/inquisitor_classes/argent.dm b/code/modules/jobs/job_types/inquistion/inquisitor_classes/argent.dm index bc9c950341f..de9f896e320 100644 --- a/code/modules/jobs/job_types/inquistion/inquisitor_classes/argent.dm +++ b/code/modules/jobs/job_types/inquistion/inquisitor_classes/argent.dm @@ -219,9 +219,9 @@ name = "Argent (Sacrestants)" cloak = /obj/item/storage/backpack/satchel wrists = /obj/item/clothing/neck/psycross/silver - gloves = /obj/item/clothing/gloves/leather/otavan + gloves = /obj/item/clothing/gloves/leather/grenzel neck = /obj/item/clothing/neck/gorget - backr = /obj/item/storage/backpack/satchel/otavan + backr = /obj/item/storage/backpack/satchel/grenzel backl = /obj/item/gun/ballistic/bow/cross belt = /obj/item/storage/belt/leather/knifebelt/black/psydon beltr = /obj/item/storage/belt/pouch/coins/mid diff --git a/code/modules/jobs/job_types/inquistion/inquisitor_classes/confessor.dm b/code/modules/jobs/job_types/inquistion/inquisitor_classes/confessor.dm index 0f3056c6c43..a8fca7369c5 100644 --- a/code/modules/jobs/job_types/inquistion/inquisitor_classes/confessor.dm +++ b/code/modules/jobs/job_types/inquistion/inquisitor_classes/confessor.dm @@ -220,9 +220,9 @@ name = "Confessor (Sacrestants)" cloak = /obj/item/storage/backpack/satchel wrists = /obj/item/clothing/neck/psycross/silver - gloves = /obj/item/clothing/gloves/leather/otavan + gloves = /obj/item/clothing/gloves/leather/grenzel neck = /obj/item/clothing/neck/gorget - backr = /obj/item/storage/backpack/satchel/otavan + backr = /obj/item/storage/backpack/satchel/grenzel belt = /obj/item/storage/belt/leather/knifebelt/black/psydon beltr = /obj/item/storage/belt/pouch/coins/mid pants = /obj/item/clothing/pants/tights/colored/black diff --git a/code/modules/jobs/job_types/inquistion/inquisitor_classes/disciple.dm b/code/modules/jobs/job_types/inquistion/inquisitor_classes/disciple.dm index 573e57437eb..04b4be8b50d 100644 --- a/code/modules/jobs/job_types/inquistion/inquisitor_classes/disciple.dm +++ b/code/modules/jobs/job_types/inquistion/inquisitor_classes/disciple.dm @@ -83,7 +83,7 @@ name = "Disciple (Sacrestants)" shoes = /obj/item/clothing/shoes/psydonboots armor = /obj/item/clothing/armor/regenerating/skin/disciple - backl = /obj/item/storage/backpack/satchel/otavan + backl = /obj/item/storage/backpack/satchel/grenzel belt = /obj/item/storage/belt/leather/rope/dark pants = /obj/item/clothing/pants/tights/colored/black beltl = /obj/item/storage/belt/pouch/coins/mid diff --git a/code/modules/jobs/job_types/inquistion/inquisitor_classes/templar.dm b/code/modules/jobs/job_types/inquistion/inquisitor_classes/templar.dm index cac2e4c9803..e3440f71730 100644 --- a/code/modules/jobs/job_types/inquistion/inquisitor_classes/templar.dm +++ b/code/modules/jobs/job_types/inquistion/inquisitor_classes/templar.dm @@ -91,7 +91,7 @@ gloves = /obj/item/clothing/gloves/chain/psydon neck = /obj/item/clothing/neck/chaincoif pants = /obj/item/clothing/pants/chainlegs - backl = /obj/item/storage/backpack/satchel/otavan + backl = /obj/item/storage/backpack/satchel/grenzel shirt = /obj/item/clothing/armor/gambeson/heavy/inq shoes = /obj/item/clothing/shoes/psydonboots belt = /obj/item/storage/belt/leather/black diff --git a/code/modules/jobs/job_types/inquistion/puritian/inspector.dm b/code/modules/jobs/job_types/inquistion/puritian/inspector.dm index 52fcb2565b6..1a1913e29bc 100644 --- a/code/modules/jobs/job_types/inquistion/puritian/inspector.dm +++ b/code/modules/jobs/job_types/inquistion/puritian/inspector.dm @@ -158,14 +158,14 @@ shirt = /obj/item/clothing/armor/gambeson/heavy/inq belt = /obj/item/storage/belt/leather/knifebelt/black/psydon neck = /obj/item/clothing/neck/gorget - shoes = /obj/item/clothing/shoes/otavan/inqboots + shoes = /obj/item/clothing/shoes/grenzel/inqboots pants = /obj/item/clothing/pants/tights/colored/black - backr = /obj/item/storage/backpack/satchel/otavan + backr = /obj/item/storage/backpack/satchel/grenzel beltl = /obj/item/ammo_holder/bullet/bullets beltr = /obj/item/gun/ballistic/powder/wheellock/puffer head = /obj/item/clothing/head/leather/inqhat mask = /obj/item/clothing/face/spectacles/inq/spawnpair - gloves = /obj/item/clothing/gloves/leather/otavan + gloves = /obj/item/clothing/gloves/leather/grenzel wrists = /obj/item/clothing/neck/psycross/silver ring = /obj/item/clothing/ring/signet/silver armor = /obj/item/clothing/armor/medium/scale/inqcoat/armored diff --git a/code/modules/jobs/job_types/inquistion/puritian/ordinator.dm b/code/modules/jobs/job_types/inquistion/puritian/ordinator.dm index 8d780a2a502..93d227ee41b 100644 --- a/code/modules/jobs/job_types/inquistion/puritian/ordinator.dm +++ b/code/modules/jobs/job_types/inquistion/puritian/ordinator.dm @@ -108,14 +108,14 @@ armor = /obj/item/clothing/armor/plate/fluted/ornate/ordinator belt = /obj/item/storage/belt/leather/steel neck = /obj/item/clothing/neck/gorget - shoes = /obj/item/clothing/shoes/otavan/inqboots - backl = /obj/item/storage/backpack/satchel/otavan + shoes = /obj/item/clothing/shoes/grenzel/inqboots + backl = /obj/item/storage/backpack/satchel/grenzel wrists = /obj/item/clothing/neck/psycross/silver ring = /obj/item/clothing/ring/signet/silver pants = /obj/item/clothing/pants/platelegs cloak = /obj/item/clothing/cloak/ordinatorcape head = /obj/item/clothing/head/helmet/heavy/ordinatorhelm - gloves = /obj/item/clothing/gloves/leather/otavan + gloves = /obj/item/clothing/gloves/leather/grenzel backpack_contents = list( /obj/item/storage/keyring/inquisitor = 1, /obj/item/paper/inqslip/arrival/inq = 1, diff --git a/code/modules/jobs/job_types/inquistion/puritian/preceptor.dm b/code/modules/jobs/job_types/inquistion/puritian/preceptor.dm index 60943ba84f3..e45592b8582 100644 --- a/code/modules/jobs/job_types/inquistion/puritian/preceptor.dm +++ b/code/modules/jobs/job_types/inquistion/puritian/preceptor.dm @@ -79,7 +79,7 @@ name = "Preceptor (Herr Prafekt)" shoes = /obj/item/clothing/shoes/psydonboots armor = /obj/item/clothing/armor/regenerating/skin/disciple - backl = /obj/item/storage/backpack/satchel/otavan + backl = /obj/item/storage/backpack/satchel/grenzel backpack_contents = list( /obj/item/storage/keyring/inquisitor = 1, /obj/item/paper/inqslip/arrival/inq = 1, @@ -87,10 +87,10 @@ belt = /obj/item/storage/belt/leather/rope/dark pants = /obj/item/clothing/pants/tights/colored/black cloak = /obj/item/clothing/cloak/cape/inquisitor - head = /obj/item/clothing/head/headband/naledi - mask = /obj/item/clothing/face/lordmask/naledi/sojourner + head = /obj/item/clothing/head/headband/preceptor + mask = /obj/item/clothing/face/lordmask/preceptor/gold gloves = /obj/item/clothing/gloves/bandages/pugilist neck = /obj/item/clothing/neck/psycross/gold - wrists = /obj/item/clothing/wrists/bracers/naledi + wrists = /obj/item/clothing/wrists/bracers/preceptor ring = /obj/item/clothing/ring/signet diff --git a/code/modules/jobs/job_types/other/merc_classes/enforcer.dm b/code/modules/jobs/job_types/other/merc_classes/enforcer.dm index a015096e00c..e8d3fce5ea0 100644 --- a/code/modules/jobs/job_types/other/merc_classes/enforcer.dm +++ b/code/modules/jobs/job_types/other/merc_classes/enforcer.dm @@ -66,10 +66,10 @@ is_leader = TRUE var/obj/item/weapon/sword/katana/mulyeog/rumacaptain/P = new(get_turf(src)) H.equip_to_appropriate_slot(P) - var/obj/item/weapon/scabbard/kazengun/gold/L = new(get_turf(src)) + var/obj/item/weapon/scabbard/blackmeadow/gold/L = new(get_turf(src)) H.equip_to_appropriate_slot(L) else var/obj/item/weapon/sword/katana/mulyeog/rumahench/P = new(get_turf(src)) H.equip_to_appropriate_slot(P) - var/obj/item/weapon/scabbard/kazengun/steel/L = new(get_turf(src)) + var/obj/item/weapon/scabbard/blackmeadow/steel/L = new(get_turf(src)) H.equip_to_appropriate_slot(L) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/game/fogbeast.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/game/fogbeast.dm index 6c490570ef1..1d61aefd733 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/game/fogbeast.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/game/fogbeast.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(valid_honse_colors, list("White" = COLOR_WHITE, "Gray" = COLOR_ /mob/living/simple_animal/hostile/retaliate/honse name = "honse mare" - desc = "A distant cousin to the saiga, hailing from the mysterious islands of Kaizoku - rarer, but more strongly valued. Extensively used in the Steppes of Aavnr as pack animals and combat mounts." + desc = "A distant cousin to the saiga. Extensively used in the Steppe as pack animals and combat mounts." icon = 'icons/mob/monster/fogbeast.dmi' icon_state = "fogbeast" icon_living = "fogbeast" @@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(valid_honse_colors, list("White" = COLOR_WHITE, "Gray" = COLOR_ // FOAL /mob/living/simple_animal/hostile/retaliate/honse/kid name = "honse filly" - desc = "A young honse, likely to be running around with its mother. Honses are a distant cousin to the saiga, hailing from the mysterious islands of Kaizoku - rarer, but more strongly valued. Extensively used in the Steppes of Aavnr as pack animals and combat mounts." + desc = "A young honse, likely to be running around with its mother. Honses are a distant cousin to the saiga. Extensively used in the Steppe as pack animals and combat mounts." icon = 'icons/mob/monster/fogbeast.dmi' icon_state = "foggie" icon_living = "foggie" diff --git a/code/modules/unit_tests/craftable_clothes.dm b/code/modules/unit_tests/craftable_clothes.dm index 8c5bcad8a50..04ce1c72297 100644 --- a/code/modules/unit_tests/craftable_clothes.dm +++ b/code/modules/unit_tests/craftable_clothes.dm @@ -47,8 +47,8 @@ abstract types are automatically excluded. /obj/item/clothing/head/roguehood/psydon/confessor, ///inqport /obj/item/clothing/face/facemask/steel/confessor, ///inqport /obj/item/clothing/gloves/bandages/pugilist, - /obj/item/clothing/armor/gambeson/heavy/otavan/inq, ///inqport - /obj/item/clothing/armor/gambeson/heavy/otavan, ///null + /obj/item/clothing/armor/gambeson/heavy/grenzel/inq, ///inqport + /obj/item/clothing/armor/gambeson/heavy/grenzel, ///null /obj/item/clothing/armor/gambeson/heavy/inq, //inqport /obj/item/clothing/armor/leather/studded, /obj/item/clothing/armor/leather/jacket/leathercoat/confessor, //inqport @@ -63,11 +63,11 @@ abstract types are automatically excluded. /obj/item/clothing/armor/plate/fluted, /obj/item/clothing/cloak/templar, //base type /obj/item/clothing/face/antiq, //implied to be a weird heartfelt technoitem. good luck replicating this. unique to antiquarian - /obj/item/clothing/wrists/bracers/naledi, //Inqstuff + /obj/item/clothing/wrists/bracers/preceptor, //Inqstuff /obj/item/clothing/head/menacing/mad_touched_treasure_hunter, //cursed /obj/item/clothing/face/facemask/steel/mad_touched, //cursed /obj/item/clothing/cloak/poncho/yellow,//No free colouring - /obj/item/clothing/cloak/ordinatorcape/lirvas, + /obj/item/clothing/cloak/ordinatorcape/warrior, /obj/item/clothing/cloak/minotaur, /obj/item/clothing/cloak/psydontabard/black, /obj/item/clothing/cloak/psydontabard/black/alt, @@ -127,19 +127,19 @@ abstract types are automatically excluded. /obj/item/clothing/gloves/plate/iron/banded, ///all blackmeadow are pending blackmeadow features - /obj/item/clothing/cloak/kazengun, - /obj/item/clothing/neck/gorget/kazengun, - /obj/item/clothing/shoes/boots/leather/kazengun, - /obj/item/clothing/pants/trou/leather/kazengun, - /obj/item/clothing/face/facemask/steel/kazengun, - /obj/item/clothing/face/facemask/steel/kazengun/full, + /obj/item/clothing/cloak/blackmeadow, + /obj/item/clothing/neck/gorget/blackmeadow, + /obj/item/clothing/shoes/boots/leather/blackmeadow, + /obj/item/clothing/pants/trou/leather/blackmeadow, + /obj/item/clothing/face/facemask/steel/blackmeadow, + /obj/item/clothing/face/facemask/steel/blackmeadow/full, /obj/item/clothing/head/helmet/heavy/kabuto, /obj/item/clothing/armor/plate/full/samsibsa, /obj/item/clothing/gloves/plate/kote, /obj/item/clothing/head/helmet/kettle/jingasa, /obj/item/clothing/armor/brigandine/haraate, - /obj/item/clothing/wrists/bracers/naledi, //Inqstuff + /obj/item/clothing/wrists/bracers/preceptor, //Inqstuff /obj/item/clothing/pants/trou/leather/pontifex, /obj/item/clothing/head/peel_pin, //Giveaway only )