Code

Backend melee refactors mostly#3964

Code

Open

FalloutFalcon wants to merge 124 commits intoshiptest-ss13:mastershiptest-ss13/Shiptest:masterfrom FalloutFalcon:backend-melee-refactors-mostlyFalloutFalcon/ShiptestF:backend-melee-refactors-mostlyCopy head branch name to clipboard

+542-747

Commits

Commits on Apr 11, 2024

• orginize some weapon sprites

  FalloutFalcon

  committed
  6083109

  Copy full SHA for 6083109

• more orginzing

  FalloutFalcon

  committed
  f81394f

  Copy full SHA for f81394f

• new sprites mabye

  FalloutFalcon

  committed
  ae8b538

  Copy full SHA for ae8b538

• fix energy weapon icon path

  FalloutFalcon

  committed
  925010f

  Copy full SHA for 925010f

Commits on Apr 13, 2024

• orginizes files

  FalloutFalcon

  committed
  4adba95

  Copy full SHA for 4adba95

• cruft

  FalloutFalcon

  committed
  4a76632

  Copy full SHA for 4a76632

• yea

  FalloutFalcon

  committed
  b9c2bdf

  Copy full SHA for b9c2bdf

• orginizes primal and clothing cat (cherrypicked)

  FalloutFalcon

  committed
  e03cb56

  Copy full SHA for e03cb56

• orginizes some more recipes

  FalloutFalcon

  committed
  4f1bd7f

  Copy full SHA for 4f1bd7f

Commits on Apr 14, 2024

• recipe cruft

  FalloutFalcon

  committed
  57b39e9

  Copy full SHA for 57b39e9

• yea

  FalloutFalcon

  committed
  68903db

  Copy full SHA for 68903db

• Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest into improv

  FalloutFalcon

  committed
  4053cc9

  Copy full SHA for 4053cc9

• trailing whitespace

  FalloutFalcon

  committed
  b6fab46

  Copy full SHA for b6fab46

• better sword parent

  FalloutFalcon

  committed
  bacc3d4

  Copy full SHA for bacc3d4

• renove null rod

  FalloutFalcon

  committed
  4ff3443

  Copy full SHA for 4ff3443

• yuh

  FalloutFalcon

  committed
  11bfe91

  Copy full SHA for 11bfe91

• bad type

  FalloutFalcon

  committed
  ac1b4a2

  Copy full SHA for ac1b4a2

• remaps chappy armor

  FalloutFalcon

  committed
  7f316d6

  Copy full SHA for 7f316d6

• ytea

  FalloutFalcon

  committed
  f3ded51

  Copy full SHA for f3ded51

• axe parent type, removes magic hammers

  FalloutFalcon

  committed
  dc8d07f

  Copy full SHA for dc8d07f

• stuff

  FalloutFalcon

  committed
  e4d9d66

  Copy full SHA for e4d9d66

• removing cult weapons

  FalloutFalcon

  committed
  e4671a6

  Copy full SHA for e4671a6

• oops

  FalloutFalcon

  committed
  3fb28b7

  Copy full SHA for 3fb28b7

• oops

  FalloutFalcon

  committed
  e2fccf8

  Copy full SHA for e2fccf8

Commits on Apr 15, 2024

• what if i just deleted the cult file haha so silly

  FalloutFalcon

  committed
  d26bf9f

  Copy full SHA for d26bf9f

• Revert "what if i just deleted the cult file haha so silly"

  Show description for 2171f22
  FalloutFalcon

  committed
  2171f22

  Copy full SHA for 2171f22

• fixing sprites by removing stuff mostly c:

  FalloutFalcon

  committed
  aa6115b

  Copy full SHA for aa6115b

• removes bostaff cruft item (tho i do want a cool matrial staff)

  FalloutFalcon

  committed
  83a92e0

  Copy full SHA for 83a92e0

• almost passing i think

  FalloutFalcon

  committed
  d7a2276

  Copy full SHA for d7a2276

• damn bone spear was like better then a plasma spear what the hell

  FalloutFalcon

  committed
  f8a9ff4

  Copy full SHA for f8a9ff4

