Commit Graph
890 Commits
Author SHA1 Message Date
brainfood1183 53b2d209b0 Spray Paint (Review Ready) (#23003)
* Spray Paint (Draft)

* paint colors, paints in maints loot, cargo crate of paints.

* fix

* remove paint (sort of)

* moved paintcleaner into own system

* Moved paint to server (had to unfortunately)

* doafter now breaks when moving away.

* cant paint mobstatecomp

* loads of fixes

* fixes

* fixes

* nopaintshadercomp

* fixes

* fix

* use locale for paint remove string

* remove nopaintshadercomponent and use blacklist

* remove enabled.true from visualizer

* paint doafter event.

* add verbs for paint and remove paint and icon for paint verb.

* fixes

* no longer replaces shader when shader exists.

* replace forloop with foreach, check shader before adding and removing.

* paint doafter now separate so no copy paste code

* Entities in sprayed targets item slots are also now correctly sprayed.

* fix

* fix

* fix airlock psray painter now removes painted before painting door.

* spray paints now use openablecomponent.

* fix

* fix damn accesstypes.

* fix

* fix

(cherry picked from commit e4d5e7f1ae)
2024-03-23 23:59:20 +01:00
vanx 678468cc05 Suit slot weapon consistency + visuals (#26152)
suit slot my beloved

Co-authored-by: vanx <#vanxxxx>
(cherry picked from commit 6c239890c5)
2024-03-23 23:52:02 +01:00
Awlod 831909a4a1 Recolor paper-stamp detective (#26194)
the old seal of the detective on paper has been changed to a new one

(cherry picked from commit 0ea4c5ca7c)
2024-03-17 15:11:18 +01:00
deltanedas 76330eae64 add more carp plushies (#26081)
* carp plushie textures

* add the plushies

* add plushies to spawners

* rainbow carp and make special plushies rarer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit f8305a26a9)
2024-03-17 15:08:11 +01:00
Mr. 27andmetalgearsloth d7c48b4028 Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

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

(cherry picked from commit 3cb1c585c5)
2024-03-17 15:06:54 +01:00
Alzore 19eea0c3e2 Remove the blue tint from the health analyzer (#26101)
nomoreblue

(cherry picked from commit e5f05b735d)
2024-03-17 15:06:10 +01:00
Debug d3c23632e9 Add Psychologist stamp back hopefully 2024-03-17 15:05:42 +01:00
Mangohydra 0603f3ec77 The lawyer finally gets a stamp (#26012)
lawyer stamp

(cherry picked from commit 61b3eb4de0)
2024-03-17 15:02:28 +01:00
Debug 000d55c932 Revert "Psychologist & Lawyer stamp (#849)"
This reverts commit 344aa7bff7.
2024-03-17 15:02:07 +01:00
Ed 440e3a5b31 Recolor detective stamp (#25945)
* Add files via upload

* Update rubber_stamp.yml

(cherry picked from commit d3d9898d2a)
2024-03-17 14:51:57 +01:00
Decortex 1a509f7267 ATV resprite (#25885)
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/vehicle.png

* Add files via upload

* Delete Resources/Textures/Objects/Vehicles/atv.rsi/Vehicle.png.png

* Add files via upload

* Update meta.json

* Update meta.json

* .

(cherry picked from commit cef8a17726)
2024-03-15 11:24:47 +01:00
Guess-My-Name 344aa7bff7 Psychologist & Lawyer stamp (#849)
* new stamps

* add stamps to cmos locker and lawdrobe

* adds stamps to starting gear of psychologist and lawyer

* move locale to deltav
2024-03-07 22:14:24 -05:00
MACMAN2003 bbc0f1e15f Clockwork structures and furniture (#24673)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml

(cherry picked from commit f0e8695a91)
2024-03-07 01:26:19 +01:00
IlyaElDunaev c3a564f3eb Detective's rubber stamp (#25676)
Stamp Detective

(cherry picked from commit 81b016433f)
2024-03-07 01:15:30 +01:00
potato1234_x f8891e16b4 Add fill levels to bowls (#25639)
* fills

* contrast

(cherry picked from commit e2741498b8)
2024-03-07 01:07:56 +01:00
lzk 81b69ef3f0 Remake cargo orders to contains flatpacks (#25647)
* Remake cargo orders to contains flatpacks

* whoop

* grounging plamsa

(cherry picked from commit ec28e777c1)
2024-03-07 01:05:23 +01:00
Firewatch 4e00e2e699 Syndicate Decoy Bundle + Snap Pops (#25333)
* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake

⭐

* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy 👍

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality

(cherry picked from commit 93d820f315)
2024-03-07 01:05:03 +01:00
rosieposie 1e25e23e2a Stalagmite Changes (#25646)
* initial commit

* remove unnecessary thing

* Revert "remove unnecessary thing"

This reverts commit c4e3aecbcb9088c4dee5bf41dc5cc88eaa81f505.

* fix (real)

(cherry picked from commit e94d190ade)
2024-03-07 01:04:08 +01:00
Zadeon a48c9cc1e2 Adds minable salt "ore" (#25324)
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.

(cherry picked from commit 133bd0353a)
2024-03-07 00:59:54 +01:00
Ed 64ccfc1afb Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix

(cherry picked from commit 7a5f81ddb4)
2024-03-07 00:59:22 +01:00
MACMAN2003 7eb03410a4 add NanoTrasen balloon (#25543)
nt balloon

surprised one didn't exist already

(cherry picked from commit 0536ce6f95)
2024-03-07 00:59:19 +01:00
Ed 40fabb5bed Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish

(cherry picked from commit 84cbcb93ca)
2024-03-07 00:59:07 +01:00
Ed 35ad3c59e8 Flora anomaly nerf (#25499)
* Update kudzu.yml

* Update living_light.yml

* files

* Update flora.yml

* Update kudzu.yml

* bul

* Update kudzu.yml

* Update living_light.yml

* bullet immune

(cherry picked from commit 656679cb54)
2024-03-07 00:55:39 +01:00
Ps3Moira e9a74b764f Add Large Wood Floors (#25462)
Large Wood Floors

(cherry picked from commit 83cd1089fe)
2024-03-05 09:48:29 +01:00
lzk b4dc5351fb Little rework of existing yaml flatpacks (#24814)
* Little rework of existing yaml flatpacks

* comit 2

* 55

* 66

* 77

* WRAAAA

* done mr sloth

* Update flatpack.yml

* fix??

(cherry picked from commit 326b890318)
2024-03-05 09:46:21 +01:00
potato1234_x 5f19fc3bb6 Spaceman's Trumpet and Lily (#25090)
* trumpet + lily +polypy

* trumbet

(cherry picked from commit 33153aaa2e)
2024-03-05 09:43:30 +01:00
Tayrtahn ae6b5434fd Add fill level sprites for all the drinks (#25319)
* Fill levels for cuba libre

* Absinthe glass

* Acid Spit

* Ale glass

* Devil's kiss

* Doctor's delight (ugghh)

* Blue Curacao and Emerald Liquor glasses

* Allies cocktail, Martini, Vodka martini, Driest martini, Gildlager glass, Manhattan, Manhattan Project, Patron glass

* Aloe, Amasec, Andalusia, Antifreeze, Atomic Bomb

* Barefoot, B-52, Bahama Mama, Banana Honk, Beepsky Smash, Beer glass, Berry juice, Blood glass, Bloody Mary, Booger, Brave Bull, White Russian

* Whiskey Soda, Whiskey glass, Whiskey Cola, Vermouth glass, Tequila glass

* Cognac glass, Demon's Blood, Erika Surprise, Gargle Blaster, Gin Fizz, Gin & Tonic

* Grog glass, Hippies' Delight, Iced Beer, Irish Car Bomb, Irish Cream glass, Irish coffee

* Long Island Iced Tea, Manly Dorf, Margarita, Mead

* Merge beer steins

* More merging

* Tintable Demon's Blood, Absinthe, Barefoot, Bahama Mama, Beer, Bloody Mary, Booger, Devil's Kiss, Patron

* Sbiten, Coffee Liqueur, Cogchamp, Screwdriver, Rewriter

* Vodka glass, Gin Vodka glass, Wine glass, NT Cahors glass, Poison Wine glass, Rum glass, Dead Rum, Champagne

* Black Russian, Mojito, Neurotoxin, Silencer, Sui Dream, Snow White, Syndicate Bomb, Tequila Sunrise, The Martinez, Three Mile Island

* Green tea, Iced green tea, Iced tea, Grenadine, Iced coffee, Lemonade, Kira Special

* Cafe latte, Soy latte, Nuclear Cola, Singulo, Toxins Special, Vodka Tonic, Ice cream, Rootbeer, Rootbeer float

* Removed rogue pixel in Manhattan fill sprite.

(cherry picked from commit 29cdb9cf4e)
2024-03-05 09:31:25 +01:00
MjrLandWhale 39a7741acb Resprite & hand position correction of Nettle & Death Nettle (#25421)
Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants.

(cherry picked from commit 114f2aa543)
2024-02-21 04:09:00 +01:00
Sybil aea748df17 add icons for drinks in Solar's (#25301)
* add icons for drinks in Solar's

fixed colors of tea

* consistently use capitals for color codes

* don't add extra whitespace

(cherry picked from commit 64cecdde84)
2024-02-21 03:56:42 +01:00
Moomoobeef 308675aa7a Added Evidence Markers for the Detective! (#25255)
* added evidence markers

* box tweak

* fixed a spelling mistake

* new sprites, tweaked yml too

(cherry picked from commit 07b796d6d2)
2024-02-18 23:37:44 +01:00
Pieter-Jan Briers 25bc39b2f9 Fix missing line in nuke exploding sprite (#25351)
I could've sworn I corrected this before committing but guess not ???

(cherry picked from commit 71713fdebf)
2024-02-18 23:37:43 +01:00
MilenVolf cb0fdb47d1 LockVisualizer (#25224)
* LockVisualizer

* Fix state

* Clean some code

* Make it component, fix tests fail

* Fix for StateUnlocked

Now it is possible to manually set the unlocked state and it will work!

* Optimize LockVisualizer, add check for unlocked state

* No todo I guess

(cherry picked from commit c7870882f6)
2024-02-18 23:27:28 +01:00
PotentiallyTom f4e2bef3d2 New sprites for guidebooks (#25232)
* added books to roles

* First pass

* removed yaml to split pull requests into resprite first, then giving the books to assistants

* new science

(cherry picked from commit 561e808842)
2024-02-18 23:26:27 +01:00
Pieter-Jan Briers e9975e23e8 Nuke fancification (#25297)
Actually use more icon states for deployed/armed/about to explode

Also unlit layer.

Also examine text

(cherry picked from commit 3a45d519dc)
2024-02-18 23:17:22 +01:00
Ed b74146831d Anomaly Synchronizer + Signallers tweaks (#24461)
* content

* nerf

* fix rsi

(cherry picked from commit 4d7fd1cace)
2024-02-18 23:03:09 +01:00
Ubaser 4b136b3c34 Void jetpack resprite (#25150)
add

(cherry picked from commit 6ac83f2c7b)
2024-02-18 22:59:11 +01:00
PoorMansDreams df496a6d5d Buyable Jani Trolley (#25139)
Trolley

(cherry picked from commit 655c7bd677)
2024-02-18 22:55:51 +01:00
PoorMansDreams cf9c3969c9 Color Tipped Ammo (#25103)
* Tipped .35 ammo

* used layers instead of new sprites

* remove the useless old sprites

* changed the green slightly

(cherry picked from commit 47a199eefe)
2024-02-18 22:54:13 +01:00
Flareguy 21db631ee4 Shuttle floor resprite (#25127)
* resprites shuttle tiles

* resprites shuttle floor tiles & adds grey/black shuttle tiles

* attributions.yml update

(cherry picked from commit a93466ac24)
2024-02-18 22:54:03 +01:00
potato1234_x 321df5db54 Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas

(cherry picked from commit 667cebef52)
2024-02-18 22:39:46 +01:00
PoorMansDreams aa482a50b2 Added Tourniquets to stop bleeds (#23198)
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt.

* Resprite of the monstrosity

* Resprite of the tourniquet NO LONGER PHALLUS SHAPED

* too bright, now darker and edgier

* Tourniquet resprite

* metajson yay

(cherry picked from commit bd4e2c35ec)
2024-02-18 22:38:05 +01:00
Ubaser 8a14ecf215 Small t-ray scanner resprite (#25047)
add

(cherry picked from commit 601da0c3a3)
2024-02-18 22:35:09 +01:00
Fluffiest Floofers 1561e966d0 Fix mantis stamp (#800)
move paper_stamp-matis
2024-02-09 11:47:35 +01:00
Debug ca87c21fee Delete Resources/Textures/Objects/Tanks/yellow.rsi directory
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-08 20:22:33 +01:00
Tayrtahn 83c1438b40 Add open/closed/fill states and sprites (#24600)
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.

As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.

(cherry picked from commit 41cf3e5599)
2024-02-08 12:36:25 +01:00
deltanedas 508568a6bb Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 604748534e)
2024-02-08 12:32:24 +01:00
Tayrtahn 3de3e13bb3 Add Stonk Pockets (#24876)
* Added stonk pockets

* Give me a little credit

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

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

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 765ea789cc)
2024-02-08 12:30:17 +01:00
SlamBamActionman 4ca11a55e5 Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly

(cherry picked from commit e36844de47)
2024-02-08 12:25:20 +01:00
lzk b0dcdcb504 Newton cradle (#22914)
* comit

* comit2

* little more range

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 628e22ba02)
2024-02-08 12:20:03 +01:00
lzkandmetalgearsloth 9c7adf8290 Remove yellow oxygen tank (#24374)
* Remove yellow oxygen tank

* forgor

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

(cherry picked from commit e5bf4979ae)
2024-02-08 12:10:11 +01:00