* Add meat tag to Five Alarm Burger
* Revert "Add meat tag to Five Alarm Burger"
This reverts commit e483b5effe63a8cbdcce81eeddc622f5555ae240.
* Re-add tag, but in notepad
* Move tag down to follow hierarchy
---------
Co-authored-by: LevitatingTree <None>
* Rebalance HoS's Energy Shotgun
* SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system.
* Prevent recharge cooldown if 0 power is used.
* Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges.
* Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun.
* Clean up the client ammo UI fix.
* Update the self recharger component to comply with maintainer request.
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Remove code that was made redundant by a hotfix from another PR.
* Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared.
* Fix another internal issue
* Code cleanup + fix the rapid recharge verb to remove pause.
* cleanup
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* does everything
* beer flavor revert and linter fix
* Update Resources/Locale/en-US/flavors/flavor-profiles.ftl
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* fix misspelling
* fix yet another misspelling
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* english has weird spellings huh
* im starting to feel ashamed of myself
* this is shameful
---------
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* Give silicons proper lobby/character editor previews
No more naked dummies, properly show a borg/AI sprite now.
This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined.
Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad.
* Update Content.Shared/Roles/JobPrototype.cs
* Update Content.Client/Lobby/LobbyUIController.cs
* Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Add new sprites for alternative psychologist PDAs
* Add localizations for alternative psychologist job names
* Add localizations for additional psychologist loadout groups
* Expand psychologist loadout options
Adds three new alternative job title PDAs:
- Psychiatrist
- Therapist (req. 4hrs psych)
- Social Worker (req. 4hrs service)
Adds head, outer clothing, scarf, and shoe loadout groups to the psychologist.
Adds a blue folder to the psychologist's starting equipment.
* Restore erroneous whitespace
I hate YAML.
This whitespace should not exist, but removing it would cause merge conflicts or something equally stupid.
Signed-off-by: Michelle Szinger <chell@alterae.online>
* Restore erroneous trailing whitespace
I hate YAML.
This whitespace should not exist, but its removal would lead to merge conflicts or diff messiness or other such nonsense, so.
Signed-off-by: Michelle Szinger <chell@alterae.online>
* Remove erroneously restored erroneous whitespace
This one is actually my bad. Apologies.
Signed-off-by: Michelle Szinger <chell@alterae.online>
* De-dent erroneously indented lines
I hate YAML. Not even sure how this particular mistake happened, but I
hate YAML.
Note to self: stop using Rider for YAML changes.
---------
Signed-off-by: Michelle Szinger <chell@alterae.online>
* Added flavors
* Added the flavors for real this time
* Fixed the spaces
* Removed xenobasher (it already existed and I missed that)
* Fixed acidspit
* DEFINITELY fixed acidspit
---------
Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com>
Southbridge
PJBot
LevitatingTree
lzk
onesch
Winkarst
BramvanZijp
metalgearsloth
Velcroboy
slarticodefast
TGRCDev
ArtisticRoomba
joshepvodka
ScarKy0
deathride58
sleepyyapril
Plykiya
Errant
Pieter-Jan Briers
Vasilis The Pikachu
Delta-V bot
Lyndomen
Stop-Signs
Michelle Szinger
Aikakakah