mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 12:41:09 +01:00
Removes shitty "status" variable on organs, makes them use organ_flags instead (#76350)
## About The Pull Request Title. ## Why It's Good For The Game Seriously this shit pisses me off, why are ORGAN_SYNTHETIC and ORGAN_ROBOTIC two different things? ## Changelog not applicable unless i fucked up --------- Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
This commit is contained in:
co-authored by
Time-Green
parent
b090e404dd
commit
82cf9ea499
@@ -28,14 +28,13 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/organ/internal/appendix/on_life(seconds_per_tick, times_fired)
|
||||
..()
|
||||
var/mob/living/carbon/organ_owner = owner
|
||||
if(!organ_owner)
|
||||
. = ..()
|
||||
if(!owner)
|
||||
return
|
||||
|
||||
if(organ_flags & ORGAN_FAILING)
|
||||
// forced to ensure people don't use it to gain tox as slime person
|
||||
organ_owner.adjustToxLoss(2 * seconds_per_tick, updating_health = TRUE, forced = TRUE)
|
||||
owner.adjustToxLoss(2 * seconds_per_tick, updating_health = TRUE, forced = TRUE)
|
||||
else if(inflamation_stage)
|
||||
inflamation(seconds_per_tick)
|
||||
else if(SPT_PROB(APPENDICITIS_PROB, seconds_per_tick))
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
desc = "This expanded digestive chamber allows golems to smelt minerals, provided that they are immersed in lava."
|
||||
icon_state = "ethereal_heart"
|
||||
color = COLOR_GOLEM_GRAY
|
||||
status = ORGAN_MINERAL
|
||||
organ_flags = ORGAN_MINERAL
|
||||
/// Action which performs smelting
|
||||
var/datum/action/cooldown/internal_smelting/smelter
|
||||
|
||||
|
||||
Reference in New Issue
Block a user