• new weapons!

  FalloutFalcon

  committed
  9ecd1ea

  Copy full SHA for 9ecd1ea

• gives scrap vest ok armour

  FalloutFalcon

  committed
  d0fa531

  Copy full SHA for d0fa531

• scrap armor

  FalloutFalcon

  committed
  c656b54

  Copy full SHA for c656b54

• swords blulky by default

  FalloutFalcon

  committed
  133c694

  Copy full SHA for 133c694

• no armour for tribal pins

  FalloutFalcon

  committed
  ddfb8df

  Copy full SHA for ddfb8df

• removes some random cruft sprites to clean up items_and_weapons

  FalloutFalcon

  committed
  6ab22f6

  Copy full SHA for 6ab22f6

• renames items_and_weapons because why is its name so big omg

  Show description for e7faee2
  FalloutFalcon

  committed
  e7faee2

  Copy full SHA for e7faee2

• more dmi stuff

  FalloutFalcon

  committed
  1df55bc

  Copy full SHA for 1df55bc

• knife parent

  FalloutFalcon

  committed
  9f239b6

  Copy full SHA for 9f239b6

• combat knife doesnt realyl affect survival or bone

  FalloutFalcon

  committed
  4619cec

  Copy full SHA for 4619cec

• insane

  FalloutFalcon

  committed
  a82ab89

  Copy full SHA for a82ab89

• minor path fixing

  FalloutFalcon

  committed
  9df3b5f

  Copy full SHA for 9df3b5f

Commits on Apr 16, 2024

• yea

  FalloutFalcon

  committed
  2b37b9e

  Copy full SHA for 2b37b9e

Commits on Apr 24, 2024

• Merge branch 'master' into improv

  Show description for 504566f
  FalloutFalcon

  authored
  504566f

  Copy full SHA for 504566f

• yea

  FalloutFalcon

  committed
  1cbb43a

  Copy full SHA for 1cbb43a

• make fixing new ruins made during this pr easier to fix

  FalloutFalcon

  committed
  98733cc

  Copy full SHA for 98733cc

• spears

  FalloutFalcon

  committed
  4212422

  Copy full SHA for 4212422

Commits on Sep 13, 2024

• This hurt. Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest into oops-all-refactors

  FalloutFalcon

  committed
  12c6006

  Copy full SHA for 12c6006

• regex and banishing tribal.dm once more

  FalloutFalcon

  committed
  5902a54

  Copy full SHA for 5902a54

• regex

  FalloutFalcon

  committed
  34f272d

  Copy full SHA for 34f272d

• oops!

  FalloutFalcon

  committed
  d0f04f6

  Copy full SHA for d0f04f6

• repath kitcken knives

  FalloutFalcon

  committed
  aa8ce55

  Copy full SHA for aa8ce55

• bunch more repaths from merge

  FalloutFalcon

  committed
  3a561a9

  Copy full SHA for 3a561a9

• kitchen not kitcken

  FalloutFalcon

  committed
  efa1cba

  Copy full SHA for efa1cba

• more repaths

  FalloutFalcon

  committed
  8c66360

  Copy full SHA for 8c66360

• why did regex add new lines wtf

  FalloutFalcon

  committed
  7ba778d

  Copy full SHA for 7ba778d

• yea!

  FalloutFalcon

  committed
  4891293

  Copy full SHA for 4891293

Commits on Sep 16, 2024

• Merge branch 'master' into oops-all-refactors

  FalloutFalcon

  authored
  f57b1d4

  Copy full SHA for f57b1d4

Commits on Sep 19, 2024

• Merge branch 'master' into oops-all-refactors

  FalloutFalcon

  authored
  eecbfef

  Copy full SHA for eecbfef

• transforming component, stunbaton span defines, wip items

  FalloutFalcon

  committed
  b3a5f7f

  Copy full SHA for b3a5f7f

• oh this is transforming weapon pr now?

  FalloutFalcon

  committed
  9e42991

  Copy full SHA for 9e42991

