shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

section one

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-24 22:34:22 +01:00
parent a88fa29682
commit 7fb55a02a5
115 changed files with 1202 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/debuffs.dm
+1 -1
View File
@@ -438,7 +438,7 @@
var/still_bleeding = FALSE
for(var/thing in throat.wounds)
var/datum/wound/W = thing
if(W.wound_type == WOUND_LIST_CUT && W.severity > WOUND_SEVERITY_MODERATE)
if(W.wound_type == WOUND_SLASH && W.severity > WOUND_SEVERITY_MODERATE)
still_bleeding = TRUE
break
if(!still_bleeding)
code/datums/status_effects/wound_effects.dm
+20 -11
View File
@@ -117,8 +117,7 @@
/datum/status_effect/wound/on_creation(mob/living/new_owner, incoming_wound)
. = ..()
var/datum/wound/W = incoming_wound
linked_wound = W
linked_wound = incoming_wound
linked_limb = linked_wound.limb
/datum/status_effect/wound/on_remove()
@@ -140,9 +139,9 @@
// bones
/datum/status_effect/wound/bone
/datum/status_effect/wound/blunt
/datum/status_effect/wound/bone/interact_speed_modifier()
/datum/status_effect/wound/blunt/interact_speed_modifier()
var/mob/living/carbon/C = owner
if(C.get_active_hand() == linked_limb)
@@ -151,7 +150,7 @@
return 1
/datum/status_effect/wound/bone/nextmove_modifier()
/datum/status_effect/wound/blunt/nextmove_modifier()
var/mob/living/carbon/C = owner
if(C.get_active_hand() == linked_limb)
@@ -159,24 +158,34 @@
return 1
/datum/status_effect/wound/bone/moderate
/datum/status_effect/wound/blunt/moderate
id = "disjoint"
/datum/status_effect/wound/bone/severe
/datum/status_effect/wound/blunt/severe
id = "hairline"
/datum/status_effect/wound/bone/critical
/datum/status_effect/wound/blunt/critical
id = "compound"
// cuts
/datum/status_effect/wound/cut/moderate
/datum/status_effect/wound/slash/moderate
id = "abrasion"
/datum/status_effect/wound/cut/severe
/datum/status_effect/wound/slash/severe
id = "laceration"
/datum/status_effect/wound/cut/critical
/datum/status_effect/wound/slash/critical
id = "avulsion"
// pierce
/datum/status_effect/wound/pierce/moderate
id = "breakage"
/datum/status_effect/wound/pierce/severe
id = "puncture"
/datum/status_effect/wound/pierce/critical
id = "rupture"
// burns
/datum/status_effect/wound/burn/moderate
id = "seconddeg"