Commit Graph

986 Commits

Author SHA1 Message Date
Lyndomen 98b47476de
Tweak IPCs (#2979)
* gamer species nerf

* heal ipc radiation with plasma

* comments

* tweaks

* bloodloss work

* oilpack and bleeding

* Update silicon_base.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* tweak

* i lost the plot

* fixing code comments

* reduce bleed damage

* clean up omni patch

* yaml fixes to bloodloss and omni patch. Makes welders stop bloodloss

* survival boxes

* add logistics and uplink purchases

* code commends and pro comments

* rename

* change name of datafield

* update name to bloodlossModifier

* add - to comment

* rename bloodloss to bleedingModifier

* cant be emagged

* tweaks and survival box

* comment

---------

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
2025-02-18 19:44:17 +00:00
HTML/Crystal 968887b704
Centcomm drip (#3003)
* centcomm sprites + centcomm beret

* CC mantle + prototypes

* bags

* Make centcomm hardsuit consistant

* requested changes

---------

Signed-off-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
2025-02-18 19:38:02 +00:00
Stop-Signs af0bec4897
Arsenal Tech tweaks (#2993)
* Meow

* fucking yml typo
2025-02-18 03:44:45 +00:00
deltanedas 7bd91cc1d1
jumpskirts nitpicks (#2982)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-15 19:41:23 +00:00
HTML/Crystal ee72a94b45
More jumpskirts (#2840)
* prison jumpskirt

* actually make the prison guard jumpskirt exist now

* big fixes + adds guard jumpsuit to uniform printer

* salv jumpskirt

* chem formal jumpskirt

* fixed salv loadout string

* formal epi jumpskirt added

* requested fixes

* Quick fix

* merge un-conflicted

---------

Signed-off-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
2025-02-15 19:39:28 +00:00
deltanedas b8f96b9b55 fix all the recipes 2025-02-14 16:10:02 +00:00
deltanedas be644b6a92 beans 2025-02-14 16:10:01 +00:00
deltanedas 735df5a95e missing warm light bulbs 2025-02-14 16:10:01 +00:00
Джексон Миссиссиппи 5c1e8cf446 Add loungewear to uniform printer (#35008)
* Update clothing.yml

* Update clothing.yml
2025-02-14 16:09:59 +00:00
deltanedas b38b5a32a2 move lathe recipes into packs (easier for forks and maintaining) (#33095)
* add LatheRecipePackPrototype

* change Lathe and EmagLathe to use packs

* add AddRecipesFromPacks helper to SharedLatheSystem

* update lathe logic to work with packs and clean up some stuff

* migrate individual recipes to recipe packs

* update client

* remove node/artifact scanner from techs

* :trollface:

* fix test and make it include emag recipes

* add test that every dynamic recipe must be researched

* pro

* fix

* fix

* fix all tests, genuinely good test i wonder who made it

* add unused uranium and incendiary drozd mags to tech and lathe

* add recipes

* add incendiary prototype

* undo some changes

* troll

* :trollface:

* true

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* shitmed real

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* update funny test

* :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-02-14 16:09:57 +00:00
SG6732 44274db281 Swapped butter w/ olive oil for making spaghetti (#34904)
* > Swapped the butter in boiled spaghetti with olive oil

* Update meal_recipes.yml

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
2025-02-14 16:09:56 +00:00
UpAndLeaves 1442b32d0f Fixed Wehxplosion yaml error (#34837) 2025-02-14 16:09:52 +00:00
Minty642 4412581839 Add Reagent gold and silver solification with frost oil (#33239)
* Add Reagent gold and silver solification with frost oil

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* edit frostOil value

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-14 16:09:51 +00:00
Boaz1111 4e22d87380 Separates frost oil into coldsauce and frost oil (#34458) 2025-02-14 16:09:51 +00:00
August Sun 9a6cd01b00 The Goliath Hardsuit (#34721)
* Entities for hardsuit and helmet, graph and crafting recipe; modifies goliath hide drop rate

* Added hardsuit sprites, corrected some crafting YAML

* fixed crafting recipe, adjusted resource requirements

* Added durathread material req

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
2025-02-14 16:09:47 +00:00
Southbridge 4b3dd30851 Astro Asteroid Sand (#34463)
* Added astro asteroid sand

* fixed the stack name

* adjusted tile sprites for asteroid and ice

* Adjusted meta.json

* Realized the other tile sprites all have solid lines on their perimeters

* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml

that works

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update tiles.yml

* Update Resources/Locale/en-US/tiles/tiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* adjusted the snow sprite

* Update meta.json

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2025-02-14 16:09:47 +00:00
deltanedas e5e82f0de5
move all nuke core stuff to _DV (#2902)
* move store-objective stuff to _DV

* radiation fix

* move SealingCabinet to _DV

* move textures to _DV

* move yml stuff to _DV

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-06 13:22:28 +00:00
Stop-Signs 0fb81cf702
Svallin 1984 (#2835)
* Update arsenal.yml

* Update lathe.yml

* changes
2025-02-02 15:57:52 -03:00
Radezolid f7a31e1556
Port Frontier Station's conveyor belt sprites (#2846)
* Belts Sprites

* Color fix

* Fix the desync

* Correct the JSON formatting

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
2025-02-02 06:12:55 +00:00
ArtisticRoomba e168d8ef12 Adds better description to pneumatic valve and build menu description (#32655)
* adds description to pneumatic valve and build menu description

* Change one atmosphere to kPa
2025-01-28 04:52:38 +00:00
CaasGit fc8f1267c8 New solar sprites, new solar panel upgrades, and some solar panel fixes. (#29224)
* New solar sprites, new solar panel upgrades, and some solar panel fixes.

This adds and changes a few things for solar panels!

* New sprites for all solar panels and all related states.
* Move from xform.WorldRotation to _xformSystem.SetWorldRotation within
  the solar code.
* Few random fixes that Rider suggested as warnings.
* Solar Tracker Electronics was using what looks like to be the airlock
  controller electronics, so that's now updated to something a bit more
  realistic. It also uses the engineering circuit sprite instead of the
  generic
* New Solar Panels! Adds Plasma and Uranium Glass solar panels. These
  can be constructed by adding the respective glass to the panel. Plasma
  is a slight increase of power and health, and uranium is double the
  power and health of glass. Thus giving engineers something to update
  if they want to use solar panels and possibly giving small outposts
  a way to make a bit more power without a large and complex power
  setup.

* Add in solar sprites that were not in the meta file.

* Updated sprites based on feedback.

* Fix the rotation of the solar panel sprites.
2025-01-28 04:49:38 +00:00
Nim 5dda2b3226 Blueprint double emergency tank (#34232)
* blueprint

* NitrogenTank

* description
2025-01-28 04:31:30 +00:00
kosticia f967a14b25 Printable bedsheets (#34034)
* Bedsheets

* that one fixes yellow bedsheet and delete american bedsheet
2025-01-28 04:31:23 +00:00
ArtisticRoomba 46795dc2bf Remove the ability to print the station anchor circuit board (#34358)
remove the ability to print the station anchor circuit board
2025-01-28 04:31:23 +00:00
Killerqu00 f670e51f50 craftable pet carrier (#34431)
* craftable pet carrier

* epic integration test fail

* Update Resources/Prototypes/Recipes/Crafting/improvised.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* extra tab begone

* epic linter fail

* how did linter not see this???

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-28 04:31:21 +00:00
justdie12 6d89d79d84 Bended radiator (#34251) 2025-01-12 08:17:18 +00:00
Alpaccalypse 31e3a3f1cb Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.

* Fixing some missed references

* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).

* Corrected description back to "Irish Cream"

* Removed non-entities from migration.yml
2025-01-12 07:44:34 +00:00
Janet Blackquill 4e175ea8ee
Make chloral hydrate better suited for use as anesthesia (#2685) 2025-01-11 06:23:27 +00:00
deltanedas 83a8002922
Merge pull request #2542 from deltanedas/shitmed-ops
shitmed real
2025-01-07 17:15:23 +00:00
deltanedas 1f01adef38
Merge pull request #2589 from deltanedas/upstream-ops
upstream merge 2/1/25
2025-01-06 01:35:55 +00:00
deltanedas 84c0b3e895
snipe qol prs from upstream (#2614)
* Remove discard functionality from the ChemMaster

This duplicates other methods of discarding chemicals, including
the drain conventionally given to chemistry labs.

Any problems it solves are miniscule compared to the severe UI error
that is having a destructive action without confirmation attached
to a mode, the most common source of user error.

* Improve animal cube interactions (#31668)

* Working on dehydrate recipes to renew animal cubes

* Added remaining cube dehydration recipes

* Add OnExamine to RehydratableSystem.cs, need to add functionality to check total volume vs current volume to determine if 'soaked' text needs to be displayed

* Added logic to append text to the description when the wrong reagent has been added to a compressed animal cube

* Re-adding deleted summary

* Update default SolutionName to be correct

* Remove cube recipes to prevent infinite nutrient generation

* Add OnMicrowaved event to RehydratableSystem.cs in order to clear solution of cube when microwaved. CURRENT ERROR REQUIRES REFACTOR OF MICROWAVECOMPONENT

* Subscribe to microwave event

* Refactor of MicrowaveComponent.cs to be in shared folder, accessible to RehydratableSystem.cs. Updated imports

* Modify cube to only dehydrate in microwave when cooked for at least 5 seconds

* now using event to check access to fingerprint

* Tweak - Reflective vest and Energy Katana should reflect only in correct slots (#31902)

* ReflectComponentLogicFix
Added bool InRightPlace and updated relevant system

* Using SlotFlags

* prevent friendly fire for dragon/carp (#32231)

* add NoFriendlyFire

* make zombies use NoFriendlyFire

* no friendly fire for dragon

* let dragon kill naughty fish and validhunting syndies

* add button to print logprobe logs (#32255)

* add EntityName at the bottom of LogProbe

* add button to print logprobe logs

* Add camera mod to diagnostic hud (#32254)

* ai-glass

* weh to protect against bad grammar

* transmutation into diagnostic hud

* Apply forensics when loading with an ammo box

* inaprovaline metabolizes slower

* :trollface:

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
Co-authored-by: Preston Smith <Blackfoot03@outlook.com>
Co-authored-by: YourUsername <you@example.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ArZarLordOfMango <arzarchannel@gmail.com>
Co-authored-by: themias <themias5@gmail.com>
Co-authored-by: Alzore <blackern5000@gmail.com>
2025-01-05 03:55:34 +00:00
amatwiedle 251bf3e449 Add Holopad Circuit Board to A/V Communication Technology (#34150)
Added the holopad circuit board to the AV Communication technology and circuit imprinter lathe.
2025-01-01 17:20:12 +00:00
Velcroboy 8e98721350 Rolling joints no longer requires a filter (#34106)
* Remove filters from joint crafting

* err

* hmmm

* guhhh

* yyyy

* whitespace

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-01-01 17:18:39 +00:00
ArtisticRoomba 87ee3bf6e4 New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508)
* A looooooooot of new cotton foods for the moffs

* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)

* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png

* update requested sprites

* change requested sprites

* address part of sloth's review, awaiting response

* address second half of review, fix magical food nutriment mitosis bug
2025-01-01 17:18:38 +00:00
Alpaccalypse b1ad99fcec Removed Power Monitoring Computer boards from research and lathe recipes. Added default engineering sprites for atmos computer boards. (#34078)
* Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them.

* Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes.

* Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
2025-01-01 17:15:30 +00:00
ArtisticRoomba a728a158bc Reinforced tables require welding to construct/deconstruct (#33992) 2025-01-01 17:11:35 +00:00
deltanedas 9ece272884 merge master 2025-01-01 09:14:40 +00:00
deltanedas ec94579ebc
the great namespace refactor (#2574)
* refactor DeltaV/deltav resources to _DV

* change DeltaV namespaces to _DV

* add space before all DeltaV comments

* update xamls

* fix and move arena parallax to _DV

* more fix

* refactor even more stuff

* fix the grid fills

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-01 07:50:34 +00:00
Lyndomen 9e7d191c39
Speedboot text change and tweaks (#2550)
* speednerf

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Boospace

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* more speed because they might suck now idk

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* coldfeet

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

* Update misc.yml

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

---------

Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
2024-12-29 07:31:02 +00:00
gluesniffler a3ccc297e6 Major Shitmed Bugfixes (#1003) 2024-12-27 17:13:03 +00:00
gluesniffler fd11cee0e0 Shitmed Update 2 - bottom text (#956)
* full fucking send

* ope forgot to remove the EE scripts

* fix test

* fix shitcode fail

* DELTA THAT VALUE IS NULLABLE

* whoopsie daysie

* fixed???

* chat is this real
2024-12-27 17:02:58 +00:00
gluesniffler da885d8854 Shitmed (#869)
* full fucking send

* ope forgot to remove the EE scripts

* fix test

* fix shitcode fail
2024-12-27 16:47:20 +00:00
deltanedas 13a1e1fda2
Merge pull request #2496 from deltanedas/upstream-ops
upstream merge 21/12
2024-12-22 20:05:08 +00:00
Stop-Signs 89429b12f9
Removes cooked egg reaction (#2501)
1984
2024-12-22 09:02:48 +00:00
JustinWinningham 3fc1074b7f Wood walls from barricades (#33902)
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

* Fixed construction instructions for wooden wall

* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

* Fixed construction instructions for wooden wall

* fixed linter error

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

Reasonable suggestion

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

spelling error

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* removed ability to build wall from 'junk' wood barrier'

* fixed ability to pry overlay barricades and not allow them to extend to full wood walls

* renamed incorrectly named entity

* fixed default entity graph so as to not complain for unit tests

* corrected my incorrect assumptions and fixed destroy cost

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-21 10:25:23 +00:00
Hannah Giovanna Dawson 54aa904ef4 [Christmas] Y'all want a Smite Cranberry? (#33922)
* Add a festive lemon-lime soda variant: cranberry!

* Gave lemon-lime a brand name

* Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks.

* Extend the Christmas anomaly with extra jolliness

* Minor spelling mistake. Jollyness will not be denied.

* Removed redundant delay from meta file
2024-12-21 10:20:32 +00:00
lzk 5e37de1b66 Make safes craftable (#32694)
* Made the Armory Gun Safe craftable with 10 steel, 10 plasteel, and 5 LV cables.

* Changed gun safe price to 335, to match the cost of its material components. Changed gun safe to start with no accesses when constructed.

* adress the review

* yeah

* wrah

* test fail is not real

---------

Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com>
2024-12-21 10:16:48 +00:00
Tiniest Shark 412985193c Ground Light Post Crafting Description Fix (#33920)
Updates ground light post's crafting description
2024-12-21 10:16:33 +00:00
ArtisticRoomba 1ef104d172 Adds Advanced SMES, an SMES with higher capacity for mapping (#33757)
* Adds Advanced SMES machine and board to autolathe roundstart

* Make Advanced SMES T2 Advanced Powercells research, reduce cost, remove from random spawner, add sprites by augustsun

* fix attribution formatting

* Update smes.yml to address review

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* add new sprites and change naming scheme, testing something

* address review, tested it a bit more, works ingame

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2024-12-21 10:16:14 +00:00
goet 61e0a8aa4d Spaceshroom grilling (#31872)
* make spaceshroom cookable on grill

* remove microwave recipe
2024-12-21 10:13:10 +00:00