Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Changes from all commits
Commits
Show all changes
31 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
86801f1
Merge branch 'master' into MqiibUpstream/master
Mqiib Feb 7, 2022
ab03e55
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Feb 9, 2022
ed2339e
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Feb 14, 2022
1a31d79
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Feb 23, 2022
d5105ac
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Mar 5, 2022
7e886dc
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Mar 15, 2022
17cb20f
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Mar 20, 2022
b9ba171
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Mar 24, 2022
a3e90d5
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 5, 2022
c7c2c66
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 7, 2022
bc61903
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 8, 2022
3cb60a8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 10, 2022
b1f5c3b
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 12, 2022
03c16fc
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 13, 2022
77a518e
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 18, 2022
8cd10cd
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Apr 26, 2022
ebfbcc1
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib May 3, 2022
178a988
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib May 6, 2022
d709cc2
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib May 12, 2022
19c1e4b
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib May 17, 2022
66c3728
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib May 18, 2022
3cf277f
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib May 22, 2022
cabcff4
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Jun 9, 2022
8e82ba1
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Jun 21, 2022
85307ce
Krav Maga Nerfs
Mqiib Jun 21, 2022
1672fa0
capital K
Mqiib Jun 26, 2022
56d85d3
Update code/datums/martial/krav_maga.dm
JamieD1 Jun 26, 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
2 changes: 1 addition & 1 deletion code/datums/martial/krav_maga.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
span_userdanger("[A] slams your chest! You can't breathe!"))
playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1)
if(D.losebreath <= 10)
D.losebreath = clamp(D.losebreath + 5, 0, 10)
D.losebreath = clamp(D.losebreath + 3, 0, 6)
D.adjustOxyLoss(10)
log_combat(A, D, "quickchoked")
return 1
Expand Down