Commit Graph
97 Commits
Author SHA1 Message Date
Nemanja 043880a89b welding gas mask (#27108)
* welding gas mask

* eek

(cherry picked from commit 0215292baa)
2024-05-03 00:27:50 +02:00
Alzore 9de3cbed07 Make the cargo telepad T2 civilian (#26270)
therearetwowaystodothis

(cherry picked from commit 4290d5f13e)
2024-05-03 00:01:49 +02:00
Hannah Giovanna DawsonandNemanja 4edf577b1b SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit f059714a75)
2024-04-21 23:46:34 +02:00
metalgearslothandiNVERTED cc5d741a09 Added Jukebox (#26736)
* Added Jukebox, along with music for jukebox

* Fixed Jukebox meta.json copyright

* Removed songs I couldn't find a license for.

* Renamed files to solve check failures from spaces

* Added missing attributions.yml

* Fixed lack of description in Jukebox

* Jukebox is now constructable.

* Change Jukebox menu to FancyWindow

* Moved Jukebox messages out of jukebox component

* Removed Jukebox OnValueChanged.

* JukeboxComp now uses AutoGenerateComponentState

* Removed state code, since it's auto generated

* Fixed various Jukebox code to match conventions.

* Updated Standard.yml to match changed song list.

* fixes

* Jukebox workin

* Fix

* Polishing

* Finalising

* Revert

* bad

* jukey

* Reviews

* name

* Update submodule to 218.2.0

---------

Co-authored-by: iNVERTED <alextjorgensen@gmail.com>

(cherry picked from commit 2db374988c)
2024-04-21 22:04:54 +02:00
GeneralGaws 2910bf21d5 Robotists technology icon fix (#26723)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
(cherry picked from commit 8cd0cce22e)
2024-04-07 14:34:18 +02:00
FlareguyandNemanja b05cb2bb2d Makes secglasses roundstart (#26487)
* makes secglasses roundstart

* fix epic fail

* fix tests questionmark?

* Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit a98d0cfe2e)
2024-04-07 14:17:35 +02:00
Boaz1111 43cc2e7db0 Industrial Reagent Grinder (#25020)
* all work done

* adress whitespace

* millions must factorio

* conflict fix

* i forgot

(cherry picked from commit 6ef592ddba)
2024-04-07 14:14:05 +02:00
IProduceWidgets b8f3ef8bfc Add astro-jungle/mowed grass and astro-snow (#26381)
(cherry picked from commit 89235b9e1b)
2024-03-27 18:35:28 +01:00
deltanedasanddeltanedas e45cbd7282 remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 5ac88d9b27)
2024-03-24 00:12:25 +01:00
Fluffiest Floofers 5ac3da210b Another .38 special clean up / balance (#852)
* Fix weird firerates

The .45 magnum firerate is around 2 to 3 so it was extremely funny how the .38 would be slower than a .45 and even the snubbed version.

* change ejection port placement on psibreaker

* Rubber nerf + new ammo + fix recipe costs

Everyone gets incendiary and uranium bullets so why not.

* Make lucky available in salvage

Alongside the other revolvers

* Update look of speedloader

So it matches the other revolver speedloader. Slightly smaller just because.

* Fix mistakes 🍞

* Add extra speedloaders

* mindbreaker ammo box

* New markers, update old .38 markers

* commentfix

* firerate pass 2

* Fixes

* cleanup

* Add new colored tips to cartridges

* Fix typo

* holy update after someone pointed out the damage

It's technically still a bullet but coated in silver/holy magic whatever, so it should still pierce. Still have to print them one by one and they are not as good as normal bullet against normal things

* someone did the math for silver bullets

I guess.
2024-03-07 23:47:51 +01:00
FungiFellow 46e7aea655 Moved Grapple to T1 Industrial (#25782)
(cherry picked from commit 8d83efd254)
2024-03-07 01:19:29 +01:00
Nemanja 205b1f053c move space heaters into cargo (#25735)
* move space heaters into cargo

* AAA!!! the indentation1!!!

* remove crate

(cherry picked from commit 9cdffb7b6e)
2024-03-07 01:17:01 +01:00
Menshin 37c7ac7931 Add space heaters (#25250)
(cherry picked from commit 9884351101)
2024-03-07 01:05:02 +01:00
Ed 64ccfc1afb Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix

(cherry picked from commit 7a5f81ddb4)
2024-03-07 00:59:22 +01:00
Debug 9a246f9527 Remove drones, fix InnateToolSystem (#25372) 2024-03-05 09:34:57 +01:00
takemysoult c05ea5aa3e balance Explosive Technology (#25397)
* update arsenal yml

balance ExplosiveTechnology

* small changes in arsenal research

small changes in arsenal research

* Update arsenal.yml

(cherry picked from commit 89d0b47354)
2024-02-21 04:09:04 +01:00
Mangohydra 9df7cb37c9 Mechanized treatment improvements (#25356)
Medical module merge

(cherry picked from commit db809a27f4)
2024-02-21 04:03:38 +01:00
Ed b74146831d Anomaly Synchronizer + Signallers tweaks (#24461)
* content

* nerf

* fix rsi

(cherry picked from commit 4d7fd1cace)
2024-02-18 23:03:09 +01:00
Ubaser d364ed9a31 Roundstart Food Service research (#25046)
add

(cherry picked from commit 93d225d109)
2024-02-18 22:50:15 +01:00
FungiFellow d49acecdc5 Borg Module QoL and Gas Analyzer Module Removal (#24702)
* Borg Module QoL Focused on Engi Modules

* Update borg_modules.yml

* Update borg_modules.yml

* Removed Gas Analyzer Module Recipe

* Update borg_modules.yml

* Removes Gas Analyzer Module from research

* Update borg_modules.yml

* Update lathe.yml

* Update handheld_crew_monitor.yml

* Update borg_modules.yml

* Exchanged Service Module Dropper with BorgDropper

* Made a Lingering Plasteel Stack

* Made Lingering Reinforced Glass Stack

* Added Reinforced Glass and Plasteel into Construction Module

* Change Borg Crew Monitor Charge use

* Update handheld_crew_monitor.yml

* Removed Borg Crew Monitor

* Removed Crew Monitor From Diagnosis Module

* ID change

* Update handheld_crew_monitor.yml

* Delete Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

* Update borg_modules.yml

* Update metal.yml

* Update glass.yml

(cherry picked from commit ce77589155)
2024-02-08 12:39:31 +01:00
deltanedasanddeltanedas 6a9259db2e nuke biochem research discipline (#24871)
* make chem machine boards roundstart

* nuke biochem

* kill

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 24af66a544)
2024-02-08 12:34:15 +01:00
Nemanja e99fe9c116 remove compact power tech (#24558)
(cherry picked from commit ff207b2e05)
2024-01-28 00:27:46 +01:00
Edandmetalgearsloth 145c2158ca Star Wars 14: Shuttle weapon update (#23644)
* setup codebase

* make auto-fire, but its broken

* collider problem

* fix rate, add toggle port

* add laser

* power cages

* ginormous cells

* fix inhand

* add pirate cannon

* salvage gun

* functional Nuke cannon

* rewrite to standart grenade

* fix naming, add emp sprite

* grenade cartridge

* thruster fix

* nuke cannon

* audio + visual polish

* balance tweak

* tweaks

* laser balance tweak: new Electronic damage modifier set, reduce structural cannon damage

* resprite energy cages, start implementing in game

* fix cage recharger craft

* add small laser gun

* fix colliders

* add  lasers and ptk to research and crafting

* finish implementing weapon to rnd and sec

* some fixes

* splitted grenades and cannon balls

* integrate new cannon balls

* tweaks stick

* move circuits to sectechfab, fix

* fix?

* add ability to E shoot, without signals

* fix!

* fix?!?! and naming tweak

* go!

* Lank fix

* oh

* mornings don't start with coffee.

* the morning starts with bug fixes.

* fucking bugs!

* finally

* it is now possible to craft projectiles separately from cartridges

* +2 fix

* refactor

* piu

* More weight

* add AutoShootGunComponent

* move autoshoot to partial

* SetEnabled()

* some fixes

* remove CanShootWithoutUser field

* remove null-checks ToCoordinates from AttemptShoot()

* war without reason

* return to home

* ?

* forgot remove it

* review

* Fix formatting and update path

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit a2d5d74b46)
2024-01-27 23:40:06 +01:00
Alzore fae6917f8e Make crushers not craftable/researchable (#24319)
* nomorecrushersci

* nocomment

(cherry picked from commit 542aa11d8e)
2024-01-26 23:16:03 +01:00
Nemanja 703b4cb7cc Quantum Spin Inverter (#23756)
(cherry picked from commit fdd18c9ae4)
2024-01-26 22:17:00 +01:00
Emisse 9d047a7e52 kill machine parts + migrate machine part spawners to salvage loot spawner (#23752)
* kill machine parts

* guidebook and artifact effect

* worst test ive ever seen in my life

* nuke test

(cherry picked from commit df1d8c36e5)
2024-01-26 22:14:43 +01:00
Nemanja 53c4793673 Turbo Recharger (#23723)
turbo charger

(cherry picked from commit c861b66a47)
2024-01-26 22:12:03 +01:00
Nemanja 77bd303603 Hellfire Thermomachines (#23543)
* hellfire thermomachines

* slight nerf? idk

* ilya review

* Improve clarity

* Update Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit a78e9a854e)
2024-01-26 22:07:36 +01:00
Ed acdef432dc Teslaloose and Singuloose counterplay (#23444)
* add tesla dissapear mechanic
add field holobarrier

* add PD

* add crafting

* spacing

* added to cargo

* Fix

* resprite + damageable

* oopsie

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

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

* Update Resources/Locale/en-US/research/technologies.ftl

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

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 0f8c004a2f)
2024-01-26 21:41:52 +01:00
Nemanja 96d1e4090f Flatpacks and the Flatpacker 1001 (#23338)
* Flatpacker and flatpacks

* ok that's good enough

* convert solars/AME to flatpacks

* mats, mats, we are the mats

* basic mechanics are DONE

* thing

* final UI

* sloth

* rped jumpscare

* rename

(cherry picked from commit 1c11332fa4)
2024-01-26 21:27:25 +01:00
Ilya246 59f69e4d6c biofabricator (#23319)
* initial implementation

* implement

* more mobs

* add tech

* buff abomination

* uncopypaste desc

* add sprite

* fix sprite

* remove biomass tag

* inden't

* less plasma for fish

(cherry picked from commit fc4ad82934)
2024-01-26 21:26:06 +01:00
Ilya246 64d260e005 minor science tree changes (#23269)
* it is done

* unbrokey rt again

(cherry picked from commit b9b88123d7)
2024-01-23 22:50:23 +01:00
deltanedas 9df4c6302c roundstart mop and stuff (#23203)
* roundstart mop and stuff

* dragonops

* move move

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit cf95dd39e2)
2024-01-22 21:09:07 +01:00
Nemanja 04f0a8811a Hyper convection lathes and industrial ore processor (#23202)
* Hyper-convection lathes and industrial ore processor

* balance

* gold... why not?

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit c3f81bfe03)
2024-01-22 21:00:37 +01:00
Ubaser 56877652f0 Science magboots (#23107)
* add

* uhhh

* fix RSI

* lathe

* fix

(cherry picked from commit 56884fd72d)
2024-01-22 20:59:01 +01:00
Nemanja 850e75a073 GORILLA Gauntlets (#23012)
* GORILLA gauntlets

* oh shit this too

(cherry picked from commit 9bd03824ac)
2024-01-22 18:47:45 +01:00
Stanislav4ix 27bebbcda9 Added disabler SMG! (#23051)
* Added disabler SMG!

* Changed a few errors

* errors.. again

* Update battery_guns.yml

* Update security.yml

* Update lathe.yml

* Update security.yml

(cherry picked from commit 28b825d898)
2024-01-22 18:46:27 +01:00
Debug 18f0af1f68 Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
Boaz1111 d86ac8804e Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo

* added depleted uranium to more ammo

* Last changes and additions

* Forgot something, theoretically resolved the merge conflict too

* Nerfed the DU munitions, renamed em to uranium because it's not really DU

* made the ammo more expensive, also fixing the crash at the same time

* Fixed the last error, theoretically at least

* Revert "Fixed the last error, theoretically at least"

This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.

* copyright changes, small sprite changes, last references of depleted uranium removed

* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"

This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.

* Update meta.json

* Update meta.json

* Update lathe.yml

* Update arsenal.yml
2023-12-22 23:22:09 +01:00
Stanislav4ixandTunguso4ka 795fd833c4 Added ore bag of holding (#22680)
* Added ore bag of holding

* Now its in industrial tecnologi

Yeah, I fixed it with Tunguso4ka

Co-Authored-By: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>

* Update ore_bag_holding.yml

Now the "magnet" has a larger radius of attraction

* Changed location

---------

Co-authored-by: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
2023-12-22 23:00:25 +01:00
Kevin Zheng 16cce7a1fa Give security sunglasses the security HUD (#19904)
* Give security sunglasses the security HUD

* Switch security to round-start sunglasses, add sec glasses research
2023-12-22 22:59:08 +01:00
Nemanja 013ec1b111 Remove RCD from tech and make it a crate (#22720) 2023-12-22 22:59:07 +01:00
Kara 557fc67753 Faux astro-tiles for science & mappers (#22586)
* Faux astro-tiles for science

* didnt mean to commit dode
2023-12-16 20:37:38 +01:00
deltanedasanddeltanedas 8241f944aa add glaive to salv weapons (#22514)
* refactor ops

* add recipe

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 20:24:29 +01:00
Nemanja f3f3dcff8b artifact crusher (#22301) 2023-12-16 19:56:00 +01:00
Nemanja f456d0f409 Remove tasers from arsenal tech (#22361) 2023-12-16 19:55:38 +01:00
Nemanja f2c9f4042d Experimental Anomaly Vessel (#22233)
* experimental anomaly vessel

* sprote changes
2023-12-16 19:34:18 +01:00
Boaz1111 d663746a8a Cryostasis syringe (#22021)
* Added cryo syringe, sprite courtesy of Ubaser

* I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly

* IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW

* added canReact at the wrong place, fixed now

* made the transfer good

* more issues with the sprites

* not much to say, one must imagine sisyphus happy

* mmm yes give me 0 of layers

* I oughta double check shit more

* Should be all done!

* I didn't add it to the lathe, I am le stupide

* Forgot to add the recipe somewhere

* final touches, can actually be made at the medlathe now

* added the recipe to the protolathe as well
2023-12-02 20:33:26 +01:00
Kadeo64 fb877f4bba Ripley APLU is now T1 Industrial. (#21787)
* Add files via upload

* Updates industrial.yml with ripley changes
2023-12-02 18:58:33 +01:00
Emisse 2cd375e8f2 janiborg cleaning module starts with trashbag now (#21680)
* burger king

* fixe

* nightmare blunt rotation
2023-11-19 22:13:50 +01:00