cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)

Browse Source 
* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes
This commit is contained in:
farie82
2020-09-18 11:07:19 -04:00
committed by GitHub
parent f6b8fe5547
commit 229cf3e344
40 changed files with 648 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implant_krav_maga.dm
+3 -3
View File
@@ -17,12 +17,12 @@
/obj/item/implant/krav_maga/activate()
var/mob/living/carbon/human/H = imp_in
if(!ishuman(H))
if(!ishuman(H) || !H.mind)
return
if(istype(H.martial_art, /datum/martial_art/krav_maga))
if(istype(H.mind.martial_art, /datum/martial_art/krav_maga))
style.remove(H)
else
style.teach(H,1)
style.teach(H, TRUE)
/obj/item/implanter/krav_maga
name = "implanter (krav maga)"