* I was working on an outdated version of the upstream resulting in some lines of code having merge conflicts, hopefully I fixed it
* Eversince the "keep X alive and make sure X completes atleast half of their objectives" were removed the parts about them stayed in the guidebook those were changed, aswell as with the removal of thieving gloves parts talking about the thieving gloves were changed to instead talk about the new pickpocketing ability thieves got.
* Apply suggestions from code review
Co-authored-by: Andrew Malcolm O'Neill <105134723+maland1@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* requested changes
* Apply suggestions from code review
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* request
* Apply suggestions from code review
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* request2
---------
Co-authored-by: Andrew Malcolm O'Neill <105134723+maland1@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Create marble tile textures
* Flatten tiles to better match art style
* Add prototypes and translations for tiles
* Change marble footstep sound to one that makes sense
* Add marble tile object and in-hand sprites
* Add prototypes and translations for marble tile objects
* Add marble tile cutter recipes
* Double number of marble tile variants
* Increase plasma and uranium costs of plasmarble and uranium marble
* Add attributions for marble tile sprites
* Fix whitespace problem hopefully
* Fix trailing whitespace take 2
* Rename just "marble" marble to "white marble"
* Remove cutter recipes for uranium marble and plasmarble
* add supercritical sounds for flesh anomaly and shadow anomaly
* fix attribution yml
* use sound collections, add TWO -- count em TWO tech anomaly supercrit sounds.
* add sound for present anomaly
* wrong soundcollection for flesh
* actually add the present anomaly sound...
* add fire anom sound
* add gravity anomaly supercritical sound
* add electric anomaly supercritical sound
* add bluespace anomaly supercritical and explosion sound
* add ice anomaly supercritical sound
* add fluid anomaly supercritical sound
* fix busted link
* typo
* add floral supercritical sound, fix typos
* Add supercritical sounds to injected anomalies
* add rock anomaly supercritical sound
* supercritical sound follows the entity, important for injected anomalies
* make the rock crit rumble a little less subtle at the start
* use CC0 freesound alternatives where available
* New pyro anomaly sound by GonTar
* New sounds by GonTar. Change AnomalyComponent so that you can change the length of supercritical properly in the prototype.
* oopsie, forgot the traps
* use TimeSpan for duration
* Fix errors
* Cleanup CanMetabolizeInhaledAir
* Wait no don't do that
* Revert changes for real
* Fix
* Code cleanup and some safety rails
* Better tests and also comments
* Better comments
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* NPC spiders now spin webs
* oops
* move logic to always update next spawn, to prevent rare web spam
* WebSpawnCooldown is timespan
* remove vv
* add web spawn method, no sus action event method call
* dont spin web immediately at spawn
* move NextWebSpawn value init to update
* oop
* remove unused game timing
* web spawn cooldown to 45
* Add wearable helmet sprites for banana and mimana peels
Made it so banana peels and their variants can be worn as head gear. The sprites were done by myself, so feel free to change or update them! Includes hamster compatibility.
* fixed a minor state bug
* Review fixes
- Removed blank space
- Added "FlipBrooke" to all modified meta.jsons, with the added note of which sprites I got the colors from/referenced.
* I forgot a comma
adds a comma and some periods
* fix: band-aid the reaction sound effect stacking
It's so funny I'm so sad I'm writing this commit :(
* fix: remove unused hashset
Drive by fix. 'Tis never read from.
* fix: switch to just making it server only
* fix: uncomment the if lol
Commented it out for recording video oopsie