Adds the Zaddat Race + Modifies pressure damage calculations

This commit is contained in:
elgeonmb
2019-02-06 21:34:21 -08:00
committed by Novacat
parent a98ac52678
commit 9d056decda
40 changed files with 405 additions and 20 deletions
@@ -243,7 +243,26 @@
/datum/gear/accessory/locket
display_name = "locket"
<<<<<<< HEAD
path = /obj/item/clothing/accessory/locket
=======
path = /obj/item/clothing/accessory/locket
/datum/gear/accessory/halfcape
display_name = "half cape"
path = /obj/item/clothing/accessory/halfcape
/datum/gear/accessory/fullcape
display_name = "full cape"
path = /obj/item/clothing/accessory/fullcape
/datum/gear/accessory/sash
display_name = "sash (colorable)"
path = /obj/item/clothing/accessory/sash
/datum/gear/accessory/sash/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/accessory/asym
display_name = "asymmetric jacket selection"
@@ -260,4 +279,5 @@
/datum/gear/accessory/cowledvest
display_name = "cowled vest"
path = /obj/item/clothing/accessory/cowledvest
path = /obj/item/clothing/accessory/cowledvest
>>>>>>> 3e9624c... Adds the Zaddat Race + Modifies pressure damage calculations (#5869)
@@ -1,4 +1,5 @@
// Alien clothing.
/datum/gear/suit/zhan_furs
display_name = "Zhan-Khazan furs (Tajaran)"
path = /obj/item/clothing/suit/tajaran/furs