Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zwei west armor #2503

Merged
merged 3 commits into from
Oct 22, 2024
+66 −0
Merged

Zwei west armor #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9db815
adds zwei west
Kitsunemitsu Oct 22, 2024
e36a601
Update association.dm
Kitsunemitsu Oct 22, 2024
8db5200
Update zwei.dm
Kitsunemitsu Oct 22, 2024
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
5 changes: 5 additions & 0 deletions ModularTegustation/tegu_items/refinery/crates/association.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
/obj/item/ego_weapon/city/zweihander/knife,
/obj/item/clothing/suit/armor/ego_gear/city/zwei,
/obj/item/clothing/suit/armor/ego_gear/city/zweiriot,
/obj/item/clothing/suit/armor/ego_gear/city/zweiwest,
/obj/item/ego_weapon/city/zweibaton,
/obj/item/ego_weapon/city/shi_assassin,
/obj/item/ego_weapon/city/shi_knife,
Expand All @@ -31,6 +32,7 @@
rareloot = list(
/obj/item/ego_weapon/city/zweihander/vet,
/obj/item/clothing/suit/armor/ego_gear/city/zweivet,
/obj/item/clothing/suit/armor/ego_gear/city/zweiwestvet,
/obj/item/ego_weapon/city/shi_assassin/sakura,
/obj/item/ego_weapon/city/shi_assassin/serpent,
/obj/item/ego_weapon/city/shi_assassin/vet,
Expand Down Expand Up @@ -69,11 +71,14 @@
/obj/item/ego_weapon/city/zweihander/knife,
/obj/item/clothing/suit/armor/ego_gear/city/zwei,
/obj/item/clothing/suit/armor/ego_gear/city/zweiriot,
/obj/item/clothing/suit/armor/ego_gear/city/zweiwest,
/obj/item/ego_weapon/city/zweibaton,
)

rareloot = list(
/obj/item/ego_weapon/city/zweihander/vet,
/obj/item/clothing/suit/armor/ego_gear/city/zweiwestvet,
/obj/item/clothing/suit/armor/ego_gear/city/zweiwestleader,
/obj/item/clothing/suit/armor/ego_gear/city/zweivet,
/obj/item/clothing/suit/armor/ego_gear/city/zweileader,
)
Expand Down
11 changes: 11 additions & 0 deletions code/modules/clothing/suits/ego_gear/non_abnormality/cinq.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,14 @@
name = "cinq association cavalier hat"
desc = "A cavalier hat worn by members of the cinq association, it gives you the urge to d-d-d-duel"
icon_state = "cinq"

/obj/item/clothing/head/ego_hat/cinqwest
name = "cinq knight hat"
desc = "A cavalier hat worn by members of the cinq association, it gives you the urge to d-d-d-duel"
icon_state = "cinqwest"

/obj/item/clothing/neck/ego_neck/cinqwest
name = "cinq knight cape"
desc = "A cape worn by cinq west."
icon_state = "cinq"

50 changes: 50 additions & 0 deletions code/modules/clothing/suits/ego_gear/non_abnormality/zwei.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,53 @@
/obj/item/clothing/suit/armor/ego_gear/city/zweileader/noreq
equip_slowdown = 0
attribute_requirements = list()


//Zwei West
/obj/item/clothing/suit/armor/ego_gear/city/zweiwest
name = "Zwei knight armor"
desc = "Armor worn by zwei west association fixers. It slows you down slightly, but offers excellent defenses"
icon_state = "zweiwest"
slowdown = 0.4
neck = /obj/item/clothing/neck/ego_neck/zweiwest
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 30, BLACK_DAMAGE = 30, PALE_DAMAGE = 10)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 60,
PRUDENCE_ATTRIBUTE = 60,
TEMPERANCE_ATTRIBUTE = 60,
JUSTICE_ATTRIBUTE = 60
)

/obj/item/clothing/suit/armor/ego_gear/city/zweiwestvet
name = "Zwei veteran knight armor "
desc = "Armor worn by zwei west association fixers. It slows you down slightly, but offers excellent defenses"
icon_state = "zweiwest_veteran"
slowdown = 0.4
neck = /obj/item/clothing/neck/ego_neck/zweiwest
armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 40, BLACK_DAMAGE = 40, PALE_DAMAGE = 30)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 80,
PRUDENCE_ATTRIBUTE = 60,
TEMPERANCE_ATTRIBUTE = 60,
JUSTICE_ATTRIBUTE = 60
)

/obj/item/clothing/suit/armor/ego_gear/city/zweiwestleader
name = "Zwei knight director armor"
desc = "Armor worn by zwei association fixers when they are suppressing riots or unrest. It slows you down slightly, but offers excellent defenses"
icon_state = "zweiwest_director"
slowdown = 0.4
neck = /obj/item/clothing/neck/ego_neck/zweiwest
armor = list(RED_DAMAGE = 70, WHITE_DAMAGE = 50, BLACK_DAMAGE = 50, PALE_DAMAGE = 40)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 100,
PRUDENCE_ATTRIBUTE = 60,
TEMPERANCE_ATTRIBUTE = 80,
JUSTICE_ATTRIBUTE = 80
)


/obj/item/clothing/neck/ego_neck/zweiwest
name = "zwei knight cape"
desc = "A cape worn by Zwei west."
icon_state = "zweiwest"
Loading