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 389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
2024-10-30 13:26:32 +03:00
..
bananiumhorn.rsi Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
bikehorn.rsi
candy_bucket.rsi Candy Bucket for Halloween (#21257) 2023-10-31 11:54:41 -04:00
caps.rsi
clownrecorder.rsi Adds the clown recorder (Clown fix) (#15074) 2023-04-06 20:06:52 -06:00
cluwnehorn.rsi Cluwne smite (#13367) 2023-03-06 11:09:24 -08: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 Adds duck-related content and a seclite (#4489) 2021-08-19 16:23:49 -07:00
figurines.rsi Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551) 2023-11-12 16:41:45 -07:00
glue.rsi Add open/closed/fill states and sprites (#24600) 2024-02-04 12:13:47 -08:00
goldbikehorn.rsi Golden honker glow (#24230) 2024-01-18 10:26:28 -05:00
immovable_rod.rsi Immovable rod (#8306) 2022-05-20 19:43:26 -07:00
Instruments made the guitars be able to be worn on suitstorage (#29048) 2024-07-10 09:28:10 +10:00
mech_figurines.rsi Collectible figurines! (#17993) 2023-07-16 01:07:47 -06:00
mrchips.rsi Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
mrdips.rsi Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
newton_cradle.rsi Newton cradle (#22914) 2024-02-01 22:41:19 +11:00
pai.rsi Potato battery update + potato AI (#21142) 2023-10-26 00:52:49 +11:00
pequeno.rsi among pequeno (#11115) 2022-09-10 19:08:16 -05:00
rubber_hammer.rsi Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
sharkplush.rsi Make Shark Plush Janitor-Bucketable (#20123) 2023-09-14 00:17:44 -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 Retexture grass & dirt tiles (#2282) 2024-06-21 04:34:47 +03:00
toy_sword.rsi Resprites energy sword and double energy sword (#22797) 2023-12-20 23:32:11 -07:00
toys.rsi upstream 2024-09-16 12:40:23 +03:00
whistles.rsi Add default whistle + whistles reorganize (#27676) 2024-05-05 16:42:35 +02:00
whoopie.rsi Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00