Code

Blocking and Shields#8584

Code

Merged

metalgearsloth merged 42 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom keronshb:riotshieldskeronshb/space-station-14:riotshieldsCopy head branch name to clipboardJul 4, 2022

+981-1

Commits

Commits on Jun 2, 2022

• Blocking

  keronshb

  committed
  e253ca7

  Copy full SHA for e253ca7

• Master Merge

  Show description for b77802a
  keronshb

  committed
  b77802a

  Copy full SHA for b77802a

• Fixes Bodytype bug

  keronshb

  committed
  2b7dcf1

  Copy full SHA for 2b7dcf1

Commits on Jun 3, 2022

• Blocking Damage Modifier

  keronshb

  committed
  bb7e3e5

  Copy full SHA for bb7e3e5

• Storing bodytype

  keronshb

  committed
  ea0a56b

  Copy full SHA for ea0a56b

• Consolidates Stop Blocking code

  keronshb

  committed
  c168ce6

  Copy full SHA for c168ce6

• Consolidates more methods

  keronshb

  committed
  617b753

  Copy full SHA for 617b753

Commits on Jun 4, 2022

• Some cleanup, hitbox fix

  keronshb

  committed
  527dd3c

  Copy full SHA for 527dd3c

• Shield Textures

  keronshb

  committed
  33b5597

  Copy full SHA for 33b5597

• Conflict fix

  keronshb

  committed
  a97dede

  Copy full SHA for a97dede

• Passive blocking modifier check

  keronshb

  committed
  38f7d16

  Copy full SHA for 38f7d16

• Localization, popups, and more cleanup

  keronshb

  committed
  856e499

  Copy full SHA for 856e499

Commits on Jun 5, 2022

• Small cleanup

  keronshb

  committed
  0378fcd

  Copy full SHA for 0378fcd

• Relay event

  keronshb

  committed
  c33a1ad

  Copy full SHA for c33a1ad

Commits on Jun 6, 2022

• Fixes a shutdown bug, adds specific containers and sets

  keronshb

  committed
  74c83db

  Copy full SHA for 74c83db

• Popups and sounds

  keronshb

  committed
  97ee8bb

  Copy full SHA for 97ee8bb

• Fixes typo

  keronshb

  committed
  f0bb37d

  Copy full SHA for f0bb37d

• Removes whitespace, adds comment

  keronshb

  committed
  3a00380

  Copy full SHA for 3a00380

Commits on Jun 19, 2022

• Some requested changes

  keronshb

  committed
  bdbbd02

  Copy full SHA for bdbbd02

• Remove Shared

  keronshb

  committed
  187ca90

  Copy full SHA for 187ca90

• Merge master for sound fix

  keronshb

  committed
  9037639

  Copy full SHA for 9037639

• Audio fix

  keronshb

  committed
  a2f982f

  Copy full SHA for a2f982f

Commits on Jun 23, 2022

• Merge conflict fix

  keronshb

  committed
  6e2de77

  Copy full SHA for 6e2de77

Commits on Jun 24, 2022

• More changes

  keronshb

  committed
  b9bafc6

  Copy full SHA for b9bafc6

• More requested changes

  keronshb

  committed
  9b1e8c3

  Copy full SHA for 9b1e8c3

• Properly remove on shutdown

  keronshb

  committed
  da887ba

  Copy full SHA for da887ba

Commits on Jun 27, 2022

• Adds riot shields to seclathes

  keronshb

  committed
  75c24c0

  Copy full SHA for 75c24c0

• SecTech Riot shield

  keronshb

  committed
  32cee59

  Copy full SHA for 32cee59

• Constant variable

  keronshb

  committed
  11a7395

  Copy full SHA for 11a7395

• Relay transfer to user blocking system

  keronshb

  committed
  8ac0fb4

  Copy full SHA for 8ac0fb4

Commits on Jun 28, 2022

• More destruction behavior

  keronshb

  committed
  4b62587

  Copy full SHA for 4b62587

• Adds a shape field

  keronshb

  committed
  b56c5ac

  Copy full SHA for b56c5ac

• Merge master

  keronshb

  committed
  4117a1a

  Copy full SHA for 4117a1a

• Riot shield cleanup

  keronshb

  committed
  3384f78

  Copy full SHA for 3384f78

• More requested changes.

  keronshb

  committed
  10c9f37

  Copy full SHA for 10c9f37

• Prevents blocking attempt where a user cannot be anchored

  keronshb

  committed
  a7fc0c2

  Copy full SHA for a7fc0c2

Commits on Jun 29, 2022

• Listen for anchor change

  keronshb

  committed
  f37a635

  Copy full SHA for f37a635

• Unused using cleanup

  keronshb

  committed
  c6c8351

  Copy full SHA for c6c8351

Commits on Jul 1, 2022

• More shields.

  keronshb

  committed
  6aa768d

  Copy full SHA for 6aa768d

• Buckler

  keronshb

  committed
  ed0984a

  Copy full SHA for ed0984a

• Construction

  keronshb

  committed
  e8314c1

  Copy full SHA for e8314c1

• Linter fix

  keronshb

  committed
  463cbd6

  Copy full SHA for 463cbd6