nevimer
baf3837ae8
Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29
...
# Conflicts:
# _maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
# _maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
# _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
# _maps/map_files/tramstation/tramstation.dmm
# code/_onclick/hud/new_player.dm
# code/datums/components/squashable.dm
# code/datums/diseases/advance/symptoms/heal.dm
# code/datums/diseases/chronic_illness.dm
# code/datums/status_effects/buffs.dm
# code/datums/status_effects/debuffs/drunk.dm
# code/datums/status_effects/debuffs/stamcrit.dm
# code/game/machinery/computer/crew.dm
# code/game/objects/items/devices/scanners/health_analyzer.dm
# code/game/objects/items/wall_mounted.dm
# code/game/turfs/closed/indestructible.dm
# code/modules/admin/view_variables/filterrific.dm
# code/modules/antagonists/heretic/influences.dm
# code/modules/cargo/orderconsole.dm
# code/modules/client/preferences.dm
# code/modules/events/space_vines/vine_mutations.dm
# code/modules/mob/dead/new_player/new_player.dm
# code/modules/mob/living/carbon/human/death.dm
# code/modules/mob/living/carbon/human/species_types/jellypeople.dm
# code/modules/mob/living/damage_procs.dm
# code/modules/mob/living/living.dm
# code/modules/mob_spawn/ghost_roles/mining_roles.dm
# code/modules/mob_spawn/mob_spawn.dm
# code/modules/projectiles/ammunition/energy/laser.dm
# code/modules/projectiles/guns/ballistic/launchers.dm
# code/modules/projectiles/guns/energy/laser.dm
# code/modules/reagents/chemistry/machinery/chem_dispenser.dm
# code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
# code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
# code/modules/reagents/chemistry/reagents/medicine_reagents.dm
# code/modules/surgery/healing.dm
# code/modules/unit_tests/designs.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# tgui/packages/tgui/interfaces/ChemDispenser.tsx
2025-11-29 22:49:21 -05:00
Majkl-J
3a8eed4eb2
fixes a single missing indent in thesync
2025-02-27 04:45:08 -08:00
Waterpig and GitHub
0e48bb6486
Merge branch 'master' into upstream-25-02a
2025-02-27 13:39:30 +01:00
Roxy and GitHub
76878341e0
Fix SAD not transferring wounds ( #3167 )
...
## About The Pull Request
Add code to `/datum/component/damage_tracker/human` to keep track of
wounds and reapply them as needed.
## Why It's Good For The Game
Fixes #3162
## Proof Of Testing
I tested with both the permanent limp quirk and breaking one of my arms
with force and both wounds stayed after using the SAD
## Changelog
🆑
fix: fixed the SAD deleting wounds
/🆑
2025-02-26 18:29:43 -08:00
Majkl-J
225199e26b
Moves all the organcode down to obj/item/organ
2025-02-20 00:06:45 -08:00
9c60ff1de1
[MIRROR] Removes Clone Damage [MDB IGNORE] ( #25429 )
...
* Removes Clone Damage
* Update blackbox.dm
* Modular
* Update schema
* Update database_changelog.md
* More modular deprecated clone things
---------
Co-authored-by: distributivgesetz <distributivgesetz93@gmail.com >
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com >
2023-12-04 23:01:54 -05:00
Pinta and GitHub
6b284ae441
[MODULAR] Damage Tracker Component ( #22902 )
...
nice
2023-08-08 18:28:28 -04:00
nevimer