Commit Graph

1155 Commits

Author SHA1 Message Date
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
lzk
a97eb8dcdc fix plushie rouny sprite (#24031) 2024-01-13 20:20:56 +03:00
Nemanja
053924b1a6 Matter bin & manipulator resprite (#23990) 2024-01-12 17:05:52 -07:00
Fahasor
fa3da1ab82 Whistle for security (second try) (#23945)
* Move Exclamation entity

* Add Whistle Component and Whistle System

* Add BaseWhistle prototype

* Add sound to BaseWhistle

* Add SecurityWhistle prototype

* Add Sprite and Icon to SecurityWhistle

* Add whistleExclamation prototype

* Fix SecurityWhistle prototype

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Add whistles to sec vendingMachine

* Revert "Add sound to BaseWhistle"

This reverts commit 0c2eeab1286fb778ed7a845e59c642f667582a4a.

* Add sounds for BaseWhistle

* Make atributions compact

* Remove unnecessary spaces

* Make WhistleSystem class sealed

* Remove possibility to exclamate one person from WhistleComponent

* Remove delay from WhistleSystem

Increase delay

* Remove unnecessary HashSet

* Try replace Resolve

* Refactor sound emmiting

* Rework spawn of exclamation

* Move WhistleComponent from Server to Shared

* Edit WhistleComponent because of moving

* Move WhistleSystem from Server to Client

* Edit WhistleSystem because of moving

* Add new event

* Add server part of WhistleSystem

* Modify system for prediction

* Add documentation to WhistleComponent

* Revert "Modify system for prediction"

This reverts commit 89abb290571ff47deb5491b0f720f6bde079110b.

* Revert "Add server part of WhistleSystem"

This reverts commit ca52ca081f30fb164f401c1818d08531f02af284.

* Revert "Add new event"

This reverts commit 5ca9694757c94c03ca72d5b2f56f5f23503a3263.

* Move system from client to shared

* Modify whistle system because of moving

* Separate checks and action

* Organize file folders according to conventions

* Make component Networked

* Change trigger component for WhistleSystem

* Put indents betwen methods

* Rework WhistleExclamation prototype

* Change variable name

* Add serializer to WhistleComponent

* Rename one variable

* add predict possibility to Shared

* add Client part of prediction

* Add Server part of prediction

* Increase whistle distance

* Prevent spawn for invisible entities

* WhistleComponent now use file-scoped namespace

* Delete unnecessary part from MakeLoudWhistle

* Add Resolve check

* Delete Server and Client part for prediction

* Make system prediction properly

* Change prediction behaviour

* Fix unexpected error occured

* Avoid using obsolete methods

* Add comments

* Update DataField to make it shorter

* Update size for new size system

* Prevent ping for invisible entities for real now

* Avoid triggering unnecessary debug asserts

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-01-12 01:05:28 -07:00
Justin Pfeifler
26c1a78186 Update Blood Red Phone Sprite (#23964)
* Add new phone sprite

* Update copyright attribution
2024-01-12 00:42:49 -07:00
IProduceWidgets
11bbf2b020 Uranium & AP magazine and projectile sprites (#23914)
Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.
2024-01-11 01:01:41 -07:00
Nemanja
b3014e6cb3 machine parts + power cell resprite (#23913)
* machine parts + power cell resprite

* logic fix
2024-01-10 23:06:01 -07:00
Boaz1111
5fd3d4552c More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)
* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-09 15:23:11 +03:00
Ubaser
fd7c641a76 Resprite powersink (#23281)
* add

* update

* meta
2024-01-09 04:21:08 -07:00
IProduceWidgets
f39fbd4800 Add the N1984 pistol (#23775) 2024-01-09 03:17:40 -07:00
Nemanja
fdd18c9ae4 Quantum Spin Inverter (#23756) 2024-01-09 00:37:55 -07:00
Emisse
78442ce4e2 Mining rebalance + seismic charges (#23757)
* push

* PUSH

* reuse cryo explosion

* minus loud

* ore band + pka

* idk dawg
2024-01-09 16:27:00 +11:00
cool dolphin
a34ee7c300 Add delicious mopwata (#23740)
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills
2024-01-08 19:24:32 -07:00
Ubaser
2cf4ba8a47 Dehydrated cube box overhaul (#23685)
* add

* yes

* fix
2024-01-07 23:27:40 -07:00
TruePaInt
4c2fd55720 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>
2024-01-08 00:03:18 +03:00
MaloTV
b85a9d7688 Bullet Type Visual Indicator (#21068)
* Bullet Class indicators

* New Practice Sprite

* Removed re-specified values

* fixes up whitespace to get this merged

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2024-01-06 21:36:51 -05:00
Alekshhh
a3f40c239e Ore Visual Change (#23618)
* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* ore

* banona

* glo

* shadwe
2024-01-06 14:34:11 -05:00
Ubaser
7858dad9e4 Darken syndicate implanter sprite (#23622)
add
2024-01-06 11:10:56 -05:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-07 02:34:15 +11:00
Ilya246
154416787e add syndicate singularity beacon (#18486)
* implement singulo attraction

* add attractor syndie item

* cleanup

* fix name/desc

* actually fix name

* singulo toolbox no longer whitelisted

* add custom sprite, overhaul prototype

* address review

* beacon real

* webedit 1

* webedit 2

* webedit 3

* permalink to copyright

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-01-06 00:21:24 -08:00