cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-10-06 14:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,205 Commits 27 Branches 0 Tags
d35e2f39a71cb5505bee10410d049d2e35c94de6
Commit Graph
729 Commits
Author SHA1 Message Date
Alzore 3dd7e7a6bb Make shotgun slug ammo not useless (#24196) 
* 20blunt8pierce

* ShotgunSlugLathe

* Commentbecauseapparentlyitdoesntknowichangedthis

* nevermindthereweretwo

* 28pierce

(cherry picked from commit 261153683e)
 2024-01-28 00:32:23 +01:00
Debug bc370fb77d Mime hardsuit 1984 2024-01-28 00:31:36 +01:00
ERROR404 a0265a76bb Mime hardsuit (#24198) 
* Mime hardsuit

* small fix

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* New sprite

* newest sprite

* No more CTRL+C CTRL+V

* update sprite in hand

* final sprite in hand

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
(cherry picked from commit dedb77f43a)
 2024-01-28 00:28:51 +01:00
MilenVolf 693924bdf0 Fix winter coats prices (#24557) 
* Fix wintercoats prices & remove armor from them

Fixes craftable winter coats prices & removes armor from common craftable wintercoats

* Get that armor back

* Setting priceMultiplier to 0 to balance price

* Make craft cost more reasonable & add price

(cherry picked from commit 3ca413d295)
 2024-01-28 00:28:04 +01:00
Minty642 db16f44eb0 Adding Industrial Ore Processor premium recipe (#24345) 
Edit Industrial Ore Processor

(cherry picked from commit e882179a75)
 2024-01-28 00:27:11 +01:00
Nim b57f8429d1 Solo bench (#24203) 
* solo bench

* price

* fix

* comfy

* 111

* clear

(cherry picked from commit 016d35645f)
 2024-01-27 23:51:28 +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
Ubaser dbc89a5476 Buff potassium availability from bananas (#24257) 
* banana

* yes

(cherry picked from commit 949b07dce0)
 2024-01-27 23:35:57 +01:00
Nim cd2f967ae2 Add snake kebab (#24341) 
* add snake kebab

* fix sprite

* just meat

(cherry picked from commit 6a0c800492)
 2024-01-27 23:35:54 +01:00
Debug 122e99302b Fix Delta stuff 2024-01-26 23:29:17 +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 40f7e0b53e Lathe Categories (#24247) 
* Lathe Categories

* serilog my beloathed

(cherry picked from commit 73e94dfa92)
 2024-01-26 23:12:38 +01:00
Ubaser c3e95f02a0 Make super bite burger easier to craft (#24231) 
* add

* needs space for salt

(cherry picked from commit 8cc24c9a5d)
 2024-01-26 23:07:24 +01:00
TurboTrackerss14 37c32f5776 Add Mothroach Burger (#24156) 
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering

(cherry picked from commit c32d19cf5c)
 2024-01-26 23:01:01 +01:00
Boaz1111 328d7a604d Reinforced glass reacting fix (#24135) 
* takeitouttakeitout

* Delete error.glsl

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 24aeec2373)
 2024-01-26 22:55:30 +01:00
Nim 061432debd Construction Blast door (#24050) 
* construction blast door

* fix

* price

* fix2

* hem

* xif

* Static

(cherry picked from commit efb424834a)
 2024-01-26 22:53:00 +01:00
Skye be33bad257 Cryo Burn Chem - Aloxadone (#23980) 
Aloxadone (accidentally exploded first pr oops)

(cherry picked from commit 9c277bd0e2)
 2024-01-26 22:51:19 +01:00
takemysoult 54a9bea5eb Tranquilizer balance (#23979) 
(cherry picked from commit 9e1342f3e4)
 2024-01-26 22:33:45 +01:00
GreyMario 9e4fb570bc 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

(cherry picked from commit 1c3c596bae)
 2024-01-26 22:33:39 +01:00
icekot8 0d269d0954 new chemical-Necrosol (#23850) 
* rollback

* dumb fix

(cherry picked from commit 6820cff4f5)
 2024-01-26 22:33:11 +01:00
icekot8 e2e9eb62f6 medsec hud is no longer a filler (#23934) 
* medsec hud

* medsec hud

* fix

(cherry picked from commit 3d9a6f57ac)
 2024-01-26 22:30:25 +01:00
deltanedasanddeltanedas cf50b5a8b3 dedicated burn and shock meds (#23941) 
* pyrazine and insuzine

* add recipes

---------

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

(cherry picked from commit 581c95ed72)
 2024-01-26 22:28:40 +01:00
degradka 78424dcde0 Adjust prototype names to lowercase (#23810) 
(cherry picked from commit ae59b072cc)
 2024-01-26 22:21:04 +01:00
Boaz1111 477f5fdb97 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>
(cherry picked from commit 5fd3d4552c)
 2024-01-26 22:19:19 +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
Naive817 01ade0303e 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>
(cherry picked from commit 1b93243bea)
 2024-01-26 22:09:51 +01:00
GreyMario 1d3712f921 Pies and tarts categorized in meal_recipes.yml, added their recipes where possible (#23266) 
pies and tarts categorized, added recipes where possible

(cherry picked from commit 19e41011b8)
 2024-01-26 22:09:00 +01:00
Adrian16199 287fe376a5 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.

(cherry picked from commit 7c87ba3b41)
 2024-01-26 22:08:48 +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
Ubaser f79d2acf5e Flower wreaths (#23662) 
* add

* fix

(cherry picked from commit 93a77e89fe)
 2024-01-26 22:06:27 +01:00
Ubaser 5a76c4f135 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>
(cherry picked from commit 172fcaf2d4)
 2024-01-26 22:03:21 +01:00
MACMAN2003 3ff6808627 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

(cherry picked from commit 04cf1c3c49)
 2024-01-26 22:03:04 +01:00
Velcroboy 45bae76bec Add Diphenhydramine Recipe (#23006) 
Add Diphenhydramine

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 52aac0ea3b)
 2024-01-26 21:50:19 +01:00
iacore f2adcd8783 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

(cherry picked from commit d73c7e9a0a)
 2024-01-26 21:50:18 +01:00
Nemanja 3d4fa26e22 Fix iron naming, add specific materials for ores (#23590) 
add materials for ores, fix iron naming

(cherry picked from commit 86c1e36cd5)
 2024-01-26 21:47:38 +01:00
Nairod 3e61dfd5a1 More Buildable Furniture + Tweaks (#23188) 
your PR will be my beginning of a maintainer journey

(cherry picked from commit 1f2a89d453)
 2024-01-26 21:46:56 +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
ada-please 442844f1a7 Added reaction OilBreakdown (#23537) 
Added recipe OilBreakdown

(cherry picked from commit 79c790c391)
 2024-01-26 21:40:21 +01:00
Alzore 3a033a3b7d Gauze recipe in medfab (#23417) 
* Gauzelathe

* latherecipe

(cherry picked from commit 292026c584)
 2024-01-26 21:29:41 +01:00
lapatison be7ca47895 Circuit floor tile print (#23467) 
stuff

(cherry picked from commit b0a5e0f10c)
 2024-01-26 21:29:24 +01:00
deathride58 f100a9d414 Glowy lights - light fixtures now actually glow (#23428) 
* glowy lights - makes light fixtures actually physically glow when active

* serviced the lights

* ya sure

(cherry picked from commit 1a531342c5)
 2024-01-26 21:27:53 +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
lzk d2e35a2003 Fix windoor secure graph (#23274) 
* 1

* try fix

* real fix

(cherry picked from commit 07a5eaf258)
 2024-01-23 22:52:34 +01:00
Nemanja b38189c1e2 Add reagent sources to the guidebook (#22627) 
* source in my guidebook

* finish it!

* sir yes sir oorah

* network that bitch, baby

(cherry picked from commit f538a2e34a)
 2024-01-22 21:09:13 +01:00
Alzore e1670f2ac6 Easy Ramen Noodles (#23189) 
* easynoodles

* morenoodlepernoodle

* bigcup

(cherry picked from commit b5f984b57e)
 2024-01-22 21:01:53 +01:00
lzk 6b7569e608 Make shivs based on construction (#23134) 
* comit

* remove construnt

* 222

(cherry picked from commit defb7f93b9)
 2024-01-22 21:00:45 +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