Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Chaplain monk staff is now nonlethal #15503

Merged
JamieD1 merged 13 commits into from
Sep 4, 2022
Merged

Chaplain monk staff is now nonlethal #15503

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
27f5fc5
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 6, 2020
dd26ed1
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 9, 2020
edc0df1
Merge branch 'yogstation13:master' into master
Mqiib Jan 29, 2022
7a20bc0
Merge branch 'yogstation13:master' into master
Mqiib Feb 7, 2022
88b109e
Merge branch 'yogstation13:master' into master
Mqiib Feb 24, 2022
6dd33d0
Merge branch 'yogstation13:master' into master
Mqiib Jul 29, 2022
5c2e288
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 2, 2022
b9aadc8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 15, 2022
7761c93
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 15, 2022
4ddc713
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 16, 2022
eea26c8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 26, 2022
a73cf7a
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 29, 2022
b10d0ad
+bonk
Mqiib Aug 29, 2022
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
4 changes: 3 additions & 1 deletion code/game/objects/items/holy_weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,8 +764,10 @@
name = "monk's staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, it is now used to harass the clown."
w_class = WEIGHT_CLASS_BULKY
force = 15
damtype = STAMINA
force = 18
block_chance = 40
armour_penetration = 20
slot_flags = ITEM_SLOT_BACK
sharpness = SHARP_NONE
hitsound = "swing_hit"
Expand Down