zumorica
|
eb3660b9cb
|
Use DataField for tool quality enum
|
2020-05-23 14:20:26 +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 |
|
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 |
|
FL-OZ
|
613e1619fa
|
satiates abrahams hunger for microwave fixes
|
2020-05-22 17:22:42 -05:00 |
|
FL-OZ
|
597761b0c7
|
fix food proto as well
|
2020-05-22 16:26:17 -05:00 |
|
Jackson Lewis
|
e992d8fa43
|
Fix YAML prototype errors (#954)
|
2020-05-22 18:59:13 +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 |
|
zumorica
|
d2d6c2cecd
|
Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
# SpaceStation14.sln.DotSettings
|
2020-05-22 11:31:18 +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 |
|
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 |
|
FL-OZ
|
629ff929c5
|
Change some instrument program #'s to better fit their name/sound. (#938)
|
2020-05-21 15:17:34 +02:00 |
|
zumorica
|
e5ddf6e309
|
Add tile prying component
|
2020-05-20 10:55:17 +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 |
|
chairbender
|
61e4a431a2
|
Remove TableParts, fix SmoothTile destruction bug (#918)
|
2020-05-17 16:04:44 +02:00 |
|
zumorica
|
8668c78f43
|
Stun baton sprites
|
2020-05-14 15:38:17 +02:00 |
|
zumorica
|
567c0a1312
|
Animation for when mobs fall/stand
|
2020-05-14 13:34:45 +02:00 |
|
GlassEclipse
|
27d27f2b59
|
Body System Part 1 POGGERS!!! (#855)
|
2020-05-13 21:48:49 +02:00 |
|
zumorica
|
6428cdd596
|
Adds stunbaton
|
2020-05-13 20:21:03 +02:00 |
|
zumorica
|
b85161a35f
|
Adds stuns
|
2020-05-13 16:53:01 +02:00 |
|
Swept
|
a0e839a6ad
|
Fluff
|
2020-05-12 02:08:39 -07: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 |
|
FL-OZ
|
b1f30bf396
|
Supplemental PR for microwave. Reagent containers/ recipes/ reagents etc...
|
2020-05-07 10:58:30 -05:00 |
|
Pieter-Jan Briers
|
fe23fdb620
|
Merge branch 'master' into kitchen
|
2020-05-05 11:35:20 +02:00 |
|
Hugal31
|
fbaafa8366
|
Add smart equip shortcuts (#873)
|
2020-05-05 00:39:15 +02: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 |
|
Fouin
|
ccbe4bc23f
|
Add pitch variations (#874)
|
2020-05-03 11:20:03 +02:00 |
|
Jackson Lewis
|
4534181446
|
Clean up entity prototypes so that they don't define components twice (#866)
|
2020-05-02 23:19:20 +02:00 |
|
Víctor Aguilera Puerto
|
41ac363603
|
Adds an acoustic guitar instrument (#881)
|
2020-05-02 17:16:36 +02: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
|
b2aca9a686
|
Add microwave visualizer. Clean up microwave code.
|
2020-05-01 03:37:21 -05:00 |
|
FL-OZ
|
93c3e86c9f
|
Unfuck mostly everything.
|
2020-04-30 18:08:51 -05:00 |
|
zumorica
|
6dd0b00512
|
Fix bug where fuel wouldn't be consumed
|
2020-04-29 14:10:22 +02:00 |
|
zumorica
|
ff5549a0d1
|
Finish refactoring tools. Add multitools. (as in multiple tools in one)
|
2020-04-29 13:48:32 +02:00 |
|