Commit Graph

864 Commits

Author SHA1 Message Date
Víctor Aguilera Puerto
3e1015eeda fix glass firelocks 2020-09-06 17:52:11 +02:00
Víctor Aguilera Puerto
bc972156bb Fix firelocks 2020-09-06 17:34:45 +02:00
Víctor Aguilera Puerto
d89188a742 Merge branch 'master' into 2020-08-19-firelocks
# Conflicts:
#	Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
#	Content.Shared/Maps/TurfHelpers.cs
#	SpaceStation14.sln.DotSettings
2020-09-06 00:17:48 +02:00
Swept
5db94dbb07 Adds inhands and removes vir and genetics satchels. (#2003)
* Satchels now have a nice RSI

* Adds inhands for all the satchels

* Annnd we're done!
2020-09-03 23:17:32 +02:00
Swept
bd1dfed82e Removes Courier backpacks. (#1988)
* Macerates the Courier bags.

* Removes prototype file
2020-09-03 23:14:09 +02:00
Swept
e3ace03cad Boxes (and sterile mask) (#1964)
* Added sprites and lights, handcuffs and PDA box.

* Syringe and Beaker

* Adds flashbang latex and a sterile mask

* Adds a box to store those sterile masks

* Adds donkpocket box WHY WASN'T THIS IN ALREADY I'LL KILL YOU ALL AHHHHH

* Makes inhand boxes grey

* Security boxes now have proper layer

* Adds meson, sechud, and better inhands

* Adds survival box (no o2 can or injector because they're not included yet

* Adds survival box sprites

* Blank commit

* Adds filled backpacks for starting-gear

* Moves filled backpacks to a sensible place

* Builds now

* Fixes rsi
2020-09-03 23:13:45 +02:00
nuke
c3630b7301 Glowsticks, flares and lighting behaviours (#1886)
* Assets

* LightingBehaviours, flares, and such.

* More changes

* More changes, more flare work.

* More work on flares + light behaviours

* another refactor

* missed

* Light behaviours refactor, added sfx, improved graphics, improved lighting effects for glowstick and flare.

* remove unneeded value

* nullables

* remove old code

* nullable

* one last push

* net id

* more work

* more colors for glowsticks

* Adjust flare so it fades in

* fix name

* sprite fix
2020-09-03 22:02:40 +02:00
creadth
b8bf100277 Feature/1754 kill player on body parts missing (#2014)
* Moved the uplink creation code to the PresetSuspicion.Start method to ensure uplink created when we give the traitor role
Moved the starting TC balance to cvars

* Added isVital flag for body parts
Automatically killing creature if last vital body part removed
Marked head as vital part
2020-09-03 20:35:39 +02:00
Víctor Aguilera Puerto
3d9fe8ecfa Fix lv426 barsign case sensitivity 2020-09-03 15:40:20 +02:00
Pieter-Jan Briers
0a1d41d53a Merge pull request #1871 from SweptWasTaken/goodbyebarsigns 2020-09-02 23:10:39 +02:00
Exp
40f967a03a Hurt Command (#1967)
* Hurt Command

* Fixed not sending help

* Removed unused import

* Use IDamageableComponent

* Optional entityuid arg

* Reviews

* Allow DamageTypes too

* who wrote this

* reviews

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-02 23:00:06 +02:00
SoulSloth
e40e3fa267 Cloning (#1932)
* Add art assets for cloning

* Added a 'Scan DNA' button to the medical scanner

* Made the UI update unconditional for the medical scanner until checks for power changes are in place

* Update Medical scanner to reflect powered status and fix #1774

* added a 'scan dna' button the the medical scanner that will add the contained bodies Uid to a list in CloningSystem, fixed an issue with the menu not populating if the scanner starts in an unpowered state

* Add disabling logic to 'Scan DNA' button on medical scanner

* Removed un-used libraries

* changed scan dna button to Scan and Save DNA

* Added cloning machine code infrastructure copied from Medical Scanner

* Added a list to cloning menu containing some numbers

* Cloning Machine UI sends a message to the cloning component with the entityUID

* New scans now show up in cloning pod menu

* fixed cloning machine collision shape

* cloning machine can now spawn the right player profile assuming the attatched entity is still correct.

* refactored cloning system to use a map of integer ids to player Minds

* Added a return to body cloning loop for the ghost

* Fixed warning for _playerManager being possibly null, added TODO note for ghost return to body button acting as a toggle

* removed #nullable from cloningMachineWindow"

* Trying to get rid of nullable error

* fix CloningMachine to not initilize with it's owner components

* updated CloningMachine server component to play nice with the new nullable rules

* replace flag with eventBus message for sending a ghosts mind to a clone body

* Refactor cloning so that a popup option is used to get user consent for cloning

* Refactoring

* Reverting unused changes for cloning component

* Added proper cloning pod sprites and a visualizer so 'idle' and 'cloning' states are properly reflected

* added missing robust toolbox contents

* Added cloning NoMind State and made cloning take time

* Added cloning progress bar and mind status indicator to cloning pod

* Added missing localization calls, removeed 'returned to cloned body' from ghostUI

* Added unsubscribe for cloningStartedMessage in Mindcomponent.cs OnRemove

* Added eject button to cloningMachine and clamped the cloning progress bar to 100%

* Added condition to eject body on cloningmachine so bodies can't be ejected until cloning is done

* Add click-dragOn functionality to the medical scanner for things with a bodyManager

* Messed with scan query so it doesn't fail on dead bodies as long as Mind still owns the mob

* refactored clonning scan check on medical scanner so it doesn't do a linq query

* merge with rogue toolbox

* Change the name of Cloning Machine to the less generic Cloning Pod

* Changed Cloning Pod so it pauses cloning while the power is out

* Removed the evil LocalizationManager from the cloning menus and used the static Loc instead

* removed localization dependency from bound accpetCloning user interface

* Removed Ilocalization dependency I accidentally added to ghost ui

* Update Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerComponent.cs

Co-authored-by: Exp <theexp111@gmail.com>

* Changed null check to tryget in case for cloning UiButton.Clone

* Parameterized Cloning time on serverside component

* tried to reset Robust toolbox module to current master

* Added null check to ghost client component message handling, unsubscribe to the mind component listening to the cloning question ui, fixed _clonningProgress typo, moved CloningPod component dependencies to actually be dependencies, removed un-needed disposals of cloning windows, added disposals missing in boundUserInterfaces.

* Reset submodule

* corrected exception for cloning pod visualizer to refer to cloning pod state and not medical scanner state

* Fix typo

* Unsubscribe from onUiReceiveMessage in mindcomponent in the onRemove function, not the acceptcloningui function

* unsubscribe from OnUiReceiveMessage in CloningPodComponent

* unssubscribe from ghostreturn message in cloningpodComponent onRemove

Co-authored-by: Exp <theexp111@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-02 12:07:54 +02:00
Swept
95665d184f Updates surgery IDs to standard (#2004)
* Updates IDs and map file

* Update the surgery duffel
2020-09-02 11:57:21 +02:00
Swept
77057ac499 Cleans up backpack prototypes/rsis (#2002)
* Backpack rsis up to snuff

* Readds holding meta.json

* Updated bag of holdings license

* Backpacks prototype now clean
2020-09-02 11:53:28 +02:00
Moses
6a4b856961 Extinguisher cabinet (#1976)
* 1779 Add extinguisher cabinet base item, rsi, and class based on potted plant

* Pretty much the rest of the owl

* Allow construction

* no more deconstruction

* pr fixes
2020-09-02 01:41:35 +02:00
ALMv1
4044602187 Object Description Update For Prototypes (#1986)
* Food Description Update

* dice.yml Description Update

* Minor drink_cans.yml Update

* backpacks.yml Description Update
2020-09-02 01:29:47 +02:00
Swept
538eac8a15 Adds random spawners for toys (#1979) 2020-09-02 01:18:18 +02:00
Swept
072f374bcc Removes the Straylight SMG (#1881)
* goodbye

* Removes Straylight from spawners
2020-09-02 00:38:35 +02:00
Swept
2e12d8b758 Adds the Mime (#1798)
* Adds mime job

* Adds mime spawn point

* Moves the ID prototypes/textures to Objects/Misc

* The things I do to avoid conflicts

* identification_cards.yml's final resting place

* Adds ID card and PDA

* Center mime id

* Puts pen and paper in the mimes pocket

* Adds mime spawnpoint to Saltern

* Revert "Adds mime spawnpoint to Saltern"

This reverts commit 56c6cf729baae0958b8b41dd83f71355e4e5f9aa.

* Add mime spawn point

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-01 21:42:31 +02:00
Víctor Aguilera Puerto
2d92432830 Fix certain prototypes' clickable bounds 2020-09-01 16:16:29 +02:00
Víctor Aguilera Puerto
850586d3d7 GLES2: companion PR to engine PR (#1956)
* GLES2: Content shader stuff (possibly unfinished)

* GLES2: More shader stuff to get things working

* GLES2: Fixes, clarifications to shaders
2020-09-01 15:32:54 +02:00
Swept
111ad63dce Installing a new power infrastructure for Saltern. (#1559)
* Removes all deprecated wires, generators and apcs

* Removes all deprecated power entities

* Updates to master

* Map g2g

* Map new power system and some materials

* Remove old power entities from stationstation

* Removes deprecated shit AGAIN

* Remove outdated wires from stationstation

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
Co-authored-by: juliangiebel <juliangiebel@live.de>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-01 12:44:48 +02:00
DrSmugleaf
a937e67d38 Add delete entities with prototype id command (#1983)
* Add delete entities with prototype id command

* Add command to groups

* Add feedback and lowercasing
2020-09-01 12:24:28 +02:00
Swept
ae03c633cf Adds Duffelbags. And Mime, Botany and Chemistry backpacks. (#1982)
* Sprite added

* Duffel prototypes

* Updates the surgery tools to ID standards

* Revert "Updates the surgery tools to ID standards"

This reverts commit a9997ea979230e090793f85c1e779c5d0a0f2217.

* Adds a filled surgical duffelbag

* Adds Mime, Botany and Chemistry backpack
2020-09-01 12:24:12 +02:00
py01
4d43a15cba Pump enabled animation (#1973)
* Pump enabled animation

* naming fixes

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-09-01 00:29:53 +02:00
ancientpower
f41e39410d Tweaks damage types and classes (#1969)
Co-authored-by: ancientpower <ancientpowerer@gmail.com>
2020-08-31 19:11:22 +02:00
py01
178931e54b Pump visuals (#1960)
* Pipe sprites

* pipe copyright

* SharedPipeComponent

* Pipe Visualizer draft

* missing longitudinal pipe sprites

* expanded rsi states

* pipe prototype fixes

* Fixed pipe visualizer

* PressurePump and VolumePump

* VolumePump fix

* PressurePump fix

* Shared pump

# Conflicts:
#	Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs
#	Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs

* PumpVisualizer Draft

* ConduitLayer enum

* PipeVisualizer update

* halfpipe sprites

* pumpvisualizer simplification

* yaml unneeded proto removal

* pump visualizer draft 2

* Pump overlays

* pump rsi name

* merge fix

* PumpVisuals ConduitLayer

* merge fix

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-08-31 12:33:05 +02:00
py01
9d5278ab0d Volume and pressure pump (#1955)
* PressurePump and VolumePump

* VolumePump fix

* PressurePump fix

* volume pump simplification

* Fixes GridAtmosphereComponent not updating pumps

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-08-31 02:13:23 +02:00
py01
68ec6e6be5 Pipe Sprites & Visualizer (#1954)
* Pipe sprites

* pipe copyright

* SharedPipeComponent

* Pipe Visualizer draft

* missing longitudinal pipe sprites

* expanded rsi states

* pipe prototype fixes

* Fixed pipe visualizer

* ConduitLayer enum

* PipeVisualizer update

* halfpipe sprites

* yaml unneeded proto removal

* PipeVisualizer uses its own RSI

* Removes unused field from PipeVisualizer

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-08-31 02:13:15 +02:00
DrSmugleaf
a8aa088058 Add invulnerable damage flag, godmode and damage flag commands (#1949)
* Add invulnerable damage flag and commands

* Add serialization for damage flags

* Add godmode command
2020-08-30 11:16:47 +02:00
metalgearsloth
72eb1fdc1c Add door welding (#1951)
* Add door welding

Surprised this wasn't in already.

* smug's feedback

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-08-30 11:16:29 +02:00
Julian Giebel
38b9a5a901 Remove collision from disposal pipes (#1958)
Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
2020-08-30 11:10:14 +02:00
20kdc
8acb0ba1a5 GLES2: Fixes, clarifications to shaders 2020-08-29 19:55:16 +01:00
Exp
b993ebb30a Status Effect Tooltip & Notify on click (#1943)
* -Show tooltip on hover
-Show notify on click

* -Status Effects now get removed instead of going invisible
-Removed empty textures for that

* Revert break in HungerComponent
2020-08-29 13:33:38 +02:00
DrSmugleaf
4d23bbf4df Fix slippery items not being slippery (#1948)
* Fix slippery items not being slippery

* Fix slippery not being slippery part 2 redux electric boogaloo

* You got a license for that hard collidable?
2020-08-29 13:13:22 +02:00
ancientpower
566ed6b770 Adds the antimatter engine (#1905)
* adds antimatter engine

* fixes some nullables

* fixes ALL OF THE NULLABLES

* adds explosions

* adds fancy lighting

* requested changes + license info

Co-authored-by: ancientpower <ancientpowerer@gmail.com>
2020-08-29 13:05:44 +02:00
ShadowCommander
aa66aa2286 Implement machine linking (#1784)
* Implement machine linking

* Cleanup and rename Signals

* Implement signal button

* Add machine linking signal mapping

* Fix signallink command help

* Add localization to signal linking and allow infinite range

* Add feedback for when a transmitter is not connected to any receivers

Refactor PopupMessage to use the entity extension
Refactor dependencies to not have to disable warnings
2020-08-29 12:33:42 +02:00
Víctor Aguilera Puerto
16f0eebf15 Merge branch 'master' into 2020-08-19-firelocks
# Conflicts:
#	Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
#	Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
#	SpaceStation14.sln.DotSettings
2020-08-28 14:35:45 +02:00
20kdc
d1f0ea0112 GLES2: More shader stuff to get things working 2020-08-28 12:00:16 +01:00
20kdc
d809968635 GLES2: Content shader stuff (possibly unfinished) 2020-08-28 00:04:44 +01:00
py01
7b12d4e08c PipeNet (#1626)
* PipeNode

* Pipe prototypes

* Fixes Default NodeGroup not being registered by NodeGroupFactory

* GasNet

* PumpComponent

* IPipeNet

* PipeComponent

* misc naming, yaml

* PipeComponent rework

* PipeNet gas transfer from pipes

* PipeNet correctly combines gas on combining with other group

* Client ignores piping components

* AfterRemake

* PipeNet remake simplification

* IGasMixtureHolder on PipeComponent, IPipeNet

* PipeContainerComponent

* BasePump

* DebugPump

* IgnoredComponent fix

* Pipe LocalAir and Air

* comments

* Pump fix

* PipeNet fix

* name simplification

* PipeDirection name changes

* BaseVentComponent and DebugVentComponent

* Moves Pipe to own file

* DebugVentComponent moved to own file

* BaseScrubberComponent

* DebugScrubberComponent

* IgnoredComponents update

* scrubber prototype

* vent prototype fix

* comments

* Removes vent and scrubber PipeDirection check

* PipeContainer, Pipe, and PipeNode refactor

* Yaml cleanup

* pump prototype fix

* Removes AssumeAir usage from old IGasMixtureHolders

* Simplfies Vent & Scrubber to use AtmosHelper methods

* Vents and scrubbers invalidate the coordinate they changed the gas of

* UpdatedPipingComponent

* ScrubberComponent renamed to SiphonComponent

* Removes PumpSystem

* Removes framTime from UpdatedPiping

* PipeNetDevices

* PipeNetDevice updated by GridAtmosphereComponent

* PipeNets react from update in GridAtmosphereComponent

* GridAtmosphereComponent stores PipeNets/PipeNetDevices to be updated in queue

* diff fix

* Removes debug gas starting in pipes

* type safety in IPipeNet when combining groups

* null checks

* GridAtmos stores PipeNets and PipeNetDevices in List

* comments

* rogue curly bracket

* ProcessPipeNets update fix

* RemovePipeNet fix

* PipeNet update() unique index

* fix diff

* Integration test fixes

* Error Logging

* error fix

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-08-27 17:45:27 +02:00
nuke
388e717a53 Get rid of CuffSystem, make CuffableComponent update its hand count properly (#1927)
* Merge branch 'master' of https://github.com/space-wizards/space-station-14 into cuff-fix

* yml

* event bus
2020-08-27 16:33:10 +02:00
Exp
fc6ec5a7b9 Add ItemStatus to energy weapons (#1921)
* -ItemStatus for BatteryGuns
-EjectCell Verb
-Using the gun throws the battery also on the ground

* Copy the flashlight and call it a day

* Name a red fruit

* Remove SoundGunshot
2020-08-27 16:31:29 +02:00
nuke
a17239ad2c Fix for handcuff exception (#1923) 2020-08-26 16:59:34 +02:00
DTanxxx
01ba95396d Fix mismatched case in audio file (#1920) 2020-08-26 13:04:21 +02:00
DrSmugleaf
1d17331853 (Re)add healing items (#1918)
* (Re)add healing component

* Do range check only when healing someone else
2020-08-26 03:50:26 +02:00
Exp
292ef4ef16 Admin Menu (#1648)
* First Prototype

* Command Window

* Dropdown

* Is this better?

* That's kinda better?

* Added divider

* Shit

* Check if Admin Menu & Commands are allowed

* -Funcy Shit
-Now gets properly the playerlist
-Fixed kick reason

* Dropdown Improvement with some more func

* -Added DirectCommand for commands that don't need a ui
-Added RestartRound

* Better way to make DirectCommandButtons

* -Some new Tabs
-Player list

* -Split Buttons
-Regions
-Fixed Test Command

* Some server buttons

* Playerlist alignment

* Fucky SpawnEntites & SpawnTiles in AdminBus

* -Debug Buttons
-Few more commands

* -Make dem controls thicc
-SpinBox

* Escape Kick Reason

* Only create the window when you press the button

* Adds StationEvents

* Nullable "fixes"

* This thing wasn't made for buttons

* Call other constructor for empty CommandButton

* Request method in the interface

* -Pushed most Controls to be fields
-No more dict passing
-Removed test cmd
-Regions to better navigate

* -Bound to key
-Removed from escape menu
-Remember cmd windows
-Close all cmd windows on toggle

* -Moved dependency

* Merge fixes

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-08-25 17:18:32 +02:00
Exp
c665e66318 Accent System (#1892)
* First Accent Prototype

* -RegisterSystem
-Fixed addaccent cmd
-Spanish accent

* -list is now ?
-Checks if the accent is already added
-Made components public

* owo whats this

* special word filter

* Eeeeeeeeee

* Better?

* -Use a delegate func
-Made some funcs not static
-Moved SentenceRegex

* InjectDependencies

* Name change?

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-08-25 17:09:39 +02:00
nuke
a62935dab2 Handcuff system (#1831)
* Implemented most serverside logic

* All serverside cuff logic complete

* SFX, Clientside HUD stuff, Other logic.

* fffff

* Cuffs 1.0

* missing loc string

* Cuffs are stored in the balls now.

* Basic integrationtest

* Support stripping menu.

* rrr

* Fixes

* properties

* gun emoji

* fixes

* get rid of unused

* reeee

* Update Content.Shared/GameObjects/ContentNetIDs.cs

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-08-25 14:54:23 +02:00
Julian Giebel
d9f02a6a0a The disposals pushing and pulling update (#1875)
* Add collision to disposal unit and pipes
Make disposal unit and pipes pullable
Implement proper handling of collisions in disposals

* Implement IsExiting
Move DisposalSystem to shared

* Change SharedDisosalUnitComponent to call manager.ContainsEntity directly

* Update saltern.yml

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
2020-08-24 20:41:15 +02:00