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

Removing Tower Shield - only Scrap Ones Now #272

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removing Tower Shield - only Scrap Ones Now #272

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01735b8
That's it, that's the PR.
SirSwagmeyer Nov 13, 2024
8bc624f
Merge branch 'master' into Removing-tower-shield-crutch
Aurrain Nov 15, 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
21 changes: 0 additions & 21 deletions code/game/objects/items/shields.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,27 +406,6 @@ obj/item/shield/riot/bullet_proof
to_chat(user, span_notice("[src] can now be concealed."))
add_fingerprint(user)

/obj/item/shield/riot/tower
name = "tower shield"
desc = "A heavy metal tower shield. Very unwieldly."
icon_state = "shield_tower"
item_state = "shield_tower"
slot_flags = ITEM_SLOT_BACK
shieldbash_cooldown = 8 SECONDS
shieldbash_brutedamage = 50//if you close in with this, and land a shieldbash you should deal a good bit of damage
shieldbash_stamdmg = 80//and stamina
force = 25
block_parry_data = /datum/block_parry_data/shield/tower
throwforce = 5
throw_speed = 1
throw_range = 1
slowdown = 0.2
w_class = WEIGHT_CLASS_HUGE
custom_materials = list(/datum/material/iron = 32000)
repair_material = /obj/item/stack/sheet/metal
shield_flags = SHIELD_FLAGS_HEAVY
max_integrity = -1

/datum/block_parry_data/shield/tower
block_slowdown = 0.75
block_damage_multiplier = 0.7
Expand Down
Loading