Commit Graph

156 Commits

Author SHA1 Message Date
themias
cd03dbac2b Add inhand fill visuals (#24495)
* Add inhand fill visuals

* oops

* remove unused import

(cherry picked from commit bd100344a2f9f845e2dceb8351d36f8af913a5f1)
2024-02-08 11:54:38 +01:00
Tayrtahn
9878278736 Add broken sprites for Vim (#24458)
* Add broken state sprites for Vim

* And the actual file too

(cherry picked from commit 424d3c8dc6bbec4f8772668057d8740a32ff321d)
2024-01-27 23:51:31 +01:00
Ubaser
9e10766f1d Resprite buckets (#23866)
* add

* fix

* tweak

* bucket

* buckt

* bucket'd

* buckt

* bottm roundinger

(cherry picked from commit ecd84d8bfb21a952f6f0b64cd5c2f29fb170eb76)
2024-01-26 22:56:47 +01:00
TruePaInt
bb7e94892b Gun cyborg module (#19629)
* Update borg_modules.yml

* Update uplink_catalog.yml

* Update uplink-catalog.ftl

* Add files via upload

* Update meta.json

* Update uplink-catalog.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
(cherry picked from commit 4c2fd55720923ea897fbc3bbc02b7ae26c25ffae)
2024-01-26 22:09:48 +01:00
Ubaser
1189291386 Darken syndicate implanter sprite (#23622)
add

(cherry picked from commit 7858dad9e4f85337fa0529d2e3a86fde093c6381)
2024-01-26 22:03:22 +01:00
GreyMario
e1bc14743b make chem layer in bottles not semitransparent (#23581)
(cherry picked from commit 8577507c20e904c96d303658b6178e15dfa10e19)
2024-01-26 21:47:01 +01:00
ERROR404
3c0e9433d5 Observation Kit (#23384)
Observation Kit

(cherry picked from commit abbb724849309178bf9372b6ef59407d0f813f52)
2024-01-26 21:37:32 +01:00
Alzore
5c9a9f6dd3 Gauze Recolor (#23409)
gauzerecolor

(cherry picked from commit 7dc1de77e8e5c4b8e3b45c1b3865039668880368)
2024-01-26 21:29:25 +01:00
Alekshhh
4d39df95c5 Seed Bag Resprite (#23210)
* seed

* meta

* tweak

(cherry picked from commit 937df9fe3bcfb5b043224ed10bffb1909a077409)
2024-01-22 21:07:53 +01:00
Ubaser
8e8cdea026 Syndicate Implanter resprite (#23227)
add

(cherry picked from commit 59eac36d5f163827b4a86d705c73f6b270a734a1)
2024-01-22 21:00:40 +01:00
lzk
7a8c1569e9 Fix nettle seeds inhand sprite (#22891)
fix

(cherry picked from commit e6b52cc294a9ecafadda75ff62b91c60152b7d96)
2024-01-22 18:28:31 +01:00
lzk
b6593a1916 add saturation to TC inhand sprites (#22870)
change

(cherry picked from commit 8604efc520934e1de5c67f96ebb1df9d1da600d1)
2024-01-22 18:23:50 +01:00
Guilherme Ornel
714d913850 Updated (most) medipen sprites (#22789)
* changed sprites

* desaturated a bit
2023-12-22 23:13:16 +01:00
Stanislav4ix
795fd833c4 Added ore bag of holding (#22680)
* Added ore bag of holding

* Now its in industrial tecnologi

Yeah, I fixed it with Tunguso4ka

Co-Authored-By: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>

* Update ore_bag_holding.yml

Now the "magnet" has a larger radius of attraction

* Changed location

---------

Co-authored-by: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
2023-12-22 23:00:25 +01:00
Ubaser
1f4162eede Add vials (#22587)
* vial

* yea

* s

* fix something

* yaml

* fixer

* aaaaaaaaaaa

* update

* sprite changes

* a

* fix'd
2023-12-16 20:38:06 +01:00
NkoKirkto
2301e05d1c Added urn (#22488)
* Changes Stuff( ͡° ͜ʖ ͡°)

* Changes Suff(Fucked Sprites)

* Chages Stuff(New Sprite)

* Changes Stuff(Hope this works)

* Changes Stuff(Renamed the Urn.rsi)

---------

Co-authored-by: NkoKirkto <halloleute640mail.com>
2023-12-16 20:38:06 +01:00
Arendian
2ace099252 Cluster grenades for uplink and security (#22029)
* clustergrenades go boom

* Small tweaks

* Some tweaks and soaplet

* clustergrenadesystem changes and launcher types

* small tweaks

* typo

* whitespace

* rsi edit

* another typo

* add containers

* Some changes related to merge

* Forgot to change name

* Made changes based on review

* Removed new china lake ammo based on feedback in other PR

* Unneeded nested loop moment

* Nested loop needed after all moment
2023-12-16 20:19:56 +01:00
Boaz1111
d663746a8a Cryostasis syringe (#22021)
* Added cryo syringe, sprite courtesy of Ubaser

* I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly

* IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW

* added canReact at the wrong place, fixed now

* made the transfer good

* more issues with the sprites

* not much to say, one must imagine sisyphus happy

* mmm yes give me 0 of layers

* I oughta double check shit more

* Should be all done!

* I didn't add it to the lathe, I am le stupide

* Forgot to add the recipe somewhere

* final touches, can actually be made at the medlathe now

* added the recipe to the protolathe as well
2023-12-02 20:33:26 +01:00
DoubleRiceEddiedd
ba4c12618e New mutation species plant, Lemoon Tree (#22023)
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
2023-12-02 20:33:26 +01:00
Feluk6174
549c91f5ab Added Bananadine (#21759)
* added bananadine and its functionallity (and backed banana peel)

* added baked banana peals sprites

* fixed typos and changed the sprite used by backed banan peel to the right one

* Changed the cooktime and now grinded baked banana leaves have carbon

* Updated bananadine description

* Ficed typo in ragent-desc-bananadine

* Reverted actidental change to nocturine
2023-12-02 19:00:04 +01:00
Doru991
b76a8b6e64 Borg QOL, part 3 (#21567)
* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold
2023-11-12 20:55:34 +01:00
DoubleRiceEddiedd
f55b9bf773 New crop: Cotton (#21536)
* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole
2023-11-12 20:51:24 +01:00
Psychpsyo
3fc496001a Soapy Water & Edible Soap (#20364)
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
2023-11-12 20:26:09 +01:00
ZeroDayDaemon
95515a2be0 Pea Plants (#20504)
* Add Pea Plants

* Pea soup

* Update flavor-profiles.ftl

* Update seeds.yml

* Add seeds to vendors

* Make things more expensive to fix free money exploit

* Update textures

* Revert "Update textures"

This reverts commit b1b7046504afc7468742b0722f601d98684a1c89.

Vines dont grow straight into the air.

* Shift up 4 pixels

* Fuck autofix conflitcs

* Shift up 3 more pizels

* I finally got byond working so I made sure they were EXACTLY the same

* Address Reviews? I think?

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-10-31 19:18:38 +01:00
Doru991
d166ed49ed Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)
* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)
2023-10-31 19:14:51 +01:00
Doru991
faa7c96886 Potato battery update + potato AI (#21142)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-10-31 18:45:37 +01:00
Link
ea1c7e4c83 Added implanter sprite (#20758)
* add

* Update meta.json

* tweaaaak
2023-10-20 15:30:20 +02:00
Velcroboy
b2f67d43f1 Adds vending restocks for ChefVend and Condiment Stations (#19305)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-10-08 19:52:10 +02:00
Nim
65d41737cd Advanced treatment cyborg module for medical borg (#19667)
* chemical analysis goggles for medical borg

* module and its tools

* fix

* fix2

* icon

* module research

* meh
2023-10-08 19:52:10 +02:00
Debug
fd2cc8570d Sync master up to 1/10 (#74)
* Automatic changelog update

* Make NPC names proper nouns & fix some genders (#20534)

* Proper names & genders

* Uppercase proper names

* Make Smile female

* fix bingus wrinkly head (#20531)

* rouny meat and steak (#20526)

* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

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

* Automatic changelog update

* Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311)

* Explosive wet floor sign & janitorial suicide vest

* fix attributions

* Remove name & desc from explosive wet floor sign

* Make wet floor sign chameleonable

* Automatic changelog update

* Minor slippery stuff (#20535)

* Update submodule to 162.2.0 (#20570)

* Predicted armor (#20560)

* clean up some lines in smile the slime prototype (#20552)

* Revert "Use full file path for temp replays (#19002)" (#20545)

* Add EyesGlasses into ClothesMate (#20523)

* Automatic changelog update

* Fix Punpun crew monitor sensor (#20484)

* Automatic changelog update

* EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Make arcades hackable again (#20555)

* Automatic changelog update

* Health alert tweaks (#20557)

* Automatic changelog update

* Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564)

* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent

* Nukeops todo and cleanup

* Remove Active field

* Add EndedGameRuleComponent

* bartender suit (#20521)

* give me a drink bartender

* guh

* aARG

* Necropolis and mine walls (#20578)

* Automatic changelog update

* archaic accent tweaks (#20567)

* Automatic changelog update

* Add confirmation to kick and respawn in the admin player actions panel (#20542)

* Remove windows-latest CI runs, remove unused build-test-release.yml (#20540)

* Change .editorconfig to keep existing attribute arrangement (#20538)

* Automatic changelog update

* Catch replay start and end errors on round restarts (#20565)

* Update trivial components to use auto comp states (#20539)

* Fix role unbans not applying in real time (#20547)

* Disable AHelp buttons when no player is selected, update button styling (#20568)

* Automatic changelog update

* Added a toggle fullscreen button (default F11) (#20272)

* Added a toggle fullscreen button (default F11)

* Removed un-needed comments

* Review Requested Changes

* Fixed Acidental Spacing Change

* bwoink, removed extraneous code

* nothing, litterally

* Automatic changelog update

* Fix not networking markings (#20588)

* Automatic changelog update

* Update RobustToolbox to v162.2.1 (#20590)

* Automatic changelog update

* Glorfcode (force say on damage/stun/crit) (#20562)

* Automatic changelog update

* Fix AHelp progressively showing more AHelp panels (#20591)

* Automatic changelog update

* caninsert entitystorage tweaks (#20589)

* Automatic changelog update

* Fix mapping actions crashing on load (#20592)

* Fix loading a map with a ThirstComponent crashing the game (#20594)

* Fix electrocution displaying real name of disguised players (#20603)

* Organ fixes (#20488)

* Automatic changelog update

* Kettle medical rework (#20435)

* Initial try at medical rework for kettle

* Re-add decal decorations to Kettle's medical

* Add more lockers to kettle's med

* Actually upload kettle's map, not its proto

* Automatic changelog update

* Added blocked visuals to volumetric pump (#20610)

* Automatic changelog update

* Move TimedDespawn to engine (#20515)

* Update submodule to 163.0.0 (#20616)

* Remove v0.1 version number from local main menu screen (#20617)

* Remove cloneData parameter from AutoNetworkedField (#20596)

* Update submodule to 164.0.0 (#20618)

* fix cognizine ghost role (#20632)

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

* Automatic changelog update

* Move ID layer one pixel to correct alignment (#20630)

* Update nukie hardsuit descriptions (#20529)

* Make holofans destructable (#20445)

* Automatic changelog update

* bowl is open (#20453)

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

* Add TestPair.WaitCommand() (#20615)

* Rename ThreatPrototype and mark fields as required (#20611)

* Adjust hard bomb shape (#20608)

* dragon refactor, objectives and use GenericAntag (#20201)

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

* Automatic changelog update

* Added generic empty liquids tank (#20563)

* Move view variables verb to the top of the list with no category and localize it (#20546)

* saltern update (#20325)

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

* Fix followers leaking (#20643)

* Add Winter Boots (#20622)

* add

* fix prototype

* Add QM mantle (#20621)

* add

* fix prototype

* Automatic changelog update

* Slime mobs breathe nitrogen and resprite their organs (#20577)

* Slimes breathe nitrogen and resprite their organs

* ups

* mmm

* Automatic changelog update

* Fix the new lizard horn's consistency + issue (#20620)

* fix

* add

* Revert "add"

This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.

* Add RandomHumanoidAppearance component to for space ninjas (#20605)

* Automatic changelog update

* Space cat breathes space (#20550)

* Space cat breathes space

Made Space Cat lungs ROBUST

* Made Space Cat's lungs ROBUST 2.0

* Automatic changelog update

* Wide anomaly locator (#20581)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* add textures

* fix encoding

* fix 2

* Automatic changelog update

* Fixed Telescopic Shield Lighting (#20650)

* Fixed Telescopic Shield Lighting Bug fix #20199

* no need for these at all

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Add a special hardsuit for nukie medic (#20471)

* Automatic changelog update

* Carry over other mutations when doing species mutation (#20551)

* Automatic changelog update

* Add Spanish accent to poncho and sombrero (#20377)

---------

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com>
Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com>
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: Miro Kavaliou <miraslauk@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com>
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com>
Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com>
2023-10-03 14:15:46 -05:00
Nim
4d0a0f3003 [Resprite] Syndicate Implanter (#20376)
* Syndicate Implanter

* cop

* size

* fix
2023-09-27 21:59:12 +02:00
Alekshhh
dded59d008 Medkit Fill Change (#19362)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-27 21:59:12 +02:00
Doru991
d91deb540e New crops: Berries and Bungo (#19800)
* Add berries

* Berry recipes

* Add bungo fruit

* yml tweaks

* yummy poisonous pits

* Technically it's a seed

* Revert "Technically it's a seed"

This reverts commit be892cf119c1e733ac2922b878aaa476f435152a.

Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick.

* Revert 2 Electric Boogaloo

This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687.

* Small rewording

* Cocoa balancing

* Oops
2023-09-27 21:59:12 +02:00
Psychpsyo
6716a833da Make advanced mop show up on janitor trolley (#20124)
* Make advanced mop show up on janitor trolley

* Make blue trash bag show up on janitor trolley

* Revert "Make blue trash bag show up on janitor trolley"

This reverts commit 3f94b3cf81fba68255f60ca4b2ff085f4ab0c48f.
2023-09-27 21:59:12 +02:00
Psychpsyo
0d79d99bbf Make advanced mop wieldable (#20229) 2023-09-27 21:59:12 +02:00
Doru991
16ab3f4dfe Add plant species mutations (#19960) 2023-09-27 21:59:12 +02:00
Ubaser
d7c9a2cb73 fix transparency (#19934) 2023-09-09 01:44:35 -06:00
Nemanja
4d677f0685 1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -07:00
Ubaser
7065f6cc02 New bloodpack sprites (#18192)
* Add bloodpack sprite for testing ingame

* shrink

* small tweaks

* Update bloodpack.png

* add sprites

* add meta

* fix meta again

* fix regenerative-mesh

idk how i accidentally deleted it

* HOPEFULLY FINAL FIX AAA

* change copyright

* TEST

* Revert "TEST"

This reverts commit 34de38e2a228d3f28feed966404640cc8b6c788d.

* maybe fixed

* blue
2023-08-28 22:30:10 -06:00
Nemanja
595d42659d Revert "Add peeled state for bananas (#19393)" (#19588)
Using "spawn item on use" blatantly breaks botany mutations for bananas.
2023-08-28 10:30:16 -08:00
potato1234_x
77711dea5d Add peeled state for bananas (#19393)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-26 09:31:13 -07:00
lapatison
9341cac5ef Split gardening cyborg module, literacy cyborg module tweak (#19449)
* book bag to literacy module, bucket n plant bag to gardening

* split gardening into gardening and harvesting

* book bag whitelist document, also dumpable

* fix

* new icon
2023-08-23 20:12:05 -04:00
deltanedas
4935a95687 borg construction module (#19260)
* cant insert materials into machine if unremoveable

* lingering materials

* add construction cyborg module

* fix empty stack color

* lathe recipe

* a

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-23 17:34:39 -04:00
Velcroboy
75d2c12e65 Add food carts (#19177)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-08-15 15:26:49 -07:00
Vladislav Kadira
229df7c5ec Add cocoa cultivation (#18366)
* Add cocoa cultivation

* fix

* Fix 2

* fix 3

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-08-13 10:35:58 -04:00
Nemanja
98fa00a21f Borgs (#18136)
* Laws

* positronic brain and PAI rewrite

* MMI

* MMI pt. 2

* borg brain transfer

* Roleban support, Borg job (WIP), the end of mind shenaniganry

* battery drain, item slot cleanup, alerts

* visuals

* fix this pt1

* fix this pt2

* Modules, Lingering Stacks, Better borg flashlight

* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.

* sprotes

* no zombie borgs

* oh fuck yeah i love a good relay

* charger

* fix the tiniest of sprite issues

* adjustable names

* a functional UI????

* foobar

* more modules

* this shit for some reason

* upstream

* genericize selectable borg modules

* upstream again

* holy fucking shit

* i love christ

* proper construction

* da job

* AA borgs

* and boom more shit

* admin logs

* laws redux

* ok just do this rq

* oh boy that looks like modules

* oh shit research

* testos passo

* so much shit holy fuck

* fuckit we SHIP

* last minute snags

* should've gotten me on a better day
2023-08-12 16:39:58 -05:00
deltanedas
ccd93dc464 vim!!!!!!11! (#15659) 2023-08-11 12:20:16 -04:00
JoeHammad1844
70da001b41 Brute and Burn auto-injectors (#18401) 2023-08-06 12:38:25 +10:00
Vasilis
99aa7e52c7 Plunger is now a hat (#18410)
* the plunger

* Copyright webedit
2023-07-28 18:10:45 -06:00
Slava0135
7f76dd11b3 more visible explosive banana peel (#18105)
* more visible explosive banana peel

* i am idiot
2023-07-17 13:35:58 -06:00