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

Adds a new ability to the Gargantua subclass: Desecrated Duel; alongside a small buff (#21858)

Browse Source 
* let the wall of errors begin

* alright that's enough for today

* more pain

* only 7 errors

* arena :)

* smaller arena

* slight cleanups

* okay we ask charlie for help tomorrow

* leap works

* okay we ball

* idk I'm just adding this for now

* WE HAVE A CIRCLEEE

* Charge back + timer!

* first steps of the buff

* more cleaning up

* Buff is progressing nicely, almost done

* OKAY WE BALL

* Whoops last things

* whoopsie forgot this

* 20 Stamina damage

* 150 blood now

* WE GOT ANIMATE IN THIS HOUSE

* we be impact immune now

* IT DOESN'T LOOK LIKE SHIT (and goes through walls)

* ok ship it

* Consistency

* I'm buying charlie a bottle of asda rum

* Okay, ready for review

* Henri + Hal reviews

* More reviews + I am stupid

* Charlie review

* Ohhhh so that's why it didn't work

* Yeet this

* Charlie review

* Comment

* Charlie review kinda

* Hal review

* DESECRATED DUEL WOHOOO

* Oops I changed this

* That's one thing done

* Lewc review

* Lewc review part 2

* Update code/__HELPERS/trait_helpers.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Lewc review + ICON WOOO

* Aaaaaaa

* TGUI FIXED

* Henri review

* Charlie review

* Charlie review

* Henri review

* Jimkil review

* Update code/__HELPERS/game.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Charlie review

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2023-09-13 16:48:14 +01:00
committed by GitHub
co-authored by Luc Henri215
parent c0a91a5b6b
commit 6144baf737
14 changed files with 181 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/organ_external.dm
+17
View File
@@ -148,6 +148,21 @@
if(HAS_TRAIT(owner, TRAIT_BURN_WOUND_IMMUNE))
limb_flags |= CANNOT_BURN
if(HAS_TRAIT(owner, TRAIT_IB_IMMUNE))
limb_flags |= CANNOT_INT_BLEED
/obj/item/organ/external/proc/remove_limb_flags()
if(!HAS_TRAIT(owner, TRAIT_NO_BONES))
limb_flags &= ~CANNOT_BREAK
encased = initial(encased)
if(!HAS_TRAIT(owner, TRAIT_STURDY_LIMBS))
limb_flags &= ~CANNOT_DISMEMBER
if(!HAS_TRAIT(owner, TRAIT_BURN_WOUND_IMMUNE))
limb_flags &= ~CANNOT_BURN
if(!HAS_TRAIT(owner, TRAIT_IB_IMMUNE))
limb_flags &= ~CANNOT_INT_BLEED
/obj/item/organ/external/replaced(mob/living/carbon/human/target)
owner = target
@@ -697,6 +712,8 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(NO_BLOOD in owner.dna.species.species_traits)
return
if(limb_flags & CANNOT_INT_BLEED)
return
status |= ORGAN_INT_BLEEDING
owner.custom_pain("You feel something rip in your [name]!")