cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 19:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Martial arts improvements and additions (#6094)

Browse Source 
-adds framework for weapons based martial arts, implementing a very basic swordsmanship
-makes the martial art books more modular
-fixes some minor issues with some of the martial art code
-adds amohdan swordsmen gear, to be used in a future event/sold by the merchant
- fixes #6083
This commit is contained in:
Alberyk
2019-03-10 18:38:00 -03:00
committed by Erki
parent 7934515c6a
commit 15bfb052d7
21 changed files with 187 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/misc.dm
+2
View File
@@ -141,6 +141,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/glasses/monocle = TRADER_THIS_TYPE,
/obj/item/clothing/mask/smokable/pipe = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/plaguedoctor = TRADER_THIS_TYPE,
@@ -150,6 +151,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/under/gladiator = TRADER_THIS_TYPE,
/obj/item/clothing/under/kilt = TRADER_THIS_TYPE,
/obj/item/clothing/under/redcoat = TRADER_THIS_TYPE,