tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,252 Commits 3 Branches 5 Tags
cca537fb33fd424257d7930386a08901b9a0065c
Commit Graph

30252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
31263f8597 Fixes ghosts being affected by gravity. 
Fixes #980
 2020-05-24 11:40:49 +02:00
Pieter-Jan Briers
65d46899c0 Switch to saltern. 
It's not done yet.
 2020-05-24 01:50:56 +02:00
Pieter-Jan Briers
860ccb3dcd Spawn points for all jobs. 2020-05-24 01:47:29 +02:00
Pieter-Jan Briers
1fca133688 Improve marker visualization for mapping. 
Command renamed to showmarkers.
Actually permanent (so if you place markers with it active, you immediately see them).
 2020-05-24 01:47:14 +02:00
Pieter-Jan Briers
4b7937b4a1 TG marker sprites. 2020-05-24 01:46:33 +02:00
Pieter-Jan Briers
ad10a59a8b Fix bad prob value. 2020-05-24 01:40:39 +02:00
Pieter-Jan Briers
658c23ede1 Adds Chef job. 2020-05-24 01:34:00 +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
Pieter-Jan Briers
36b5326a37 Allow server to send cursor-located popup messages. 2020-05-23 18:45:47 +02:00
Pieter-Jan Briers
7346774616 Fix alignment of popup messages. 
They were supposed to be centered but this broke.
 2020-05-23 18:44:54 +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
Pieter-Jan Briers
05b910d9db Slight cleanup to MoverSystem 2020-05-23 17:18:32 +02:00
Pieter-Jan Briers
0e8bb178f7 Fixes click-facing giving you NaN rotation if you interact with something at the exact same position as you. 2020-05-23 15:33:01 +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
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