Commit Graph

2033 Commits

Author SHA1 Message Date
zumorica
154ff47446 Add a few useful popups to welders. 2020-05-23 14:26:41 +02:00
zumorica
eb3660b9cb Use DataField for tool quality enum 2020-05-23 14:20:26 +02:00
Pieter-Jan Briers
ae344888d8 Fix bullets slowing down.
This one was pretty hilarious I gotta admit.
2020-05-23 13:07:46 +02:00
Pieter-Jan Briers
f337ae4ec7 Update submodule 2020-05-23 12:51:00 +02:00
zumorica
0242083883 Fix conflict screw up 2020-05-23 12:08:00 +02:00
zumorica
3029e31e4a Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
#	Content.Server/GameObjects/Components/AnchorableComponent.cs
#	Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
#	Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs
#	Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
#	Content.Server/GameObjects/Components/WiresComponent.cs
#	Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
#	Resources/Prototypes/Entities/Items/tools.yml
2020-05-23 12:02:34 +02:00
chairbender
6a4d78cfac Add interaction checks to all interactions (#923) 2020-05-23 11:27:31 +02:00
Tomeno
af0ec2aeb9 Replaces cooldown circle (#956) 2020-05-23 11:26:59 +02:00
Pieter-Jan Briers
cad59d2cb4 Fancy Verb Menu & Verb API Refactor (#928) 2020-05-23 03:09:44 +02:00
Pieter-Jan Briers
4527fc9e84 Update submodule 2020-05-23 02:39:38 +02:00
Pieter-Jan Briers
1cb1bd5a8f Randomize wirecutter and screwdriver colors. 2020-05-23 02:14:11 +02:00
Pieter-Jan Briers
ee47f72508 Fix powercells sliding off tables. 2020-05-23 01:42:19 +02:00
Pieter-Jan Briers
18ce80a43c Merge physics rewrite 2020-05-23 01:26:43 +02:00
Víctor Aguilera Puerto
b6b4482ca0 Merge pull request #958 from FL-OZ/microwave_fixes_2
General fixes to microwave
2020-05-23 00:31:58 +02:00
FL-OZ
613e1619fa satiates abrahams hunger for microwave fixes 2020-05-22 17:22:42 -05:00
Víctor Aguilera Puerto
a1ace4b396 Merge pull request #957 from FL-OZ/fix_recipes_and_SLURP
Fix recipes and global slurrrpp
2020-05-22 23:28:46 +02:00
FL-OZ
597761b0c7 fix food proto as well 2020-05-22 16:26:17 -05:00
FL-OZ
1e183ca5a8 GLOBAL SLUUUUURRRRP 2020-05-22 16:23:18 -05:00
FL-OZ
65c478c56c spagetti 2020-05-22 16:21:20 -05:00
Pieter-Jan Briers
c8075445dd Fix compile on full release. 2020-05-22 21:39:13 +02:00
zumorica
6daa1bcf27 Only play tool sound if the use goes through 2020-05-22 21:24:59 +02:00
Jackson Lewis
e992d8fa43 Fix YAML prototype errors (#954) 2020-05-22 18:59:13 +02:00
Pieter-Jan Briers
126c5942a4 Merge branches '2020-05-18-midi' and '20-05-22-midi-update' 2020-05-22 18:02:24 +02:00
Pieter-Jan Briers
dccd89b1f0 Update submodule 2020-05-22 18:01:51 +02:00
Pieter-Jan Briers
1809d87d3e Fix mistake with L3 closet IDs. 2020-05-22 17:51:24 +02:00
Pieter-Jan Briers
931c0a01ac Emergency closets are now filled automatically.
Mostly.
2020-05-22 17:49:07 +02:00
Pieter-Jan Briers
a8e2900052 Rename toolboxes to make more sense.
Also adds filled version of emergency toolboxes, currently empty.
2020-05-22 17:48:35 +02:00
Pieter-Jan Briers
c711bd8322 Adds missing dummy lockers. 2020-05-22 17:20:19 +02:00
Pieter-Jan Briers
46f53cf4ff Adds dummy "filled" versions of all lockers. 2020-05-22 16:22:33 +02:00
Pieter-Jan Briers
40432cdc14 TG locker sprites & prototypes.
Closes #947
2020-05-22 15:45:46 +02:00
Pieter-Jan Briers
28774740ef Delete dotnet 2020-05-22 15:19:33 +02:00
zumorica
d2d6c2cecd Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
#	SpaceStation14.sln.DotSettings
2020-05-22 11:31:18 +02:00
zumorica
da128f13c4 End playing song when mob can't interact or player disconnects 2020-05-22 11:13:34 +02:00
Pieter-Jan Briers
958c101e52 Move locked airlock types to their own file. 2020-05-21 23:48:43 +02:00
Pieter-Jan Briers
54642bdd91 Fix water tank texture casing.
Also adds suffixes to make mapping easier.
2020-05-21 23:20:06 +02:00
20kdc
0cfd2f3bb2 Solar Panels (#936) 2020-05-21 21:08:03 +02:00
zumorica
15beb2b87a Remove useless log. 2020-05-21 20:19:05 +02:00
zumorica
9b0bc818c6 Be slightly more harsh with dropped batches count to prevent abuse. 2020-05-21 20:11:09 +02:00
zumorica
fc0d54a6bb Playing black MIDIs stuns you. 2020-05-21 20:06:48 +02:00
zumorica
cb391ec3d8 Merge branch 'master' into 2020-05-18-midi 2020-05-21 19:50:09 +02:00
Víctor Aguilera Puerto
b270c69512 Merge pull request #911 from Zumorica/2020-05-13-stuns
Adds StunnableComponent, Stunbaton...
2020-05-21 19:48:19 +02:00
zumorica
d3102dbf96 Remove server-side RefreshInHands, refresh them on component state update 2020-05-21 19:44:49 +02:00
zumorica
7cbd2fd8ce OnHitEntities now returns a bool and takes a read only list 2020-05-21 19:40:08 +02:00
zumorica
bb31fcb227 Drop midi batch if it exceeds event limit. 2020-05-21 19:28:57 +02:00
zumorica
0235f6096e Sync sequencer tick correctly 2020-05-21 17:39:48 +02:00
zumorica
78aa4fb872 Use Sequencer, improve MIDI a lot 2020-05-21 15:20:37 +02:00
FL-OZ
629ff929c5 Change some instrument program #'s to better fit their name/sound. (#938) 2020-05-21 15:17:34 +02:00
Pieter-Jan Briers
da4f87dd6a Update submodule 2020-05-21 13:17:34 +02:00
zumorica
1e36851dde Timing boogaloo 2020-05-21 00:26:43 +02:00
FL-OZ
e1324fff19 Fix RND console keyboard sound being global. (#933)
* global keyboard

* e

* fixes microwave while im at it

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
2020-05-20 19:11:38 +02:00