* Allulalo: finally finishing the ancient raptor species project (#3504)
* well, it loads
* sprite's
* names + starting on displacements
* more displacements
* displacements
* left hand only
* displacements
* yup
* ooa
* inhand displacements
* blood
* accent
* iv bags
* placeholder clarification
* Revert "iv bags"
This reverts commit c2aa504eab8d0673604b33e0ccaf79b406979da6.
* whitespace
* adds tooshortforUI and removes the damage modifier set
* speechsounds
* typing indicator
* basic customisation
* guidebook 1
* fixed full
* markings, displacements, speech verb
* displacement fixes
* trailing newlines
* spelling moment
* brute damage sprites and blood fix
* guidebook iteration
* injection melee + ethanotoxin + guidebook rewrite
* guidebook
* guidebook
* nitpicks + roundstart
---------
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>
* Allulalo tooshotforui bugfix (#3598)
* yay
* p[leebnmar
* oops
* Allulalo Markings (#3602)
* eye markings and two tails
* more
* almost got ya
* yup
* wings yay
* thank you landshark for my life btw
* still needs loc files
* Update allulalo.ftl
* I lost so much progress to git bullshit
* and who can forget dear rat boy
* touch up speech indicator at yesters request
---------
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
* Allulalo Roundstart (#3621)
* yup
* shock blanket + pleebnar fixes
* yuuup (#3655)
* Allulalo fix pass 1 (#3661)
* what if I did it all in one commit like a total moron
* yup
* untuch
* i love you spriting tool
* my birdsty
* Update allulalo.yml
* Update Species.xml
* let allulalo use holopads. (#3669)
* adds a white list for the too small component to add specific allowed entities. e.g holopads
* imp comment
* i love forgetting white space!!!!
---------
Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
* fix (#3693)
* I need to learn to not do everything in one commit (#3750)
* mime on again (#4243)
* Small fix
* Add them to our accentless trait
* Add unable to wield system
* Fix too short for UI using old blacklist methods
* Fix duplicated localization line
* Add heavyweight drunk comp (might merge this with lightweight later)
* Why was this even added
* Revert "Add unable to wield system"
This reverts commit cbe3a10fc7.
* Revert "Fix too short for UI using old blacklist methods"
This reverts commit 833743f029.
* add TooShortForUIComponent (#3495)
* add TooShortForUIComponent
* correct documentation
* incomplete documentation
* add UnableToWieldComponent (#3496)
* Fixing this again I am dumb I cherrypicked things in the wrong order
* WHY WAS THIS EVEN ADDED THERE'S NO SPRITE EVEN ON IMPSTATION???
* Port Allulalos to Nubody
* Fix for Allulalo chems doing nothing
* Add allulalo to the guidebook species list
* Restore some accidentally deleted effects and comments
* Fix typo that made allu blood 10x more alcoholic than normal
* Delete random misplaced sprites from cherrypicking
* More of the random sprites removal (this time from the meta)
* Add missing allulalo flavor
* Removed some nonexistant fields from the species
* Add unisex cough/sneeze, comment out Wuhey and Ungh emotes
* Fix guidebook not using loc string
* I THINK this fixes that test error and it doesn't seem to break anything either so let's try
* Remove unsupported unshaded shader from eyes
* Ok last one didn't work (sorry for trial and error)
* Removed mention of HARMPACKs and Tether Guns from the guidebook.
* Blacklist allulalos from random humanoid spawns
* Add missing allulalo gulp sound
* Carriable in 1 hand allulalos, fix carrying system blocking both hands always
* Remove DV comments
---------
Co-authored-by: Kip <32859367+kipdotnet@users.noreply.github.com>
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>
Co-authored-by: sev7ves <58966116+sev7ves@users.noreply.github.com>
Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
Co-authored-by: Yesteryear <208338078+yesteryuri@users.noreply.github.com>
* trico no longer heals when mob is crit, and no longer heals rad
Tricordrazine no longer heals when mob is crit and no longer heals radiation damage.
* Inverted crit mobstate -> alive mobstate
* verb category
* voltage toggle comp
* move stuff
* add simple prototype
* implement verb action
* switch expression
* fixed the node not updating
* charge the battery
* fixed battery not charging
* spawn on battery level system
* finally works
* swap commentary position
* can only anchor the extractor on the station
* popup message for trying to anchor outside of station
* default placement for unanchored version
* ops
* fix body type
* commentary
* update visuals of power consumer
* add custom sprite
* fix light layer not changing
* xenoborg circuit
* fix xenoborg circuit
* add tag
* add hand to hold xenoborg circuits
* move to material
* add xenoborg circuit material
* add recipe to mothership core
* add a hand to hold circuits to the mothership core
* to not confuse
* update
* ops
* another ops
* update mothership
* update guidebook
* update values
* more info
* fix stack
* can store xenoborg circuits
* description
* also update description
* circuit -> crytal
* not modified from anything
* update description
* Revert "update mothership"
This reverts commit 84974c56afadac2a99ed2a166244a668d83fff48.
* update empty label
* small update to sprite
* not necessary code
* remove empty line
* color
* make it explode when destroyed
* change values
* update sprite
* update sprite
* make it eletrified
* flavor text
* simplify to only use charge
* subscribe to event
* new line
* remove popup
* no need for the setter
* no longer networked
* feedback popups
* Minor tweaks
* better to understand
* better now?
---------
Co-authored-by: beck-thompson <beck314159@hotmail.com>
* Update toxins.yml
* poison!!!!
* I hate solutions sytem I hate solutions sytem I hate solutions system
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Refactoring
* Last PR
* forgot to switch
* Redone Psionic System
* more refactoring
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Another refactorio
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* I don't know why I tried to overcomplicate this I could have just made it a popup message from the start instead of wasting three hours
* another big refactorio
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update lighthouse.yml (#4849)
* Pebble hotfix 1: Added ore processor (#4874)
* Added ore processor
* Forgot grills
* Automatic changelog update
* Terra: The Holiday Episode (#4843)
SNOW
* Automatic changelog update
* Academy 1.3.0 (#4863)
* * make festive for winturrr
* fixed emergency light in viro checkpoint
* fixed always on light outside dispo
* fixed light
* Map Edits: The Hive (#4887)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* Map Hotfix: Tortuga (#4878)
* Map Hotfix: Tortuga
* invalid
* Circuit imprinter
* increase detective 1->2
* return of the circuit imprinter
* fish power
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* And another one!
* Fix yaml linter
* Fix mapping section in CONTRIBUTING.md (#4894)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Give dummy avali and chitnid moth eye sprites (#4884)
1 commit ops
* Midpoint Festive Season (#4891)
* Midpoint Festive Season
* Made frosty lights not be powered by festive magic
* Automatic changelog update
* Make pride clothing be able to chameleon into similar pieces of pride clothing (#4845)
* Expedite gender reassignment (#36894)
* Remove Misgendering (#40425)
fix misgendering
* make pride scarfs and cloaks chameleon
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* add missing comments
* Attempt Toby's suggestion: rename chameleon stuff
* rename the chameleon verb & window
---------
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* kill speedboots (#4883)
* remove speedboots
* no more reverse engineering
* Update Resources/Prototypes/Research/civilianservices.yml
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
---------
Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Automatic changelog update
* Centcomm roles QOL (#4880)
* first commit yippee
* ERT now gets centcomm implants too. Also fixes ERT not having death rattle implants
* Always bigger fi- oh nevermind (Feroxi Emote) (#4877)
* feroxi changes
Wideswing,10 pierce, tail thump, better storage of body emotes for feroxis
* Direction Changes
Removed wideswing dropped feroxi melee back to 7
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
---------
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
* Automatic changelog update
* Update Credits (#4897)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
* Add Chemical, Paramedic, and Surgeon wall lockers (#4899)
* woo wall lockers!
* chemical
* clean up
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Fix respawn timer (#4895)
* fix
* Automatic changelog update
* Demetashield epsilon part 2 (#4481)
* demetashield epsilon part 2
* bug fix
* annoucement.yml fix
* some redundant stuff removed
fix
* Make the cane loadout group include the librarian cane (#4904)
* Atmos Ops: dP Guidebook Entry (#4906)
Atmos dP Guidebook Entry (#40194)
* Add Atmos dP guidebook
* Update Resources/ServerInfo/Guidebook/Engineering/DeltaPressure.xml
---------
(cherry picked from commit a93f6b8cdf)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Automatic changelog update
* Xenoarch tweaks (#4486)
* Initial glimmer change
* Added glimmer multiplier
* Adds scalar of research properly like the old glimmer system
* Left over code
* Glimmer changes for Analysis Console UI
* Accidental Namespace added
* Fixed small Math issue with glimmer values
* Fixed reference to Nyano
* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Fixed Deltav comment references
Went though various files and added comments to signify where delta v changes are to the upstream code
* More DeltaV Comment fixes
Added a few more comments for DeltaV specific changes, I also removed an unused line of code, and renamed to variables for better clarity
* Commenting and moving one file to _DV
I cant read apparently and only saw some fixes requested, here are the rest apologies
* Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Shared/Content.Shared.csproj
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Shared/_DV/Xenoarchaeology/BUI/AnalysisConsoleBoundUserInterfaceState.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Addressed issues of cleaning up a function to one that already exists, restoring an old comment from upstream, and moving localization data to _DV folder
* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
* Missed one line to bring over to _DV
* Fixed github and IDE complains about null ref
---------
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
* It Snew On Lady Elegance (Christmas PR) (#4903)
* Update elegance.yml
* Update elegance.yml
* those who snow
* nukes the tattered cloak for real
* Update elegance.yml
* Automatic changelog update
* Winterhouse (#4910)
Update lighthouse.yml
* Hivemas (#4898)
* Hivemas
* variantize
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* It's a Tortuga Xmas! (#4893)
* It's a Tortuga Xmas!
* ...
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* Reinforced Tinted Windows (#4875)
* completion
* fix
* moved directories
* fixed
* Apply suggestion from @Toby222
Signed-off-by: Tobias Berger <toby@tobot.dev>
---------
Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* Automatic changelog update
* Manual changelog update
* Manual changelog update
* Harpies Flightless No More! (#4888)
* Initial port of EE Harpy flying (#919)
* Added better friction and acceleration modifiers.
* Moved server's flight system to shared. I don't know why it isn't in the first place.
* Shifting things around.
* Code tweaks to make it better
* Comment fixes
* Fixed footsteps and footstep sounds
* Added a quick conditional if InitialStaminaCost greater than zero
* Removed a pop-up that wasn't showing
* Additional adjustments
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fixed a few more systems to call the Flying system instead of the component
* Comment consistency. DeltaV comments where I made it better. EE comments where they originally had things
* YAML fixes
* Guidebook
* Apply suggestions from code review
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Removed DoAfterDashEvent
* Fixed suggestions
* Updated comment
* Added new copyright free wingflaps with proper attribution
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Appeased YAML gods
---------
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* Automatic changelog update
* Adds nightvision to rat kings and xenos (#4881)
* ISeeDeadPeople
* Apply suggestions from code review
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
---------
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Automatic changelog update
* Give custom laws to Salv Borg (#4866)
* Give custom laws to Salv Borg
Give a custom lawset to salvage borg
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* updated laws explain it better and look cleaner
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
* Update laws.ftl
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
---------
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Automatic changelog update
* Protect arrivals and evac from meteors (slightly) (#4820)
* Protect arrivals and evac from meteors (slightly)
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* change meteor protection zone to a MarkerBase
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* xenoarch: remove impossible artifact trigger combinations (#4740)
* xenoarch trigger combination blacklists
* minor review comments
* review comments
* Automatic changelog update
* xenoarch: node scanner UI overhaul (#4814)
* xenoarch: node scanner UI overhaul
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>
* Update Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>
---------
Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Automatic changelog update
* Syndie borg fixes (#4913)
* Moved law boards to their own file, similar to the structure that upstream uses.
* Fixed syndicate medical borg ghost role. Moved DV lawsets.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Feroxi: Blood in the Water (#4902)
* Added shark vision to Feroxi.
* Fixed a bug if someone was holding a container of blood.
* Updated pulse time and useDelay for the pulse.
* Updated guidebook
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Cleanup
* More clean-up
* Removed vision goggles sound from ability
* Got rid of an unused namespace
* last fix I swear
* Apply suggestions from code review
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Apply suggestion from @Toby222
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Removed SharedLightSystem from SharkVisionOverlay
---------
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* Automatic changelog update
* Byoin TEG burn chamber edits! (#4911)
Update byoin.yml
* Automatic changelog update
* Reinforced Tinted Windows Bug Fix (#4918)
fix
* Automatic changelog update
* Vulnerable String Sanitization (Prevent `cmdlink`) (#4922)
* Fix label markup escapeing (#40600)
fix
* Sanitize NanoChat
* Escape PDA Owner/Job
* Escape ID Examine
* Early merge of https://github.com/space-wizards/space-station-14/pull/41799
---------
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* 100% Ion resistance on Ninja Suit and Visor NVG. (#4916)
* Add NVG to visor, Ion Immunity and no EMP armor ignore
* Comments..
* .ftl from up to _DV
* Rewrote visor description.
* Remove ftl newline, forgor desc comment.
* Automatic changelog update
* AI HUD and Comms Update (#4905)
* test one
* Removed mind shield hud
* Automatic changelog update
* Syndicat ghost role description tweak (#4889)
* final tweaks I promise.
* minor desc change requests
* typo buh
* Automatic changelog update
* Chibi update 08DEC2025 (#4914)
* omg chibi so kawaii!~ >w<
* take a wild fucking guess
* cameras, fixrotations, tilewindows
* Automatic changelog update
* Fixes coffe typo (#4930)
* Add more festive holiday clothing to AutoDrobe (#4909)
* sprites galore
* no Santa monkey
* autodrobe
* cost up
* Automatic changelog update
* EntropicDegen Fix (#4931)
lol
* Automatic changelog update
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Merge Upstream
* One refactor to rule them all (#15)
* Add xenoborg laws to ion storm chance (#41532)
add xenoborg laws to ion storm chance
* Replace (almost) all existing storage fills with entity table container fills (#41360)
* Replace all existing storage fills with container fills, adjust some formatting to accomadate
* Forgot to remove that
* I really need to spell better
* Right, those are 3x3
* Change some NestedSelectors to GroupSelectors
* Actual container fills, test fix (maybe), and a few minor formatting changes
* Fix some more mistakes
* Forgot to add to that comment
* Some parenting fixes
* Test optimisation, maybe
* Roll holiday lights instead of individually listing it
* Move eletrical toolbox to NestedSelector
* Back to entity tables (except for vending)
* More nesting (and a TODO)
* Yet another fix
* Probably shoulda done it this way originally
* Entity tables for vending restocks
* I am good at formatting
* Make added table names consistent
* Make grand lottery weights a little more readable
* Use existing fills for bio suit crates
* Get rid of some more redundant amounts
* Nuke the StorageFill test section and update some comments
* Apply changes from code review
* Split off changes to vending restocks
* Split off changes to vending restocks
* Apply more changes from code review
* Attempt #2 of detangling this mess (oh shit I missed the pin)
* They look so similar
* I am great at formatting
* Missed a newline
* How did I manage to do that
* Move toy in FoodMealHappyHonkClown to top to prioritise
* Apply changes from review and move dank pizza to organise by weight
* Replace all storage fills with entity table container fills
* Balloons now float and slide smoothly. (#41102)
* The balloons became airy
* Attributions + Sound
* Add BaseBalloon
* Proto fixes
---------
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
* Add Whitelist.Components yaml valiation (#40916)
* Add Whitelist.Components yaml valiation
* poke_tests
* fix linter
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Remove blacklist methods in EntityWhitelistSystem (#40932)
* replace blacklist methods
* VS is trolling me
* Remove blacklist methods from fork changes
* Add test checking for multiple container fills, mark StorageFillComponent as obsolete (#41562)
add test, obsolete storagefill
* No more sub wizards in xenoborg preset (#41565)
no more sub wizards in xenoborg preset
* Fix gas filters (#41567)
fix gas filters
* Fix stunbaton component namespace (#34790)
* Fixed incorrect namespace
* .Components was weird so I removed it
* Predict powercells, chargers and PowerCellDraw (#41379)
* cleanup
* fix fixtures
* prediction
* fix test
* review
* fix svalinn visuals
* fix chargers
* fix portable recharger and its unlit visuals
* fix borgs
* oomba review
* fix examination prediction
* Fix and mark microwave time addition for BeingMicrowaved
* Fix for missing namespace in Nanochat
* Fix several systems and protos after powercell prediction change
* Fix typo in Ion Storm lawsets (#41574)
Pizzaria → Pizzeria
* Remove commented items (#41577)
* Tourniquets can now fit in medical belts (#41584)
* Fewer War Crimes (#41541)
* Fewer War Crimes
Re-colour the syndicate medical bags to not use the legally restricted Red Cross symbol and instead use the same blue cross colours as used across the rest of the game's medical symbolism.
Because no-one wants to go to the Hauge. Also consistency is nice.
* Update meta.json
* Update another meta.json
* Update meta.json again
additional detail
* Make gameticker spawn code more modular (#41588)
gameticker dospawn
* Meatball Salvage wreck remake (#41589)
Remake-Meatball-Wreck
* Update mothership again (#41491)
* add xenoborg recharging station
* it was backwards
* make it a tad darker
* touch ups
* add xenoborg blast door sprites
* update sprites
* add xenoborg blast door
* improve blast door sprite
* typo
* make it thinner
* update mothership
* moved yml lines
* updated xenoborg charger sprite
* removed unused state
* fixes to the mothership
* Fix helmet lights (#41599)
fix helmet lights
* Change thief backpack ui name and description with Component fields (#41583)
* Add new name and description fields to the thiefbackpack component and ui
* Change fields to locids, remove Title from menu.xaml, add comments to thiefbackpackui.cs
* Helper method for get charge level (#41601)
* get-charge-percent
* review
* Adds option to whitelist or blacklist store entries based on buyer objectives (#41493)
* BuyerObjectiveWhitelistCondition done
* fix to check every buyer objective for a blacklisted objective before checking whitelisted objectives
* resolved requested changes
* forgot a line
* Update Content.Server/Store/Conditions/BuyerObjectiveWhitelistCondition.cs
* Replaced IsBlacklistPass with IsWhitelistPass
* cleaning up
* placed whitelist == null check above objective loop
* Moved empty whitelist check below foreach loop
* final cleanup i pray
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Fix looking at verbs causing sounds or popups (#41609)
* fix verb popups
* spelling
* Properly document AtmosDeviceEnabled(Disabled)Event (#41613)
kill misnomers
* Felinase/Caninase Reagent Tweaks (#41527)
* Tweaked reagents required for recipes, increased output of recipe, lowered time of accent per unit, and tweaked chem thresholds
* tweaks
i was lazy
* product change
lazy again
* yuh
* pluh
---------
Co-authored-by: NoreUhh <noreuhh@gmail.com>
* Change to add shot glasses to the bartender guidebook entry (#41618)
adds shot glass to bartender guidebook
* Add StatusIcon component to MobBaseAncestor (#41624)
add StatusIcon to ancestor
* Make xenoborg round end text better (#41623)
* make xenoborg win color easier to read
* display the max number of xenoborgs and the number of crew alive in the end
* make it a datafield
* add : (literally)
* add period
* make text better
* Fix EquipmentVerbs not showing up in strip menu (#41631)
commit
Co-authored-by: iaada <iaada@users.noreply.github.com>
* Fix clientsided alerts being overwritten by server (#37033)
Initial commit
* Predict borgs (#41600)
* predict borgs
* small fix
* fix MMI item slot serialization
* fix movement speed for mothership core
* review and minor improvement
* fix resolve
* review
* predict name identifiers (#41605)
* Make Firespread logical (#41636)
* FIRE
* code comment fix
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* fix rcd overlay getting stuck for borg modules (#41648)
fix rcd overlay getting stuck
* Add water flower for clowns (#41469)
* Spray!
* Add to clown loadout
* Fix the easy things
* lot nicer
* spray update..
* Fix yaml
* fixes
* changed it to warning!
* review
* review
* sku
* multi reagent bloodstream (#41489)
* multi reagent bloodstream
* pluralize the comments
* fix TryModifyBloodLevel return logic
* now with quantity
* now with solution
* implement suggestions
* fix forensics
* minor thing
* Nevermind undo that caps matters.
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Fork fixes for multi reagent bloodstreams
* [HOTFIX] FIX LIGHT MELEE LOGS (#41655)
God fugcking
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Add Changeling DNA store (#41632)
* created changeling dna currency and locale currency name
* created changeling store category, created changeling-catalog.ftl
* added store and action to Urist McLing
* found the entity
* make armblade a purchase
* comment
* created ApplyToMob datafield and applied to armblade
* ApplyToMob check in storesystem
* Update Resources/Prototypes/Catalog/changeling_catalog.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Fix Damageable API (#41657)
Fix damageable api
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Add debug hitscan weapon (#41658)
* debug gun
* predict
* fix AI battery alert (#41879)
* fix AI battery alert
* fix copy paste error
* Fix rigged power cells exploding early (#41813)
* fix riggable
* fix
* Unify BatteryComponent and PredictedBatteryComponent (#41867)
* unify
* cleanup and merge conflicts
* floating points
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Downstream fixes for battery unification
* Fix xenoborg modules (#41625)
* change name from heavy laser to laser cannon
* fixed some ids
* fix name and description
* change cost of upgrade modules
* remove unwield penalty
* commentary
* change name of scout modules
* same firerate as before
* typo
Co-authored-by: āda <ss.adasts@gmail.com>
* new line at end of file
* duplicated
---------
Co-authored-by: āda <ss.adasts@gmail.com>
* Only run StationPowerTests over stations in DeltaV
* Five bounty arbitrage fixes (#41846)
* commit
* tweak
* more bounties
---------
Co-authored-by: iaada <iaada@users.noreply.github.com>
* Stop the laser gun bounty allowing LaserTag guns
* Fix power draw on Defib cabinet when not charging anything
* Mail Cart (#41482)
* Add mailcart crate type
* Add recent progress, move location of mailcart.rsi
* Allow letters and packages to be inserted
* Add updated sprites for mailcart
* Add storage for letters
* Bugfix for sprite
* Add fix for mincount mailcart sprite updates
* Add dynamic names to packages in mailcart
* Add additional whitelist items
* Update tag comments
* Remove max item size
* Update fixture for mailcart, remove unused code from crates.yml
* Add mail cart to cargo ordering
* Update meta.json
* Remove unused comment
* Update copyright
* Add missing ContainerContainer
* Update ContainerContainer
* Revert "Update ContainerContainer"
This reverts commit 1805dcd58d8c0f52baca9db0d3173940ee241159.
* Remove container slots and increase storage
* Remove unused tags
* Remove LetterDelivery tag
---------
Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
* fix solution contents duplication on spill behavior (#33231)
* I’M SCREAMING INTO THE VOID AND IT’S NOT LISTENING
* review
* explodes pancakes with mind
* graaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
* Meteors RAAAAAAAAAAH
* I'm so tired of solutions
* whhop
* revert
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Disable xenoborgs at roundstart
* Fix issue with weaponUids not being passed correctly for weapons used by entities
* Upa APC max load to 40 kW
* Use existing hardsuit extra table
* Move xenoborg lawsets above DeltaV
* Apply #41583 to all thief stash-like entities
* Also apply #41149 to all magazines and ammo boxes
* 1984 engineering holoprojector
* change to 6 charges
* Security longcoat resprite (#5288)
* My coats are so long
* making the hos longcoat more hoslike
* Automatic changelog update
* Printable plasteel (#5284)
* Printable plasteel
* Actually make it a bit faster
* Move to that other recipe pack
* Recipes are named after their result
---------
Co-authored-by: Tobias Berger <toby@tobot.dev>
* Automatic changelog update
* Disable Wizard until Rebalanced (#5228)
* Remove wizard from midround antags until rebalanced
* Removed wizard from roundstart antags
---------
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
* Automatic changelog update
* Apply #41461 to _DV security borg modules
* Tank Dispenser Recolor (#5267)
* Add files via upload
Tank Dispenser Recolor
Signed-off-by: Thingy461 <darmentici@gmail.com>
* Add files via upload
Minor tweak to vending machine YAML for tank dispenser recolor
Signed-off-by: Thingy461 <darmentici@gmail.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fix line endings
* Apply suggestions from code review
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Apply suggestion from @ShepardToTheStars
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
---------
Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
* epic grammar ops
* hotfix-plasteel (#5298)
* Automatic changelog update
* Make unholy water actually have a color (#5312)
make unholy water actually have a color
* Tiny things not worth requesting changes for
* Changelog stuff!
* Merge pull request #5293 from Pharaz4/cherrypickattempt
LIZARDS GET TAILS ON HARDSUITS!!!
* Automatic changelog update
* Remove Syndie comms from disaster victims and guards (#5280)
* remove syndicomms from disaster victims
* removed from syndicate guard as well. (dropship ruin has a guard)
* fix harpy wing showing on cc hardsuit
* Automatic changelog update
* Halve Space Law Sentencing Times (#5249)
* Reduce times in space law and SOP, in guidebook and wiki
* cat c 12 minutes instead of 10
* update crime assist
* CentComm stuff (#5315)
* CentComm stuff
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* hmm...
---------
Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Add missing link in changelog
* Uncloneable in my medical scanner? Yes. (#5310)
* Update OrganManipulation.xml
* Merge branch 'DeltaV-Station:master' into master
* Merge branch 'DeltaV-Station:master' into master
* Merge branch 'DeltaV-Station:master' into master
* no more taser!
* Merge branch 'DeltaV-Station:master' into master
* Merge branch 'DeltaV-Station:master' into master
* Merge branch 'DeltaV-Station:master' into master
* Merge branch 'DeltaV-Station:master' into master
* Merge branch 'DeltaV-Station:master' into master
* MMm yummy fixes
* Adsd the UNcloneable to the scanner!
* fixing some guidebook things about the cloning
* Fixed the guidebook entry
* undone a change to splaw
* textlinkd
* COMMENTS RAHHHHH
* Update CryoPodSystem.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
* Update HealthAnalyzerSystem.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
* Update HealthAnalyzerSystem.cs
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
* Automatic changelog update
* Health Analyzer Uncloneable Refactor (#5330)
* Partial revert of #5310
* Refactored uncloneable out of the HealthAnalyzerScannedUserMessage BUI.
* Automatic changelog update
* Centcomm fixes (#5321)
* Automatic changelog update
* epic guidebook ops
* fix EngieeringRegulations type
* minor fixes
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update Credits (#5341)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
* Invisible Guitar Wield Bugfix (#5331)
chec
* Automatic changelog update
* Brigmed Beret (#5333)
brigmed
* Automatic changelog update
* bandolier buff? tweak? (#5313)
ok functional
* Automatic changelog update
* Port admin logging of AAC messages (#5309)
fix: Admin log AAC tablet messages
* Automatic changelog update
* Changed enabled mapped pressure pump to 300 kpa (#5336)
lowered pressure by 10 kpa
* Automatic changelog update
* Port sneaking status icon from Lagrange (#5308)
* Make the icon for sneaking show sneaking status (#358)
* Make the icon for sneaking show sneaking status
* Specify sprite
(cherry picked from commit dd5fa91e1e1b9f350f7dac15579430d503b2ab6b)
* Update from review
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
---------
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* Automatic changelog update
* Updates random solar panel spawner (#5323)
* Updates random solar panel spawner
* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
---------
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* feat: Add a few bowls to the perma chefvend (#5304)
* Automatic changelog update
* The Reclaimer MK2 returns! (#5245)
* The Reclaimer returns
* Added the ability to name GridSpawns with a specific name
* formatting
---------
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
* Automatic changelog update
* Midpoint Updata: CC now have an office on Midpoint (#5231)
* Midpoint CC
* Update maps.yml
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fixed spelling!
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Feroxi Wagging (#5319)
* uno
* fix
* fml
* mark 2
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Fix harpy ERT, CC, suits (#5325)
* Fix harpy ERT suits (not elite ones, change enabled mapped pump from 310kPa to 300kPa.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* fix harpy suits not working (probably)
* fix the harpy suits not displaying
* Fixed Lizards missing a sprite for the rhino hardsuit, also some minor comment adjustments
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Hid upstream ERT spawners
* added 3 sprites for reptiles
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* fix firesuit (And its namespace) and add rd suit sprite for lizards
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* elite ert sprites because toby hasnt reviewed yet
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* still not merged so im adding this, will fix debug test failing on prs
* fixed attributions
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Emagnum patch (#5352)
* Update projectiles.yml
* Now that I’m thinking about it giving it opaque could lead to unintended interactions
* Apply suggestion from @ShepardToTheStars
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
---------
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Update Credits (#5356)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
* Small Pebble fixes (#5347)
* Small Pebble fixes
* Small pebble fix
* Automatic changelog update
* Byoin and Basu update (#5232)
* Byoin and Basu update
* Byoin Fixes
* more small edits.
* minor fixes
* Automatic changelog update
* Shoko update (#5334)
* Updayed shokou to modern standard, see pr for more info
* changed stuff based on feedback in discord
* added mailing unit between botany and chem. fixed window in bathroom. added to the 4th wall breaking note in station anchor.
* fixed mail unit placement in botany
* added drain to salv airlock and disposals. redid parts of epistemics. redid perma bathroom and removed condiments. added colors to atmos pipes and changed up the pipe layour of distro and waste. added firebot to teg room.
* added salvage job board to salv dock
* made changes based on feedback from FC
* fixed missing change
* Automatic changelog update
* Map Hotfix: The Hive (#5368)
* Map Hotfix: The Hive
* switcheroo
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* Hotfix: Obliterated the second LO locker on Pebble (#5371)
Obliterated the second LO locker
* Automatic changelog update
* adds 4 new ruins based off of /tg/ stations space ruins. (#5283)
* adds 4 new ruins based off of /tg/ stations space ruins.
* fixed up window missing a grille and made mines a 33% chance to spawn instead of garuntee
* Automatic changelog update
* Update Credits (#5383)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
* the fabled single line change
* Update PlayerProvidedCharacterRecords.cs
* Revert Soretizone buff (#5307)
* Update medicine.yml
Update medicine.yml
Update medicine.yml
Revert "Update medicine.yml"
This reverts commit 905c5cac07.
Update medicine.yml
* Update medicine.yml
* agono make you numb also
* condenser power usage change (10kW ->2kW) (#5365)
* Auto label port
* Make it so it works/comments
* Post review changes.
* Post review change part two.
* review pt 3
* Fixed client UI from not getting updated.
* Gas condenser power usage to 2k
---------
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
* Automatic changelog update
* shoko update numba 3 (#5401)
* shoko update numba 3
* 88 LINES ADDED 82LINES REMOVED
* Automatic changelog update
* Fix pew sprite, benches, and make these benches constructible. (#5375)
* fix pew sprite, fix incorrect labelling of benches and sofa, add snapgrid center to benches
* make it so you can construct/deconstruct and relocate namespace
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Add migration
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* Fixes to suffix (#5353)
* Reverts Arena weapon spawner change (#5322)
Reverts change from prob to weight
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Removed a dead pixel on a book sprite (#5362)
* Update Credits (#5413)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
* Hotfix: Pebble, small changes. (#5415)
Pebble fixes
* Automatic changelog update
* Lighthouse Tweaks... again... (#5246)
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Automatic changelog update
* old_infiltrator hotfix (#5405)
* oldinfiltrator hotfix
* put command corpse spawner and add exception for cc loot to the infiltrator ruin
* fix wrong file path
* webedit
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
* fuck github
---------
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
* Removed ability for limbs to be trashed
* removed bodyparts ability to be placed in trashbag
* Removed estoc slowdown (#5242)
* Removed estoc slowdown
* Re-added speed penalty, but reduced to 0.9x instead of 0.75x
* Automatic changelog update
* Adding purifying salt to the med vend, and a new cryo chem for holy and shadow (#5276)
* new cryo chem and adding topicals to medivends and med's techfab
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* me when dumb and tired and on phone
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* woof
* Update Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* Update Resources/Prototypes/_DV/Reagents/medicine.yml
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* ok maybe that fixes it if not will look at later
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* did the />
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
---------
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Automatic changelog update
* Asterisk fix (#5373)
* first part
* last one
* last
* last one maybe
* last fix
* Automatic changelog update
* Academy 1.6.0 (#5412)
* boxketball court is wooden again
* gave botany a window and moved their machines around, extra crate, extra tools
* added masks to clown and mime rooms, someone complained "it's barren"
* fixed hop diectional sign above robo
* added crashcart to med and viro
* added mailcart to mail
* converted maint passage to hallway between epistemics and cargo, and updated directional signs
* removed christmas cakes from kitchen and cargo cafe
* replaced winter with spring/summer
* added gold and silver to cargo
* Automatic changelog update
* Automatic changelog update
* add emoting component to skia (#5366)
* Automatic changelog update
* Fix shrapnel landmines not triggering properly (#5379)
* Fix shrapnel landmines not triggering properly
* Re-enable landmines in the landmine entity table
* Automatic changelog update
* Make the chemvend's bluespace beaker only available through an emag (#5392)
* move the chemvend bluespace beaker to emaggedInventory
* forgot to commit
* Automatic changelog update
* removing machine pistol mag compatability for the viper and pollock and fixing practice mags (#5296)
* sighs
* :3 oopsie daisy,,,,,
* adding the thingy
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* Fix comment
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
---------
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
* Automatic changelog update
* New Gun Safe Sprites (#5314)
* Automatic changelog update
* Automatic changelog update
* Automatic changelog update
* infested frigate ruin fix (#5431)
* Automatic changelog update
* Merge pull request #5218 from DisposableCrewmember42/conspirator-port
feat: add Conspirators from Harmony
* Automatic changelog update
* Slavic Accent character trait (#5264)
* port slavic accent
* change some replacements
* bobr
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* eliminate redundant regex
* bozhe moy
* order matters
* Merge branch 'master' into slavicAccent
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Apply suggestions from code review
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
* Update Content.Server/_DV/Speech/EntitySystems/SlavicAccentSystem.cs
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
* tryfix
* Merge branch 'slavicAccent' of https://github.com/zelezniciar1/Delta-v into slavicAccent
* Automatic changelog update
* Free Suit Storage (#5300)
what fun
* Automatic changelog update
* Elegance Update Number I Lost Track (#5387)
* Update elegance.yml
* holy shit is that kris deltarune
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* dghjdsgjkdfs
* that one random brick decal under the window:
* stuff
* Kill that line
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
* Kill that line 2 but it's actually redoing them
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
---------
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Crusher Right Click Wideswing (#5327)
commit
* Automatic changelog update
* Map Edits: The Hive (#5438)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* Reclaimer MK2 hotfix (#5440)
Fixes#5428
* Map Edits: Arena (#5445)
* Map Edits: Arena
* AI router
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* PKA fixes try 2 (#5311)
* easier to just redo the PR rather then fix the old one
* remove comment
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
---------
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* Automatic changelog update
* fix: (re)remove forced accents (#5343)
fix: (re)remove clothing/item/role-forced accents
* Automatic changelog update
* Let Engineering choose their starter suit (#5317)
* test
* a lot of stuff
* Changed voidsuit speed to 15%. Added a locker variant to just have the hardsuit, with a shitty id
* test re-run
* deltaV addition comments
* goob copyright (just in case bro, don't sue us)
* Automatic changelog update
* Add new Lobby and Jukebox music by Darklyac (#5424)
* darkylac muisic real
* the time
* Automatic changelog update
* Add cloth wraps (#5335)
add cloth wraps
* Automatic changelog update
* Borg Crew Monitor Fixes (#5342)
* Update handheld_crew_monitor.yml
* suggested clarity
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Automatic changelog update
* Update Credits (#5453)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
* Edge fix (#5439)
* Edge
* Edge Part two
* Edge final
* Automatic changelog update
* move bluekies to DV namespace (#5414)
* move bluekies to DV namespace
* FIX FAIL
* fix harpy paramed suit
* Automatic changelog update
* Remove ballistic reflect from energy swords (#5429)
* reduce reflect chance on ninja and cult swords Energy weapons by default now only reflect energy projectiles
* Revert "reduce reflect chance on ninja and cult swords Energy weapons by default now only reflect energy projectiles"
This reverts commit 444d9a4921.
* Energy swords only reflect energy shots
* Enable wizard's teleport scroll and wizard's den map (#5215)
* Enable wizard's teleport scroll and wizard's den map
* mapPath
* longer cable in cave
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* add blacklist to cigpackbase for chems (#5402)
* add blacklist to cigpackbase for bottle and vial
* hold up i forgot half the shit
* Automatic changelog update
* Tweak the Health Analyzer Triage System (#5110)
* guh
* applied suggestions + made medical access only
* Automatic changelog update
* Minor Rat King Tweaks (#5326)
* baby rat king tweaks
* requested changes
* Automatic changelog update
* Port over Funky's unary pipe layers (#5372)
* port over funkies unary layers and put them under _funky namespace
* fix construction thingies having names that cause yaml linter to fail
* why does yamllinter not show errors on my machine
* Apply suggestions from code review
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* addd attributions
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
* add attributions 2
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
* add attributions 3
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
* Update Resources/Prototypes/_Funkystation/Entities/Structures/Piping/Atmospherics/alt_layers.yml
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
---------
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
* Automatic changelog update
* Hos Aura Buff (#5425)
* that should do it
* copyright update
* more work done
* Rename Icon.png to icon.png
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
---------
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
* Automatic changelog update
* Map Edits: Tortuga (#5437)
* Map Edits: Tortuga
* Additional changes
* Passive vents
* oh yeah
* review fixes
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* Submarine Fixes (#5394)
MASS UPDATE
* Automatic changelog update
* Map Edits: Evac Shuttles (#5457)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Automatic changelog update
* Lighthouse Arrivals (#5419)
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Update lighthouse.yml
* Automatic changelog update
* Update division.yml (#5465)
* Terra Hotfix 4 - It's Alive! (#5432)
* Terra Hotfix 4 - It's Alive!
* Removed all bombing targets from warp points
* Renamed Vault substatin, extended cargo dock, added AI restore to AI Sat, changed arrivals screen
* Automatic changelog update
* fix missing exception on lavaland ruin (#5472)
* Elegance Engineering Crates Hotfix (#5468)
* Update elegance.yml
* Update elegance.yml
* Update elegance.yml
* Automatic changelog update
* Merge Upstream
---------
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: Samuka <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Hohenzolaren <153686236+ReWAFFlution@users.noreply.github.com>
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Jessey van Hoeijen <114107545+LMSNoise@users.noreply.github.com>
Co-authored-by: Stefano Pigozzi <me@steffo.eu>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: CDWimmer <31413434+CDWimmer@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: NoreUhh <85219416+NoreUhh@users.noreply.github.com>
Co-authored-by: NoreUhh <noreuhh@gmail.com>
Co-authored-by: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Noah Beverly <noahbeverly@gmail.com>
Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Co-authored-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Co-authored-by: Thingy461 <darmentici@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com>
Co-authored-by: Theo <rebe83a@gmail.com>
Co-authored-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DeltaV-Bot <github@deltav.gay>
Co-authored-by: verybigman <171044200+verybigman311@users.noreply.github.com>
Co-authored-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
Co-authored-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: marigauge <thesaiyandude3@gmail.com>
Co-authored-by: MD360 <74264906+MantasDab360@users.noreply.github.com>
Co-authored-by: Katie <Katiethekater@gmail.com>
Co-authored-by: turtlemutt <wolfybriggan575@gmail.com>
Co-authored-by: Hamey <jhammett3229@gmail.com>
Co-authored-by: Woljif <243318409+Woljif@users.noreply.github.com>
Co-authored-by: snowywinters <134970424+snowywinters@users.noreply.github.com>
Co-authored-by: biddygelson <4606269+Calis007@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Cepelinas1 <kakelis01@gmail.com>
Co-authored-by: wesker <53323309+weskified@users.noreply.github.com>
Co-authored-by: pootslap <211648338+pootslap@users.noreply.github.com>
Co-authored-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: SirrRequiem <webrules11@yahoo.com>
* Revert "One refactor to rule them all (#15)"
This reverts commit b2a2613ad7.
* fix fails
* THE LAST REFACTOR
* Fix test fails
* more test fails
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Test fails BE GONE
* small fix
* Remove Mime powers from Psionics
* Adress Initial Reviews
Co-Authored-By: BarryNorfolk <190395382+BarryNorfolk@users.noreply.github.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fix csproj file
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Fix the other
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Adress other review
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update Content.Shared.csproj
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Remove CSProj change
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Erase empty space
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* das
* UNTOUCH THE GODDAMN FILE
* untouch file
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
* Fix goidacode
* Merge fixes
* Adhere to the messaiah
---------
Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Signed-off-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: turtlemutt <wolfybriggan575@gmail.com>
Co-authored-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: SirrRequiem <webrules11@yahoo.com>
Co-authored-by: biddygelson <4606269+Calis007@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
Co-authored-by: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com>
Co-authored-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DeltaV-Bot <github@deltav.gay>
Co-authored-by: Stxcking <tamthaotran5@outlook.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Cepelinas1 <kakelis01@gmail.com>
Co-authored-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: verybigman <171044200+verybigman311@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Co-authored-by: MD360 <74264906+MantasDab360@users.noreply.github.com>
Co-authored-by: snowywinters <134970424+snowywinters@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Minerva <218184747+mnva0@users.noreply.github.com>
Co-authored-by: Samuka <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Hohenzolaren <153686236+ReWAFFlution@users.noreply.github.com>
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Jessey van Hoeijen <114107545+LMSNoise@users.noreply.github.com>
Co-authored-by: Stefano Pigozzi <me@steffo.eu>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: CDWimmer <31413434+CDWimmer@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Co-authored-by: NoreUhh <85219416+NoreUhh@users.noreply.github.com>
Co-authored-by: NoreUhh <noreuhh@gmail.com>
Co-authored-by: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Noah Beverly <noahbeverly@gmail.com>
Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Co-authored-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Co-authored-by: Thingy461 <darmentici@gmail.com>
Co-authored-by: Theo <rebe83a@gmail.com>
Co-authored-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Co-authored-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
Co-authored-by: marigauge <thesaiyandude3@gmail.com>
Co-authored-by: Katie <Katiethekater@gmail.com>
Co-authored-by: Hamey <jhammett3229@gmail.com>
Co-authored-by: Woljif <243318409+Woljif@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: wesker <53323309+weskified@users.noreply.github.com>
Co-authored-by: pootslap <211648338+pootslap@users.noreply.github.com>
Co-authored-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
Co-authored-by: BarryNorfolk <190395382+BarryNorfolk@users.noreply.github.com>
* Ammonia restores Rat King Bloodlevel
Adds a saline effect to ammonia for creatures with the rat metabolizer type condition (aka, rat kings)
* error fix
code did not like amount under condition so fixing that, and restoring amount to 1 to be identical to how it was working in the video. amount 6 was comical levels of blood restoration
* changed omni OD to 21, combat medpen to 20 omni and 10 tranex
* Changed comments to reflect the previous values
Signed-off-by: Radezolid <snappednexus@gmail.com>
---------
Signed-off-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
* Omni has 20u OD and removes other chemicals from bloodstream at a rate of 1
* Include mention of cell damage in description
* Revert "Include mention of cell damage in description"
This reverts commit a0cd827ce0.
* fix comment and desc
* Untouch medicine.ftl
Signed-off-by: Radezolid <snappednexus@gmail.com>
* Update medicine.yml comments
Signed-off-by: Radezolid <snappednexus@gmail.com>
---------
Signed-off-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
* Main Implementation
* Hidden Species basics
* Modified CVar to be a single variable, fixed some errors
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Quiet RSI Warning
* Typo fix
* Force touch to shup up RSI Validator?
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Attempt 3 to shut up rsivalidator?
* Desperation.png
* Remove bad folder. Whoops
* Whoops, Fix poisoning the atmoshpere
* Untouch
* Yesbutwhataboutsecondfix
* Resolved issues
* Gave motorkind intrinsic radios. Whoops
* And unlockable
* Minor Fixes
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Conglomerartes Horns, fixes Motorkind Encryption keys
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fixed fuel digestion
* Made bonk multiplier explicit.
* Removed unused field
* Many fixes
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Tweaked reagents required for recipes, increased output of recipe, lowered time of accent per unit, and tweaked chem thresholds
* tweaks
i was lazy
* product change
lazy again
* yuh
* pluh
---------
Co-authored-by: NoreUhh <noreuhh@gmail.com>
* Renamed InPain to ChronicPain. Changed references.
* Updated meds to use the name status effect system for chronic pain suppression. Standardized popup chances for all meds.
* Migrated ChronicPain to the new Status effect system. Basically re-wrote it and re-organized it.
* Cleanup and tweaks.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fixed cloning traits for pain.
* Addressing Milon-san's feedback uwu
* Apply suggestions from code review
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Turned floats into TimeStamps.
* Derp
* Forgot the trait lol
---------
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* harpy suffocate in the presence of trace pollutant gases
(cherry picked from commit 1a618f3f12716d22c3879ba0760c83d6419a2fd6)
# Conflicts:
# Resources/Prototypes/_DV/Body/Organs/harpy.yml
* harpy asphyxiation finally accurate in the guidebook
* Flavors, Flavor Profiles, Reagent Text
* Base Reagent and Mix reaction
* Borkinase, flavor stuff
* Final touches me thinks
* Comment out shit
* Update fun.yml
removed comments
* Update fun.yml
Increased output for borkinase and felinase
* explosive reaction
creates razorium when mixed and makes a radioactive explosion. screaming explosion funny!!!
* reagent descriptions
updated em
* chem is no longer nuclear bomb
* remove tile-break scale
* recipe change
done through web view dont kill me im lazy
* removed cellular, halved rads
done through web again, dont end me thanks
* updated locale to reflect name change
* updated reagent to reflect name change
* updated reactions to reflect name changes
---------
Co-authored-by: NoreUhh <noreuhh@gmail.com>
* rename kira
* these one too
* migration
* Revert "migration"
This reverts commit ae0006ef745909c2e17b37fd18fd1d57204fe773.
* Revert "these one too"
This reverts commit 9757d2cf6898719b158e03c0f3b637cd2b55ce17.
* Revert "rename kira"
This reverts commit 170408c6f7486a6746b7a7c52cf10c597ead2608.
* bless the emo
* aaaaa
* time to end this right here and right now
* Revert "time to end this right here and right now"
This reverts commit b2c38573f9f8b5e8f736443d646d26839a0694cf.
* Revert "aaaaa"
This reverts commit 0f9451e22533b2f646211219e04103ce16d952ca.
* Revert "bless the emo"
This reverts commit 223607accf81e286481cab8d1037b1eb89a44dac.
* rename
* bikeshedding
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Drunk moment
* push
* fix test fails + a smidge of cleanup
* two smidges of cleanup
* Unpredicted so don't need the workaround
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* metabolizing slime restores blood level
* halved the effectiveness of hunger satiation when slime is consumed by a slime organ
* kaboom
* ref george orwell's 1984
* rewrite george orwell's 1984
* Revert "rewrite george orwell's 1984"
This reverts commit c283a38e584c477f601179ea7504ec2651d22d31.
* this is exactly like doublethink from george orwell's 1984
* this is exactly like the ministry of truth from george orwell's 1984
* this is exactly like the ministry of peace from george orwell's 1984
* i'm going to lose it just like the protagonist in george orwell's 1984
Arcane
Not-A-Chair
ScarKy0
Coryler
pathetic meowmeow
Connor Huffine
Samukaandbeck-thompson
ScarKy0andPrincess Cheeseballs
qwerltaz
Princess CheeseballsandPrincess Cheeseballs
AeraAulinandSir Warock
Stop-Signs
Jae
Vape
Hohenzolaren
ReWAFFlution
Leon Friedrich
slarticodefast
Jessey van Hoeijen
Stefano Pigozzi
YoungThug
CDWimmer
Errant
Alzore
imatsoup
Pok
alexalexmax
ArtisticRoomba
NoreUhh
NoreUhh
JackspajfMain
Minemoder5000
āda
iaada
SlamBamActionman
beck-thompson
Ignaz Ian Kraft
Noah Beverly
Justin Pfeifler
Milon
zelezniciar1
Halo3moth
Delta-V bot
Pharaz4
Thingy461
ConstantlyConfused
Theo
Field Command
PureBreadBagel
github-actions[bot]
verybigman
keekee38
Madison Rye Progress
Velcroboy
Vanessa
This_Is_Gray
marigauge
MD360
Katie
turtlemutt
Hamey
Woljif
snowywinters
biddygelson
Stxcking
DisposableCrewmember42
KOTOB
Cepelinas1
wesker
pootslap
Colin-Tel
SirrRequiem
BarryNorfolk
HTML/Crystal
IProduceWidgets
Proxy also works :3
Dorragon
Stxcking
SirSmith148
Charlie Morley
BungleBoss
Minerva
0-Anon
cloudyskies
William Lemonandpre-commit-ci[bot]
Centronias
rumaks
kosticiaandPrincess Cheeseballs
emberwinters