Commit Graph

26 Commits

Author SHA1 Message Date
beck-thompson
864ecb9c02 Replaced some AddMarkups with AddMarkupOrThrow (#30632)
* First commit

* Silly me

* bruh

(cherry picked from commit ee922e37f6539a5c3da94e76a1a0efef4c8e2b59)
2025-07-12 01:47:31 +10:00
BramvanZijp
d833061e47 Shield blocking/raising fixes
(cherry picked from commit bec7022ca9769f848497ca1aa858a46c959ec76d)
2025-03-29 17:06:18 +03:00
BramvanZijp
e4732075b4 Port the BSO's Greatshield From LRP. (#2029)
# Description

Title, it replaces the eshield in the BSO's loadout.
I had to tweak the values to be a little less... extreme.

Also made EMP immune untill somebody ports the eshield changes fully, as
right now, the eshield is emp immune, so why would the greatshield be
disabled by it.

Also, added a way to smart-equip the shield from your belt, if you've
already taken out the mace (which can also be put in the belt slot by
itself just like a stun baton.)

---

<details><summary><h1>Media</h1></summary>
<p>

[Video of the stamina damage of the mace, and the shield health &
recharge.](https://github.com/user-attachments/assets/8b98dda2-e7ab-4b4d-be41-6f0c247b3e10)

</p>
</details>

---

# Changelog

🆑 BramvanZijp
- add: Added the BSO's Greatshield and Atrocity (Mace) as a primary
weapon option.
- remove: The Energy Shield has been removed from the BSO's loadout.

---------

Signed-off-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>

(cherry picked from commit d1cc81ca03a35ecd5cf38d280b20b54c1bc63536)
2025-03-21 18:25:24 +03:00
Pieter-Jan Briers
ccea85136b Random spontaneous cleanup PR (#25131)
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
(cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e)
2024-02-18 23:02:29 +01:00
metalgearsloth
32216a1b03 Entitylookup method renames (#23519)
(cherry picked from commit 1f3a29c0926c2d3af7ce1ef8148a73d332c3302f)
2024-01-26 22:38:25 +01:00
themias
8b1247b9c5 Fix riot shield audio and popup spam (#21881) 2023-12-02 20:25:43 +01:00
Leon Friedrich
45d2375818 Fix action-granting items not being predicted (#20778)
* Ensure actions are predicted

* Fix test fail
2023-10-08 19:58:56 +02:00
DrSmugleaf
c71f97e3a2 Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
metalgearsloth
d3aece12cb Lookup changes (#18416) 2023-08-06 12:44:05 +10:00
LankLTE
48f29cbbf7 no use in pocket (#17785) 2023-07-03 15:36:59 -06:00
metalgearsloth
b7ee34f5a7 Fix buildies (#17396) 2023-06-17 12:17:21 +10:00
Slava0135
8ed4dcf0fb shield values examine (#17245) 2023-06-17 12:07:58 +10:00
Slava0135
277689c9a6 make shields be able to block doorways (#16079)
* you can block doors
(doors now consider static fixtures)

* this was unnecessary
2023-05-05 11:14:32 -04:00
DrSmugleaf
b947856431 Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
metalgearsloth
2e25128770 Update content for .Owner culling (#14185) 2023-02-22 12:45:32 +11:00
metalgearsloth
bf79d76666 Content update for ECS physics (#13291) 2023-01-15 15:38:59 +11:00
Jezithyr
eeb5b17b34 Mobstate Refactor (#13389)
Refactors mobstate and moves mob health thresholds to their own component

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-01-13 16:57:10 -08:00
Leon Friedrich
881a2b2ece PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
keronshb
153fcd2172 Refactors blocking system, fixes exception (#12947) 2022-12-10 14:42:38 +11:00
keronshb
02ba8720cb Cleans up some shield code, adds grid checks (#12621)
closes https://github.com/space-wizards/space-station-14/issues/11196
2022-11-19 14:51:54 +11:00
metalgearsloth
600c0e3255 Fix a few warnings (#11576) 2022-10-04 14:24:19 +11:00
metalgearsloth
78a4ab6eb2 Update for collision events by-ref (#10933) 2022-09-14 17:26:26 +10:00
keronshb
b69b18c24e Don't let someone block if they're too close or if they're in a doorway. (#9890)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-07-25 14:54:18 +10:00
keronshb
4a89446e03 Fixes Blocking bugs (#9424)
* Fixes Riot shield bugs

* Removes redundant check and extra parenthesis

* Requested changes

* Prevent block with another shield if already blocking.
2022-07-10 20:50:09 -05:00
Kara
2d5ec7f85c Id[entity] 2.0 (real) (#9612)
* starter API

* network ID cards

* Port more stuff from old identity

* Re-implement identity representation + name updating

* move

* proper name returning for `IdentityName`

* move everything important to server, give in to  temptation

* shared / server / client split sadly. move ensure to shared and spawn to server

* identity update queueing + identityblocker

* fixes

* and just like that it's usable for admins

* huge identity pass

* pass dos

* jesus christ

* figs :D

* fuck u

* fix bad merge.

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-07-10 20:36:53 -05:00
keronshb
d65601f024 Blocking and Shields (#8584)
* Blocking

* Fixes Bodytype bug

* Blocking Damage Modifier

* Storing bodytype

* Consolidates Stop Blocking code

* Consolidates more methods

* Some cleanup, hitbox fix

* Shield Textures

* Passive blocking modifier check

* Localization, popups, and more cleanup

* Small cleanup

* Relay event

* Fixes a shutdown bug, adds specific containers and sets

* Popups and sounds

* Fixes typo

* Removes whitespace, adds comment

* Some requested changes

* Remove Shared

* Audio fix

* More changes

* More requested changes

* Properly remove on shutdown

* Adds riot shields to seclathes

* SecTech Riot shield

* Constant variable

* Relay transfer to user blocking system

* More destruction behavior

* Adds a shape field

* Riot shield cleanup

* More requested changes.

* Prevents blocking attempt where a user cannot be anchored

* Listen for anchor change

* Unused using cleanup

* More shields.

* Buckler

* Construction

* Linter fix
2022-07-04 16:31:12 +10:00