cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Martial arts now use a weight system to determine which one is active (#21037)

Browse Source 
* martial arts have a weight system now

* remove unneeded variable

* carp cannot be deactivated once learned

* i love documentingtation

* krav can no longer delete other combos

* now ill be embarassed if i dont make it better

* i know how istype works i promise

* implement sirryan's changes

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
BiancaWilkson
2023-06-03 00:24:42 -05:00
committed by GitHub
co-authored by Ryan
parent 30cd47b94a
commit edef576f2e
11 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/brawling.dm
+2
View File
@@ -1,5 +1,6 @@
/datum/martial_art/boxing
name = "Boxing"
weight = 1
/datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
to_chat(A, "<span class='warning'>Can't disarm while boxing!</span>")
@@ -43,6 +44,7 @@
/datum/martial_art/drunk_brawling
name = "Drunken Brawling"
weight = 2
/datum/martial_art/drunk_brawling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(prob(70))