Commit Graph

333 Commits

Author SHA1 Message Date
ChilbroBaggins
abc8d5b6d8 Food and Beverage Spawners (#9547)
* Textures to make lamps mappable to East/West.

* Adds various rng food and beverage spawners for mapping. Also adds a smaller icon for rndm arcade machine because the other was triggering people.

* Fix

* ugh

* edits

* Oops, missed a couple xenos

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-07-12 19:03:10 -05:00
KIBORG04
71c8d08e4c Kvass (#9082)
* add kvass

* nevermind

* forgot about double 's'

* Update tanks.yml

* gotovo

* Update meta.json
2022-07-11 23:11:12 -07:00
Leon Friedrich
65408f63d4 Injector sprite fix (#9011) 2022-07-09 02:59:39 -07:00
Ablankmann
d4c5381a09 BEHOLD! The MagiVend! (#9440)
* Magivend Sprites, and Entity stuffs

* Oopsie!
2022-07-08 19:40:49 -07:00
ChilbroBaggins
ad46c4669a Textures to make lamps mappable to East/West. (#9414)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-07-07 11:47:05 -07:00
Kara
7e34124244 Emergency light goodies (#9352)
Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>
2022-07-07 09:16:48 -07:00
Rane
723004a300 Tiny fans for freezers/shuttles (#9451) 2022-07-05 14:54:27 -05:00
Peptide90
bc19f52aa6 removes metal walls, adds rusted walls (#8416)
* removes metal walls, adds rusted walls

* removes 2 metal walls in bagel

* remove metal walls from pillar

* Remove icon from rust wall

* Made welding work

* removes old prototype
2022-07-04 02:11:47 -05:00
Peptide90
649b94303e Telescreens and big flat screen TV (#8842)
* first pass wall tv

* telescreen first pass

* adds flat screen television

* removed duplicate assets

* code changes and construction graph start

* Update lv stack to apc

* completed graphs and fixed bb sizes

* Proto update

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-07-04 17:10:29 +10:00
Ablankmann
e6d9c5f622 See-Through Shuttle Wall (#9306) 2022-07-02 19:10:19 -07:00
Emisse
b7f8a688dd Lighthouse and Waystation posters (#9141) 2022-06-28 01:04:55 +10:00
Leon Friedrich
229627a934 Gas injector visuals & balance (#8963) 2022-06-20 19:04:55 -07:00
Emisse
c87f4ab65c Holofan Projector Upstream from Nyano (#8352)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-03 21:58:18 +10:00
Veritius
237cb3d0b4 Communications Console: The ECSining (#8374)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-03 21:37:35 +10:00
Peptide90
05c701975b Post Light sprite fix and state (#8578)
* adjusted post light sprite and added empty state

* update construction location
2022-06-02 15:12:23 -05:00
Flipp Syder
d4697c000c Surveillance cameras (#8246)
* cameras but i didn't feel like git stashing them

* Adds more functionality server-side for surveillance cameras

* rider moment

* Adds skeleton for SurveillanceCameraMonitorBoundUi on client

* whoops

* makes surveillance camera monitor UI more defined

* removes tree from SurveillanceCameraMonitorWindow

* surveillance camera active flag, other routing things

* actually sets how SurveillanceCameraMonitorSystem sends camera info to clients

* adds entity yaml, changes field

* adds the camera/monitor entities, makes the UI open

* SurveillanceCameraRouters (not implemented fully)

* subnets for cameras, server-side

* it works!

* fixes rotation in cameras

* whoops

restores surveillance cameras to ignored components
makes it so that switching cameras now lerps the other camera

* makes the UI work

* makes it so that cameras actually refresh now

* cleanup

* adds camera.rsi

* cleans up prototypes a bit

* adds camera subnet frequencies, cameras in subnets

* adds surveillance camera router subnets

* might fix testing errors

* adds the circuit board to the surveillance camera monitor

* fixes up the camera monitor (the detective will get his tv soon)

* adds heartbeat, ensures subnet data is passed into cameras to send

* fixes up a few things

* whoops

* changes to UI internals

* fixes subnet selection issue

* localized strings for UI

* changes 'test' id to 'camera' for cameras

* whoops

* missing s

* camera static!

* adds a delay to camera switching

* adjusts a few things in camera timing

* adds setup for cameras/routers, localization for frequency names

* adds setup ui for routers, makes subnet names in monitor window follow frequency name in prototype

* localization, some cleanup

* ui adjustments

* adds surveillance camera visuals

* fixes a bug when closing the UI for monitors

* adds disconnect message to UI

* adds construction graph to cameras

* adds the camera to the construction menu

* fixes network selection for setup, tweak to assembly

* adds surveillance camera router construction, fixes up surveillance camera wire cutting

* adds disconnect button to monitor UI

* switches around the status text

* tweaks monitor UI

* makes the address actually show

* might make tests pass

* UI adjustments, hard name limit

* ok, that didn't work

* adds wireless cameras

* makes the television work/look nicer

* adds tripod cameras in addition to mobile cameras

* makes wireless cameras constructable

* fixes up those prototypes

* reorganization in C#, small cleanup

* ensures that power changes deactivate some devices

* adds a component to the television, comments out a function

* actually, never mind, i forgot that wireless cameras existed/are creatable for a second

* tweaks to router construction, removes SubnetTest from prototypes

* removes it from frequencies too

* Apply suggestions from code review

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* type serializers into components

* setup window opens centered, enum is now byte

* replaces active monitor list with ActiveSurveillanceCameraMonitorComponent

* adds paused/deleted entity checks, changes how verbs are given

* removes EntitySystem.Get<T>() references

* fixes bug related to selecting network from setup, alphabet-orders network listing in setup

* rider moment

* adds minwidth to surveillance camera setup window

* addresses reviews

* should fix the issue with camera visuals not updating properly

* addresses some reviews

* addresses further review

* addresses reviews related to RSIs

* never needed a key there anyways

* changes a few things with routers to ensure that they're active

* whoops

* ensurecomp over addcomp

* whoops

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-31 18:44:57 +10:00
keronshb
11f729d024 Simple Magic Spellbook System (#7823)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-29 16:29:10 +10:00
Emisse
7d5989a9cc Atmos sign (#8462)
* Add files via upload

* Update meta.json

* Update meta.json

* Update signs.yml

* Update meta.json
2022-05-26 23:41:50 -07:00
EmoGarbage404
d908435222 Mini Gravity Generator (#8449)
* meenee

* Update Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-26 20:08:05 -07:00
Emisse
3ffda1a8bb High Security Door (#8148)
* Add files via upload

* Update layouts.yml

* Add files via upload

* Update highsec.yml

* Update highsec.yml

* Update highsec.yml

* Update meta.json

* Update meta.json

* Add files via upload

* Delete panel_closed.png

* Update meta.json

* Update meta.json

* Update meta.json

* Update layouts.yml
2022-05-19 08:04:44 +10:00
Peptide90
18c2d7a4df Gas Tank dispenser (#8160) 2022-05-18 12:46:35 +10:00
EmoGarbage404
09425d0137 paintings 1 (#8067) 2022-05-12 09:46:21 +10:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754)
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-05-11 00:17:24 -07:00
EmoGarbage404
8b8ad9a513 Filing Cabinet Resprites (#8043) 2022-05-09 17:46:23 -07:00
Tomeno
73d2e9043f Icon smoothing for asteroid rocks (#8058)
Co-authored-by: Tomeno <tomeno@lulzsec.co.uk>
2022-05-09 17:41:28 -07:00
Emisse
da1e3c3dd8 Atmospherics Access, Air Alarms, Doors, Locker (#7923) 2022-05-08 00:54:04 -07:00
Fishfish458
41f56fa5c8 More bureaucracy - CE stamp, filing cabinets, folder changes (#7816)
Co-authored-by: fishfish458 <fishfish458>
2022-05-04 09:22:53 -07:00
Emisse
798d004311 Bagel Update 13 (#7901)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
2022-05-03 13:58:16 -05:00
Peptide90
ec11a7562e Vault Walls (alien, sandstone and rock) (#7799) 2022-05-02 15:38:06 -07:00
Peptide90
a3b8c08210 Adds metal and wood counters (#7688) 2022-04-30 14:28:03 -07:00
Alex Evgrashin
2d34ded94d Artifact container (#7822)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-04-28 15:03:39 -07:00
Chris V
94a0bc92b7 Salvage mining, ore processing, and material clean-up (#7406)
* adding stuff cuz new computer

* removed unused materials

* remove unused materials and such, lathe things

* material volume no longer hardcoded

* fixed mining system

* add 5 stacks of materials, and add them to the ore processor

* fix copyright for ores and handdrill

* comma momma

* whyyyyy

* more fixes to make the yaml linter happy

* i should get my eyes checked

* silver proper

* more cleanup

* leftovers

* remove more references to material doors

* couldn't bear to be without bearhide

* added uranium, added more lathe recipes

* copyright fix, stack fix

* ore processor sprite and such

* ore processing some binches

* MaterialCotton removal

* 1 uranium ore means 1 sheet

* fix merge conflict? idk

* time to ketchup

* lathe recognizes material volume again

* yaml cleanup

* forgot to remove adamantine lol

* re-added diamond for now

* diamond stacks

* functional ore processor

* added ignoreColor to lathe visuals

* ore processor machine board

* add board to industrial tech and circuit printer

* provided lathes their whitelists

* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance

* re-added ore processor

* typos and cleanup

* Update Content.Client/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* revert mapchange

* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn

* actually null canceltoken

* remove five-stacks, ore processor produces full stacks or single sheets/ingots

* VV proper

* adjust ore chances

* readd Cotton

* Update Content.Server/Mining/MineableSystem.cs

* tweaks

* Material is now dict (material, volume)

* removed unused property

* Space crystal -> space quartz

* forgor asteroid space quartz

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-04-28 20:41:04 +10:00
Rane
a74e6842d9 Medical Techfab + Bed Deconstruction Fix (#7637) 2022-04-23 19:27:12 -07:00
Peptide90
cbe6f620e7 Adds the water cooler (#7724) 2022-04-23 16:39:00 -07:00
EmoGarbage404
db56d5ef60 Zombies!!! (#7509)
* wip

* heal on bite

* more fixes and additions

* don't crash

* Update medicine.yml

* zombie claw item and damage resist

* ignoredcomponents.cs

* Add zombie claw, fix infection, add immunities

* fix

* razzle dazzle

* yaml fix

* Update Content.Server/Disease/DiseaseZombieSystem.cs

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

* Update Content.Server/Disease/DiseaseZombieSystem.cs

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

* Update Content.Server/Disease/DiseaseZombieSystem.cs

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

* Update Content.Server/Disease/DiseaseZombieSystem.cs

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

* sdasadsadsadasd

* Generalize DiseaseProgression.cs

* final final final final final final cope seethe

* Update medicine.yml

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* Update BloodstreamSystem.cs

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* fixing until i die

* folder + zombietransfer fix

* smol fixe

* the smallest of fixes

* aaaa

* Infection timer buff

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-04-18 17:30:22 -05:00
Rane
93cdca4f82 Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238)
* Prototype that's mostly borked rather than completely borked

* ECS inserting mats

* Partial ECS mostly done, needs cleanup and visualizer

* Replace timers

* Power visualizes at least

* First ""working"" version

* Clean up all lathes

* Colors

* Fix animation timing

* Fixes greyscale, adds a bunch of colors

* Give every (used) material a color

* Made most lathes take long enough you can at least see there's some sort of animation

* Insertion feedback popup

* Sound for circuit printer and uniform printer

* Fix queueing, optimize update

* Remove mono crash

* cleanup

* Fix test failure

* Techfab inserting sprite

* Cleanup and commenting

* Fix bug in CanProduce check

* Fix UI resolves

* Mirror review stuff
2022-04-17 17:34:14 +10:00
Rane
5376aed6ea Beds, Medical Beds, Stasis Beds (#6695) 2022-04-15 15:53:52 -07:00
Emisse
ef4cc598ce Station Map Posters (#7562) 2022-04-15 11:52:51 -07:00
Pieter-Jan Briers
536a8cd5d4 High effect engineering (#7528) 2022-04-13 23:38:34 +10:00
EmoGarbage404
1488c9a4f2 Brass Instruments (#7291) 2022-04-08 14:12:44 -07:00
T-Stalker
8f1ec1a09e Adds dresser, television, and a fireplace (#7327) 2022-03-29 13:17:34 +11:00
metalgearsloth
6dfa4c0fef Shuttle walls (#7219) 2022-03-28 16:11:39 -07:00
T-Stalker
a59cdadb90 Adds banners and robot showcase (#7253)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-03-27 17:15:18 +11:00
Fishfish458
4500f88737 Add door emag visuals and sound (#6971)
Co-authored-by: fishfish458 <fishfish458>
2022-03-19 12:00:01 -07:00
Peptide90
3b6cfd6b6b Adds more directional signs. Fixes directions on existing (#6401) 2022-03-19 14:27:45 +11:00
Mith-randalf
38011eda11 Adds directionals for arcade machines (#7143) 2022-03-16 14:30:05 -07:00
Peptide90
5d29c8aa61 New generators and wallmount substation (Shuttle power PR) (#6795) 2022-03-15 12:27:39 +11:00
EmoGarbage404
4970a0ff71 Added new sprites for the security techfab (#7022) 2022-03-14 13:33:52 -07:00
Rane
bb9ad4259c Diseases (#7057)
* Disease system first pass

* Renamed HealthChange

* First working version of diseases (wtf???)

* Fix the cursed yaml initialization

* Pop-Up effect

* Generic status effect

* Create copy of prototype

* CureDiseaseEffect

* Disease resistance

* Spaceacillin

* Nerf spaceacillin now that we know it works

* Sneezing, Coughing, Snoughing

* Fix queuing, prevent future issues

* Disease protection

* Disease outbreak event

* Disease Reagent Cure

* Chem cause disease effect

* Disease artifacts

* Try infect when interacting with diseased

* Diseases don't have to be infectious

* Talking without a mask does a snough

* Temperature cure

* Bedrest

* DiseaseAdjustReagent

* Tweak how disease statuses work to be a bit less shit

* A few more diseases

* Natural immunity (can't get the same disease twice)

* Polished up some diseases, touched up spaceacillin production

* Rebalanced transmission

* Edit a few diseases, make disease cures support a minimum value

* Nitrile gloves, more disease protection sources

* Health scanner shows diseased status

* Clean up disease system

* Traitor item

* Mouth swabs

* Disease diagnoser machine

* Support for clean samples

* Vaccines + fixes

* Pass on disease resistant clothes

* More work on non-infectious diseases & vaccines

* Handle dead bodies

* Added the relatively CBT visualizer

* Pass over diseases and their populators

* Comment stuff

* Readability cleanup

* Add printing sound to diagnoser, fix printing bug

* vaccinator sound, seal up some classes

* Make disease protection equip detection not shit (thanks whoever wrote addaccentcomponent)

* Mirror review

* More review stuff

* More mirror review stuff

* Refactor snoughing

* Redid report creator

* Fix snough messages, new vaccinator sound

* Mirror review naming

* Woops, forgot the artifact

* Add recipes and fills

* Rebalance space cold and robovirus

* Give lizarb disease interaction stuff

* Tweak some stuff and move things around

* Add diseases to mice (since animal vectors are interesting and can be used to make vaccines)

* Remove unused reagent
2022-03-13 20:02:55 -05:00
Rane
fa3283ffff Uniform Printers (#6968) 2022-03-09 10:58:49 +11:00