juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,218 Commits 57 Branches 0 Tags
0527d2e7192bf3ac3eeecaedbaa4a256f9f71ded
Commit Graph

19218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DrSmugleaf
0527d2e719 Fix barriers not working (#19774) 2023-09-04 15:33:40 -07:00
Leon Friedrich
e4ca6f4fb9 Allow solutions to store extra reagent data (#19323) 2023-09-05 07:55:10 +10:00
PJBot
a6b81058d0 Automatic changelog update 2023-09-04 16:19:09 -04:00
Fromoriss
b50e5651a1 Add moth plushie (#19828) 
* Add moth plushie

Moth plushie. It's cute, don't mind, merge it.

* Update toys.yml
 2023-09-04 13:18:03 -07:00
PJBot
dc3d1e3165 Automatic changelog update 2023-09-04 16:12:46 -04:00
Doru991
c6869c89d0 Add plant phalanximine, fix slippery fruits (#19820) 2023-09-04 12:11:40 -08:00
PJBot
941e49e580 Automatic changelog update 2023-09-04 16:03:58 -04:00
PixelTK
74bd86af2f Arachnid RE-REWORK (#19138) 
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
 2023-09-04 13:02:54 -07:00
PJBot
aac1e14f5c Automatic changelog update 2023-09-04 15:34:51 -04:00
router
0b94825182 Fix thrusters, add new max velocity calculation (#19688) 2023-09-04 11:33:47 -08:00
PJBot
a20211a1df Automatic changelog update 2023-09-04 12:25:43 -04:00
drteaspoon420
a2c9ef04b3 Mutate plant chemical and gas production (#19455) 
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2023-09-04 08:24:39 -08:00
PJBot
818f0bb231 Automatic changelog update 2023-09-04 10:23:00 -04:00
lzk
33cdcf34dd NPC/silicon.yml cleaning (#19731) 2023-09-05 00:21:52 +10:00
PJBot
e7b6314248 Automatic changelog update 2023-09-04 10:17:14 -04:00
deltanedas
9e60e0db88 gib hitchhikers on ftl (#19793) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-05 00:16:10 +10:00
metalgearsloth
7368adcfa5 Update submodule to 154.1.0 (#19818) 2023-09-05 00:15:44 +10:00
PJBot
cec4ea6d4f Automatic changelog update 2023-09-04 10:15:14 -04:00
deltanedas
04cd014179 nuke lights code change (#19315) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-04 17:14:10 +03:00
PJBot
ecd43bccfc Automatic changelog update 2023-09-04 10:12:41 -04:00
deltanedas
4b5228e10d disposal emag fix and refactoring (#19790) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-05 00:11:34 +10:00
metalgearsloth
db1ff07821 Weldable cleanup (#19809) 2023-09-05 00:07:01 +10:00
PJBot
88454b046a Automatic changelog update 2023-09-04 09:13:02 -04:00
chromiumboy
05e9d2e33a Plasma fueled radiation collectors (#19598) 
* Fixes issue with solution regenerators

* Update Solution.cs

Removed excess whitespace

* Undid file scoping to make this easier to review

* Initial prototype

* Adjusted coefficients

* Removed unintentional changes from another PR

* Undid unintentional change

* Undid unintentional change

* Added temperature modifier to power production

* Guidebook entry and radiation collector low pressure warning

* Reviewer requested changes
 2023-09-04 16:11:57 +03:00
PJBot
cebc3f28f3 Automatic changelog update 2023-09-04 08:58:58 -04:00
liltenhead
e7ea597c51 Rebalance Ore Conversions (#19814) 2023-09-04 22:57:51 +10:00
PJBot
c1e93f02f3 Automatic changelog update 2023-09-04 08:54:18 -04:00
TNE
52ef8f9b70 Allow drag-and-drop insertion of reagents into the ChemMaster (#19796) 
* Add DumpableSolutionComponent

Separates out the component from "DrainComponent" that allows one to drag a bucket/any reagent container onto a drain/sink/toilet to empty it and allows other reagent containers to reuse the code effortlessly.

* Give the ChemMaster 4000 the DumpableSolution Component

Allows drag and dropping solutions into the ChemMaster much like you used to be able to do exclusively with drains. This also allows dumping jugs into them.
 2023-09-04 15:53:13 +03:00
PJBot
d67569786c Automatic changelog update 2023-09-04 08:24:53 -04:00
AlexMorgan3817
61b0e6abcd Hot Fix of Gravity Grenades (#19414) 
* Supermatter grenade fix

* taking out the trash

* Removing debug Console.Log() in twostage

* More fixes

* Better to put LoadComponents on Update, else it will modify list of other untriggered components
 2023-09-04 15:23:48 +03:00
deltanedas
91cfabd6f6 light refactoring/rework (#19314) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-03 22:31:10 -07:00
PJBot
4e51fd4fff Automatic changelog update 2023-09-04 01:17:40 -04:00
deltanedas
d8effa6150 carpsuit and iansuit revival (#19728) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-03 22:16:36 -07:00
deltanedas
b3f66fff40 decouple objectives round end text from traitor (#19687) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-03 21:55:34 -07:00
PJBot
7c5b3e36a7 Automatic changelog update 2023-09-04 00:53:15 -04:00
qwerltaz
b6da21fd3e prevent pulse throw from throwing observers (#19704) 2023-09-03 21:52:11 -07:00
PJBot
5fe9e06ef3 Automatic changelog update 2023-09-04 00:50:53 -04:00
deltanedas
5ead3d5108 magazine fill repeating doafter (#19780) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-03 21:49:49 -07:00
PJBot
892fc7c07b Automatic changelog update 2023-09-04 00:49:04 -04:00
lzk
ba65dab94d [Fix] Steel stack sprite (#19785) 2023-09-03 21:48:00 -07:00
PJBot
7eaa92626e Automatic changelog update 2023-09-04 00:35:24 -04:00
metalgearsloth
e9a4b1c747 Fix NPC juke stuttering (#19805) 2023-09-03 21:34:20 -07:00
PJBot
5d91fc7aff Automatic changelog update 2023-09-04 00:25:36 -04:00
metalgearsloth
1f904ddb81 Fix crusher showing popup on swing (#19791) 2023-09-03 21:24:31 -07:00
qwerltaz
21b898afcd Add vent welding (#19759) 2023-09-03 21:23:38 -07:00
PJBot
6ec929850c Automatic changelog update 2023-09-03 23:39:27 -04:00
Flareguy
7b69395061 Blindy changes a bunch of event spawnrates in hopes that it does something. (#19803) 
* blindly changes some event rates in hopes it does something cool

* emergent game play
 2023-09-03 23:38:22 -04:00
Nemanja
445ed9e9d5 argocytes (#19801) 2023-09-03 22:02:00 -04:00
PJBot
676ac1e101 Automatic changelog update 2023-09-03 17:28:23 -04:00
FinnishPaladin
53637c9a39 Bartender aprons! (#19794) 
* Adds a new apron to the bar clothing vendor.

* quick fix

* quick edits to the sprites

* another sprite edit.

* more tweaks...

* darkened sprites a bit, moved the apron's location in the bardrobe

* improved the item suffix
 2023-09-03 17:27:19 -04:00