Fixes a lot of bugs. (#16187)

* Fixes a lot of bugs.

* fix more shit

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-04-10 17:29:16 +00:00
committed by GitHub
co-authored by Matt Atlas
parent 405f4d846c
commit fee7deabd7
32 changed files with 278 additions and 197 deletions
+5 -2
View File
@@ -225,12 +225,15 @@ proc/blood_incompatible(donor,receiver,donor_species,receiver_species)
trace_chems = LAZYACCESS(vessel.reagent_data[/singleton/reagent/blood], "trace_chem") || list()
.["trace_chem"] = trace_chems.Copy()
proc/blood_splatter(var/target, var/source, var/large, var/spray_dir, var/sourceless_color)
/proc/blood_splatter(var/target, var/source, var/large, var/spray_dir, var/sourceless_color)
var/obj/effect/decal/cleanable/blood/splatter
var/decal_type = /obj/effect/decal/cleanable/blood/splatter
if(sourceless_color == COLOR_OIL)
decal_type = /obj/effect/decal/cleanable/blood/oil/streak
if(ishuman(source))
var/mob/living/carbon/human/H = source
if(H.isSynthetic())
decal_type = /obj/effect/decal/cleanable/blood/oil/streak
var/turf/T = get_turf(target)
// Are we dripping or splattering?
+1 -1
View File
@@ -45,7 +45,7 @@
icon_state = dead_icon
/obj/item/organ/internal/proc/surgical_fix(mob/user)
if(damage > min_broken_damage && !(status & ORGAN_ROBOT))
if(damage > min_broken_damage)
var/scarring = damage / max_damage
scarring = 1 - 0.5 * scarring ** 2 // Between ~15 and 50 percent loss.
var/new_max_dam = Floor(scarring * max_damage)