Tayrtahn
1cf4508ca7
Add fill level visuals for water bottle in-hand sprites ( #24708 )
...
Fill level visuals for water bottle inhands
(cherry picked from commit cebb20d535 )
2024-02-08 11:56:59 +01:00
themias
cd03dbac2b
Add inhand fill visuals ( #24495 )
...
* Add inhand fill visuals
* oops
* remove unused import
(cherry picked from commit bd100344a2 )
2024-02-08 11:54:38 +01:00
Hanz
be60ec7f59
Bartender limited reagents fixup ( #24598 )
...
Fixed up bartending after the limited reagents update
(cherry picked from commit 8fc9650b6e )
2024-01-28 00:33:59 +01:00
icekot8
f8ae10391f
Add an inhand sprite to the syndicate jaws of life ( #24583 )
...
* commit
* fix fucking pixel
(cherry picked from commit 15edca2cf2 )
2024-01-28 00:32:03 +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 424d3c8dc6 )
2024-01-27 23:51:31 +01:00
Ed and metalgearsloth
145c2158ca
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 >
(cherry picked from commit a2d5d74b46 )
2024-01-27 23:40:06 +01:00
Ed
378b1199ac
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 >
(cherry picked from commit b3b64e6cf2 )
2024-01-27 23:36:10 +01:00
Nim
cd2f967ae2
Add snake kebab ( #24341 )
...
* add snake kebab
* fix sprite
* just meat
(cherry picked from commit 6a0c800492 )
2024-01-27 23:35:54 +01:00
Drayff
f7561b4c51
Toolboxes ( #24305 )
...
* Added animations for opening toolboxes
* Fix cow toolbox
(cherry picked from commit f71df97b5e )
2024-01-26 23:13:13 +01:00
themias
043f6205d8
Add fill visuals and inhand sprites to water bottle ( #24240 )
...
* Add fill visuals and inhand sprites to water bottle
* adjust sprite
(cherry picked from commit 6931848f1d )
2024-01-26 23:05:34 +01:00
Ubaser
b10c9e9ed2
Golden honker glow ( #24230 )
...
add
(cherry picked from commit 9968cc178b )
2024-01-26 23:04:40 +01:00
TurboTrackerss14
37c32f5776
Add Mothroach Burger ( #24156 )
...
* Add Mothroach Burger
* append copyright
* fix whitespace and metajson ordering
(cherry picked from commit c32d19cf5c )
2024-01-26 23:01:01 +01:00
Ubaser
9e10766f1d
Resprite buckets ( #23866 )
...
* add
* fix
* tweak
* bucket
* buckt
* bucket'd
* buckt
* bottm roundinger
(cherry picked from commit ecd84d8bfb )
2024-01-26 22:56:47 +01:00
Emisse
b9bf8342d7
medal case sprite ( #24147 )
...
medal case no longer cigar case lmao
(cherry picked from commit f33307e766 )
2024-01-26 22:55:50 +01:00
Psychpsyo
e439d50479
Plates & Cash gridinv visuals ( #24075 )
...
(cherry picked from commit a747e6dda4 )
2024-01-26 22:50:12 +01:00
lzk
00829cfa54
fix plushie rouny sprite ( #24031 )
...
(cherry picked from commit a97eb8dcdc )
2024-01-26 22:35:46 +01:00
Nemanja
d1cf90a5b3
Matter bin & manipulator resprite ( #23990 )
...
(cherry picked from commit 053924b1a6 )
2024-01-26 22:34:22 +01:00
Fahasor
a764a4eb3b
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 >
(cherry picked from commit fa3da1ab82 )
2024-01-26 22:33:18 +01:00
Justin Pfeifler
06669e20e3
Update Blood Red Phone Sprite ( #23964 )
...
* Add new phone sprite
* Update copyright attribution
(cherry picked from commit 26c1a78186 )
2024-01-26 22:31:36 +01:00
IProduceWidgets
058f10078c
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.
(cherry picked from commit 11bbf2b020 )
2024-01-26 22:26:55 +01:00
Nemanja
9890ea542c
machine parts + power cell resprite ( #23913 )
...
* machine parts + power cell resprite
* logic fix
(cherry picked from commit b3014e6cb3 )
2024-01-26 22:26:40 +01:00
Boaz1111
477f5fdb97
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 >
(cherry picked from commit 5fd3d4552c )
2024-01-26 22:19:19 +01:00
Ubaser
f49e44fb84
Resprite powersink ( #23281 )
...
* add
* update
* meta
(cherry picked from commit fd7c641a76 )
2024-01-26 22:19:01 +01:00
IProduceWidgets
eeb061ba57
Add the N1984 pistol ( #23775 )
...
(cherry picked from commit f39fbd4800 )
2024-01-26 22:17:51 +01:00
Nemanja
703b4cb7cc
Quantum Spin Inverter ( #23756 )
...
(cherry picked from commit fdd18c9ae4 )
2024-01-26 22:17:00 +01:00
Emisse
cfea52905b
Mining rebalance + seismic charges ( #23757 )
...
* push
* PUSH
* reuse cryo explosion
* minus loud
* ore band + pka
* idk dawg
(cherry picked from commit 78442ce4e2 )
2024-01-26 22:15:44 +01:00
cool dolphin
81fa7c6443
Add delicious mopwata ( #23740 )
...
* added delicious mopwata
* added mopwata, the reagent
* fixed issues, changed color, added more possible fills
(cherry picked from commit a34ee7c300 )
2024-01-26 22:15:01 +01:00
Ubaser
66f7d55ad1
Dehydrated cube box overhaul ( #23685 )
...
* add
* yes
* fix
(cherry picked from commit 2cf4ba8a47 )
2024-01-26 22:11:58 +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 4c2fd55720 )
2024-01-26 22:09:48 +01:00
MaloTV
c4600dc5d7
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 >
(cherry picked from commit b85a9d7688 )
2024-01-26 22:04:39 +01:00
Alekshhh
8274aad9bf
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
(cherry picked from commit a3f40c239e )
2024-01-26 22:03:23 +01:00
Ubaser
1189291386
Darken syndicate implanter sprite ( #23622 )
...
add
(cherry picked from commit 7858dad9e4 )
2024-01-26 22:03:22 +01:00
Ubaser
5a76c4f135
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 >
(cherry picked from commit 172fcaf2d4 )
2024-01-26 22:03:21 +01:00
Ilya246
113c5ccbbf
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 >
(cherry picked from commit 154416787e )
2024-01-26 21:50:16 +01:00
Ed
41751ecaef
Tesla Gun ( #23175 )
...
* add content
* u cant pickup lightning
* -5 heat damage
* Update battery_guns.yml
(cherry picked from commit 7d30b5ae63 )
2024-01-26 21:48:53 +01:00
GreyMario
e1bc14743b
make chem layer in bottles not semitransparent ( #23581 )
...
(cherry picked from commit 8577507c20 )
2024-01-26 21:47:01 +01:00
Alekshhh
6dc9b472aa
Uranium Ore Visual Change ( #23526 )
...
hamlet after you won't let them eat a stack of uranium ore
(cherry picked from commit ccd9ae2fd8 )
2024-01-26 21:41:55 +01:00
Ed
acdef432dc
Teslaloose and Singuloose counterplay ( #23444 )
...
* add tesla dissapear mechanic
add field holobarrier
* add PD
* add crafting
* spacing
* added to cargo
* Fix
* resprite + damageable
* oopsie
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com >
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Co-authored-by: Kara <lunarautomaton6@gmail.com >
* Update Resources/Locale/en-US/research/technologies.ftl
Co-authored-by: Kara <lunarautomaton6@gmail.com >
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com >
(cherry picked from commit 0f8c004a2f )
2024-01-26 21:41:52 +01:00
Mr. 27
75f497fac8
Arachnid plushie ( #23504 )
...
(cherry picked from commit 7947b4e599 )
2024-01-26 21:41:31 +01:00
ERROR404
3c0e9433d5
Observation Kit ( #23384 )
...
Observation Kit
(cherry picked from commit abbb724849 )
2024-01-26 21:37:32 +01:00
Ed
2282987f38
Human plushie ( #23518 )
...
* AAAAAAAAA
* TBoI reference
* really remove from cargo crate. redescription
* pipi
(cherry picked from commit 1c5639be75 )
2024-01-26 21:37:16 +01:00
themias
91929f53d8
Add clown emergency oxygen tank ( #23495 )
...
* Add clown emergency oxygen tank
* increase pressure and volume slightly due to less o2 percentage
(cherry picked from commit 0fd68b2af8 )
2024-01-26 21:35:32 +01:00
Alzore
5c9a9f6dd3
Gauze Recolor ( #23409 )
...
gauzerecolor
(cherry picked from commit 7dc1de77e8 )
2024-01-26 21:29:25 +01:00
Nemanja
96d1e4090f
Flatpacks and the Flatpacker 1001 ( #23338 )
...
* Flatpacker and flatpacks
* ok that's good enough
* convert solars/AME to flatpacks
* mats, mats, we are the mats
* basic mechanics are DONE
* thing
* final UI
* sloth
* rped jumpscare
* rename
(cherry picked from commit 1c11332fa4 )
2024-01-26 21:27:25 +01:00
zzylex
671fad267b
Allow plungers to be fired by bows and embedded into entities ( #23406 )
...
* allow plungers to be fired by bows and embedded into entities
* fixed bow being able to shoot every object
(cherry picked from commit 0f85e10747 )
2024-01-26 21:27:13 +01:00
icekot8
9a6c2e7909
artifact effect fauna and flora spawn ( #23295 )
...
* adding EffectFaunaSpawn
* add spawn flora effect, blood trigger
* fix
removed the bloody trigger
* fix
oh, I hope this solves the problem.
* I added an icon sprite..
* fix
I'm stupid..
* final touch...
(cherry picked from commit 77c10185bb )
2024-01-23 22:50:30 +01:00
Alekshhh
941435c7e7
Ammo Box Tweaks ( #23180 )
...
ammo
(cherry picked from commit 786de55d2f )
2024-01-22 21:08:32 +01:00
themias
c24d548ba8
Allow flashlights on belts ( #23256 )
...
(cherry picked from commit e3d4b69664 )
2024-01-22 21:08:31 +01:00
Alekshhh
4d39df95c5
Seed Bag Resprite ( #23210 )
...
* seed
* meta
* tweak
(cherry picked from commit 937df9fe3b )
2024-01-22 21:07:53 +01:00
Ubaser
8d8b45b660
Increase contrast in the medal case sprite ( #23228 )
...
Update icon.png
(cherry picked from commit 432a8f5768 )
2024-01-22 21:00:43 +01:00