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
..
6pack.rsi
arabianlamp.rsi	add an arabian lamp. (#27270)	2024-07-21 01:24:28 -06:00
bedsheets.rsi	Added missing details from worn capes to head of department beadsheets (#34396)	2025-01-15 16:15:56 +01:00
books.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
brbsign.rsi	Merge remote-tracking branch 'space-wizards/master'	2025-04-09 18:04:28 +03:00
buffering.rsi
bureaucracy.rsi	Чуть пофиксил голо бумагу плюс добавил ее в донат аплинк ГП (#2678)	2025-07-31 21:02:33 +03:00
cablecuffs.rsi
candles.rsi	Multiple items in loadouts (#33193)	2024-12-24 01:24:19 +01:00
candy_bowl.rsi
cc-clipboard.rsi
cd.rsi	Assorted device and core inhands (#38162)	2025-06-09 00:40:14 -07:00
chopstick.rsi
clipboard.rsi
coins.rsi	Salvage Spawners (#31020)	2024-08-15 13:26:02 -06:00
desk_bell.rsi
diskcases.rsi
eggspider.rsi
ensnare.rsi
fire_extinguisher.rsi
fire_extinguisher_mini.rsi	Emergency toolbox fill rework (#29202)	2024-06-19 14:13:27 -04:00
flare.rsi
fleshkudzu.rsi
flies.rsi
folders.rsi	Cleanup: Move folders out of bureaucracy.rsi and paper.yml (#35108)	2025-04-22 23:31:42 -07:00
glowstick.rsi
guardian_info.rsi
handcuffs.rsi
Handy_Flags
ice_crust.rsi
id_cards.rsi	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
inflatable_door.rsi
inflatable_wall.rsi
killsign.rsi
kudzu.rsi
kudzuflower.rsi
landmine.rsi	Light Up Landmines (#38092)	2025-06-06 19:01:14 -04:00
Lights	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
meteor.rsi	New fun meteors (#37327)	2025-05-20 23:04:27 +10:00
modular_receiver.rsi
module.rsi	init	2025-02-17 13:23:57 +01:00
monkeycube.rsi
moproach_shoes.rsi	Moproaches (#38700)	2025-07-14 22:47:47 -04:00
nukedisk.rsi	Disk """resprite""" (#29277)	2024-06-22 23:06:17 +10:00
ParcelWrap	Adds Parcel Wrap (#34471)	2025-04-26 19:24:25 -04:00
pens.rsi	Wizard's Magical Pen (#35623)	2025-03-03 16:54:43 +01:00
potatoai_chip.rsi
proximity_sensor.rsi	some robotics inhands (#33676)	2025-03-19 21:43:00 -04:00
qm_clipboard.rsi
reagent_fillings.rsi
rifle_stock.rsi
sample_tubes.rsi	Salvage Spawners (#31020)	2024-08-15 13:26:02 -06:00
skub.rsi
spaceshroom.rsi
stamps.rsi	Печать ВЕТО и особая печать (#2525)	2025-07-07 17:00:24 +03:00
stock_parts.rsi	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-23 21:07:25 +03:00
torch.rsi
utensils.rsi	Changed utensil sprites to appear smaller. (#34277)	2025-02-05 14:08:53 +01:00
zipties.rsi