• the repathing... god if this conflict merges

  FalloutFalcon

  committed
  0f0c30a

  Copy full SHA for 0f0c30a

• updates icon states

  FalloutFalcon

  committed
  c79296a

  Copy full SHA for c79296a

• more missing icon_state

  FalloutFalcon

  committed
  c5f0cce

  Copy full SHA for c5f0cce

• better unit tests to help me

  FalloutFalcon

  committed
  0b8b15f

  Copy full SHA for 0b8b15f

• tweak to test, only fail if only 1 inhand is missing cause then its clearly a mistake

  FalloutFalcon

  committed
  85117b8

  Copy full SHA for 85117b8

• tweaks to unit tests again

  FalloutFalcon

  committed
  8970218

  Copy full SHA for 8970218

• what if i just did it again

  FalloutFalcon

  committed
  e1ef45b

  Copy full SHA for e1ef45b

• tweaks so that its eaiser to search for _w and _on

  FalloutFalcon

  committed
  a72ffaf

  Copy full SHA for a72ffaf

• bad_types?

  FalloutFalcon

  committed
  c7a992e

  Copy full SHA for c7a992e

• oops!

  FalloutFalcon

  committed
  2abc862

  Copy full SHA for 2abc862

• isbadpath

  FalloutFalcon

  committed
  5aa1d01

  Copy full SHA for 5aa1d01

• ah wrong name for that

  FalloutFalcon

  committed
  8767f3c

  Copy full SHA for 8767f3c

• to save me some time

  FalloutFalcon

  committed
  19d7125

  Copy full SHA for 19d7125

• oh i see

  FalloutFalcon

  committed
  5d41d1e

  Copy full SHA for 5d41d1e

• I have a feeling its broken

  FalloutFalcon

  committed
  c5ccfcb

  Copy full SHA for c5ccfcb

• more useful test one sec

  FalloutFalcon

  committed
  1a89aba

  Copy full SHA for 1a89aba

• wow i forgot that

  FalloutFalcon

  committed
  33a7a17

  Copy full SHA for 33a7a17

• thats prob why these werent working

  FalloutFalcon

  committed
  2f95dd4

  Copy full SHA for 2f95dd4

• only run overkill icon tests when asked

  FalloutFalcon

  committed
  5508d0b

  Copy full SHA for 5508d0b

• this looks really ugly tbh

  FalloutFalcon

  committed
  3f5f71e

  Copy full SHA for 3f5f71e

• prob a cleaner way to do this

  FalloutFalcon

  committed
  faf2610

  Copy full SHA for faf2610

• this is so out of scope

  FalloutFalcon

  committed
  071b117

  Copy full SHA for 071b117

• can now work on pedang

  FalloutFalcon

  committed
  198bab2

  Copy full SHA for 198bab2

• pedang wip

  FalloutFalcon

  committed
  71a3bef

  Copy full SHA for 71a3bef

Commits on Sep 22, 2024

• yea

  FalloutFalcon

  committed
  4137a82

  Copy full SHA for 4137a82

Commits on Sep 23, 2024

• component based behavior

  FalloutFalcon

  committed
  16d57a6

  Copy full SHA for 16d57a6

• Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest into bladeatheon

  FalloutFalcon

  committed
  30b6c42

  Copy full SHA for 30b6c42

• no longer doing charged parent type. we all in with the componenet

  FalloutFalcon

  committed
  ad27e30

  Copy full SHA for ad27e30

• more stuff working as charged comp

  FalloutFalcon

  committed
  7523426

  Copy full SHA for 7523426

• get_best_shield needs to be refactored but whatever.

  FalloutFalcon

  committed
  0edcf07

  Copy full SHA for 0edcf07

• riposte!

  FalloutFalcon

  committed
  5fd0bae

  Copy full SHA for 5fd0bae

Commits on Sep 24, 2024

• holy crap i love reposte

  FalloutFalcon

  committed
  cd9e666

  Copy full SHA for cd9e666

• more improvments to charged.

  FalloutFalcon

  committed
  bfd353a

  Copy full SHA for bfd353a

