Commit Graph

3113 Commits

Author SHA1 Message Date
Víctor Aguilera Puerto
3922759a81 address reviews 2020-09-02 15:27:28 +02:00
Víctor Aguilera Puerto
2294c32235 Merge branch 'master' into 2020-08-31-click-attack 2020-09-02 15:12:17 +02:00
DrSmugleaf
94b83c3d69 Fix crash when deleting a medical scanner with someone inside (#2007) 2020-09-02 12:29:40 +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
9fdcb2b084 Adds Fireextinguisher stuff to IgnoredComponents.cs (#2005) 2020-09-02 11:53:55 +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
DrSmugleaf
dbbe3088f8 Add puddle spill tests (#1990)
* Add puddle spill tests

* Merge fixes
2020-09-02 01:31:47 +02:00
DrSmugleaf
de9dfefd61 Replace resolve dependency with attribute in components (#1995)
* Replace resolve dependency with attribute in components

* Add changes that went missing in translation
2020-09-02 01:30:03 +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
DrSmugleaf
3a54ace1a8 Fix old use of item shuffling (#2001) 2020-09-02 01:23:43 +02:00
Swept
538eac8a15 Adds random spawners for toys (#1979) 2020-09-02 01:18:18 +02:00
DrSmugleaf
b132a4c2d9 Add a test to check that maps are not saved postmapinit (#1987) 2020-09-02 01:16:42 +02:00
DrSmugleaf
61f64e15f2 Add extensions for spilling solutions into puddles (#1991) 2020-09-02 01:16:25 +02:00
DrSmugleaf
682b6b9568 Add IMechanism interface to body system (#1997) 2020-09-02 01:16:13 +02:00
Swept
072f374bcc Removes the Straylight SMG (#1881)
* goodbye

* Removes Straylight from spawners
2020-09-02 00:38:35 +02:00
Víctor Aguilera Puerto
80ffe6bfcc Merge pull request #1999 from DrSmugleaf/tile-adjacent-extensions
Add extension methods for getting adjacent tiles randomly and to offset coordinates in a direction
2020-09-02 00:37:26 +02:00
Víctor Aguilera Puerto
6fa5a25ce4 Merge pull request #1992 from DrSmugleaf/entity-shuffle
Add extension method to shuffle an entity by a random value
2020-09-02 00:35:57 +02:00
Víctor Aguilera Puerto
4c5aa3c11d Merge pull request #1993 from DrSmugleaf/verbs-injectio
Make verbs be created through IDynamicTypeFactory
2020-09-02 00:34:41 +02:00
Víctor Aguilera Puerto
8040e3fac1 Merge pull request #1994 from DrSmugleaf/buckle-made-saner
Add an entire nullable to buckle
2020-09-02 00:34:06 +02:00
Víctor Aguilera Puerto
64addb26c1 Merge pull request #2000 from DrSmugleaf/murica-helpers
Add helpers for converting to and from Fahrenheit
2020-09-02 00:04:33 +02:00
Pieter-Jan Briers
f5cba6ae89 Fix screenshots crashing due to bad FileAccess 2020-09-01 23:53:49 +02:00
Pieter-Jan Briers
2aed70befe Update submodule 2020-09-01 23:53:26 +02:00
DrSmugleaf
8afeb4d094 Add helpers for converting to and from Fahrenheit 2020-09-01 23:33:42 +02:00
DrSmugleaf
8a14725539 Add extension methods for getting adjacent tiles randomly and to offset coordinates in a direction 2020-09-01 23:28:59 +02:00
DrSmugleaf
549c8c595e Add extension method to shuffle an entity by a random value 2020-09-01 22:04:55 +02:00
DrSmugleaf
1186552629 Add an entire nullable to buckle 2020-09-01 21:49:32 +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
DrSmugleaf
e0928d78e0 Make verbs be created through IDynamicTypeFactory
To allow for dependencies to be declared on them
2020-09-01 21:11:17 +02:00
Víctor Aguilera Puerto
9398f90e7c Lights now use dependencies. 2020-09-01 16:19:32 +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
Víctor Aguilera Puerto
627e5414e2 Update submodule. 2020-09-01 15:32:35 +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
8f9ed2f562 Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods (#1965)
* Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods

* Remove redundant code
2020-09-01 12:34:53 +02:00
DrSmugleaf
14259ed920 Change EntityTest.SpawnTest to not use stationstation (#1984) 2020-09-01 12:29:58 +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
Víctor Aguilera Puerto
db12634bd5 Merge branch 'master' into 2020-08-31-click-attack 2020-09-01 03:25:14 +02:00
Víctor Aguilera Puerto
fdd61d1c94 Fix instrument crash when you put an instrument in Urist's hands 2020-09-01 03:08:32 +02:00
Víctor Aguilera Puerto
3fb4adeb0f Update submodule. 2020-09-01 02:35:13 +02:00
Víctor Aguilera Puerto
c8b55714cc Increase barotrauma timer to 3 seconds. 2020-09-01 02:25:19 +02:00
creadth
12801ccf2c Moved the uplink creation code to the PresetSuspicion.Start method to ensure uplink created when we give the traitor role (#1974)
Moved the starting TC balance to cvars
2020-09-01 00:36:49 +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
Víctor Aguilera Puerto
391444c879 Add an effect that shows the item you're using to attack with when attacking 2020-08-31 20:54:33 +02:00
Víctor Aguilera Puerto
b927fddf4c Better click attack effect 2020-08-31 19:32:06 +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
Víctor Aguilera Puerto
69bd44c94c Adds click attacks 2020-08-31 18:58: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