Commit Graph

559 Commits

Author SHA1 Message Date
Swept 8860ca6e2c
Crowbar, Wrench, Welder inhand (#990) 2020-05-24 21:44:22 +02:00
Swept 67143b1371
Toolboxes Update (#985) 2020-05-24 18:56:19 +02:00
Pieter-Jan Briers 08c165c703
Adds warp points to make moving around the map for testing easier. 2020-05-24 14:32:22 +02:00
zumorica 3cf2948f82 Fix remnants of IAfterAttack 2020-05-24 13:47:13 +02:00
Víctor Aguilera Puerto 1c00bf2855
Merge pull request #865 from Zumorica/2020-04-28-tool-component
Tool refactor, multi tools
2020-05-24 13:42:02 +02:00
Pieter-Jan Briers ad10a59a8b
Fix bad prob value. 2020-05-24 01:40:39 +02:00
Pieter-Jan Briers bd92bdfbf8
Improve equip fail messages.
Message when trying to equip regular items to slots.
Mention ID slot specifically.
2020-05-23 22:57:25 +02:00
Pieter-Jan Briers 54b3783b03
Use mouse-focused popup for equip failure message. 2020-05-23 22:52:17 +02:00
Pieter-Jan Briers 82b7a09880
Fix exceptions from deleting pilot chair with player in it. 2020-05-23 22:51:41 +02:00
zumorica 934e69d6e3 Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
#	Content.Server/GameObjects/Components/AnchorableComponent.cs
#	Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
#	Content.Server/GameObjects/Components/Doors/AirlockComponent.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
2020-05-23 18:00:28 +02:00
Pieter-Jan Briers 3847b5260b
Fix exception if you attack and hit nothing. 2020-05-23 17:47:32 +02:00
Hugal31 6c2ad53b68
Add error popup message on equip failure (#955) 2020-05-23 17:27:57 +02:00
Clyybber 1ad9a10050
Fix #274 (#927) 2020-05-23 17:23:25 +02:00
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
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
Pieter-Jan Briers cad59d2cb4
Fancy Verb Menu & Verb API Refactor (#928) 2020-05-23 03:09:44 +02:00
Pieter-Jan Briers 1cb1bd5a8f
Randomize wirecutter and screwdriver colors. 2020-05-23 02:14:11 +02:00
Pieter-Jan Briers 18ce80a43c
Merge physics rewrite 2020-05-23 01:26:43 +02:00
FL-OZ 613e1619fa satiates abrahams hunger for microwave fixes 2020-05-22 17:22:42 -05:00
FL-OZ 1e183ca5a8 GLOBAL SLUUUUURRRRP 2020-05-22 16:23:18 -05:00
zumorica 6daa1bcf27 Only play tool sound if the use goes through 2020-05-22 21:24:59 +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 931c0a01ac
Emergency closets are now filled automatically.
Mostly.
2020-05-22 17:49:07 +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
20kdc 0cfd2f3bb2
Solar Panels (#936) 2020-05-21 21:08:03 +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 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
zumorica 6db9ac7247 Improved timing 2020-05-20 17:48:36 +02:00
zumorica 731ab22568 Better timing 2020-05-20 17:13:49 +02:00
zumorica 400a71f8a1 More refactors 2020-05-20 15:15:17 +02:00
zumorica 1e91b9f075 Change properties to auto-properties 2020-05-20 11:05:55 +02:00
zumorica e5ddf6e309 Add tile prying component 2020-05-20 10:55:17 +02:00
zumorica f04b9c0a2f God fucking dammit 2020-05-19 14:52:45 +02:00
zumorica be6eba4f75 Add TryPryTile 2020-05-19 14:50:24 +02:00
Víctor Aguilera Puerto 312e8f17a5
Merge branch 'master' into 2020-04-28-tool-component 2020-05-19 14:19:45 +02:00
zumorica 06d2cc74ed Refactor a bunch of stuff. 2020-05-19 14:17:48 +02:00
zumorica 06c7030514 Some work 2020-05-17 12:58:54 +02:00
20kdc dd38d2f763 RotatableComponent: Fix "clockwise/counter-clockwise" verbs being swapped
"Clockwise" actually rotated it counter-clockwise and vice versa.

See response to https://discord.com/channels/310555209753690112/310555209753690112/711331672485789718 for confirmation that this is correct
2020-05-16 22:43:13 +01:00
zumorica 51f06c4142 Math -> MathF 2020-05-14 18:58:45 +02:00
zumorica 569a5b3c85 Add IStunModifier component interface 2020-05-14 18:03:08 +02:00
zumorica ebb49b3377 Document some stun code 2020-05-14 17:49:40 +02:00
zumorica b5cf3cf2da Adds stun status effect 2020-05-14 17:44:09 +02:00
zumorica a8275b4fae Sounds for stun baton 2020-05-14 16:13:25 +02:00
zumorica 2132ff41d4 In-hands are now refreshed when the prefix is changed 2020-05-14 15:44:05 +02:00
zumorica 1dd7eb8677 Stunbaton now has a 3/4 chance of applying slowdown instead of paralyze 2020-05-14 15:43:49 +02:00
zumorica 390127924b Add slowdown stun 2020-05-13 22:35:23 +02:00
zumorica 4e843358bd Remove useless bools 2020-05-13 22:13:22 +02:00
zumorica 6428cdd596 Adds stunbaton 2020-05-13 20:21:03 +02:00
zumorica a524eca44b Action blocker for changing direction 2020-05-13 19:26:39 +02:00
zumorica c3c5b87fd5 Expose data on StunnableComponent 2020-05-13 19:10:29 +02:00
zumorica f968128af7 StandingStateHelper, StunSystem 2020-05-13 19:04:50 +02:00
zumorica b85161a35f Adds stuns 2020-05-13 16:53:01 +02:00
Pieter-Jan Briers c9ce38a6a7
Merge pull request #892 from FL-OZ/microwave_hot_fix 2020-05-13 02:10:56 +02:00
FL-OZ f3f7422129 , AudioParams.Default to beep sounds. should fix global but probably doesnt 2020-05-11 16:59:02 -05:00
zumorica 94491e9626 Cleanup code a little. 2020-05-11 15:40:33 +02:00
zumorica b1db8d1e7a Add WelderComponent back 2020-05-11 15:26:07 +02:00
Clyybber 7d58baa0e0 Fix #673 2020-05-11 13:54:31 +02:00
zumorica 6ae5e36a18 Merge branch 'master' into 2020-04-28-tool-component 2020-05-11 12:24:43 +02:00
Pieter-Jan Briers 1aa1867971
Merge pull request #899 from PaulRitter/wire_interact_check 2020-05-11 01:31:19 +02:00
Paul 531278ced1 added InRangeUnobstructed call to wire component 2020-05-08 14:01:33 +02:00
FL-OZ 40ad366636 Various hotfixes and touchups to the microwave.
- Stop a debug assertion from TryGetComponent on a deleted entity.
-  Add a dark overlay for when microwave is busy to UI.
2020-05-06 17:45:45 -05:00
Pieter-Jan Briers fe23fdb620
Merge branch 'master' into kitchen 2020-05-05 11:35:20 +02:00
FLOZ c8e2624390 lol 2020-05-04 19:59:43 -05:00
FLOZ b803bee2c0 Remove unncessary class dictionary and list. Fix meal prototype properties. 2020-05-04 18:35:36 -05:00
Hugal31 fbaafa8366
Add smart equip shortcuts (#873) 2020-05-05 00:39:15 +02:00
FLOZ 69b34e74ce Seperated Reagent item list and Solid item list to allow for vaporizing particular reagents at will. (also fixes a really nasty null reference exception because they shared the same list before D: ) 2020-05-04 15:16:16 -05:00
FLOZ 108bd36b8c And not a single "ToList()" went home to their family that day..... 2020-05-04 14:39:33 -05:00
FLOZ 4034458d26 Pretty up the microwave menu, add click sounds. Remove some unnecessary ToList() calls. Remove unnecessary IoC resolves. 2020-05-04 13:54:54 -04:00
FL-OZ d7d0bc71f9 Microwave is done. Added an easter egg recipe and made the cheeseburger recipe more sensible. 2020-05-03 23:58:29 -05:00
Víctor Aguilera Puerto 5d7514674e
Suspicion on the Space Station gamemode (#849) 2020-05-03 11:25:39 +02:00
Fouin ccbe4bc23f
Add pitch variations (#874) 2020-05-03 11:20:03 +02:00
FL-OZ 4f7deb8452 Next up timer buttons 2020-05-03 03:09:54 -05:00
FL-OZ 0f61c2fadf Microwave UI + solids implemented. 2020-05-03 01:34:00 -05:00
Jackson Lewis 1f0c72dd28
Gravity (#841) 2020-05-02 16:02:52 +02:00
FL-OZ dba0949c5b Add (not working) basis for allowing solids (entities) in recipes. 2020-05-02 01:29:20 -05:00
FL-OZ dd19466578 Microwave interface. 2020-05-01 23:34:04 -05:00
FL-OZ 13fba25edc A shit ton of microwave stuff i can't really explain this. 2020-05-01 17:19:04 -05:00
FL-OZ a5fa184765 Reformat 'PoweredIdle' to 'Idle' 2020-05-01 03:38:48 -05:00
FL-OZ b2aca9a686 Add microwave visualizer. Clean up microwave code. 2020-05-01 03:37:21 -05:00
FL-OZ 5d4c0609ec ShadowCommander is MVP. 2020-04-30 23:07:27 -05:00
FL-OZ 93c3e86c9f Unfuck mostly everything. 2020-04-30 18:08:51 -05:00
FL-OZ 8e0185f892 Refactor "output" to "result" for recipes/prototypes.
Remove a debug recipe from meal_recipes.yml
Add food.yml for food related reagents: sugar, flour, etc.
2020-04-29 21:04:08 -05:00
zumorica 2c4354c95a Take welder into account. 2020-04-29 15:41:05 +02:00
zumorica 659d623784 Cleanup construction component 2020-04-29 15:34:49 +02:00
zumorica 8e10522bd2 Read enums only when reading from serialized data 2020-04-29 14:26:13 +02:00
zumorica 6dd0b00512 Fix bug where fuel wouldn't be consumed 2020-04-29 14:10:22 +02:00
zumorica 0a44490acb Change fuel consumption back to normal 2020-04-29 13:56:38 +02:00
zumorica ff5549a0d1 Finish refactoring tools. Add multitools. (as in multiple tools in one) 2020-04-29 13:48:32 +02:00