Commit Graph

14441 Commits

Author SHA1 Message Date
metalgearsloth
b057ec6104 Content grid merging (#22448)
Mainly fixing thruster bugs
2024-01-21 17:41:10 +11:00
PJBot
8f1d67014c Automatic changelog update 2024-01-21 01:32:18 +00:00
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
github-actions[bot]
ecc21d8f52 Update Credits (#24352)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-01-20 20:25:15 -05:00
PJBot
9efa01d712 Automatic changelog update 2024-01-20 23:39:32 +00: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
PJBot
0312196887 Automatic changelog update 2024-01-20 18:03:18 +00:00
Ilya246
bd4a0b93c8 fix scram implant uplink desc (#24336)
fix
2024-01-20 18:05:09 +03: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
PJBot
18a111bb36 Automatic changelog update 2024-01-20 06:23:25 +00:00
PJBot
f10ecf4410 Automatic changelog update 2024-01-20 05:12:07 +00:00
Alzore
542aa11d8e Make crushers not craftable/researchable (#24319)
* nomorecrushersci

* nocomment
2024-01-20 16:11:01 +11:00
PJBot
28f0387ad5 Automatic changelog update 2024-01-20 04:58:11 +00:00
PJBot
0b37dbbfbd Automatic changelog update 2024-01-20 03:41:06 +00:00
PJBot
a65e3eeb8f Automatic changelog update 2024-01-20 02:51:20 +00:00
PJBot
91e8234a57 Automatic changelog update 2024-01-20 02:36:50 +00: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
PJBot
df768b289e Automatic changelog update 2024-01-20 02:30:19 +00:00
Drayff
f71df97b5e Toolboxes (#24305)
* Added animations for opening toolboxes

* Fix cow toolbox
2024-01-20 13:29:13 +11:00
PJBot
f33a3f98cd Automatic changelog update 2024-01-20 02:23:21 +00:00
Scribbles0
7a2e500f68 Unrevivable trait (#24226)
* unrevivable trait + remove unclonable remnants

* cleanup

* change to hascomp
2024-01-20 13:22:15 +11:00
PJBot
ac809c4929 Automatic changelog update 2024-01-20 00:46:10 +00:00
Nemanja
73e94dfa92 Lathe Categories (#24247)
* Lathe Categories

* serilog my beloathed
2024-01-19 17:45:03 -07:00
Ubaser
7583662672 Update Rod and Transit evacuation shuttles (#24296)
add
2024-01-19 13:42:22 -07:00
Ubaser
0a71f8a450 Update Core (#24294)
add
2024-01-19 13:41:14 -07:00
Ubaser
00e770d4dc Update Trade Station (#24295)
add
2024-01-19 13:41:00 -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
PJBot
f44661c82a Automatic changelog update 2024-01-19 15:36:08 +00:00
SpeltIncorrectyl
fd673cf6e3 Can emag artifact crusher (#23957)
* initial commit

* made it emaggable

* removed OnAttemptEmagEvent

* moved emagging to shared

* added local file to git
2024-01-19 10:35:02 -05:00
PJBot
884c866e4d Automatic changelog update 2024-01-19 15:34:15 +00: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
Ubaser
e3d5dc4d76 Improve light tube sprites (#24270)
* fix

* blocky

* glowier

* darker
2024-01-19 05:12:25 -08:00
PJBot
95815c7f2b Automatic changelog update 2024-01-19 10:15:49 +00:00
Ubaser
8364086369 Update Trading Outpost (#24281)
* add

* yes
2024-01-19 03:06:15 -07:00
Krunklehorn
caed22bebe Added defib to Brigmed on Meta (#24271) 2024-01-19 01:57:31 -07:00
Krunklehorn
27005d7b5d Added defib to Brigmed on Origin (#24272) 2024-01-19 01:57:22 -07:00
Krunklehorn
fd9c654322 Moved Gemini's Brigmed defib to the inside (#24273) 2024-01-19 01:57:12 -07:00
Krunklehorn
170467cb2d Added defib to Brigmed on Box (#24269) 2024-01-19 01:09:19 -07:00
PJBot
8aeeacce97 Automatic changelog update 2024-01-19 07:24:12 +00: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
PJBot
217e8658f0 Automatic changelog update 2024-01-19 07:11:11 +00:00
metalgearsloth
129892f144 Run fixgridatmos on trading outpost (#24264) 2024-01-19 18:10:57 +11:00