Commit Graph

1670 Commits

Author SHA1 Message Date
Víctor Aguilera Puerto
24bc06b253 Merge pull request #984 from SweptWasTaken/airlocks
* Speeds up Airlocks
* Merges Swept into the repo
2020-05-27 18:30:39 +02:00
Pieter-Jan Briers
195c16d800 Wire hacking is now fancy.
1. new UI
2. wires are correctly randomized.
3. wires layouts
are shared across machines in the same round.
2020-05-27 15:24:07 +02:00
FL-OZ
5316d599b6 Add Banjo instrument, ya'll 2020-05-24 23:56:04 -05:00
Swept
32ba48fdab Added the rest 2020-05-24 14:40:12 -07:00
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
81f778b2a9 Adds observer spawn points. 2020-05-24 16:58:32 +02:00
Pieter-Jan Briers
313cccb24f Drill and jaws inhands. 2020-05-24 15:00:12 +02:00
Swept
bceb57957f Only Basic Airlock 2020-05-24 05:47:18 -07: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
4b7937b4a1 TG marker sprites. 2020-05-24 01:46:33 +02:00
Pieter-Jan Briers
658c23ede1 Adds Chef job. 2020-05-24 01:34: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
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
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
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
Víctor Aguilera Puerto
312e8f17a5 Merge branch 'master' into 2020-04-28-tool-component 2020-05-19 14:19:45 +02:00
zumorica
8668c78f43 Stun baton sprites 2020-05-14 15:38:17 +02:00
GlassEclipse
27d27f2b59 Body System Part 1 POGGERS!!! (#855) 2020-05-13 21:48:49 +02:00
Swept
a0e839a6ad Fluff 2020-05-12 02:08:39 -07:00
zumorica
6ae5e36a18 Merge branch 'master' into 2020-04-28-tool-component 2020-05-11 12:24:43 +02:00
Pieter-Jan Briers
fe23fdb620 Merge branch 'master' into kitchen 2020-05-05 11:35:20 +02:00
FL-OZ
46ef79af60 Delete microwave.dmi, unneeded. Revert accidently changes to Shared EntryPoint.cs 2020-05-04 00:16:05 -05:00
Pieter-Jan Briers
cdf4127a86 Fix lathe recipe texture references.
Closes #860
2020-05-02 16:09:46 +02:00
Jackson Lewis
1f0c72dd28 Gravity (#841) 2020-05-02 16:02:52 +02:00
FL-OZ
b2aca9a686 Add microwave visualizer. Clean up microwave code. 2020-05-01 03:37:21 -05:00
zumorica
ff5549a0d1 Finish refactoring tools. Add multitools. (as in multiple tools in one) 2020-04-29 13:48:32 +02:00
FL-OZ
d0f18b2f66 Add Eris microwave RSI.
Cleaned up  the Microwave component code.
2020-04-28 19:15:43 -05:00
Pieter-Jan Briers
525e16ce88 Security airlocks. 2020-04-26 14:42:19 +02:00
Pieter-Jan Briers
c64101664e Plain glass & glass engineering airlock. 2020-04-26 01:09:52 +02:00
Swept
a7ba921e42 Added an animated ghost sprite. (#856) 2020-04-25 23:30:42 +02:00
Pieter-Jan Briers
a5de12e4cf Inhands for multitool and screwdriver
Also makes power debug tool its own thing.
2020-04-25 13:55:16 +02:00
Pieter-Jan Briers
f636303b8e Import proper reinforced wall sprites. 2020-04-25 12:10:43 +02:00
Pieter-Jan Briers
2734abbe20 Import command airlocks and move all airlock sprites to new directory. 2020-04-25 11:40:17 +02:00
Pieter-Jan Briers
9753c80958 Mop sprites and wet floor sign. 2020-04-24 23:43:52 +02:00
Pieter-Jan Briers
bd88fdc5b6 Bar sign is now unshaded when lit.
Made by wrestlingforme in spritebus.
2020-04-24 21:55:39 +02:00
Pieter-Jan Briers
290b3595bc Handcuff props. 2020-04-24 14:59:03 +02:00
Pieter-Jan Briers
5a09e91ca3 Arcade prop. 2020-04-23 23:51:15 +02:00
Pieter-Jan Briers
c07c0c0032 Taser prop. 2020-04-23 23:51:01 +02:00
Pieter-Jan Briers
ee87e56d55 Bartender ID card. 2020-04-23 17:08:18 +02:00
Pieter-Jan Briers
b6d82c9186 Import TG armor vest. 2020-04-23 17:08:06 +02:00
Pieter-Jan Briers
228f3b8a09 Bartender uniform. 2020-04-23 16:47:31 +02:00
Pieter-Jan Briers
7cb7e03ff6 Import colored jumpsuits from TG.
Including the holy grey jumpsuit.
2020-04-23 16:41:45 +02:00
Pieter-Jan Briers
4239e8c687 Remove ugly Eris grey jumpsuit. 2020-04-23 16:40:43 +02:00
Pieter-Jan Briers
6cad18bff4 Potted plants from TG. 2020-04-23 13:56:16 +02:00
Pieter-Jan Briers
74a4cc63cc Utensils. 2020-04-23 01:40:18 +02:00
Pieter-Jan Briers
f5a9a953a9 Import bar sign sprites from TG. 2020-04-23 00:16:09 +02:00