Commit Graph

911 Commits

Author SHA1 Message Date
The Canned One
30018a3ab1 added Derelict Cyborgs with basic functionality. 2024-09-27 18:10:51 +02:00
august-sun
b2dad9ff90 Makes the rolling pin craftable (#32285)
* Makes the rolling pin craftable

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

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

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-25 19:27:30 +02:00
lzk
87932bce57 craftable freezers (#32277)
* Craftable freezers

* oh i forgot that
2024-09-24 17:19:40 +02:00
Errant
a7e29f2878 Computer wirepanel (#32273)
* Computer wirehacking

* Power wire now shocks

* deconstruction fix

* updated tests

* Better parenting

* maintenance panel sprite

* new sprite for maintenance panel open
2024-09-23 12:51:48 +02:00
Ed
2ea54b1913 Flora anomaly seeds (#31987)
* content

* Update meta.json

* Update mobspawn.yml

* Update mobspawn.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

* Update Resources/Prototypes/Entities/Effects/mobspawn.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-21 21:54:56 +02:00
saga3152
3e92eb1910 Soda water and Vodka recipes (#32252)
* SodaWater and Vodka recipes

* Changed crystals recipe in fun.yml

* plasma is now a catalyst to create crystals

* Revert "plasma is now a catalyst to create crystals"

This reverts commit 1002d9927a3597f7a02611071ef3f706cd056a41.

* Revert "Changed crystals recipe in fun.yml"

This reverts commit 30b6b602228ec1b11a46e390c6a5868494e2b61f.

* Stir to make Vodka

* Shake to make soda water

* fix
2024-09-21 00:27:41 +02:00
Boaz1111
59a8f4445d adds plasma and uranium arrows (#31241) 2024-09-19 10:41:24 +02:00
deltanedas
4da704fd9c clean up clothing lathe recipes (#31520)
* clean up clothing lathe recipes

* add result

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-14 23:12:01 +02:00
slarticodefast
0d40b0b3e0 Add extradimensional orange, holymelon, meatwheat, worldpeas mutations (#27624)
* new mutations

* translation string fix

* add haloperidol to plant

* fix

* add FoodSequence

* food sequence fixes
2024-09-14 00:02:54 +10:00
slarticodefast
1d997d6e46 fix missing circuitboard recipes (#32092)
* fix missing circuitboard recipes

* and another one
2024-09-13 13:25:53 +02:00
deltanedas
782d6d780c clean up security lathe recipes (#31523)
* clean up security lathe recipes

* add result

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-12 05:20:57 +02:00
deltanedas
01cbaf7af6 clean up robotics lathe recipes (#31522)
* clean up robotics lathe recipes

* add result

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-12 05:13:48 +02:00
PECK
8fb78573ec Ore Processors can now produce Reinforced Glass (#32069)
fix reinforced glass in ore processors
2024-09-11 16:06:08 +02:00
ArtisticRoomba
b306afbf56 Adds salvage magnet board to the circuit imprinter (#31996)
* Adds salvage magnet board to lathe as default recipe, changes board sprite to supply sprite

* Adds the salvage magnet board to the QM's locker, science cannot be trusted and never should be

* my body is a machine that turns commits pushed to the wrong branch into machinations on git

---------

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-09-10 17:25:22 -06:00
Velcroboy
2452e46476 Completes secure wiring across all airlocks and windoors (#30794)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-09-09 13:35:47 -06:00
deltanedas
3f6846b8b2 clean up electronics lathe recipes (#31524)
* clean up electronics lathe recipes

* result

* make door and firelock cheap

* engin

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-09 13:34:18 -06:00
Alzore
00f90ac78a Add easy window upgrading, fix some other window issues. (#31978)
* uhhh a lot of window stuff, mainly easy upgrades

* buff plasma/uranium rwindows so you actually want them

* fix uranium number, correct construction descriptions

* fix tinted window price

* frosted windo
2024-09-09 13:26:10 -06:00
Ed
230ea9be46 Metamorphosis - FoodSequence 3 (#31012)
* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
2024-09-08 02:22:27 -04:00
Nemanja
efe54e011e Biogenerator (#30694)
* biogenerator

* ack

* test success!

* fix tests

* increase price of reagents
2024-09-07 23:34:22 -06:00
themias
f49d83ac81 Add justice helm (#31905)
* Add justice helm

* backslash moment

* spinny light

* remove power cell from recipe
2024-09-06 21:04:31 -06:00
Nemanja
8599251825 Mineral Scanner (#31390)
* Mineral Scanner

* doink

* review

* sunday funday

* review and fix bugs i think?

* Update MiningOverlay.cs
2024-09-07 00:05:53 +10:00
Hreno
fce7abb88e Delete nonsense solar assembly construction through the Construction window (#31425)
* Delete construction for solar assembly, it's the way to do it

* Fix description of solar tracker electronics
2024-09-04 16:12:54 +02:00
IProduceWidgets
c8e59ebdd5 Add Snails (#30765)
* add snails

* scuffix

* migrate

* mo-grate

* oopsied the ftls

* Revert "oopsied the ftls"

This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.

* the curse of staging the wrong file, resolved.

* Snoth

* fix my dumbs

* reviews 1

* anti space technology

* salt hurty

* spelling

* Its a slotherhouse out here

* sequencing

* cooked snail

* volfix

* speed reversal
2024-09-03 12:33:44 +02:00
themias
78201101d6 Add Donk Co. microwave board to Combat Bakery Kit (#31239)
* Add special microwave board to Combat Bakery Kit

* use event instead of trycomp

* make the board sus

* add instructions note

* embarrassing typo

* Add functionality to Donk Co. microwave instead

* update note
2024-09-02 15:49:00 +02:00
Julian Giebel
417d3a87a2 Station Anchor (#26098)
* Work on abstracting out chargeup functionality/ui from grav gen

* Work on station anchor

* Finish implementing station anchors

* uhh yeah

* ok.

* fix tests

* whoops

* Get the last extraneous yaml fail

* PJB review

* beast mode... ACTIVATE!

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2024-08-31 10:40:28 -04:00
deltanedas
3bdd2e3a87 reduce lathe recipe copy pasta (#31515)
* add inheritance to lathe recipes and make result an override

* add GetResult method to lathe system

* make other parts of the code use GetResult

* clean up the stock parts yml

* remove unused apu boards from dynamic recipes

* make inverse dictionary public so test doesnt have to copy paste

* revert result override stuff

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-08-29 15:36:29 -04:00
RumiTiger
d9b1369dae Cherry (#28962)
* Add files via upload

* Update produce.yml

* Update produce.yml

* Update seeds.yml

* Update flavor-profiles.ftl

* Update flavors.yml

* Update meal_recipes.yml

* Update food_produce.yml

* Update meta.json

* Update seeds.yml

* Update botany.yml

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Update produce.yml

* Update produce.yml

* Update produce.yml

* Update food_produce.yml

* Update food_produce.yml

* Update produce.yml

* Apply suggestions from code review

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update seeds.yml

* Update juice.yml

* Update juice.ftl

* Update seeds.ftl

* Update seeds.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_vending.yml

* Update cargo_vending.yml

* Update seeds.yml

* Update seeds.yml

* Update meta.json

* Update produce.yml

* Cherry Tree

* Alphabetical order

* Update food_produce.yml

* Update food-sequence.ftl

* Update food-sequence.ftl

* Update produce.yml

* Update produce.yml

* Update food-sequence.ftl

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-08-29 11:30:58 +10:00
deltanedas
6808558df6 add construction for carp statue (#31261)
* separate eyes and teeth

* make it buildable and make fixture less abusable

* norot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-08-28 15:08:55 +02:00
lzk
512d27ca6b Add black suspenders (#29055)
* Black suspenders

* fix

* fix linter
2024-08-28 11:43:30 +02:00
lzk
2871e69268 Moff cooking. Part one. (#30668)
* yml part

* guidebook

* commit

* some fixes

* a little

* change
2024-08-26 12:46:16 +10:00
Nemanja
85b7d183bd Blueprints (#31138)
* Blueprints

* Update tables_loot.yml

* doink

* mark as required
2024-08-25 22:06:50 +10:00
themias
c46a78b8e3 Fix firelockedge rotation (#31371)
save
2024-08-25 00:57:36 -04:00
Alchebun
2ce425603c Recipe for cream (#30503)
* Adds heat-based recipe for cream

* Added aeration

---------

Co-authored-by: Alchebun <jimmy.12.or#gmail.com>
2024-08-23 15:13:14 +10:00
dffdff2423
54cbe55102 Make Vox blood able to be used to make space cleaner (#30749)
Boiling vox blood creates ammonia
2024-08-23 15:05:45 +10:00
slarticodefast
ee4729fed3 Revert "Tweaking things that restrict freedom (#31095) (#31197)
* Revert "Tweaking things that restrict freedom (#31095)"

This reverts commit 171884df8f.

* keep the unequip time

* keep alphabetical order
2024-08-19 12:47:23 -06:00
Nemanja
476c7751c4 Recycler Overhaul (#30802)
* Recycler overhaul

* remove
2024-08-18 21:39:00 -06:00
to4no_fix
171884df8f Tweaking things that restrict freedom (#31095)
* Adding a straitjacket production recipe

* Adding unequipDelay and equipDelay to the muzzle

* Adding unequipDelay and equipDelay to the blindfold

* Sorting recipes
2024-08-18 21:05:25 -06:00
deltanedas
ad691931c6 add memory cell and rework logic construction (#24983)
* rework construction to be deconstructable, add memory cell

* update textures

* add code

* add memory cell and ports, empty circuit

* d

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-08-18 16:34:43 -06:00
potato1234_x
1952618203 Tea Plant and Blue Pumpkin (#25092)
* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks
2024-08-18 16:28:18 -06:00
themias
ef3de39364 Add croissant recipe (#30825)
* Add croissant recipe

* comma

* fix description

* fix merge error
2024-08-18 00:09:42 +10:00
Nemanja
ada6455b17 Make printing from ore procecssors slightly more bearable (#31074)
* Make printing from ore procecssors slightly more bearable

* Update sheet.yml
2024-08-17 15:12:55 +10:00
themias
f06176ac39 Cook-able cutlets for kebabs/tacos (#31048) 2024-08-15 13:30:08 -06:00
to4no_fix
6567fa36e4 Adding shock collar and electropack (#30529)
* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-15 10:30:39 -04:00
Eris
e5d2738a26 Sedin (#27110)
* Sedin

* almost forgot this.

* what

* Did a few fixes, tried to readd popup

* Fix popup, ready for merge

* minor change

* Generalize seed removal/destruction system, add popups in general.

* fix

* fix (again)

* deadcode is no more

* Sedin buff (nerfing the recipe soon)

* godont

* webedit moment

ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit

* CRIKEY

* Revert "CRIKEY"

This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.

I was not supposed to commit that >:/

* Alright, it should be good now but I havent tested it

* ready for merge/review

* prob -> probability

* Requested changes nodoc

* Review nodoc

* documento

* thumb up emoji
2024-08-15 10:38:21 +10:00
Ed
e659eb992f Custom Taco & Kebabs - FoodSequence 2 (#30905)
* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

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

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

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

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

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

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-14 15:04:00 +02:00
Ubaser
c6209cc725 Make mantles loadout only. (#30929)
* remove cloaks and mantles from dresser

* remove mantles from lathe

* add role timer loadout thing

* add back cloak dresser

* fix test fail

* potentially fix test fail (?)
2024-08-12 01:14:45 -06:00
Alzore
bcd7085a3e Add diamond mining drills, buff regular mining drills (#30814)
* why do I have to change so much just to add drills

* diamon
2024-08-12 11:49:09 +10:00
Plykiya
6aed90ed75 Rename cooking shelf, improve content whitelist (#30858)
Rename cooking shelf to kitchen shelf

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-11 16:21:34 +10:00
lzk
9ba038d04f Standartize clothing recipes (#29315) 2024-08-11 04:16:56 +10:00
Ubaser
ed3ec4dc5f Crowbar variants (#28988)
* add

* comma

* sprites

* yaml-ify

* add s

* lathe and engi belt

* yes

* fix maybe

* progress

* nearly there

* fix

* fix yaml linter having a stroke
2024-08-09 13:29:00 -06:00