Code

Heath System Rework#579

Code

Merged

MrMelbert merged 148 commits intomasterMrMelbert/MapleStationCode:masterfrom rimconMrMelbert/MapleStationCode:rimconCopy head branch name to clipboardJan 27, 2025

+7,543-5,907

Commits

Commits on May 8, 2024

• Replaces stat with consciousness

  MrMelbert

  committed
  d81cce5

  Copy full SHA for d81cce5

• Adds some modifiers

  MrMelbert

  committed
  1d91ffa

  Copy full SHA for 1d91ffa

Commits on May 12, 2024

• Free code

  MrMelbert

  committed
  b8f8469

  Copy full SHA for b8f8469

Commits on May 17, 2024

• Update

  MrMelbert

  committed
  d295722

  Copy full SHA for d295722

Commits on May 18, 2024

• Brain Business

  MrMelbert

  committed
  256cd3f

  Copy full SHA for 256cd3f

Commits on May 20, 2024

• Baton = pain

  MrMelbert

  committed
  8eec6b5

  Copy full SHA for 8eec6b5

Commits on May 24, 2024

• Working tests

  MrMelbert

  committed
  fe29528

  Copy full SHA for fe29528

Commits on Jun 3, 2024

• Buncha smalls

  MrMelbert

  committed
  f0f18b4

  Copy full SHA for f0f18b4

Commits on Jun 5, 2024

• Various updates

  MrMelbert

  committed
  46324c5

  Copy full SHA for 46324c5

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  8e131d2

  Copy full SHA for 8e131d2

Commits on Jun 6, 2024

• Fixes

  MrMelbert

  committed
  c1c46dd

  Copy full SHA for c1c46dd

Commits on Jun 10, 2024

• Lung rupturing, reworks

  MrMelbert

  committed
  1f11c95

  Copy full SHA for 1f11c95

Commits on Jun 11, 2024

• Breathing Changes

  MrMelbert

  committed
  c9c821c

  Copy full SHA for c9c821c

• Document updates and more tweaks

  MrMelbert

  committed
  f448a13

  Copy full SHA for f448a13

• Temp Tweaks

  MrMelbert

  committed
  4b3140e

  Copy full SHA for 4b3140e

• Fixes

  MrMelbert

  committed
  07f3d1c

  Copy full SHA for 07f3d1c

Commits on Jun 21, 2024

• Optimizations and reworks

  MrMelbert

  committed
  cc378ea

  Copy full SHA for cc378ea

• Removing some vars

  MrMelbert

  committed
  76f345b

  Copy full SHA for 76f345b

Commits on Jun 27, 2024

• Exhale framework

  MrMelbert

  committed
  075bf4f

  Copy full SHA for 075bf4f

Commits on Jul 1, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  c1b3dc7

  Copy full SHA for c1b3dc7

• Heart tweaks

  MrMelbert

  committed
  723de4e

  Copy full SHA for 723de4e

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  94b28e1

  Copy full SHA for 94b28e1

Commits on Jul 2, 2024

• Small things

  MrMelbert

  committed
  b8a7ba4

  Copy full SHA for b8a7ba4

• More sweeping reworks

  MrMelbert

  committed
  5067f33

  Copy full SHA for 5067f33

Commits on Jul 3, 2024

• Audits a bunch of damage procs, things should be rather volatile now

  MrMelbert

  committed
  160ddca

  Copy full SHA for 160ddca

• Stun baton fixing

  MrMelbert

  committed
  c5c18b9

  Copy full SHA for c5c18b9

• Tweaks

  MrMelbert

  committed
  d4b26bb

  Copy full SHA for d4b26bb

• Oops

  MrMelbert

  committed
  bddaf6d

  Copy full SHA for bddaf6d

Commits on Jul 13, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  c368192

  Copy full SHA for c368192

Commits on Jul 14, 2024

• Bullet tweaks

  MrMelbert

  committed
  718bcdf

  Copy full SHA for 718bcdf

• More tweaks + Pain up

  MrMelbert

  committed
  acc7d53

  Copy full SHA for acc7d53

Commits on Jul 15, 2024

• Bunch of tweaks to wounds

  MrMelbert

  committed
  0fcabc9

  Copy full SHA for 0fcabc9

• Buff to pain healing

  MrMelbert

  committed
  a2f6dfa

  Copy full SHA for a2f6dfa

Commits on Jul 16, 2024

• Tweaks and reverts

  MrMelbert

  committed
  e4dba64

  Copy full SHA for e4dba64

• Stamina damage changes

  MrMelbert

  committed
  78781be

  Copy full SHA for 78781be

Commits on Jul 19, 2024

