Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/map_files/austranderlin/austranderlin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/daftmarsh/daftmarsh.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/vanderlin/vanderlin_bog.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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" = (
Expand Down
14 changes: 7 additions & 7 deletions _maps/map_files/vanderlin/vanderlin_forest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/vanderlin/vanderlin_mountain.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/storage/storage_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
6 changes: 3 additions & 3 deletions code/datums/loadouts/cloak_loadout_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/datums/loadouts/pants_loadout_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions code/datums/stress/negative_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/datums/world_factions/coastal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions code/datums/world_factions/mountain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion code/datums/world_factions/zalad.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/melee/axes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/melee/polearms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/weapons/scabbard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -222,20 +222,20 @@
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"
item_state = "kazscab_steel"
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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/villain/vampire/daewalker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions code/modules/cargo/supply_packs/apparel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
20 changes: 10 additions & 10 deletions code/modules/cargo/supply_packs/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
Loading
Loading