• shocking

  FalloutFalcon

  committed
  a3e8fe6

  Copy full SHA for a3e8fe6

Commits on Sep 29, 2024

• attack_cooldown

  FalloutFalcon

  committed
  05f5697

  Copy full SHA for 05f5697

Commits on Sep 30, 2024

• diffrent cd's pending balance

  FalloutFalcon

  committed
  43b0223

  Copy full SHA for 43b0223

• better force string and readds world icons i somehow removed.

  FalloutFalcon

  committed
  2892509

  Copy full SHA for 2892509

• energy weapons dont need the transforming parent type

  FalloutFalcon

  committed
  21cf5f0

  Copy full SHA for 21cf5f0

• tweaks to two handed stuff to make it more maintaiable

  FalloutFalcon

  committed
  57de0bf

  Copy full SHA for 57de0bf

• Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest into bladeatheon

  FalloutFalcon

  committed
  235e47e

  Copy full SHA for 235e47e

• better duel energy weapon path

  FalloutFalcon

  committed
  e551a82

  Copy full SHA for e551a82

• 70 lines only for halberds. not bad

  FalloutFalcon

  committed
  ca0606d

  Copy full SHA for ca0606d

• oh its just a varedit

  FalloutFalcon

  committed
  274188a

  Copy full SHA for 274188a

• few things broke. those are fixed now

  FalloutFalcon

  committed
  28fcdaf

  Copy full SHA for 28fcdaf

• yea

  FalloutFalcon

  committed
  78b3f4e

  Copy full SHA for 78b3f4e

• mass sword stuff...

  FalloutFalcon

  committed
  63852fa

  Copy full SHA for 63852fa

Commits on Oct 1, 2024

• sound design

  FalloutFalcon

  committed
  5f429b7

  Copy full SHA for 5f429b7

• the sledge

  FalloutFalcon

  committed
  b50d974

  Copy full SHA for b50d974

Commits on Dec 31, 2024

• Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest into bladeatheon

  FalloutFalcon

  committed
  48f4f5c

  Copy full SHA for 48f4f5c

• merge fixes

  FalloutFalcon

  committed
  7bb054b

  Copy full SHA for 7bb054b

• stuff!

  FalloutFalcon

  committed
  062ab7b

  Copy full SHA for 062ab7b

• more tweaks

  FalloutFalcon

  committed
  f168675

  Copy full SHA for f168675

• knucklebuster proof of concept

  FalloutFalcon

  committed
  91dd36c

  Copy full SHA for 91dd36c

Commits on Jan 1, 2025

• yea

  FalloutFalcon

  committed
  398256a

  Copy full SHA for 398256a

Commits on Jan 3, 2025

• cleanup

  FalloutFalcon

  committed
  ed491b1

  Copy full SHA for ed491b1

Commits on Jan 4, 2025

• parrying ports from paridise

  FalloutFalcon

  committed
  3772cbc

  Copy full SHA for 3772cbc

• some sprites from stiel

  FalloutFalcon

  committed
  407000c

  Copy full SHA for 407000c

• removes bladeatheon file, small icon fixes

  FalloutFalcon

  committed
  51db39b

  Copy full SHA for 51db39b

• stops meat sounds from trees.

  FalloutFalcon

  committed
  baf670c

  Copy full SHA for baf670c

• mostly removing parrying from this pr.

  FalloutFalcon

  committed
  8be45cd

  Copy full SHA for 8be45cd

Commits on Jan 7, 2025

• Merge branch 'master' into backend-melee-refactors-mostly

  Show description for c7a2795
  FalloutFalcon

  authored
  c7a2795

  Copy full SHA for c7a2795

Commits on Jan 14, 2025

• Merge branch 'master' into backend-melee-refactors-mostly

  FalloutFalcon

  authored
  81e78b0

  Copy full SHA for 81e78b0

Commits on Jan 15, 2025

• Merge branch 'master' into backend-melee-refactors-mostly

  FalloutFalcon

  authored
  898eb95

  Copy full SHA for 898eb95