Commit Graph

1174 Commits

Author SHA1 Message Date
Ed
7a5f81ddb4 Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
2024-02-26 16:19:51 -07:00
MACMAN2003
0536ce6f95 add NanoTrasen balloon (#25543)
nt balloon

surprised one didn't exist already
2024-02-26 16:15:53 -07:00
Ed
84cbcb93ca Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
2024-02-26 16:11:20 -07:00
Ed
656679cb54 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
2024-02-25 15:41:24 -08:00
Ps3Moira
83cd1089fe Add Large Wood Floors (#25462)
Large Wood Floors
2024-02-22 14:59:41 +03:00
metalgearsloth
d0df5ed5fa Revert "Remove handheld crew monitor (#24761)" (#25439)
* Revert "Remove handheld crew monitor (#24761)"

This reverts commit bbc6d29d21.

# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Research/biochemical.yml
#	Resources/migration.yml

* changes

* zeweh

* dergs
2024-02-22 22:00:35 +11:00
lzk
326b890318 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??
2024-02-21 21:44:22 -05:00
potato1234_x
33153aaa2e Spaceman's Trumpet and Lily (#25090)
* trumpet + lily +polypy

* trumbet
2024-02-20 23:49:39 -07:00
Tayrtahn
29cdb9cf4e 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.
2024-02-20 23:17:56 -07:00
MjrLandWhale
114f2aa543 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.
2024-02-20 18:58:08 -05:00
Sybil
64cecdde84 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
2024-02-19 10:40:43 -05:00
Moomoobeef
07b796d6d2 Added Evidence Markers for the Detective! (#25255)
* added evidence markers

* box tweak

* fixed a spelling mistake

* new sprites, tweaked yml too
2024-02-17 15:49:16 -05:00
Pieter-Jan Briers
71713fdebf Fix missing line in nuke exploding sprite (#25351)
I could've sworn I corrected this before committing but guess not ???
2024-02-17 15:46:38 -05:00
MilenVolf
c7870882f6 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
2024-02-16 16:52:31 -07:00
PotentiallyTom
561e808842 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
2024-02-16 16:50:49 -07:00
Pieter-Jan Briers
3a45d519dc Nuke fancification (#25297)
Actually use more icon states for deployed/armed/about to explode

Also unlit layer.

Also examine text
2024-02-15 16:26:45 -08:00
Ed
4d7fd1cace Anomaly Synchronizer + Signallers tweaks (#24461)
* content

* nerf

* fix rsi
2024-02-13 17:19:22 -05:00
Ubaser
6ac83f2c7b Void jetpack resprite (#25150)
add
2024-02-12 14:44:23 -06:00
PoorMansDreams
655c7bd677 Buyable Jani Trolley (#25139)
Trolley
2024-02-11 23:35:19 -07:00
PoorMansDreams
47a199eefe Color Tipped Ammo (#25103)
* Tipped .35 ammo

* used layers instead of new sprites

* remove the useless old sprites

* changed the green slightly
2024-02-11 22:02:52 -05:00
Flareguy
a93466ac24 Shuttle floor resprite (#25127)
* resprites shuttle tiles

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

* attributions.yml update
2024-02-11 13:53:56 -07:00
potato1234_x
667cebef52 Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas
2024-02-10 00:21:44 -08:00
PoorMansDreams
bd4e2c35ec 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
2024-02-09 17:57:42 -08:00
Ubaser
601da0c3a3 Small t-ray scanner resprite (#25047)
add
2024-02-08 18:09:00 -05:00
Tayrtahn
41cf3e5599 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.
2024-02-04 12:13:47 -08:00
deltanedas
604748534e Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-03 19:12:56 +11:00
Tayrtahn
765ea789cc 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>
2024-02-03 12:55:02 +11:00
Mr. 27
8ef69ff2e1 detective patch (#24739)
* inital

* fikss

* nuh uh
2024-02-01 17:49:53 -05:00
SlamBamActionman
e36844de47 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
2024-02-02 09:27:52 +11:00
lzk
628e22ba02 Newton cradle (#22914)
* comit

* comit2

* little more range

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-01 22:41:19 +11:00
lzk
e5bf4979ae Remove yellow oxygen tank (#24374)
* Remove yellow oxygen tank

* forgor

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-01 17:53:33 +11:00
RumiTiger
b80b6c04b2 A beer can and a wine can (#24365)
* A beer can and a wine can

* fix wrong file locations

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Update drinks_cans.yml

* A beer can and a wine can

* Update drinks_cans.yml

* A beer can and a wine can

* replace sprites

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Update meta.json

* Update meta.json

* Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-01 17:41:23 +11:00
PixelTK
08a31eae19 New sprite for the arachnid plushie. (#24747)
* New sprite

* Contrast is key.
2024-02-01 17:36:43 +11:00
Pieter-Jan Briers
c25ddfd638 Health analyzers now show if somebody is starving (#24789)
"why are they getting cold damage" THERE YOU GO
2024-02-01 17:28:17 +11:00
metalgearsloth
bbc6d29d21 Remove handheld crew monitor (#24761)
* Remove handheld crew monitor

- It's supposed to be a CMO computer.
- It's getting powercrept and added everywhere.

* These too

* And this
2024-01-31 22:23:49 +11:00
Tayrtahn
cebb20d535 Add fill level visuals for water bottle in-hand sprites (#24708)
Fill level visuals for water bottle inhands
2024-01-29 16:19:55 -07:00
themias
bd100344a2 Add inhand fill visuals (#24495)
* Add inhand fill visuals

* oops

* remove unused import
2024-01-28 20:38:06 -05:00
Hanz
8fc9650b6e Bartender limited reagents fixup (#24598)
Fixed up bartending after the limited reagents update
2024-01-27 09:49:26 -08:00
icekot8
15edca2cf2 Add an inhand sprite to the syndicate jaws of life (#24583)
* commit

* fix fucking pixel
2024-01-26 21:27:14 -05:00
Tayrtahn
424d3c8dc6 Add broken sprites for Vim (#24458)
* Add broken state sprites for Vim

* And the actual file too
2024-01-23 17:26:30 -05:00
Ed
a2d5d74b46 Star Wars 14: Shuttle weapon update (#23644)
* setup codebase

* make auto-fire, but its broken

* collider problem

* fix rate, add toggle port

* add laser

* power cages

* ginormous cells

* fix inhand

* add pirate cannon

* salvage gun

* functional Nuke cannon

* rewrite to standart grenade

* fix naming, add emp sprite

* grenade cartridge

* thruster fix

* nuke cannon

* audio + visual polish

* balance tweak

* tweaks

* laser balance tweak: new Electronic damage modifier set, reduce structural cannon damage

* resprite energy cages, start implementing in game

* fix cage recharger craft

* add small laser gun

* fix colliders

* add  lasers and ptk to research and crafting

* finish implementing weapon to rnd and sec

* some fixes

* splitted grenades and cannon balls

* integrate new cannon balls

* tweaks stick

* move circuits to sectechfab, fix

* fix?

* add ability to E shoot, without signals

* fix!

* fix?!?! and naming tweak

* go!

* Lank fix

* oh

* mornings don't start with coffee.

* the morning starts with bug fixes.

* fucking bugs!

* finally

* it is now possible to craft projectiles separately from cartridges

* +2 fix

* refactor

* piu

* More weight

* add AutoShootGunComponent

* move autoshoot to partial

* SetEnabled()

* some fixes

* remove CanShootWithoutUser field

* remove null-checks ToCoordinates from AttemptShoot()

* war without reason

* return to home

* ?

* forgot remove it

* review

* Fix formatting and update path

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-21 19:58:40 +11:00
Ed
b3b64e6cf2 The glowing forest anomaly (#24351)
* sans

* Papyrus

* add to game

* tweak stick

* fixes

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

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-01-20 17:31:12 -08:00
Nim
6a0c800492 Add snake kebab (#24341)
* add snake kebab

* fix sprite

* just meat
2024-01-20 18:38:10 -05:00
Drayff
f71df97b5e Toolboxes (#24305)
* Added animations for opening toolboxes

* Fix cow toolbox
2024-01-20 13:29:13 +11:00
themias
6931848f1d Add fill visuals and inhand sprites to water bottle (#24240)
* Add fill visuals and inhand sprites to water bottle

* adjust sprite
2024-01-18 16:55:05 -05:00
Ubaser
9968cc178b Golden honker glow (#24230)
add
2024-01-18 10:26:28 -05:00
TurboTrackerss14
c32d19cf5c Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering
2024-01-17 01:46:33 -07:00
Ubaser
ecd84d8bfb Resprite buckets (#23866)
* add

* fix

* tweak

* bucket

* buckt

* bucket'd

* buckt

* bottm roundinger
2024-01-16 08:47:52 -05:00
Emisse
f33307e766 medal case sprite (#24147)
medal case no longer cigar case lmao
2024-01-16 00:53:10 -07:00
Psychpsyo
a747e6dda4 Plates & Cash gridinv visuals (#24075) 2024-01-14 11:44:17 -05:00