Commit Graph

57 Commits

Author SHA1 Message Date
Víctor Aguilera Puerto
484eb0bba4 Botany (#2357)
* plants and seeds go brrrr

* update plants

* P L A N T

* brrrr

* Hydroponics actually work! How about that?

* Reuse resource path in visualizer

* They lied to us.

* Several stuffs

* more werk

* Add a bunch of plants

* Logs go brr.

* Brrr moment.

* Remove unused method

* Important comment.

* Seed inventory, yo!

* tomato moment

* Balance consumption

* Makes hydroponics pourable

* Adds plant metabolism effect for sugar, the same as glucose.

* Eggplant moment

* Apple moment

* Corn moment

* Chanterelle mushroom moment

* prototype tweaks

* Seed extractor moment

* typo

* IPlantMetabolizable doc improvement

* I should trust my gut instinct more often.

* egg-plant.....

* localization

* Make WaterLevel and NutritionLevel setters private

* Less code repetition! Wooo!
2020-10-26 23:19:46 +01:00
Swept
bae8816c44 Slightly offsets LV cable sprites. (#2363)
* Initial

* Unfucked the cable meta.jsons and applied proper licensing.
2020-10-23 10:25:42 +02:00
py01
f01a50012e Vent and Siphon visualizer and icon fixes (#2288)
* Half pipes

* PipeVisualizer pipeRSI field

* Vent and Siphon visualizer fixes

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-10-18 12:13:06 +02:00
Exp
47ba7fc690 Crayons (#2132)
* -Added Crayons + CrayonBox
-Can set any crayon state and color
-Added CrayonDecals

* Allows to cycle through decals (not the final thing)

* ItemStatus

* -UI (WIP)
-Selection thing works
-Changed some shitty state names

* -Icons
-Changed decal name

* Pure Texture Grid

* Charges

* -Reach check
-Toggle interface on use

* Can't draw on windows anymore

* UI now shows selected decal and color

* -UseSound
-Nullable

* Remove unused imports

* -Rotation
-Made decal abstract

* Remove some duplicate images

* Space Cleaner cleans

* Loc Title

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Review adressed

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-10-13 13:40:05 +02:00
py01
77fa796a3b Rotatable Pumps (#2223)
* Pump textures

* PumpVisualizer enabled state

* Pump rotation

* Pump tests fix

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-10-12 13:02:57 +02:00
metalgearsloth
73c730d06c Sprite fixes (#2213)
Test still needs more checks that filepaths are valid but I think I got most of the current issues.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-10-10 14:44:30 +02:00
py01
970f3bc82f Pipe prototypes (#2124)
* Pipe prototypes

* PipeDirection setter

* IRotatableNode

* NodeContainer passes rotation events to its nodes

* Removes duplicate pipe prototypes that are rotations of each other

* PipeDirectionHelpers

* PipeNode rotation

* icon removal

* Pipe icons

* Icon fix

* Fixes pipe sprites and icons

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-10-08 17:53:56 +02:00
Víctor Aguilera Puerto
745401a41e Data-oriented Construction System (#2152)
- Powerful
- Data-oriented
- Approved by PJB
- Powered by node graphs and AI pathfinding
- Coded by the same nerd who brought you atmos

Co-authored-by: Exp <theexp111@gmail.com>
2020-10-08 17:41:23 +02:00
Swept
e9be70fb58 Unshaded maintenance and external airlocks. (#2160)
* Maint airlocks unlit

* Unlit button sprites for external

* True unlit for external airlocks
2020-10-04 18:07:58 +02:00
Swept
155882f469 Removes nonfunctional turrets (#2154) 2020-09-30 12:44:11 +02:00
Swept
898744f4a9 Icon fixing and general cleanup (#2156)
* Cable coils now look BEAUTIFUL and have inhands

* Editors note

* Materials have their own rsi + more icons fixed

* Fixed Mimic [AI]

* More icons fixed...

* Tanks have own rsi and fixed tank icons

* Airlock icons fixed

* Fuel tank hotfix

* Arcade fixed

* ChairBase is now abstract

* Fixes medical stuff

* Fixes rechargers

* Pump/Pipe icons

* Misc hotfixes

* All debug power icons fixed!

* Fixes auto/proto/research computer icons
2020-09-30 12:43:06 +02:00
Swept
552918d59d TABLE TIME LET'S GET ITTTTTTT (#2141)
* Replace pilot chair with a better sprite

* Refactors furniture.yml

* Cleans up dumb indentations

* Massive table cleanup YEAAHAHAAAHAHAHA FUCK YEAH WE CAN GAMBLE NOW

* Bookshelves, rack, metal shelf

* Actually good looking carpets holy crap lois

* three more colored carpets

* Rest of carpet colors and they now have proper drawdepth

* Adds Phoron windows and recolor phoron gas

* A bunch of decorative lights

* CarpetBase now abstract

* Inhands for torches

* Tables now have icons and a much nicer rsi/yaml layout

* Carpet Icons fix

* Removes old carpet
2020-09-29 16:11:42 +02:00
20kdc
4b9d488c1e The Grovelling-to-the-Chef Games (monkey cubes and meat spikes) (#2117)
* Rehydratable component -> monkey cubes now have some of their behaviour

* Placeholder kitchen spike entity

* KitchenSpike component: the kitchen spike now has basic functionality

still placeholder sprite though

* Kitchen Spike: Import meatspike assets from CEV-Eris

* Kitchen Spike: Actually use sprites somewhat

* Kitchen Spike: Forgot I removed the MeatParts property from Butcherable

* Monkey cubes: Use IReagentReaction even though it doesn't quite work yet. Butcherable: remove imports

* Monkey cubes/Rehydratable: Re-add ISolutionChange

* Update Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-09-26 15:28:55 +02:00
Víctor Aguilera Puerto
18a788a22a Fix crimes against the remake
Someone forgot to convert a DMI, it seems.
2020-09-25 12:18:43 +02:00
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
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
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
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
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
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
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
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
Swept
c792cc8906 Adds the emprah bar sign 2020-08-23 11:50:31 -07:00
Swept
babb5ec69d Removes old/cruddy bar signs 2020-08-22 17:20:02 -07:00
Swept
ac3db20815 Mad? 2020-08-22 16:42:20 -07:00
Julian Giebel
1c21f2c3b0 Rework emergency lights (#1830)
* Implement emergency lights reacting to lost power

* Add emergency light sprites
Remove shared emergency light component

* Remove unused import

* Remove EmergencyLight NetID

* Add rich description
Change comments
Add license
Implement ExposeData

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
2020-08-22 12:06:29 +02:00
Víctor Aguilera Puerto
a5fbe0f024 firelock stuff I guess 2020-08-21 18:29:43 +02:00
Víctor Aguilera Puerto
68fb5d4257 Merge branch 'master' into 2020-08-19-firelocks 2020-08-21 16:51:50 +02:00
Víctor Aguilera Puerto
d7ced7a45c unlit layers for firelock.rsi 2020-08-21 16:51:47 +02:00
Julian Giebel
1292adb001 Disposal routing (#1710)
* Implement disposal tagger
Implement disposal  router
Combine sprites to make conpipe-tagger sprite

* Implement change requests

* Remove nullable

* Update DisposalHolderComponent.cs

* Update DisposalHolderComponent.cs

* Update Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-08-19 15:50:06 +02:00
Víctor Aguilera Puerto
5190c04944 Some work 2020-08-19 12:23:42 +02:00