Commit Graph

6730 Commits

Author SHA1 Message Date
Ed
b3b64e6cf2 The glowing forest anomaly (#24351)
* sans

* Papyrus

* add to game

* tweak stick

* fixes

* Update Resources/Prototypes/Entities/Objects/Misc/kudzu.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-01-20 17:31:12 -08:00
Nemanja
691c3d55b8 Allow chemical-fueled generators to use multiple reagents (#24258)
multi-reagent generators
2024-01-20 17:25:52 -08:00
Ubaser
949b07dce0 Buff potassium availability from bananas (#24257)
* banana

* yes
2024-01-20 18:39:10 -05:00
Alekshhh
113ee78d69 Cerberus Wideswing (#24328)
arf
2024-01-20 18:38:26 -05:00
Nim
6a0c800492 Add snake kebab (#24341)
* add snake kebab

* fix sprite

* just meat
2024-01-20 18:38:10 -05:00
Kot
4f307a49be Fix issue where round could reset all job priorities to high (#24340)
* Update job priorities when job requirements are getting updated

* Sort jobs by weight and then by the name

* Sort departments too
2024-01-20 17:03:10 -05:00
Errant
efdc6f8d4c Beacon localization (#24138)
* localize beacons

* No not like that

* Tesla beacons were already depreciated, time to give the reaper their due

* Entity name fallback

* The real treasure was the far easier solution we missed along the way

* weh

* Shared mapinit

* fix RT version

* a single line break
2024-01-20 19:59:41 +11:00
Alzore
542aa11d8e Make crushers not craftable/researchable (#24319)
* nomorecrushersci

* nocomment
2024-01-20 16:11:01 +11:00
Agoichi
559ff13a12 Rebalance of Lobbying bundle (#24303)
* Rebalance of Lobbying bundle

- More money, mickey (5000 -> 30000)
- Added trader`s rubberstump for high iq players
- Phone to call upper managment
- Some fancy and absolutely unsuspicious clothings
- Patriotic Flag for the most valuable lobist of Syndicate

* Thief problem fix

Thief now have have separate lobbying bundle, now it calls bribing bundle

* Fixing

Money count, suffix

* Hi

Fixing money
2024-01-20 13:35:44 +11:00
metalgearsloth
34806400bd Revert "Adds more grindables (#24267)" (#24311)
This reverts commit 16a1f2f16a.
2024-01-20 13:32:57 +11:00
Drayff
f71df97b5e Toolboxes (#24305)
* Added animations for opening toolboxes

* Fix cow toolbox
2024-01-20 13:29:13 +11:00
Scribbles0
7a2e500f68 Unrevivable trait (#24226)
* unrevivable trait + remove unclonable remnants

* cleanup

* change to hascomp
2024-01-20 13:22:15 +11:00
Nemanja
73e94dfa92 Lathe Categories (#24247)
* Lathe Categories

* serilog my beloathed
2024-01-19 17:45:03 -07:00
Ubaser
a6e16d9961 Mustard, ketchup and mayonnaise now tastes distinct (#24297)
add
2024-01-19 11:42:47 -05:00
Ubaser
08c7386074 Fix reagents obtained from grinding iron ore. (#24215)
add
2024-01-19 19:08:38 +03:00
Flareguy
16a1f2f16a Adds more grindables (#24267)
* Adds more grindables

* fuc

* A
2024-01-19 10:48:18 -05:00
Kara
818b07ecf8 Destruction & impact sound rework pass 1 (#24282)
* Various sounds ported

* Replace wall_bonk.ogg

* Metal/metalglass break sound pass

* Replace metalbreak.ogg

* Replace woodhit

* Replcae tap.ogg n some smack uses

* Fix lint

* Replace bang.ogg and some instances of hit_kick.ogg

* couple more

* fix wood sound

* i may be stupid

* le attributing

* bro what

* standardize more destruction sounds

* fix melee hit sound cutting off

* window threshold sounds and remove `destroySound` it literally doesnt exist
2024-01-19 10:33:07 -05:00
Ubaser
bdb1399ada Actually fix carrot oculine this time (#24290)
SEEDS MAN
2024-01-19 10:31:35 -05:00
metalgearsloth
ad23facb7a Add ability to put spesos into cargo console (#24263)
I thought we had it already but maybe it was an unfinished pr or something.
2024-01-19 18:23:07 +11:00
Ubaser
8cc24c9a5d Make super bite burger easier to craft (#24231)
* add

* needs space for salt
2024-01-19 00:24:09 -05:00
metalgearsloth
243491dd59 Rework wheelchairbound (#24173)
* Rework wheelchairbound

Fixes the save/load bug and fixes it being a singleton.

* weh
2024-01-19 00:18:19 -05:00
Ubaser
f0b21e2edc Adjust produce (#24220) 2024-01-18 19:03:24 -08:00
Emisse
61704f009b Title2 (#24254)
* title2

* Update lobby.yml

* Update attributions.yml

* real
2024-01-19 13:47:19 +11:00
metalgearsloth
a7388e5c05 Add trade stations (#23863)
* puters

* Start on fulfillment

* weh

* Smol update

* FTL sound fixes or smth iunno

* Add consoles

* More tweaks

* Make it unanchorable

* final wehs

* weh

* Fix 1 test

* Shrimply bump the distance

* cat
2024-01-19 13:02:28 +11:00
Nemanja
f69f3e0f41 fix gas canister names (#24252)
fix canister names
2024-01-19 12:44:46 +11:00
lapatison
21b7b112a2 Spawn guidebooks on random bookshelves (#24036) 2024-01-18 16:32:00 -08:00
themias
0c944ed81e More sprite movement states (#24237)
* More sprite movement states

* what
2024-01-18 18:48:27 -05:00
themias
6931848f1d Add fill visuals and inhand sprites to water bottle (#24240)
* Add fill visuals and inhand sprites to water bottle

* adjust sprite
2024-01-18 16:55:05 -05:00
deltanedas
4315531a3f make terminator immune to rev and zombie (#24239)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-01-18 16:35:34 -05:00
Ubaser
da7ed4b27b Add pacifism description and clean up traits a little (#24216)
add
2024-01-18 18:50:00 +03:00
Ubaser
882e277955 Carrots now properly contain Oculine (#24228)
* carrot

* add

* quantity
2024-01-18 10:28:01 -05:00
Ubaser
08c2cac96d Paramedic void suit is now a soft suit. (#24229)
add
2024-01-18 10:26:59 -05:00
Ubaser
9968cc178b Golden honker glow (#24230)
add
2024-01-18 10:26:28 -05:00
0x6273
7a7d0017b5 Use old reagent dispenser beaker slot ID (#24209)
Change the slot ID back to what it was to keep old map saves with an item in the slot loading correctly.

This also fixes the "You can't put this in the dispenser!" message not appearing when inserting an item without FitsInDispenserComponent because the whitelisted slot name wasn't changed.
2024-01-17 17:30:30 -08:00
Volodius
a61e24a254 fix flippo not igniting plasma (#24207)
Add welder component to FlippoLighter
2024-01-17 17:28:31 -07:00
Ed
2c0e1fcfb9 Repairable shuttles (#24193)
* fixable shuttle

* nukie not repairable

* fix
2024-01-18 02:57:40 +03:00
themias
ab42c4d51c Chicken sprite movement states (#24205) 2024-01-18 09:26:19 +11:00
Kevin Zheng
9394a26245 Add limited-reagent dispensers (#23907)
* Add limited-reagent dispensers

* Add empty versions for all dispensers

* Fix lint

* Set initial window size so all buttons are visible

* Simplify logic, add parenthesis

* Use localized name for initial labels

* Adjust button style

* Avoid touching items before MapInit

* Remove pre-labeling

* Reduce diff

* Clean up YAML

* Fix test

* Really fix test

* Document

* Adjust based on review

* Add labels for obnoxiously long bottles

---------

Co-authored-by: AWF <you@example.com>
2024-01-17 16:43:48 -05:00
themias
47159d1c23 Mouse sprite movement states (#24202) 2024-01-18 08:26:53 +11:00
Kara
fd3222993e Significantly less annoying eating sounds (#24195) 2024-01-17 11:46:06 -05:00
Boaz1111
0c78c34653 Xenoarch scanning time halved (#24188)
* SALVATION

* Update ArtifactAnalyzerComponent.cs

* Update artifact_analyzer.yml
2024-01-17 11:45:18 -05:00
Kara
1fe2dda345 Change default lights on devmap to non-LED ones (#24192) 2024-01-17 06:14:52 -07:00
Ubaser
6846bcd214 Grindable ores (#24185)
add
2024-01-17 16:08:31 +03:00
lzk
8239e59388 WelderRefinable light tubes bulbs and broken bottle (#24184)
s
2024-01-17 14:16:42 +03:00
Ubaser
b6f0c35e72 Robohands glove sprite (#24182)
add
2024-01-17 03:03:00 -07:00
TurboTrackerss14
c32d19cf5c Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering
2024-01-17 01:46:33 -07:00
Ubaser
b293bf4fd8 Add 6 new small salvage wrecks (#24179)
* add

* updat
2024-01-17 01:34:24 -07:00
Arendian
f4727f2cf8 Fix water gun and spray nozzle projectile collision (#24175)
fix water gun and spray nozzle collision
2024-01-17 11:21:58 +03:00
lzk
1db42e048b Remove prototypes locale (#24159) 2024-01-16 18:32:17 -05:00
Ubaser
eaee9b6896 Hauling shuttle wreck (#24152)
add
2024-01-16 16:05:33 -07:00