Commit Graph

898 Commits

Author SHA1 Message Date
Pieter-Jan Briers
63b9cd0b92 Adds suppermatter (#7633)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 19:44:17 +10:00
wrexbe
e4312e08f1 Censor Slimes (#8101) 2022-05-12 17:40:11 +10:00
Emisse
bb0266c779 Remove the nose off the ghost (#8076) 2022-05-11 20:34:32 -07: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
Kara
4bf0aac814 Rename Assistant to Passenger (#8007)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-10 13:35:08 +10:00
EmoGarbage404
8b8ad9a513 Filing Cabinet Resprites (#8043) 2022-05-09 17:46:23 -07:00
Emisse
ea498da45d Captain's Antique Laser Gun and Traitor Objective (#7940) 2022-05-09 17:43:36 -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
Pieter-Jan Briers
5076c4d8ef Revert new parallax (#7994) (#8049) 2022-05-09 19:15:42 +10:00
Emisse
c364cbf7a9 Very Important PR That Adds 2 Fountain Pens (#8019)
* Add files via upload

* Update paper.yml

* Update meta.json

* Update pda.yml

* Update pda.yml
2022-05-09 15:17:39 +10:00
Kara
8604faab2b Nanotrasen Interns (#8006) 2022-05-08 13:00:00 -07:00
Emisse
da1e3c3dd8 Atmospherics Access, Air Alarms, Doors, Locker (#7923) 2022-05-08 00:54:04 -07:00
Emisse
1c6b83fe05 Cybersun Juggernaut Suit (#7852) 2022-05-07 22:57:14 -07:00
T-Stalker
87c927dfcd Changes the procgen clouds parallax with a solid nebulae (#7994)
* Bruh

* slowdown the parallax
2022-05-08 10:49:22 +10:00
T-Stalker
8544fea510 More markings! (#7964)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-06 18:50:00 +10:00
Flipp Syder
65da5fbae0 Fixes up lizard tails for markings (#7948) 2022-05-05 12:31:48 +02:00
Flipp Syder
a30cae21f6 Markings (#7072)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-05 10:07:42 +02: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
T-Stalker
31b210081a Swaps the health alert with a more pretty one (#7904) 2022-05-03 19:49:48 -07:00
T-Stalker
2b113187de Makes Lizard animals REAL (#7889) 2022-05-03 16:17:57 -07:00
T-Stalker
8d6aaf4690 Boo! (#7918) 2022-05-04 09:03:24 +10: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
d433234fe3 Industrial and Advanced Welders (#7855) 2022-05-02 15:51:24 -07: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
20kdc
ad6abcfff6 Timed mouse spawners (#7831) 2022-04-30 14:26:11 -07:00
EmoGarbage404
d953f88530 MRE boxes (#7726) 2022-04-30 14:24:37 -07:00
Leon Friedrich
79204b0052 Fix compatibility mode singularity shader (#7856) 2022-04-29 15:45:05 +02:00
Rane
ce186e6cc1 Mime Powers (Vow + Invisible Wall) (#7653) 2022-04-28 20:41:03 -07:00
Alex Evgrashin
2d34ded94d Artifact container (#7822)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-04-28 15:03:39 -07:00
Leon Friedrich
8fb48a09ef Improve singularity shader (#7647)
* Working example

* vector arrays

* simplify math

* max distance

* max distance

* PVS override

* rename count
2022-04-28 22:43:16 +10: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
Veritius
6b78a2a2e4 Syndicate segways (#7790) 2022-04-26 15:08:02 -07:00
Rane
a74e6842d9 Medical Techfab + Bed Deconstruction Fix (#7637) 2022-04-23 19:27:12 -07:00
Rane
98cd4fdb58 Vehicles (#7336) 2022-04-23 18:05:02 -07:00
Rane
18220b6488 Drains (#7678)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-04-23 18:04:49 -07:00
Veritius
ed26cdccee Add a syndicate stamp (#7649) 2022-04-23 17:00:53 -07:00
ZeroDayDaemon
54b99bda4a Add operative outfits and syndicate magboots (#7717) 2022-04-23 16:41:59 -07:00
Peptide90
cbe6f620e7 Adds the water cooler (#7724) 2022-04-23 16:39:00 -07:00
Saakra
e48366b42a Added ability to drink from context menu (#7732)
Co-authored-by: Saakra <xfallenfighterswolfx@gmail.com>
2022-04-23 16:38:21 -07:00
Emisse
669d5a9406 Atmospheric Technician (#7709)
* Add files via upload

* Add files via upload

* Update jumpskirts.yml

* Update jumpsuits.yml

* Update pda.yml

* Update identification_cards.yml

* Update jobs.yml

* Add files via upload

* Update atlas.yml

* Update bagel.yml

* Update delta.yml

* Update game.yml

* Update marathon.yml

* Update moose.yml

* Update splitstation.yml

* Update atmosdrobe.yml

* Update atmospheric_technician.yml

* Add files via upload

* Delete equipped.png

* Update engineer.yml
2022-04-23 14:40:12 +10:00
Snowni
87c618db4b Remote Explosives (#7682)
* Remote Explosives

* Apparently we forgot to push the changed files. Dumb.

We Forgor.#

* Made Requested Changes.

* And more changes.

* Added requested changes and tweaked a few other things.

* Fixed RSI issue (hopefully.) Readded Ensurecomp.
2022-04-22 16:54:39 +10:00
ZeroDayDaemon
4926bc7cda Gas Masks, Oxygen Tank Correction, and Correct Fills for lockers and survival boxes (#7589)
* gas mask and oxy and fills and stuff

* Update masks.yml

* Update masks.yml

* i think this is right

* bag variants fill fix

* syndicate gas mask

* Update emergency.yml
2022-04-21 22:11:26 +10:00
Ripmorld
cef7d336f2 Flash payload (#7587) 2022-04-20 16:08:57 +10: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
Emisse
224584e0d6 Paramedic Voidsuit and Armor Balance Pass (#7610) 2022-04-18 20:04:04 +10:00
Pieter-Jan Briers
df825a9d2c Use bilinear filtering for lobby art. (#7611)
Makes it looks not terrible.
2022-04-17 21:14:53 +10: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
7a6d3e69a8 Emaggable vendors + Familiars for Chaplain (#6961) 2022-04-17 17:16:02 +10:00