Commit Graph

88 Commits

Author SHA1 Message Date
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 8d83efd254ce42758dbe013fa4cd91238b6f7bd8)
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 9cdffb7b6e357da6b38833fa54fb6564d086de53)
2024-03-07 01:17:01 +01:00
Menshin 37c7ac7931
Add space heaters (#25250)
(cherry picked from commit 98843511014e1b5fce34b7e1215179dd3d0f94c8)
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 7a5f81ddb46e47078b983bfc9ba015ee67752ee3)
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 89d0b47354065bd6a50cf0f6b0d3ea04e0484d64)
2024-02-21 04:09:04 +01:00
Mangohydra 9df7cb37c9
Mechanized treatment improvements (#25356)
Medical module merge

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

* nerf

* fix rsi

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

(cherry picked from commit 93d225d109904f89838fa0f07610f93ce1034e14)
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 ce775891552f9fca2a54120b5a19f2a01c6e5c8b)
2024-02-08 12:39:31 +01:00
deltanedas 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 24af66a544d9c0ef2330f7f5ff3e0a420a5655aa)
2024-02-08 12:34:15 +01:00
Nemanja e99fe9c116
remove compact power tech (#24558)
(cherry picked from commit ff207b2e0513700d52172ac151780ffd747dd23f)
2024-01-28 00:27:46 +01:00
Ed 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 a2d5d74b46060d330e5aa14e166692f32dcce7a9)
2024-01-27 23:40:06 +01:00
Alzore fae6917f8e
Make crushers not craftable/researchable (#24319)
* nomorecrushersci

* nocomment

(cherry picked from commit 542aa11d8ea01d2b17c6d6cf46f2610161402b38)
2024-01-26 23:16:03 +01:00
Nemanja 703b4cb7cc
Quantum Spin Inverter (#23756)
(cherry picked from commit fdd18c9ae49cf98a766b5df484c67d9cf4f4418e)
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 df1d8c36e5e8b0773123c744a4acca473fb135ea)
2024-01-26 22:14:43 +01:00
Nemanja 53c4793673
Turbo Recharger (#23723)
turbo charger

(cherry picked from commit c861b66a476a1ea1037ec173b088cafd5519f757)
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 a78e9a854ebb744ca82fcdbca4968f0197d05a84)
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 0f8c004a2f6cce3443f0e2e9bbbc3c8ac12d0eba)
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 1c11332fa4b77d556e7f3db17f391dbd2664cda5)
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 fc4ad82934b0b094c9125922258248b561b1b338)
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 b9b88123d7a3e16a93f354b15cffde4009222397)
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 cf95dd39e2221326ebebf706eb27e75a1e19107c)
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 c3f81bfe033a14922dc6e91de402c56d321f3370)
2024-01-22 21:00:37 +01:00
Ubaser 56877652f0
Science magboots (#23107)
* add

* uhhh

* fix RSI

* lathe

* fix

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

* oh shit this too

(cherry picked from commit 9bd03824ac863cb4d87bfc984dcc163b84926649)
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 28b825d898361b06fc3a942209c0b93d8c2eced0)
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
Stanislav4ix 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
deltanedas 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
Doru991 b76a8b6e64 Borg QOL, part 3 (#21567)
* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold
2023-11-12 20:55:34 +01:00
Emisse d628fa4f5c Minor Borg Qol (#21548)
* boirg stuff

* gaming

* modules shits

* mini welder is too lmao

* pro

* cheaper recipes, fix mob state thresholds, remove silly crayon, rename module

* generic borg 6 module

* literacy module shityourself
2023-11-12 20:52:26 +01:00
Nemanja 27624ad280 Speed Boots [Tier 3 Civ-Service] (#21438)
* Speed Boots

* validate

* monkey
2023-11-12 20:48:04 +01:00
Ed ff0526efe0 Anomaly Synchronizer (#20945)
* added textures and basic prototype without functionality

* add full functional

* finish work

* fix naming

* reduce random anomaly spawner offset

* Update AnomalySystem.Vessel.cs

* Update SharedAnomalySystem.cs

* Update SharedAnomalySystem.cs

* Update production.yml

* fix errors

* fix?

* Update anomaly_sync.yml

* deltanedas code fixes. Thx, deltanedas!

* git what

* fix yml

* fix yml 2

* meh, try again

* work, work, work

* fix powered checking. now component work also without ApcPowerReceiving

* now supercrit port invoke on start growing, not after explosion
fix errors

* deltanedas fix pack 1

* Update AnomalySynchronizerComponent.cs
2023-11-12 20:45:19 +01:00
deltanedas aba89d47f3 Microreactor power cell research (#21473)
* buff microreactor cell and tweak a little

* add portable fission research

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-12 20:45:18 +01:00
RiceMar1244 c55026781c Adds more sources for sheet paper material (#21364)
* Moves sheetifier research unlock from civilian services to industrial

* Makes wood insertable into the sheetifier and makes paper a lathable material

* Adds a paper crate to the cargo catalog

* Adds localizations
2023-11-12 20:40:20 +01:00
Colin-Tel 623fb89b25
Add the Salvage Expedition board to research (#411)
* Expedition board is now researchable

Adds the Salvage Expedition Computer board recipe
Adds the board recipe to the Salvage Equipment research

* Update Rules.txt

Updated the rules since expeditions are coming back.
2023-11-07 07:36:49 -06:00
Debug 9bb966243b
Gravity research 1984 (Remove tether/force gun) (#232)
* Gravity 1984

* 1984 part 2
2023-10-23 19:38:04 +02:00
JJ f06fc04768
Deep Fryer And Its Powers (#163)
* Deep Fryer And Its Powers

The Deep Fryer has been implemented. It uses Corn Oil, Ghee, and Olive Oil to fry. Other features include:
1. Mixing Oil and Water at a certain temperature causes smoke.
2. When throwing an object at the Deep Fryer, a Chef will *always* land the shot, but anyone else has a chance of missing.
3. When an item is sliced, an event is triggered that other items can see.

* Update meal_recipes.yml

* Reworking the effects so they won't trigger on init.

* Create DeepFryerTest.cs

* Commenting out the UnsafeOilVolumeEffects part of the .yml. Something about the sound script inside of it breaks UnintializedSaveTest and it's not necessary for a smoke reaction to occur anyway.

* Update DeepFryerSystem.cs
2023-10-18 23:57:10 +02:00