Commit Graph

721 Commits

Author SHA1 Message Date
Minty642
e882179a75 Adding Industrial Ore Processor premium recipe (#24345)
Edit Industrial Ore Processor
2024-01-25 01:33:56 -07:00
Nim
016d35645f Solo bench (#24203)
* solo bench

* price

* fix

* comfy

* 111

* clear
2024-01-23 17:15:48 -05:00
Ed
a2d5d74b46 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>
2024-01-21 19:58:40 +11:00
Ubaser
949b07dce0 Buff potassium availability from bananas (#24257)
* banana

* yes
2024-01-20 18:39:10 -05:00
Nim
6a0c800492 Add snake kebab (#24341)
* add snake kebab

* fix sprite

* just meat
2024-01-20 18:38:10 -05:00
Alzore
542aa11d8e Make crushers not craftable/researchable (#24319)
* nomorecrushersci

* nocomment
2024-01-20 16:11:01 +11:00
Nemanja
73e94dfa92 Lathe Categories (#24247)
* Lathe Categories

* serilog my beloathed
2024-01-19 17:45:03 -07:00
Ubaser
8cc24c9a5d Make super bite burger easier to craft (#24231)
* add

* needs space for salt
2024-01-19 00:24:09 -05:00
TurboTrackerss14
c32d19cf5c Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering
2024-01-17 01:46:33 -07:00
Boaz1111
24aeec2373 Reinforced glass reacting fix (#24135)
* takeitouttakeitout

* Delete error.glsl

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-01-15 22:43:18 -05:00
Nim
efb424834a Construction Blast door (#24050)
* construction blast door

* fix

* price

* fix2

* hem

* xif

* Static
2024-01-15 15:49:08 +03:00
Skye
9c277bd0e2 Cryo Burn Chem - Aloxadone (#23980)
Aloxadone (accidentally exploded first pr oops)
2024-01-14 20:57:30 -07:00
takemysoult
9e1342f3e4 Tranquilizer balance (#23979) 2024-01-12 13:45:08 -07:00
GreyMario
1c3c596bae Pie tins returned from all pies in all situations, add lathe recipes for pie tin and some other basic kitchenwares (#23217)
* move pietin trash to FoodPieBase so all pies return their pie tin when eaten

* spawn trash from a SliceableFood if the Food has a trash

* add a limited selection of additional tablewares to the autolathe

* kitchenware material adjustments

* fix crash when slice pie in hand/inventory

* use system helpers + slices now go in parent container
2024-01-12 01:42:15 -07:00
icekot8
6820cff4f5 new chemical-Necrosol (#23850)
* rollback

* dumb fix
2024-01-12 00:59:21 -07:00
icekot8
3d9a6f57ac medsec hud is no longer a filler (#23934)
* medsec hud

* medsec hud

* fix
2024-01-11 16:22:42 -07:00
deltanedas
581c95ed72 dedicated burn and shock meds (#23941)
* pyrazine and insuzine

* add recipes

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-01-11 16:17:23 -07:00
degradka
ae59b072cc Adjust prototype names to lowercase (#23810) 2024-01-09 13:25:38 -08:00
Boaz1111
5fd3d4552c More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)
* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-09 15:23:11 +03:00
Nemanja
fdd18c9ae4 Quantum Spin Inverter (#23756) 2024-01-09 00:37:55 -07:00
Emisse
df1d8c36e5 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
2024-01-08 16:24:36 -07:00
Nemanja
c861b66a47 Turbo Recharger (#23723)
turbo charger
2024-01-08 00:15:13 -07:00
Naive817
1b93243bea Adds syndicate cyborgs. Adds Assault cyborgs to nukie uplink (#19733)
* added syndicate cyborgs

* add assault cyborg to uplink

* updated tags.yml

* changed syndicate cyborgs' hitpoints to 200
fixed NPCfaction

* added noslip and MovementAlwaysTouching component to syndicate cyborgs akin to carps, as a stop gap for no magboots or jetpack. Access component fix.

* fixes nodes

* fixes construction

* fixed typo and intergrationtests

* adds back ammocounter for l6c

* fix lawset

* fix item size

* nono, fix again

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-08 01:12:08 +03:00
GreyMario
19e41011b8 Pies and tarts categorized in meal_recipes.yml, added their recipes where possible (#23266)
pies and tarts categorized, added recipes where possible
2024-01-07 23:20:14 +03:00
Adrian16199
7c87ba3b41 Adds ties to the uniform printer. (#23686)
To not bloat the vendors but to still allow one to be fancy if they bother head of personel enough.
2024-01-07 22:55:41 +03:00
Nemanja
a78e9a854e 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>
2024-01-07 08:55:22 -05:00
Ubaser
93a77e89fe Flower wreaths (#23662)
* add

* fix
2024-01-07 00:03:46 -07:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-07 02:34:15 +11:00
MACMAN2003
04cf1c3c49 Add hats and berets to the uniform printer (take 2) (#23556)
* hates and beretes

welcome to team 4tress, after eighteen millennia in development, hopefully it will have been worth the wait

* EEYIKES!! How will I ever "fix" these "typos"???

* SPELL WARS 2: ATTACK OF THE TYPOS

hlep me i catn' stop speeling bad

* put hats above associated uniforms
2024-01-06 17:54:57 +03:00
Velcroboy
52aac0ea3b Add Diphenhydramine Recipe (#23006)
Add Diphenhydramine

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-01-06 00:29:35 -08:00
iacore
d73c7e9a0a more balanced constructing and unscrewing for metal objects (#21051)
* more balanced constructing and unscrewing for metal objects

- computer frame, machine frame, rack and meatspike can be deconstructed while anchored by screwing
- Computer frames now need time to be constructed.
- it now takes a reasonable time to make a meatspike. If you can construct a machine frame in 2.5, surely you can make a meatspike in 2.

* Fixes test
2024-01-06 00:28:57 -08:00
Nemanja
86c1e36cd5 Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming
2024-01-06 13:52:40 +11:00
Nairod
1f2a89d453 More Buildable Furniture + Tweaks (#23188)
your PR will be my beginning of a maintainer journey
2024-01-05 19:53:34 +03:00
Ed
0f8c004a2f 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>
2024-01-04 18:48:09 -08:00
ada-please
79c790c391 Added reaction OilBreakdown (#23537)
Added recipe OilBreakdown
2024-01-04 17:45:35 -05:00
Alzore
292026c584 Gauze recipe in medfab (#23417)
* Gauzelathe

* latherecipe
2024-01-03 17:42:35 -05:00
lapatison
b0a5e0f10c Circuit floor tile print (#23467)
stuff
2024-01-03 16:25:18 -05:00
deathride58
1a531342c5 Glowy lights - light fixtures now actually glow (#23428)
* glowy lights - makes light fixtures actually physically glow when active

* serviced the lights

* ya sure
2024-01-03 19:46:11 +11:00
Nemanja
1c11332fa4 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
2024-01-03 17:16:02 +11:00
Ilya246
fc4ad82934 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
2024-01-02 13:53:35 -05:00
lzk
07a5eaf258 Fix windoor secure graph (#23274)
* 1

* try fix

* real fix
2024-01-01 13:27:28 -08:00
Nemanja
f538a2e34a Add reagent sources to the guidebook (#22627)
* source in my guidebook

* finish it!

* sir yes sir oorah

* network that bitch, baby
2023-12-30 23:34:59 -08:00
Alzore
b5f984b57e Easy Ramen Noodles (#23189)
* easynoodles

* morenoodlepernoodle

* bigcup
2023-12-30 15:27:10 -07:00
lzk
defb7f93b9 Make shivs based on construction (#23134)
* comit

* remove construnt

* 222
2023-12-30 12:08:51 -05:00
Nemanja
c3f81bfe03 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>
2023-12-31 03:18:58 +11:00
Ubaser
56884fd72d Science magboots (#23107)
* add

* uhhh

* fix RSI

* lathe

* fix
2023-12-28 20:08:07 -07:00
lzk
03ec7bac67 Make directional barricade constructable (#22988)
main comit
2023-12-29 11:45:10 +11:00
Nemanja
99d78c4b97 Station beacons (#23136)
* Station beacons

* crate

* remove navmap from warp points

* ack

* oh damn

* okay emisser
2023-12-28 17:02:21 -07:00
Nemanja
9bd03824ac GORILLA Gauntlets (#23012)
* GORILLA gauntlets

* oh shit this too
2023-12-27 20:11:13 -07:00
Stanislav4ix
28b825d898 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
2023-12-27 20:08:30 -07:00