Commit Graph

88 Commits

Author SHA1 Message Date
Swept
ebebb3603a Added a buncha bloat from teegee (#1203)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-02 16:05:03 +02:00
py01
23cc6b1d4e Power Rework (#863)
Co-authored-by: py01 <pyronetics01@gmail.com>
2020-06-28 17:23:26 +02:00
Swept
339dced7a4 Adds Lean (#1221)
* We boolin' now

* Updated Meta.json
2020-06-25 18:02:48 +02:00
Swept
bad7f9dc6b Lots of new inhands, adds phoron (#1220)
* Beaker Inhands

* Flashlight Inhands

* Tile Refactor

* Adds metal/glass sheet inhands

* Removes plasma

* Adds Phoron

* We boolin'

* Phoron inhands

* First Pass inhand food

* First food inhand pass

* Soda inhand sprites

* Actually adds them
2020-06-25 13:51:58 +02:00
Víctor Aguilera Puerto
ca1fb126e7 Add timed spawner for Xeno AI and markers 2020-06-24 17:50:46 +02:00
metalgearsloth
d12a6bd9cf Add xenos (#1204)
* Add xenos for stress test

Pretty hacky and not how I'd do it long-term

* Remove claws

* Add in unarmed combat behaviors

* Cleanuppppp

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-06-24 17:43:58 +02:00
Víctor Aguilera Puerto
ffc1319733 Add new weapon spawners for SSS 2020-06-23 14:42:20 +02:00
Swept
fe65d1fa85 Weapon Tweaks (#1186)
* RPG Tweaks

* Decreased bulletbase bb
2020-06-23 14:04:19 +02:00
Swept
7b98f37f9a Adds neck UI slot and rearranges inventory UI. (#1130)
* UI Icon

* It worked?

* Reorganized UI

* converted the bedsheet/cloak sprites

* backpacks go over cloaks now

* Added a couple more neck clothing

* Milk Ape
2020-06-21 22:02:18 +02:00
metalgearsloth
95995b6232 Add a LOT more dakka (#1033)
* Start adding flashy flash

* Change slop

Might give a smoother decline

* flashy flash

* Add flashbang and flash projectiles

Bang bang bang pull my flash trigger

* Add collision check to area flash

* Flash cleanupo

* flash.ogg mixed to mono
* Adjusted flash curve again

* Enhancing flashes with unshaded and lights and shit

Still a WIP

* Add the other ballistic gun types

Re-organised some of the gun stuff so the powercell guns share the shooting code with the ballistic guns.

* Re-merging branch with master

Also fixed some visualizer bugs

* Last cleanup

Fixed some crashes
Fixed Deckard sprite
Fixed Hitscan effects
Re-applied master changes
Re-factor to using soundsystem
Add some more audio effects

* Cleanup flashes for merge

Can put flashbangs in lockers so you don't get blinded

Fix some bugs

* Fix shotties

Also removed some redundant code

* Bulldoze some legacycode

brrrrrrrrt

* Fix clientignore warnings

* Add the other Stunnable types to StunnableProjectile

* Some gun refactoring

* Removed extra visualizers
* All casing ejections use the same code
* Speed loaders can have their ammo pulled out
* Bolt sound less loud

* Stop ThrowController from throwing

* Fix speed loader visuals

* Update hitscan collision mask and fix typo

* Cleanup

* Fit hitscan and flashbang collisions
* Use the new flags support

* Update taser placeholder description

* Update protonames per style guide

* Add yaml flag support for gun firerates

* Cleanup crew

* Fix Audio up (components, audio file, + remove global sounds)
* Add server-side recoil back-in (forgot that I was testing this client-side)
* Add Flag support for fire-rate selectors

* Wrong int you dolt

* Fix AI conflicts

Haha ranged bulldozer go BRR
(I'll rewrite it after the other AI systems are done).

* Mix bang.ogg from stereo to mono

* Make sure serializer's reading for guns

Fixes integration test

* Change EntitySystem calls to use the static function

Also removed the Pumpbarrel commented-out code

* Change StunnableProjectile defaults to 0

* Fix taser paralyse

Apparently removing defaults means you have to specify the values, whodathunkit

* Add slowdown to stunnableprojectiles and fix tasers

* Remove FlagsFor from gun components

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-06-21 21:47:15 +02:00
ScumbagDog
f85dc9f94e Church organ (#1121)
* Added organ sprite

* Added church organ object

* Renamed files and references to follow guidelines
2020-06-13 13:23:10 +02:00
Swept
9ffdd023fe Adds bed, bedsheets and cloaks. (#1022)
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-06-05 23:51:46 +02:00
Víctor Aguilera Puerto
e1df008bce Add conditional spawning component (#1069)
* Add conditional spawning component

* Remove null checks

* Remove leftover return

* Properly spawn items when game rule gets added

* Fix duplicate uids in saltern

* GameRules returns IEnumerable using yield.
2020-06-05 19:42:43 +02:00
Víctor Aguilera Puerto
bffe4df16f Add gilded bike horn instrument, expose MidiBank on instruments (#1034)
* Add gilded bike horn instrument, expose MidiBank on instruments

* Reduce soundfont size by removing duplicated samples
2020-05-31 19:19:18 +02:00
FL-OZ
aa26bdfcae Rework Drink/Food/FoodContainer entirely (#1009)
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-05-29 22:50:23 +02:00
FL-OZ
4c20a504a5 Add basic PDA/Syndicate Uplink. (#942)
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-05-28 13:22:47 +02:00
FL-OZ
5316d599b6 Add Banjo instrument, ya'll 2020-05-24 23:56:04 -05: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
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
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
zumorica
d2d6c2cecd Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
#	SpaceStation14.sln.DotSettings
2020-05-22 11:31:18 +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
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
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
9753c80958 Mop sprites and wet floor sign. 2020-04-24 23:43:52 +02:00
Pieter-Jan Briers
290b3595bc Handcuff props. 2020-04-24 14:59:03 +02:00
Pieter-Jan Briers
c07c0c0032 Taser prop. 2020-04-23 23:51:01 +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
Injazz
8f580ecc1b Visually updates contents of the beaker
also adds new syringe sprite from eris
also adds colors to ALL reagents
2020-04-09 16:43:56 +05:00
Swept
3e9b93faee Adds Skub (#740)
* Added Skub

* Added Skub crafting recipe
2020-02-28 14:58:25 +01:00
moneyl
1b7860aeda Add injectors + injected reagent metabolism via BloodstreamCompo… (#730)
* Add BloodstreamComponent and BloodstreamSystem

New component for metabolizing reagents that other organs like the stomach pass their input reagents to.

* Change StomachComponent to put ingested reagents in bloodstream after delay

Now StomachComponent does not metabolize any reagents. Instead, it tracks how long each reagent has been inside it, and once they pass "digestionDelay" they'll be put inside the bloodstream, where the bloodstream will handle metabolism of the reagent.

* Add reagent injectors

Injects reagents straight into the bloodstream when used on mobs with bloodstreams. Also allows draw/inject from beakers. Does not support drawing blood/reagents from the bloodstream yet.

* Address code review

Make use of `Loc` static class instead of using `ILocalizationManager`. Localize InjectorToggleMode enum properly.
2020-02-24 01:47:33 +01:00
metalgearsloth
847acd6401 Fix gun sprites and names (#734)
Addresses #606

Sprites fixed so no short versions used (for now) and some of the extra states were removed (clarissa).

When I originally PR'd pascal case wasn't the decided name so I also updated the IDs.
2020-02-23 14:44:15 +01:00
py01
b2b8021d9b Adds rsi sprites for bureaucracy items, fixes pen and paper spri… (#711) 2020-02-17 00:16:06 +01:00
adrian
9544099c99 Paper and pen (#582)
* A very basic paper and pen implementation

* Removes SharedWriteComponent

* Update ContentNetIDs.cs
2020-02-12 00:01:05 +01:00