cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-22 05:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks Some Tajara Armours and Refluffs Amohdan Gear (#11272)

Browse Source
This commit is contained in:
WickedCybs
2021-02-24 06:24:24 -07:00
committed by GitHub
parent a4fb441257
commit 5628f2a2e3
4 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/misc.dm
+2 -2
View File
@@ -140,7 +140,7 @@
/obj/item/clothing/head/plaguedoctorhat = TRADER_THIS_TYPE,
/obj/item/clothing/head/helmet/unathi = TRADER_THIS_TYPE,
/obj/item/clothing/head/helmet/tank = TRADER_ALL,
/obj/item/clothing/head/helmet/tajara = TRADER_THIS_TYPE,
/obj/item/clothing/head/helmet/amohda = TRADER_THIS_TYPE,
/obj/item/clothing/glasses/monocle = TRADER_THIS_TYPE,
/obj/item/clothing/mask/smokable/pipe = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/plaguedoctor = TRADER_THIS_TYPE,
@@ -149,7 +149,7 @@
/obj/item/clothing/suit/wizrobe/magusred = TRADER_THIS_TYPE,
/obj/item/clothing/suit/wizrobe/magusblue = TRADER_THIS_TYPE,
/obj/item/clothing/suit/armor/unathi = TRADER_THIS_TYPE,
/obj/item/clothing/suit/armor/tajara = TRADER_THIS_TYPE,
/obj/item/clothing/suit/armor/amohda = TRADER_THIS_TYPE,
/obj/item/clothing/under/gladiator = TRADER_THIS_TYPE,
/obj/item/clothing/under/kilt = TRADER_THIS_TYPE,
/obj/item/material/harpoon = TRADER_THIS_TYPE,
code/modules/clothing/head/xenos/tajara.dm
+10 -7
View File
@@ -83,8 +83,8 @@
icon_state = "nka_consularhat"
item_state = "nka_consularhat"
/obj/item/clothing/head/helmet/tajara
name = "amohdan swordsmen helmet"
/obj/item/clothing/head/helmet/amohda
name = "amohdan swordsman helmet"
desc = "A helmet used by the traditional warriors of Amohda."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "amohdan_helmet"
@@ -97,13 +97,15 @@
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_MINOR
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
allow_hair_covering = FALSE
desc_fluff = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
single combat in their quests to become the greatest swordsman. Modern Amohda is a mix between loyalists to the NKA and to the DPRA, with almost universal praise for a return to \
traditional culture, yet often violent disagreement about the course of the island's political future. A sizable third party of monarchists which advocate the reestablishment of the \
Imperial Amohdan dynasty also exists, fragmenting the monarchist factions on the island and further complicating political violence in the area."
single combat in their quests to become the greatest swordsman. Modern Amohda is under the control of the DPRA's Adhomai Liberation Army, further solidified after the defeat \
of a Nationalist revolt vying for a truly independent Amohda. The region is still beset by trouble within and without as a deeply divided Amohdan people continue to struggle in the \
bloody conflict to stamp out Nationalistic and to a lesser extent, divided Monarchistic sentiments while their rivals from the New Kingdom of Adhomai watch from the seas they rule \
and the People's Republic of Adhomai looms over the southern end of the island..."
siemens_coefficient = 0.35
/obj/item/clothing/head/helmet/kettle
@@ -117,5 +119,6 @@
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_MINOR
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
code/modules/clothing/suits/xeno/tajara.dm
+13 -9
View File
@@ -137,8 +137,8 @@
contained_sprite = TRUE
species_restricted = list(BODYTYPE_TAJARA)
/obj/item/clothing/suit/armor/tajara
name = "amohdan swordsmen armor"
/obj/item/clothing/suit/armor/amohda
name = "amohdan swordsman armor"
desc = "A suit of armor used by the traditional warriors of Amohda."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "amohdan_armor"
@@ -152,13 +152,15 @@
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_MINOR
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
siemens_coefficient = 0.35
desc_fluff = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
single combat in their quests to become the greatest swordsman. Modern Amohda is a mix between loyalists to the NKA and to the DPRA, with almost universal praise for a return to \
traditional culture, yet often violent disagreement about the course of the island's political future. A sizable third party of monarchists which advocate the reestablishment of the \
Imperial Amohdan dynasty also exists, fragmenting the monarchist factions on the island and further complicating political violence in the area."
single combat in their quests to become the greatest swordsman. Modern Amohda is under the control of the DPRA's Adhomai Liberation Army, further solidified after the defeat \
of a Nationalist revolt vying for a truly independent Amohda. The region is still beset by trouble within and without as a deeply divided Amohdan people continue to struggle in the \
bloody conflict to stamp out Nationalistic and to a lesser extent, divided Monarchistic sentiments while their rivals from the New Kingdom of Adhomai watch from the seas they rule \
and the People's Republic of Adhomai looms over the southern end of the island..."
/obj/item/clothing/suit/armor/cuirass
name = "cuirass"
@@ -171,7 +173,8 @@
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_MINOR
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
/obj/item/clothing/suit/storage/tajaran/pra_jacket
@@ -184,6 +187,7 @@
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_MINOR,
laser = ARMOR_LASER_MINOR,
energy = ARMOR_ENERGY_MINOR
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
siemens_coefficient = 0.50
siemens_coefficient = 0.50
html/changelogs/wickedcybs_amohdaa.yml
+6
View File
@@ -0,0 +1,6 @@
author: WickedCybs
delete-after: True
changes:
- tweak: "Revised some fluff descriptions and resistances to a few pieces of Tajaran gear."