mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-10 15:36:47 +01:00
Martial arts improvements and additions (#6094)
-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:
@@ -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,
|
||||
|
||||
@@ -77,12 +77,12 @@
|
||||
/datum/uplink_item/item/visible_weapons/wrestling
|
||||
name = "Wrestling Manual"
|
||||
item_cost = 6
|
||||
path = /obj/item/wrestling_manual
|
||||
path = /obj/item/martial_manual/wrestling
|
||||
|
||||
/datum/uplink_item/item/visible_weapons/solcom
|
||||
name = "SolCom Manual"
|
||||
item_cost = 6
|
||||
path = /obj/item/sol_combat_manual
|
||||
path = /obj/item/martial_manual
|
||||
|
||||
/datum/uplink_item/item/visible_weapons/heavysniper
|
||||
name = "Anti-materiel Rifle"
|
||||
|
||||
Reference in New Issue
Block a user