Commit Graph

499 Commits

Author SHA1 Message Date
Swept
1638c366cf General tweaks (#2109)
* Removes a bunch of old Eris shoes

* Changes the jackboots sprite to tgstation's

* Prototypes nuked

* Removes walk sound from jackboots, it was pretty annoying

* Adds wood table icon

* Adds wood plank and spawns it on wood table destroy. Also removes tg hand tele sprite.

* Removes weird mask png

* Removes bad pixel on security backpack

* Adds filled utility belt to engineer and ce roles

* Update Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-09-21 01:14:19 +02:00
Swept
2eb5780303 Removes cev hull tiles (#2106) 2020-09-17 14:50:39 +02:00
Swept
b2fc944247 Small change to Walls/metal.rsi (#2072) 2020-09-16 23:59:16 +02:00
Swept
77c71d885b Fixes lights not being rotatable. And #2082. (#2089)
* Fixes lights not being rotatable

* Makes some minor map changes to lights
2020-09-14 12:57:29 +02:00
Swept
ae4254b7ea Fixes R&D point source (#2088) 2020-09-14 12:41:32 +02:00
TheCze
828370a579 Added a football object (#2075) 2020-09-13 21:13:41 +02:00
Swept
0163f2af09 Firey rags are not fucking drinks (#2037) 2020-09-13 14:07:26 +02:00
Swept
c7037c2293 Fixes a ton of sprite icons. (#2034)
* Icons + Sprites for Atmos pipes

* Fixes Mimic icon

* Fixes rsi for RnD point source

* RnD Point source prototype fix

* Centers Bike Horn icon

* Centers pirate hat sprite

* Centers a bunch of milkshake icons

* Moves light_bulb.yml to Constructibles

* Fixes light_tube icons

* Emergency Light icon fix

* Medical Scanner icon

* ID Rsi fixed

* ID cards now have proper icons

* Lockers have proper icons finally

* Default Icon Fixed

* Resolved lighting issues
2020-09-13 13:53:47 +02:00
Víctor Aguilera Puerto
c27ab9bf6a Merge branch 'master' into 2020-08-19-firelocks 2020-09-12 15:52:20 +02:00
py01
b288975cb7 Siphon and Vent Visualizers (#2062)
* scrubber sprites

* vent sprites

* Vent visualstate

* scrubber visual state

* Vent and siphon respect being disabled

* Vent and Siphon Visualizer

* Fix typo

Co-authored-by: py01 <pyronetics01@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-12 14:26:50 +02:00
Víctor Aguilera Puerto
511147f299 Adds edge firelocks 2020-09-08 15:20:58 +02:00
Víctor Aguilera Puerto
da4d08432d Merge branch 'master' into 2020-08-19-firelocks 2020-09-07 12:47:52 +02:00
Pieter-Jan Briers
d64dc592f4 Enable bilinear filtering for inverted_triangle.svg.png. 2020-09-07 12:23:27 +02:00
Víctor Aguilera Puerto
3e1015eeda fix glass firelocks 2020-09-06 17:52:11 +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
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
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
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
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
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
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
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
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
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
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
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
Swept
9019079d79 Adds a cat and then a gat (#1868)
* Adds the cat

* Adds the gat

* Adds the calico to suspicion spawner

* Fixed physics thing

* Updated BB

* Added Calico mag to ammo spawner
2020-08-24 20:27:32 +02:00
Swept
abc446109e Fixed sawn-off inhand-right sprite (#1869)
* Fixed

* Dunno what that file was
2020-08-24 20:10:57 +02:00
Exp
56ebde7f45 Add IItemStatus to some weapon types (#1879)
* Bolt Action

* Shotguns

* Revolver + Outline

* In Magazines: show bullets as numbers plus the usual bullet stuff

* Empty bullets have another texture
2020-08-24 13:13:26 +02:00
Swept
b9f6178b5b Touches up wiggle room sprite 2020-08-23 17:11:14 -07:00
Swept
899de90b93 Adds cyber sylph's 2020-08-23 14:48:20 -07:00
Swept
c1b6bf5237 Adds Zolando and Bird Cage 2020-08-23 13:09:10 -07:00
Swept
16f520f1b9 Adds LV-426 and The Sun 2020-08-23 12:58:03 -07:00
Swept
1f62047e41 Adds The Wiggle Room 2020-08-23 12:44:51 -07:00
Swept
7a29f44ef4 Readded Maltese Falcon 2020-08-23 12:23:46 -07:00
Swept
63f2220a26 Removed femboy barsign 2020-08-23 12:22:17 -07:00