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
Ps3Moira
45b252e1b6
fix pump shotgun wielded sprite ( #31885 )
...
* fix shotgun sprite
* fix take 2
2024-09-06 17:26:46 -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
drakewill-CRL
511d759a70
A kit to help new botanists discover chemistry ( #31738 )
...
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry.
* remove exclamation marks from names
* naming fix
* Rejected trademark application for 'Farmers Helper'.
---------
Co-authored-by: PraxisMapper <praxismapper@gmail.com >
2024-09-05 18:43:00 +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
Nemanja
f710b34573
Roundstart Grappling Gun ( #31737 )
...
Roundstart grappling hook
2024-09-01 22:33:25 -06: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
lzk
98680ce0f2
Change my copyright ( #31599 )
2024-08-28 21:12:09 +02:00
metalgearsloth
afd0618a60
Station AI ( #30944 )
...
* Station AI overlay
* implement
* Bunch of ports
* Fix a heap of bugs and basic scouting
* helldivers
* Shuffle interactions a bit
* navmap stuff
* Revert "navmap stuff"
This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.
* AI wires implemented
* Fix examines
* Optimise the overlay significantly
* Back to old static
* BUI radial working
* lots of work
* Saving work
* thanks fork
* alright
* pc
* AI upload console
* AI upload
* stuff
* Fix copy-paste shitcode
* AI actions
* navmap work
* Fixes
* first impressions
* a
* reh
* Revert "navmap work"
This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.
# Conflicts:
# Content.Client/Silicons/StationAi/StationAiOverlay.cs
* OD
* radar
* weh
* Fix examines
* scoop mine eyes
* fixes
* reh
* Optimise
* Final round of optimisations
* Fixes
* fixes
2024-08-28 10:57:12 +10: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
ArtisticRoomba
adea4c91de
Adds the Head of Greytide stamp ( #30189 )
...
suggested changes from discord discussion, sprite change, add to refactored loot table
2024-08-25 20:35:22 +10:00
beck-thompson
d44bbec05d
Fix nukies not getting station codes ( #31272 )
...
First commit
2024-08-21 12:53:04 -06:00
themias
6ba7d268b0
Uplink: Combat Bakery Kit ( #31179 )
...
* save
* sprites
* mime survival kit has baguette
* add weapon/uplink
* cherry-pick croissant changes
* uplink
* Switch baguette to slashing damage
* fixes
* update attribution
* fix typos
* review comments
* reduce TC cost
* switch to regular box
* fix regular baguette rotation
2024-08-19 12:57:29 -06:00
Boaz1111
2f923d88e4
New head of security weapon:Energy Shotgun ( #30643 )
...
* Reset hopefully?
* removes the emergency security orders
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Rewrites the description based on review
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com >
* 7 shots, recharge taking 42 seconds
* minor renaming :godo:
* please work
* Revert "please work"
This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.
* please fix
---------
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com >
2024-08-19 21:14:30 +10:00
Nemanja
0a05ee9a27
add space carp and sharkminnow teeth ( #31070 )
2024-08-18 21:04:59 -06:00
Moomoobeef
529e4b767c
Added a pitcher for the chef to use in serving beverages ( #31105 )
...
* changed weird red pixel on pitcher sprite
* added pitcher prototype
* added pitcher to dinnervend
* realized I need to change the other icon sprites too :P
2024-08-18 21:01:26 -06:00
Goldminermac
864956c66b
Pancakes Fix ( #31123 )
...
* Edited blueberry pancake textures to seem more blueberry-stained
* Added new blueberry pancake sprites to allow stacking up to 9
* Added more sprites for chocolate pancakes so they can stack up to 9
* Fixed up the blueberry pancake sprites to be more consistent
* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.
* Updates the stack size in the consumable stacks yaml file.
* Added the new pancake sprites to the sprite meta json file.
* Removed an unnecessary space from the baked food YAML file
* Updated branch and fully resolved merge conflict
* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive
* Diversified the textures some more for good measure.
* Fixed some missing rims around the pancakes because I'm bored
2024-08-18 20:42:58 -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
Nemanja
a540b8840e
Goliath mob ( #30839 )
...
* Goliath mob
* Update asteroid.yml
* mcfuck yourself
* add cloak
* fixes
* Update materials.yml
2024-08-18 12:22:36 -04: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
c41fe93040
Salvage Spawners ( #31020 )
...
* treasure entities and spawners
* no more smiles
2024-08-15 13:26:02 -06: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
PoorMansDreams
02521d59dd
Throngler Plushie Sprite ( #30969 )
...
Throngonkler Plush sprite
2024-08-13 23:32:53 +03:00
Ubaser
135d52406a
Add capfruit, a gatfruit mutation. ( #30850 )
...
* add base
* add fake suffix and flavor fix
* address some reviews
* parent it
* fix test fail
* add FoodSequence support and address small review
2024-08-13 13:08:40 +02: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
mhamster
e26e662023
Small json files fixes ( #30907 )
...
Small json fixes
Resources/Textures/Interface/Default/meta.json: trailing comma
Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
2024-08-11 23:26:45 +10:00
Ed
4d75cb54c8
Custom burgers - FoodSequence system ( #30755 )
...
* setup foodsequence
* name generation and max layers limit
* move to nutrition
* move code to serverside
* move to appearance data
* marked fields as required
* Update foodsequence.yml
* b
* burgeers!
* Update produce.yml
* Update meat.yml
* Update burger.yml
* fix duplicate naming
* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com >
* merge flavor profiles
* make food trash List<>
* merge trash
* Update FoodComponent.cs
* Update FoodComponent.cs
* organs and cannabis support
---------
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com >
2024-08-10 22:31:32 +03: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
MureixloI
3f4e093eaf
[Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak ( #28719 )
...
* [Fix] CMO's equipped cloak
* [Fix] CMO's equipped cloak
* [Sprites] In hands for bluespace beaker
* [Sprites] In hands for bluespace beaker
* [Sprites] In hands for bluespace beaker
* [Sprites] In hands for bluespace beaker
2024-08-09 22:02:26 +10:00
Ubaser
c1797b769c
Resprite the equipped gas canister suit slots ( #30809 )
...
* add
* red and generic
* add meta
2024-08-09 20:32:55 +10:00
themias
8ebe105458
Add butter slices ( #30789 )
2024-08-09 09:32:42 +10:00
Nemanja
1b1008ad85
Scrap ( #30762 )
...
* jnk sprites
* scrap pt 2
* metal inhands
* hell yeah brudda
* Update meta.json
* Update scrap.yml
---------
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
2024-08-09 09:31:53 +10:00
Ed
03745efc7f
Thief beacons (try 2) ( #29997 )
...
content
2024-08-08 16:17:50 +03:00
Tayrtahn
ed4ae1628c
Add "fill levels" to spear in-hand/wielded/equipped sprites ( #28865 )
...
* Add fill level sprite support for equipped items
* Add fill sprites for held/equipped spears
2024-08-02 17:18:59 +10:00
slarticodefast
448f3804e6
Remove duplicate cartridge rsi ( #30498 )
...
remove duplicate cartridge rsi
2024-08-02 16:14:50 +10:00
Ko4ergaPunk
27f3bea46d
Cutter machine & steel mozaic item tiles ( #30431 )
...
* no texture machine
* done
* delete wip
* bug fixes
* oops
* CutterMachineCircuitboard
Glass: 500
2024-08-01 13:26:32 +03:00
Alzore
517a62a6dd
Recolor the defibrillator ( #29964 )
...
* tide-ification
* metajoson
2024-07-30 00:41:21 -04:00
themias
85e36266fa
Add envelopes ( #30298 )
...
* Add envelopes
* oops
* Remove unused loc string
* comments and fixes
2024-07-29 21:49:05 -04:00
Moomoobeef
7761f86b99
added wearable lizard plushie ( #30400 )
2024-07-29 15:52:39 +03:00
BombasterDS
de7df2a760
Some plant mutations ( #28993 )
...
* Some new plants mutations
* glasstle inhand
* gapple trico increase ↑
1-10 to 3-16
* replace trico with doc delight
2024-07-27 18:08:49 +03:00
Ilya246
d5236d8236
give nukie reinforcements full operative gear ( #30173 )
...
* rebase master
* free fish
* introduce recommended changes
* fix prototypes
* fix protos yet again
* fkhsdjbhehbo;ehb
* rafle
2024-07-25 16:37:54 -07:00
mkanke-real
e1f3bdc748
Add spicy rock pizza ( #30116 )
...
* Added all the parts to implement spicy rock pizza
* Added sprites for pizza
* Fixed coma formatting in meta.json for pizzas
* Fix formatting and rebalance reagent quantities in pizza.yml
* Flipped Uranium and Radium values to be the correct ratio
* Updated meta.json file to have credit for sprite
2024-07-23 16:22:11 -07:00
IProduceWidgets
ac53e1d0a0
add an arabian lamp. ( #27270 )
...
* add an arabian lamp
* yoink solutionitemstatus since it already displays fuel remaining.
* add comments
* fix containerception?
* Yeah sure, pray- I mean rubable.
* fix one flame frame
* Fixed emag behavior
* me when lexidysia.
* limit capacity of entitystorage and add some more comments about why it be the way it do.
* test fake?
* Holy fuck its a bug fix now? Based.
2024-07-21 01:24:28 -06:00
Alzore
c8725825be
Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper ( #26947 )
...
* no more lasers for you, borg.
* downgrade
* echis
* echis
* itemtoggleupdate
* daggerparenting
* fixtypo
* more bullet per bullet
2024-07-21 17:04:33 +10:00
SlamBamActionman
4f479b6c85
Fix RGB toys color when worn/in-hand ( #30023 )
...
rgbeeeeeeee
2024-07-14 20:26:34 +10:00
Ed
1b0c434a9f
Shiny Diamonds ( #25750 )
...
* shiny
* add
* reresprite
* rereresprite
* Add files via upload
* Update ore.yml
2024-07-13 15:15:57 +03:00
Nemanja
49096cf14f
Watches ( #29550 )
...
* watches
* rename
* add it into loot pools
2024-07-13 16:09:19 +10:00
Jonathan Argo
00a2c6a234
Made musket wieldable. ( #29910 )
...
* Made musket wieldable.
* Updated musket rsi meta.json copyright.
* Copyright adjustment again.
2024-07-12 12:16:21 +03:00
