rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Objects/Fun
History
Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Shared/Gravity/SharedGravitySystem.cs
#	Content.Shared/Implants/SharedSubdermalImplantSystem.cs
#	Resources/Locale/en-US/_strings/traits/traits.ftl
#	Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
#	Resources/Prototypes/Entities/Objects/Misc/implanters.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
..
AI.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
Balloons Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189) 2025-06-11 16:29:27 -07:00
Balls Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189) 2025-06-11 16:29:27 -07:00
bananiumhorn.rsi Bikehorn Retextures (#37413) 2025-05-14 18:05:45 -04:00
bikehorn.rsi Bikehorn Retextures (#37413) 2025-05-14 18:05:45 -04:00
candy_bucket.rsi Candy Bucket for Halloween (#21257) 2023-10-31 11:54:41 -04:00
capgun.rsi Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189) 2025-06-11 16:29:27 -07:00
caps.rsi
card_sword.rsi Fun with cardboard! (#37363) 2025-08-06 12:58:07 -04:00
clownrecorder.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
cluwnehorn.rsi Bikehorn Retextures (#37413) 2025-05-14 18:05:45 -04:00
crayons.rsi Crayon boxes get white crayons (#22553) 2023-12-15 19:20:39 -08:00
Darts add content (#22518) 2023-12-15 02:55:57 -07:00
dice.rsi Change range of 10-sided dice (#22833) 2023-12-21 19:53:17 -07:00
ducky.rsi
figurines.rsi Inhand sprites for figurines (#36017) 2025-04-14 21:15:49 -07:00
Foam Fixing foam dart sprite in hands (#39758) 2025-08-19 18:39:25 -04:00
glue.rsi Add open/closed/fill states and sprites (#24600) 2024-02-04 12:13:47 -08:00
goldbikehorn.rsi Bikehorn Retextures (#37413) 2025-05-14 18:05:45 -04:00
immovable_rod.rsi
Instruments Guitar Sprite Fix (#38207) 2025-06-11 02:51:19 +02:00
mech_figurines.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
mrchips.rsi
mrdips.rsi
newton_cradle.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
pai.rsi Golden pai (#38549) 2025-07-07 01:07:52 -04:00
pequeno.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
Plushies Merge remote-tracking branch 'space-wizards/master' 2025-08-10 01:49:23 +03:00
pondering_orb.rsi Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189) 2025-06-11 16:29:27 -07:00
push_horn.rsi push horn resprite (#37392) 2025-05-12 19:32:07 -04:00
rubber_chicken.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
rubber_hammer.rsi
snap_pops.rsi Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189) 2025-06-11 16:29:27 -07:00
spectrallocator.rsi ghost locator maints loot (#32323) 2024-10-18 15:42:13 +02:00
spraycans.rsi Spray paint (#321) 2024-08-28 18:15:38 +03:00
Tabletop Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-15 18:23:20 +03:00
toy_ian.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
toy_mouse.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
toy_nuke.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
toy_singularity.rsi Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
whistles.rsi Add default whistle + whistles reorganize (#27676) 2024-05-05 16:42:35 +02:00
whoopie.rsi Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036) 2025-04-08 23:27:07 +02:00