• IB fix

  MrMelbert

  committed
  53b88a9

  Copy full SHA for 53b88a9

• Embed tweaks

  MrMelbert

  committed
  69a2943

  Copy full SHA for 69a2943

• Automatic changelog for PR #84979 [ci skip]

  

  comfyorange

  authored and

  MrMelbert

  committed
  e8bce2f

  Copy full SHA for e8bce2f

• Refactors embedding to use datums instead of storing data in bespoke elements (#84599)

  Show description for 5ec9708
  

  SmArtKar

  authored and

  MrMelbert

  committed
  5ec9708

  Copy full SHA for 5ec9708

• Embedding Detour

  MrMelbert

  committed
  599c7f7

  Copy full SHA for 599c7f7

• Sounds

  MrMelbert

  committed
  b389ac5

  Copy full SHA for b389ac5

Commits on Jul 21, 2024

• Projectile tweaks

  MrMelbert

  committed
  9758e60

  Copy full SHA for 9758e60

• Grazing

  MrMelbert

  committed
  3f4cd8c

  Copy full SHA for 3f4cd8c

Commits on Jul 24, 2024

• Oxy nerfs

  MrMelbert

  committed
  bf6a664

  Copy full SHA for bf6a664

Commits on Jul 29, 2024

• More embed changes

  MrMelbert

  committed
  9a6b6cf

  Copy full SHA for 9a6b6cf

• Health analyzer tweaks

  MrMelbert

  committed
  dc159f5

  Copy full SHA for dc159f5

• More tweaks to the analyzer

  MrMelbert

  committed
  ecd29e4

  Copy full SHA for ecd29e4

• Analyzer fixes

  MrMelbert

  committed
  a98b48c

  Copy full SHA for a98b48c

Commits on Jul 30, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  47e5d8a

  Copy full SHA for 47e5d8a

• Analyzer fix

  MrMelbert

  committed
  5cc40b0

  Copy full SHA for 5cc40b0

• Revival tweak

  MrMelbert

  committed
  592786d

  Copy full SHA for 592786d

• Testing tweaks

  MrMelbert

  committed
  cd26a8f

  Copy full SHA for cd26a8f

Commits on Aug 10, 2024

• Rebalancing

  MrMelbert

  committed
  f72ca92

  Copy full SHA for f72ca92

Commits on Aug 18, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  72e6bf3

  Copy full SHA for 72e6bf3

Commits on Aug 19, 2024

• Bunch of tweaks, pretty sick now

  MrMelbert

  committed
  d83b403

  Copy full SHA for d83b403

• More tweaks

  MrMelbert

  committed
  cff8389

  Copy full SHA for cff8389

Commits on Aug 26, 2024

• More tweaks

  MrMelbert

  committed
  960aee0

  Copy full SHA for 960aee0

• Sounds

  MrMelbert

  committed
  419cc63

  Copy full SHA for 419cc63

Commits on Sep 3, 2024

• Merge remote-tracking branch 'origin/master' into rimcon

  MrMelbert

  committed
  9f0d9fa

  Copy full SHA for 9f0d9fa

• Tweak

  MrMelbert

  committed
  6c6e71c

  Copy full SHA for 6c6e71c

• Fixes

  MrMelbert

  committed
  5188f26

  Copy full SHA for 5188f26

• Tests

  MrMelbert

  committed
  6b463b7

  Copy full SHA for 6b463b7

Commits on Sep 4, 2024

• Tests

  MrMelbert

  committed
  cff8c89

  Copy full SHA for cff8c89

Commits on Sep 9, 2024

• Number tweaks

  MrMelbert

  committed
  e29131f

  Copy full SHA for e29131f

Commits on Sep 12, 2024

• More number tweaks

  MrMelbert

  committed
  70e3037

  Copy full SHA for 70e3037

Commits on Sep 16, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  6c82904

  Copy full SHA for 6c82904

• Tests

  MrMelbert

  committed
  6a1b93e

  Copy full SHA for 6a1b93e

Commits on Sep 17, 2024

• Floating Point Memes

  MrMelbert

  committed
  d45a15f

  Copy full SHA for d45a15f

Commits on Sep 19, 2024

• Bandage tweaks

  MrMelbert

  committed
  48803f0

  Copy full SHA for 48803f0

• Some value tweaks, makes IB a bit more fair for antags

  MrMelbert

  committed
  28a2a47

  Copy full SHA for 28a2a47

• Use the modifiers I guess

  MrMelbert

  committed
  bfec208

  Copy full SHA for bfec208

• De hardcodes wound-medical item interactions

  MrMelbert

  committed
  f12ddde

  Copy full SHA for f12ddde

• Anesthetic fixes

  MrMelbert

  committed
  3d5facf

  Copy full SHA for 3d5facf

• Health analyzer - Fixes

  MrMelbert

  committed
  33b0395

  Copy full SHA for 33b0395

• Health analyzer - EMP update

  MrMelbert

  committed
  caecbbc

  Copy full SHA for caecbbc

• Health analyzer - Updates

  MrMelbert

  committed
  23944ca

  Copy full SHA for 23944ca

• Health analyzer - Dismember tweak

  MrMelbert

  committed
  0244d59

  Copy full SHA for 0244d59

• Health analyzer - Updates

  MrMelbert

  committed
  a4efb85

  Copy full SHA for a4efb85

• Whoops

  MrMelbert

  committed
  80dd6e7

  Copy full SHA for 80dd6e7

Commits on Sep 24, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  8e3e25b

  Copy full SHA for 8e3e25b

• Huh

  MrMelbert

  committed
  08b9f19

  Copy full SHA for 08b9f19

• Testss

  MrMelbert

  committed
  39f6d7c

  Copy full SHA for 39f6d7c

• Test fix

  MrMelbert

  committed
  d30d859

  Copy full SHA for d30d859

• Dumbest macro ever

  MrMelbert

  committed
  0a5ee3b

  Copy full SHA for 0a5ee3b

• Tests

  MrMelbert

  committed
  eafbb98

  Copy full SHA for eafbb98

• Tessssts

  MrMelbert

  committed
  dec1a37

  Copy full SHA for dec1a37

Commits on Sep 25, 2024

• Wounding tweaks

  MrMelbert

  committed
  3be31c7

  Copy full SHA for 3be31c7

Commits on Sep 26, 2024

• Define / value tweaks

  MrMelbert

  committed
  f641d00

  Copy full SHA for f641d00

• Changes the wound alert effect

  MrMelbert

  committed
  184d339

  Copy full SHA for 184d339

• Whoops

  MrMelbert

  committed
  d6829c0

  Copy full SHA for d6829c0

Commits on Sep 30, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  0ab8115

  Copy full SHA for 0ab8115

• Update fixes

  MrMelbert

  committed
  b207ac9

  Copy full SHA for b207ac9

• Frick

  MrMelbert

  committed
  fde6fd4

  Copy full SHA for fde6fd4

Commits on Oct 1, 2024

• Succumb tweaks

  MrMelbert

  committed
  7f6fb8e

  Copy full SHA for 7f6fb8e

• Gives simplemobs some teeth

  MrMelbert

  committed
  ad68cee

  Copy full SHA for ad68cee

• Div by zero

  MrMelbert

  committed
  e64364d

  Copy full SHA for e64364d

Commits on Oct 7, 2024

• Testing tweaks

  MrMelbert

  committed
  3693a83

  Copy full SHA for 3693a83

Commits on Oct 8, 2024

• Rebalances pain?

  MrMelbert

  committed
  b7f607e

  Copy full SHA for b7f607e

Commits on Oct 11, 2024

• Wound cleanups

  MrMelbert

  committed
  1e7ffb0

  Copy full SHA for 1e7ffb0

Commits on Oct 13, 2024

• Fix

  MrMelbert

  committed
  7431f72

  Copy full SHA for 7431f72

Commits on Oct 19, 2024

• Paincrit tweaks

  MrMelbert

  committed
  0f5f8bf

  Copy full SHA for 0f5f8bf

Commits on Nov 24, 2024

• Morphine

  MrMelbert

  committed
  2021675

  Copy full SHA for 2021675

Commits on Nov 27, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  8d90213

  Copy full SHA for 8d90213

• Updates

  MrMelbert

  committed
  7eafd79

  Copy full SHA for 7eafd79

• Warnings

  MrMelbert

  committed
  e45f31b

  Copy full SHA for e45f31b

• Thermia fixes

  MrMelbert

  committed
  61e24a0

  Copy full SHA for 61e24a0

• Balancing

  MrMelbert

  committed
  39ab98c

  Copy full SHA for 39ab98c

Commits on Dec 2, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  daf5606

  Copy full SHA for daf5606

• Tweaks

  MrMelbert

  committed
  153c135

  Copy full SHA for 153c135

Commits on Dec 15, 2024

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  e1eaf0b

  Copy full SHA for e1eaf0b

Commits on Dec 16, 2024

• Fixes

  MrMelbert

  committed
  1bb013a

  Copy full SHA for 1bb013a

Commits on Dec 23, 2024

• Shock rework

  MrMelbert

  committed
  495853e

  Copy full SHA for 495853e

• Cigarette tweaks

  MrMelbert

  committed
  ad77f2e

  Copy full SHA for ad77f2e

• Patting fires

  MrMelbert

  committed
  a041acb

  Copy full SHA for a041acb

• src

  MrMelbert

  committed
  dde7c0b

  Copy full SHA for dde7c0b

• Surgery changes

  MrMelbert

  committed
  2638ec8

  Copy full SHA for 2638ec8

Commits on Dec 28, 2024

• Fixes

  MrMelbert

  committed
  f210cad

  Copy full SHA for f210cad

Commits on Jan 5, 2025

• Fixes and tweaks and demodularizing

  MrMelbert

  committed
  9222291

  Copy full SHA for 9222291

Commits on Jan 6, 2025

• Delete this rag interaction it sucks

  MrMelbert

  committed
  3619757

  Copy full SHA for 3619757

• Monkey Fixes

  MrMelbert

  committed
  5970012

  Copy full SHA for 5970012

Commits on Jan 9, 2025

• Tweaks

  MrMelbert

  committed
  2213618

  Copy full SHA for 2213618

Commits on Jan 13, 2025

• Runtimes and hunger tweak

  MrMelbert

  committed
  5691653

  Copy full SHA for 5691653

• Reworks the Druggy visual effect to cause less eye strain (#87811)

  Show description for 062520f
  

  BurgerLUA

  authored and

  MrMelbert

  committed
  062520f

  Copy full SHA for 062520f

• Dust Animation Port

  MrMelbert

  committed
  29e3d5f

  Copy full SHA for 29e3d5f

• Speeds up part of the dust animation by a frame or so, makes remains/dust spawn aligned lower on the tile (#87858)

  Show description for 509ddc7
  MrMelbert

  committed
  509ddc7

  Copy full SHA for 509ddc7

• Eyecharts

  MrMelbert

  committed
  55ada06

  Copy full SHA for 55ada06

• Fix

  MrMelbert

  committed
  109fc87

  Copy full SHA for 109fc87

• Demodularizing, fixes, tweaks, and hearts

  MrMelbert

  committed
  1a1cc99

  Copy full SHA for 1a1cc99

Commits on Jan 14, 2025

• Tweak

  MrMelbert

  committed
  279f8c5

  Copy full SHA for 279f8c5

Commits on Jan 18, 2025

• IV drips now pull you closer and create a beam to you (#88217)

  Show description for 93c2e6b
  

  Mothblocks

  authored and

  MrMelbert

  committed
  93c2e6b

  Copy full SHA for 93c2e6b

Commits on Jan 19, 2025

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  f9f201f

  Copy full SHA for f9f201f

• DME

  MrMelbert

  committed
  108f0c2

  Copy full SHA for 108f0c2

• Fixes

  MrMelbert

  committed
  c837193

  Copy full SHA for c837193

Commits on Jan 20, 2025

• Major fixes

  MrMelbert

  committed
  9cfaf4d

  Copy full SHA for 9cfaf4d

• This test boggles the mind

  MrMelbert

  committed
  3778cf9

  Copy full SHA for 3778cf9

• This gotta be it

  MrMelbert

  committed
  0e4f635

  Copy full SHA for 0e4f635

• A

  MrMelbert

  committed
  a622629

  Copy full SHA for a622629

• Brain bix

  MrMelbert

  committed
  372d20e

  Copy full SHA for 372d20e

• Tongue sticks

  MrMelbert

  committed
  892eda0

  Copy full SHA for 892eda0

Commits on Jan 21, 2025

• Bodybag Fixes

  MrMelbert

  committed
  b99955d

  Copy full SHA for b99955d

• IB tweaks

  MrMelbert

  committed
  960656a

  Copy full SHA for 960656a

Commits on Jan 25, 2025

• Burn wounds

  MrMelbert

  committed
  62ffecc

  Copy full SHA for 62ffecc

• Merge branch 'master' into rimcon

  MrMelbert

  committed
  405b08f

  Copy full SHA for 405b08f

Commits on Jan 26, 2025

• Merge branch 'master' into rimcon

  MrMelbert

  authored
  7958cfa

  Copy full SHA for 7958cfa

Commits on Jan 27, 2025

• Disposals fix

  MrMelbert

  committed
  e077191

  Copy full SHA for e077191

• Merge branch 'rimcon' of https://github.com/MrMelbert/MapleStationCode into rimcon

  MrMelbert

  committed
  a97dd05

  Copy full SHA for a97dd05

• Banana

  MrMelbert

  committed
  683fdf6

  Copy full SHA for 683fdf6

• One thing

  MrMelbert

  committed
  755c5c6

  Copy full SHA for 755c5c6