cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [TEST-MERGE FIRST] Allows all limbs to be dismembered and significantly refactors wounds [MDB IGNORE] (#23407)

Browse Source 
* [TEST-MERGE FIRST] Allows all limbs to be dismembered and significantly refactors wounds

* ah fuck it

* test

* edaawdawd

* Revert "edaawdawd"

This reverts commit 47be710fe61a1f4ca79212b29b3e88bf05ec9a3a.

* nothing but sheer hatred

* freaawd

* dzfxg

* Fixing some diffs here while we are at it.

* These are deprecated and should be removed

---------

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
Co-authored-by: nikothedude <simon.prouty@gmail.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-09-05 19:24:22 +02:00
committed by GitHub
parent 02f66628e2
commit 2bcbb36ab9
84 changed files with 1974 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+1 -1
View File
@@ -269,7 +269,7 @@
var/mob/living/carbon/carbon_target = target
var/obj/item/bodypart/bodypart = pick(carbon_target.bodyparts)
var/datum/wound/slash/severe/crit_wound = new()
var/datum/wound/slash/flesh/severe/crit_wound = new()
crit_wound.apply_wound(bodypart, attack_direction = get_dir(source, target))
/datum/heretic_knowledge/summon/stalker
code/modules/antagonists/heretic/magic/blood_cleave.dm
+3 -3
View File
@@ -19,7 +19,7 @@
/// The radius of the cleave effect
var/cleave_radius = 1
/// What type of wound we apply
var/wound_type = /datum/wound/slash/critical/cleave
var/wound_type = /datum/wound/slash/flesh/critical/cleave
/datum/action/cooldown/spell/pointed/cleave/is_valid_target(atom/cast_on)
return ..() && ishuman(cast_on)
@@ -45,7 +45,7 @@
)
var/obj/item/bodypart/bodypart = pick(victim.bodyparts)
var/datum/wound/slash/crit_wound = new wound_type()
var/datum/wound/slash/flesh/crit_wound = new wound_type()
crit_wound.apply_wound(bodypart)
victim.apply_damage(20, BURN, wound_bonus = CANT_WOUND)
@@ -56,7 +56,7 @@
/datum/action/cooldown/spell/pointed/cleave/long
name = "Lesser Cleave"
cooldown_time = 60 SECONDS
wound_type = /datum/wound/slash/severe
wound_type = /datum/wound/slash/flesh/severe
/obj/effect/temp_visual/cleave
icon = 'icons/effects/eldritch.dmi'
code/modules/antagonists/heretic/status_effects/mark_effects.dm
+1 -1
View File
@@ -61,7 +61,7 @@
if(ishuman(owner))
var/mob/living/carbon/human/human_owner = owner
var/obj/item/bodypart/bodypart = pick(human_owner.bodyparts)
var/datum/wound/slash/severe/crit_wound = new()
var/datum/wound/slash/flesh/severe/crit_wound = new()
crit_wound.apply_wound(bodypart)
return ..()
code/modules/antagonists/traitor/objectives/eyesnatching.dm
+2 -2
View File
@@ -179,8 +179,8 @@
if(!do_after(user, eye_snatch_enthusiasm, target = target, extra_checks = CALLBACK(src, PROC_REF(eyeballs_exist), eyeballies, head, target)))
return
var/datum/wound/blunt/severe/severe_wound_type = /datum/wound/blunt/severe
var/datum/wound/blunt/critical/critical_wound_type = /datum/wound/blunt/critical
var/datum/wound/blunt/bone/severe/severe_wound_type = /datum/wound/blunt/bone/severe
var/datum/wound/blunt/bone/critical/critical_wound_type = /datum/wound/blunt/bone/critical
target.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = rand(initial(severe_wound_type.threshold_minimum), initial(critical_wound_type.threshold_minimum) + 10), attacking_item = src)
target.visible_message(
span_danger("[src] pierces through [target]'s skull, horribly mutilating their eyes!"),