Commit Graph

1136 Commits

Author SHA1 Message Date
Galactic Chimp
5363f59a90 Merge branch 'master' into replace-sounds-with-sound-specifier
# Conflicts:
#	Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
#	Content.Server/Storage/Components/SecureEntityStorageComponent.cs
2021-07-30 20:26:22 +02:00
Galactic Chimp
898bdc9491 #4420 Replaced SecureEntityStorageComp with LockComponent (new ECS) (#4228)
* #4420 moved sound components to a better spot in the project

* MWF-4420 - ported SecureEntityStorageComponent to new ECS system, as a LockComponent

* MWF-4420 - removed unused usings

* #4420 removed dumb ToggleLockVerb override workaround

* #4420 added SoundSpecifier to LockComponent
2021-07-30 10:22:06 -07:00
Swept
86aa1caddb Updated bucket's size to 100 2021-07-26 09:49:43 -07:00
Swept
aa4727d185 Gas tanks have proper item sizes 2021-07-26 09:39:12 -07:00
Swept
e826615f81 Updates broken description in sprays.yml 2021-07-26 07:10:00 +00:00
SethLafuente
cad7a9ad54 Gave lab Coats Storage Room (#4370)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-26 05:36:27 +00:00
mirrorcult
a91f919018 Remove FoodContainer, add whitelists, replace with SpawnItemsOnUse (#4358) 2021-07-25 17:41:50 +02:00
SethLafuente
e7eb3068a0 Added Makeshift Handcuffs as a craftable item (#4294)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-25 17:30:41 +02:00
Galactic Chimp
f531c65a0b Merge branch 'master' into replace-sounds-with-sound-specifier
# Conflicts:
#	Content.Server/Actions/Actions/DisarmAction.cs
#	Content.Server/Actions/Actions/ScreamAction.cs
#	Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
#	Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
#	Content.Server/Explosion/Components/FlashExplosiveComponent.cs
#	Content.Server/Physics/Controllers/MoverController.cs
#	Content.Server/Portal/Components/PortalComponent.cs
#	Content.Server/Portal/Components/TeleporterComponent.cs
#	Content.Server/Projectiles/Components/ProjectileComponent.cs
#	Content.Server/Singularity/Components/EmitterComponent.cs
#	Content.Server/Sound/EmitSoundSystem.cs
#	Content.Server/Stunnable/Components/StunbatonComponent.cs
#	Content.Server/Tools/Components/MultitoolComponent.cs
#	Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
#	Content.Shared/Gravity/GravityComponent.cs
#	Content.Shared/Light/Component/SharedExpendableLightComponent.cs
#	Content.Shared/Maps/ContentTileDefinition.cs
#	Content.Shared/Slippery/SlipperyComponent.cs
#	Content.Shared/Standing/StandingStateComponent.cs
#	Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
2021-07-25 14:12:00 +02:00
Galactic Chimp
10af8efc0e #4219 emit sound system add single sound support (#4237)
* Revert "#3935 implemented suggestions from PR"

This reverts commit a9b1c7b96333ca570067d6a9df1954481005892a.

* #4219 revert of single sound removal in EmitSoundSystem

* #4219 single sounds in EmitSoundSystem should work now

* #4219 some small project tweaks

* #4219 upgraded EmitSoundSystem to use SoundSpecifier

* #4219 pr tweaks

* #4219 pr tweak

* #4219 missing bike horn .yaml change
2021-07-25 04:37:01 -07:00
Kara Dinyes
ef5e6a754c Hotfix tests 2021-07-25 04:00:02 -07:00
metalgearsloth
ced39d4b2e Slight trigger refactor (#4320)
* Trigger tweaks

* Finish trigger refactor

* Clusterflash too
2021-07-25 12:09:08 +02:00
mirrorcult
d27164528e Add UI for setting solution transfer amount (#4074)
* basic eui and window

* finish EUI, update defaults

* unnecessary usings

* convert to bounduserinterface

* merge me up

merge me up inside

* Fix repeated define for component in prototype

* impl swept UI suggestion

* apply discord reviews

* small changes
2021-07-25 00:53:53 -07:00
Swept
c55f3fd478 Adds mapped storage for lots of entities + a botanical belt (#4342)
* Cleans up belt stuff and some sprites

* Tag cleanup and sheathed sword

* Adds plant belt for botany chads and maps it's items

* CE belt, will most likely child it to utility instead

* Merges belt_icon and belt_mob into the same RSI

* Cut out alpha layers for wirecutters

* Added lots of equipped-BELT sprites for various items

* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-07-25 17:21:18 +10:00
SethLafuente
43241267d3 Made the baseball bat craft able (#4336)
* Added the baseball bat into craftable items

* Added a space

* Update baseball_bat.yml

* Update bat.yml

* Update bat.yml

* Update baseball_bat.yml

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-07-24 23:51:17 +00:00
metalgearsloth
30c28dafb9 Don't spin thrown pies (#4328) 2021-07-22 23:12:07 -07:00
metalgearsloth
56bbeb5edd Fix mobs colliding with each other (#4326)
* Fix humans colliding with each other

* This one too
2021-07-22 20:22:59 +10:00
Ygg01
3fd28c2565 Added mapped storage for things like crayon belts and tools (#4201)
* Added mapped storage for things like crayon belts and tools

* Attempt to get StorageFillEvent to work

* Managed to get it working with Visualizer logi

* Improved PR and did some light refactoring of components

* Update Content.Client/Storage/Visualizers/MappedItemVisualizer.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Removed event, went with stateful ApperanceData

* Removed ids in favor of whitelist

* Refactor YAML, Moved functionality to Shared and renamed it.

* Changed so insert/remove always send full state.

* Move logic to component

* Fix some issues on MappedVisualizer and few nitpicks

- Fix mapped visualizer only doing init or update layers
- Fixed naming of systems
- Fixed sort of crayons

* Forgot to apply Vera's suggestion

* Fix the data to be more strict and to avoid unnecessary clearing

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-07-22 02:56:55 -07:00
metalgearsloth
500b9cb1ea Make Saltern driveable (#4257)
* Broadphase refactor (content)

* Shuttle jank

* Fixes

* Testing jank

* Features and things

* Balance stuffsies

* AHHHHHHHHHHHHHHHH

* Mass and stuff working

* Fix drops

* Another balance pass

* Balance AGEN

* Add in stuff for rotating shuttles for debugging

* Nothing to see here

* Testbed stuffsies

* Fix some tests

* Fixen test

* Try fixing map

* Shuttle movement balance pass

* lasaggne

* Basic Helmsman console working

* Slight docking cleanup

* Helmsman requires power

* Basic shuttle test

* Stuff

* Fix computations

* Add shuttle console to saltern

* Rename helmsman to shuttleconsole

* Final stretch

* More tweaks

* Fix piloting prediction for now.
2021-07-21 21:15:12 +10:00
metalgearsloth
4b78e0a4e0 ECS flash area on collision (#4311) 2021-07-21 11:20:13 +02:00
metalgearsloth
8862028860 ECS StunnableProjectile (#4309)
* ECS StunnableProjectile

Also renamed it to the more generic component for stunning on collision

* Reviews
2021-07-21 11:16:38 +02:00
metalgearsloth
94ef2cb66e Nuke portals (#4315) 2021-07-21 11:16:10 +02:00
metalgearsloth
b46de3a5db Refactor chemical injection to be ECS (#4296) 2021-07-20 17:41:22 +02:00
SethLafuente
fc6e9fe3e9 Increased Crowbar and Wrench Damage (#4292)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-19 20:55:37 +00:00
Kara Dinyes
84616743e9 Add HideContextMenu to low wall overlays
fixes #1239
2021-07-16 01:07:30 -07:00
Swept
48356ddb71 Adds shuttle consoles for Sloth 2021-07-15 23:33:39 -07:00
Swept
414888b87c Few fixes for org PR 2021-07-15 22:46:18 -07:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Swept
0ae9bc088f Fixes bike horn 2021-07-15 08:47:35 -07:00
Vera Aguilera Puerto
45643c633d Adds dual-port vent pump. (#4270)
* Adds dual-port vent pump.

* stop being lazy and do the flag check manually

* disable vent pump behavior
2021-07-15 23:24:45 +10:00
Vera Aguilera Puerto
d8e353742c Canister fixes and rework (#4266)
* Kills PipeNode ConnectToContainedEntities and EnvironmentalAir with fire.

* Reaction IGasMixtureHolder is nullable.

* Reworks canisters

* Adds PortablePipeNode and PortPipeNode, which connect to each other.
2021-07-12 10:00:50 +02:00
Vera Aguilera Puerto
077f158dda Add pipe coloring (#4261) 2021-07-12 09:59:45 +02:00
Galactic Chimp
ce3c59e0e6 replacing sound (collection) names with SoundSpecifier - part 1 2021-07-10 17:35:33 +02:00
Galactic Chimp
4500b66f28 #4219 upgraded EmitSoundSystem to use SoundSpecifier 2021-07-10 11:20:23 +02:00
Galactic Chimp
1b8fb8df1d #4213 translation string fixes (#4217)
* #4213 some translation string fixes

* #4213 cargo localization string fixes

* #4213 more localization tweaks and fixes

* #4213 - fixed some translation string issues

* #4213 - fixed some translation string issues
2021-07-10 01:14:06 -07:00
Pieter-Jan Briers
103bc19508 Pow3r: stage 1 (#4208)
Co-authored-by: 20kdc <asdd2808@gmail.com>
2021-07-04 18:11:52 +02:00
metalgearsloth
ea60a81fdf "fix" potted plants bb (#4255)
I believe it'd be one of the ones without worldrotation when we start doing rotated grids so I made it square for now.
Really I was just trying to stop the one at arrivals being jammed between the 2 walls constantly.
2021-07-04 22:35:09 +10:00
DmitriyRubetskoy
d10885742b Omnizine and donk-pockets (#4250)
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-07-03 01:16:21 +00:00
DmitriyRubetskoy
427ed72754 Changed airlock type from service to theatre (#4246) 2021-07-01 21:07:18 +10:00
DmitriyRubetskoy
579f3c1103 Thirteen Loko causes toxin damage (#4249) 2021-06-30 14:35:19 +00:00
Vera Aguilera Puerto
5d49527827 Fixes for computer YAML. 2021-06-30 11:35:08 +02:00
Vera Aguilera Puerto
eacbb3a6d2 Fix girder not being impassable.
Fixes #3777
2021-06-29 21:23:09 +02:00
Vera Aguilera Puerto
77ae49fd9c Sound Specifiers. (#4239)
* Adds SoundSpecifier and a type serializer.

* DiceComponent makes use of SoundSpecifier.

* When rider autorefactoring decices to add field:

* Remove SoundEmptySpecifier, use nullable everywhere
2021-06-28 16:20:57 +02:00
Vera Aguilera Puerto
dfe29a1550 Clean up vending machine prototypes. 2021-06-28 13:17:37 +02:00
Vera Aguilera Puerto
ff6cd00438 Fix spray puff and fire extinguisher cloud not moving.
They were anchored and had the wrong body type...
2021-06-28 13:08:10 +02:00
metalgearsloth
50cc526ebd Refactor standing to be ECS (#4142)
* Refactor standing to be ECS

E C S B A B Y

* DONE

* FIX IT FIX IT FIX IT

* IsDown event

* Change to methods

* Fixes

* Address some reviews

* Last of the Mohicans

* Final fixes

* Fix tests
2021-06-27 19:02:46 +10:00
Galactic Chimp
71d939bed5 #3927 beakers will now break and spill on landing after a throw (#4230) 2021-06-27 13:05:43 +10:00
Swept
d6805f47a3 Added fireaxe cabinets (#4221)
* Added fireaxe cabinets

* Now inserts and renamed ItemCabinetVisuals file

* Added netsync

* Cut out layers for future ItemCabinetVisualizer work and reorganized some RSIs

* Update Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json

* Update Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-06-25 13:27:22 +10:00
DrSmugleaf
716bee0746 Remove IClientSingularityInstance, move visual effects to SingularityDistortionComponent (#4194)
* Remove IClientSingularityInstance

* In and out 5 minute refactor

* Component states for singularity distortion

* Fix distortion states

* Address reviews
2021-06-24 12:48:11 +10:00
Vera Aguilera Puerto
34e457b854 Gas Tanks no longer use NodeContainer, Gas Canisters no longer use passive gates. 2021-06-23 12:02:28 +02:00