juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,198 Commits 57 Branches 0 Tags
321f337572cdc8ad29fa5429fc652bbde54e2a63
Commit Graph

515 Commits

Author SHA1 Message Date
Vordenburg
ad47cee7f4 Replace THC with THCOil (#18617) 
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2023-08-03 22:49:56 -07:00
Interrobang01
14e6ad6635 Reverted some of the mechanical changes of #16157 (#18555) 
* Reverted functional changes from PR 16157

* Unreverted Epinephrine recipe Diethylamine removal because really, Epinephrine is complicated enough.

* Unreverted that Phenol change because 1. Phenol isn't actually used except in Epinephrine so it literally does not matter and 2. having Phenol use these common ingredients causes git add .fungit add . reaction conflicts to happen which is good

* Reverted Diphesomethingsomething recipe change because Diphesomething is pretty useless and so doesn't need such an incredibly difficult recipe
 2023-08-03 22:30:37 -04:00
MisterMecky
1b4d4f8c35 Add chemical scanning goggles (#18373) 
* add chemical scanning goggles

* add prototype and textures

* .ftl stuff

* add lathe, recipe, research stuff

* missing description

* emo review

* remove static method + newlines

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-08-01 15:57:22 -04:00
forthbridge
5fc7f21853 Add Spaceshrooms (#17092) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-08-02 00:10:48 +10:00
HerCoyote23
27becd8986 Security Melee Weapon, the Truncheon (#17666) 
* Added Combat Baton

* Add to secfab

* reduce damage to 15

* Renamed to Truncheon, set damage to 17 again.

* Added T2 research, up dmg to 18 cause it'll be rarer.

* Make recipe dynamic
 2023-07-31 14:37:12 -06:00
Alekshhh
c7c56f4a81 Chemical Wiki Descriptions, Recipe Tweaks & Effect Tweaks (2) (#16157) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-07-31 16:03:49 +10:00
lzk
a52709fae2 New crafting recipes for hair flower and flower crown (#18421) 2023-07-29 11:46:29 -07:00
MishaUnity
325d2a39ee add mass-media system (#18251) 
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization
 2023-07-26 12:49:38 -06:00
Tunguso4ka
730285290a coffin and two graves (#18213) 2023-07-23 21:13:10 -06:00
Arendian
657d15751b Disposable turret balance changes (#18155) 
* tweaked stats

* change comment
 2023-07-19 20:16:09 -06:00
Flareguy
ae9af73263 Adds the Improvised Shotgun (#18025) 
* improvised shotguns

* spaghetti

* progress so far (TODO: rename modular_reciever.yml)

* i forgotted

* everything so far

* fuck fuck fuck (boner boner)

* ganon: You must die

* bobie

* boob boob booby balls
 2023-07-18 15:10:07 -06:00
Emisse
440d01b487 Saline (#18097) 2023-07-17 20:02:41 +10:00
Vera Aguilera Puerto
9243050e1a Construction graph improvements (#17960) 2023-07-13 20:23:52 +10:00
deathride58
a32fbb37ce Chevre and chevre accessories - Adds chevre, crostini, and chevre chaud to the game (#17968) 2023-07-11 21:00:30 -06:00
LankLTE
2b29e58823 Sawn-off shotgun are now empty when made (#17971) 
* New nonlethal sawnoff

* Empty guns now

* removed duplicate construct
 2023-07-11 18:45:43 -06:00
Nemanja
6dbfbc52c0 Good Intercoms (#17950) 
* crystal anomaly

* Good intercoms

* fixes

* fix construction fail

* Revert "crystal anomaly"

This reverts commit 0d9e3f62ff82c79e72f882b9c7f4ca1b9c6e6dd8.

* migration
 2023-07-11 17:58:18 -06:00
Arendian
b4c251472f Adds Advanced ointment and bruisepack recipes (#17583) 
* Adds Advanced ointment and bruisepack recipes

* Changes the sprites to the ones from /tg

* Changed names and sprites, slight tweaks

* Formatting

* Solve Conflict

* Formatting

* Fix issues found in check

* Fix Oopsie
 2023-07-09 20:22:10 -06:00
LankLTE
9e6bd30aa4 Ambuzol Plus (#17884) 
* Added component and functionality.

* Fixed ZombieImmune.

* Zombies now have zombie blood.

* Ambuzol plus.

* Ambuzol plus spawns in bundle.

* Fine CBURN get one too.

* Reworked the reaction

* No more magic blood refilling.

* ok CE i fixed it

* Component change.
 2023-07-09 16:01:35 -06:00
Nemanja
d3d718f968 fix test fail from ambuzol reaction (#17887) 2023-07-08 12:51:57 +10:00
Nemanja
e78257419b Zombie chem tweaks (#17870) 
* make romerol cause zombification, make zombrex the cure, nuke corpium

* fix descriptions

* zombrex -> ambuzol
 2023-07-06 22:45:59 -06:00
Gagarinten-Noverdo
eca22beb30 balance a explosive payload craft (#17853) 
A grenade that costs 4 TK is too easy to make. I fixed it.
 2023-07-06 18:31:18 -06:00
Errant
b7ff79c1fb Fixes airlock construction graph issues (#17812) 2023-07-04 18:31:35 -06:00
Gagarinten-Noverdo
9ae0b9e81c Balance a laser carbine craft (#17814) 
* Balance a laser carbine

* Fix
 2023-07-04 18:31:20 -06:00
Topy
b85c902189 Added sink (#14348) 2023-06-30 18:10:47 -04:00
Tom Leys
67df47f553 No atmos stacking (attempt 2) (#16687) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-29 22:04:36 +10:00
LankLTE
d0a9cce717 Adds Lead & Zinc, nerfs Licoxide. (#17703) 
* Added Lead & Zinc, Nerfed Licoxide.

* Updated physical descriptions.

* Fixed my stupid dumb error.
 2023-06-28 12:53:56 -05:00
TemporalOroboros
d9de405859 ECS AME (#16779) 2023-06-28 08:02:06 -04:00
lzk
335ee13caf Taco! (#17635) 2023-06-26 13:05:07 +10:00
Nim
25d459ac7d Add solar tracker electronics to the circuit printer (#17637) 2023-06-26 13:04:06 +10:00
deltanedas
763f6048f2 make taser require silver (#17477) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-20 00:39:20 -06:00
Nemanja
b8fb9aaabd Make BOH require less uranium (#17449) 2023-06-18 17:37:16 -06:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
Nemanja
0b5ccf3395 Artifact Fragments (#17420) 2023-06-19 00:56:45 +10:00
brainfood1183
9bdaca579e ClownHardsuit Fix (#17386) 
* ClownHardsuit Fix

* fix for monkey template
 2023-06-16 12:45:28 -06:00
metalgearsloth
f7e4a69b65 Move PKA to a tech (#17043) 2023-06-16 13:56:59 +10:00
Nemanja
fa23d57fd8 Remove cloning tech, add bluespace chemistry tech (#17345) 2023-06-14 21:11:11 -06:00
SonicHDC
7c609c913e Dumplings (#16966) 2023-06-15 12:45:30 +10:00
Slava0135
3af05a6606 allow grilles to be placed on lattice (#17073) 
* allow grilles to be placed on lattice

* Revert "allow grilles to be placed on lattice"

This reverts commit 5c536686cdcd85d49681f934d9abaf69076e2bc2.

* allow grilles to be placed on lattice (fixed)

* file namespace
 2023-06-14 20:25:29 -06:00
Flareguy
8dae049ed7 EVA suit resprite (+ new fluff hardsuit) (#17268) 
* eva suit resprite

* speed bump

* yaml linter fix
 2023-06-14 20:15:22 -06:00
deltanedas
7c6d217550 wallmount gen board cheaper (#17316) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-15 11:45:07 +10:00
Dynexust
35c838c1cf Added a new cryogenics chemical - Doxarubixadone! (#16568) 2023-06-15 11:26:27 +10:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
Veritius
d0b42aebeb Add the White Gilgamesh (#16378) 2023-06-12 03:09:41 +10:00
Chief-Engineer
1825f19a8e Add AME shielding welding logs (#17266) 2023-06-11 22:56:34 +10:00
Chief-Engineer
2015a913eb Add grille cut logs (#17267) 2023-06-11 22:56:25 +10:00
brainfood1183
cd7d4be188 HAMTR mech (hamster mech) (needs review) (#16393) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-08 16:33:35 +10:00
TemporalOroboros
d71b6c84e5 Converts the particle accelerator over to ECS + misc (#17075) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-08 16:25:59 +10:00
deltanedas
07d2430840 logic gate stuff (#16943) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-07 16:48:42 -07:00
Kit0vras
9adf737854 Reagent "Fat" and reactions for soapification and meatification (#16058) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-07 23:04:36 +10:00
Nemanja
69f6756cae Replace industrial welder with experimental welder for Advanced Tools (#17127) 2023-06-04 17:23:27 -05:00