Commit Graph

60 Commits

Author SHA1 Message Date
I.K
58f01c28f3 Make the atmospherics meta not bad (#23737)
juej

(cherry picked from commit e7c94c5aaf6d25b2d274f5ac84165b0b416df1ea)
2024-01-26 22:17:52 +01:00
brainfood1183
4fbff7ea5d Rock Anom effects (#23633)
* Rock Anom effects

* fix

* fix

(cherry picked from commit bb294a7aa2464c4d051b020a02c47d0b497cf756)
2024-01-26 22:06:25 +01:00
Ed
85a7adedc5 More artifact content (#22574)
* 3 new effect

* new trigger

* swap portal to Cak

* cake

* portals

* finish

* pupupu

* limitations (same maps)

* its broken now

* a

* portal fix, thx deltanedas

(cherry picked from commit bf7aa47b32ec4435ca76490cc920ad3bd0fcf05a)
2024-01-23 22:49:56 +01:00
chromiumboy
098c53e133 Adds construction effect to RCD (#22633) 2023-12-22 22:50:45 +01:00
brainfood1183
489563f4cd Acidifier Effect Sprite (#22425) 2023-12-16 20:24:33 +01:00
brainfood1183
f101e30565 diagonal window glass and pirate shuttle improvements (#21174)
* shuttle and priate improvements

* fix

* fix damn ubuntu

* darkened syndi airlocks

* fix

* fix ruranium

* added prison cell to pirate ship
2023-11-12 20:43:49 +01:00
brainfood1183
47436927c4 New foam sprites (edge sprites) (#21308)
* New foam sprites (icon smoothing)

* changed to edge sprites for foam

* fix

* edges for metal foams

* fix
2023-10-31 19:14:07 +01:00
Ed
457d6df806 Animals make hearts when you pet them (#20859) 2023-10-14 22:05:43 +02:00
Morb
4db75ee197 SSD Indicator (#19701) 2023-09-27 21:59:12 +02:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
PixelTK
74bd86af2f Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -07:00
deltanedas
04cd014179 nuke lights code change (#19315)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-04 17:14:10 +03:00
Kara
2e86f4c556 Portal sprite & behavior tweaks (#19179)
* Portal repalette

* Portal traversal verb + anchoring

* map restriction

* optional max distance checks if we decide to have them later

* lower pointlight energy slightly hopefully makes it less garish
2023-08-15 14:56:14 -06:00
Nemanja
be29cda183 make typing indicators 32x32 (#18976) 2023-08-10 23:10:29 -06:00
MilenVolf
c20f86733b Moths textures & Layer ordering fix + creampied sprite (#18653)
* Moths textures & Layer ordering fix + creampied sprite

* Forgot to add

* weh

* oops
2023-08-04 12:31:39 -06:00
brainfood1183
c99585c94f Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
DEATHB4DEFEAT
0ddf819983 TG portal sprite (#16329) 2023-05-12 19:36:43 -04:00
Slava0135
4ade6f60ff Electrified grille sparks effect (#15178)
* use file namespace

* shorter systems name

* replace SoundSystem with AudioSystem

* refactor update function

* refactor

* refactor 2

* remove setters

* uh oh

* remove getters

* active checks

* refactor 3

* better way

* update state

* have to remove this for now

* move electrified component to shared

* forgot this

* fix airlocks

* add effect

* Revert "move electrified component to shared"

This reverts commit 6457e8fc9c3b674a705a61034831ce6f084e2b01.

* Revert "forgot this"

This reverts commit ed361cee2d5b8b958830ba0af07fcc2627eb7845.

* functioning effects

* use animation by Aleksh

* make effect part of grille

* optimisation?

* remove timing

* file name

* only activate when touched

* refactor electrocution comp too

* make it 1 sec

* formatting

* replace all entity query with enumerator

* queue del
2023-04-29 16:05:10 -04:00
Nemanja
31851e5468 [Entity] Brig Timers (#15285)
* brigtimer

* ok

* TextScreen w timer implementation

* second commit

* working brig timer

* signal timers near completion

* soon done

* removed licenses, fixes noRotation on screens, minor edits

* no message

* no message

* removed my last todos

* removed csproj.rej??

* missed a thing with .yml and tests

* fix tests

* Update base_structureairlocks.yml

* timespan type serialize

* activation turned into comp

* sloth review

* Update timer.yml

* small changes

---------

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
Co-authored-by: rolfero <45628623+rolfero@users.noreply.github.com>
2023-04-19 01:47:01 -06:00
Peptide90
97006710b4 [QOL] Removed unnecessary delays in some old texture meta.json files (#15378)
* removed old delay from meta.json

* removed old delay from meta.json

* removed old delay from meta.json

* removed old delay from meta.json

* removed old delay from meta.json

* delay fix

* delay fix

* delay fix

* fix delays

* fix delays
2023-04-16 23:50:37 -06:00
Puro
a35e2a8bba [Speech] Moth speech bubble (#15356) 2023-04-13 00:21:57 -07:00
Slava0135
b2972c1d2c Add emp grenade (#14393) 2023-03-06 11:05:12 -08:00
metalgearsloth
81a1c6d7de Weather effects (#12528)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2023-01-17 20:26:52 +11:00
Kara
c821ca71aa Portals & hand teleporter (#13266)
* basic system with portals & linked ents

* hand tele sprites, no impl

* hand tele and teleportation works

* fancy it up

* oog

* special case projectiles

* predict portal-to-portal teleportation

* this stuff

* check nullspace

* sloth

* give to rd instead

* i guess this can probably happen

* docs
2023-01-02 19:58:25 -06:00
metalgearsloth
b1b3f765fa Fix the remaining invalid RSIs (#13113) 2022-12-20 11:49:18 -06:00
metalgearsloth
945101e5e4 Fix a bunch of invalid rsi files (#13104) 2022-12-20 09:36:59 +01:00
Pieter-Jan Briers
10a99617b8 Remove usages of texture: .rsi/*.png and such. (#12896) 2022-12-06 13:11:37 +11:00
Pieter-Jan Briers
b707b788ac Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
metalgearsloth
fc9991cff2 Polish melee effects (#11653)
* Polish melee effects

* adjustments

* Animation changes

* Fix fist
2022-11-08 14:28:49 -06:00
keronshb
e90e8052c4 Beam Component and Lightning Component (#10196) 2022-09-16 01:49:01 +10:00
Nemanja
380e9e92aa miasma sprite tweak (#11006) 2022-09-11 00:00:42 -07:00
Kara
7a553781cc Frezon (#9980)
* stuff i'll have to fix anyway when n2o gets merged

* everything except the finished reactions

* freon coolant reaction but with bad curve

* miasmic subsumation

* freon production

* nitrogen and diff temp scaling

* uhh meant to change that

* #

* hitting that frezon boof
2022-07-27 04:55:28 -05:00
Alex Evgrashin
af926c5279 Typing indicator (typing chat bubble) (#8215) 2022-05-17 02:55:19 -07:00
Leon Friedrich
56168e592e Explosion refactor (#5230)
* Explosions

* fix yaml typo

and prevent silly UI inputs

* oop

* Use modified contains() checks

And remove IEnumerable

* Buff nuke, nerf meteors

* optimize the entity lookup stuff a bit

* fix tile (0,0) error

forgot to do an initial Enumerator.MoveNext(), so the first tile was always the "null" tile.

* remove celebration

* byte -> int

* remove diag edge tile dict

* fix one bug

but there is another

* fix the other bug

turns out dividing a ushort leads to rounding errors.  Why TF is the grid tile size even a ushort in the first place.

* improve edge map

* fix minor bug

If the initial-explosion tile had an airtight entity on it, the tile was processed twice.

* some reviews (transform queries, eye.mapid, and tilesizes in overlays)

* Apply suggestions from code review

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

* is map paused

* GetAllTiles ignores space by default

* WriteLine -> WriteError

* First -> FirstOrDefault()

* default prototype const string

* entity query

* misc review changes

* grid edge max distance

* fix fire texture defn

bad use of type serializer and ioc-resolves

* Remove ExplosionLaunched

And allow nukes to throw items towards the outer part of an explosion

* no hot-reload disclaimer

* replace prototype id string with int index

* optimise damage a tiiiiny bit.

* entity queries

* comments

* misc mirror comments

* cvars

* admin logs

* move intensity-per-state to prototype

* update tile event to ECS event

* git mv

* Tweak rpg & minibomb

also fix merge bug

* you don't exist anymore go away

* Fix build

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-03-31 21:39:26 -05:00
Leon Friedrich
c95516e5b2 Revert "Explosion refactor TEST MERG (#6995)" (#7005) 2022-03-06 04:02:34 +11:00
Moony
4a466f4927 Explosion refactor TEST MERG (#6995)
* Explosions

* fix yaml typo

and prevent silly UI inputs

* oop

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2022-03-04 13:48:01 -06:00
router
426f043d45 Add capitalism (#6617)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-03-03 21:11:35 +11:00
mirrorcult
402cd9b56b Many lighting tweaks (#4709) 2021-10-01 20:59:06 +00:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Swept
55a04bfc30 Cleaned up all produce meta.jsons (#3943) 2021-05-08 09:09:35 +00:00
Swept
6df41b2fa7 Adds material and singularity cargo crates (#3445)
* Adds various crates

* Removes redundant code from EmitterComponent.cs

* (fixed) emitter

* Hopefully good

* Update meta.json
2021-02-28 11:57:44 -08:00
Pieter-Jan Briers
63947a6d35 Fixes all the rotation bugs. (#3365) 2021-02-22 00:46:27 +01:00
Vera Aguilera Puerto
9b1142973e Renames phoron to plasma everywhere in the codebase and replaces sprites. (#3110) 2021-02-09 19:05:19 +01:00
Radrark
937e261867 Add Smoke and Foam chemical reaction effects. (#2913)
* Adds smoke reaction effect

* smoke tweaks

* address reviews

* Smoke fix

* Refactor smoke and add foam

* Fix stuff

* Remove thing

* Little things

* Address some comments

* Address more things

* More addressing

* License stuff

* Address refactor request

* Small things

* Add nullability

* Update Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-02-03 15:26:46 +01:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
Paul Ritter
6a0aa9b72f Singularity, Particle Accelerator & Radiation Collectors (#2169)
* basic radiation generator

* might need this

* thonk

* big thonk

* oop

* e

* werks

* sprite

* oopsy woopsy

* radiation

* clean up file

* makes it work, probably

* minor fixes

* resources

* progress on component

* this will no longer be necessary

* radiation go brrrr

* finally fix container issues

* out var

Co-authored-by: Remie Richards <remierichards@gmail.com>

* second out fix

* another out fix

Co-authored-by: Remie Richards <remierichards@gmail.com>

* switch case

* fix switch

* sound and improvements

* nullable

* basic containment field system

* ensure alignment

* fix beam placement logic

* field generation fully working

* fix potential crash

* working containment functionality

* extremely basic emitter functionality

* fix radiation panel naming

* emitter stuff

* oopsies

* fixes

* some fixes

* cleanup

* small fix and move emitter file

* add sprite resources for PA

* slight rework of the singulo
adds rads

* pushing for smugleaf :)

* added radiationpanels

* some fixes for the singulo

* containmentfield

* pa wip

* progress

* pa working

* emitter fix

* works :)

* ui works

* some work on ui & pa

* progress

* ui work & misc fixes

* GREYSCALE

* pa ui polish
containmentfieldgen rework

* singulo rework
added snapgrid

* getcomponent get out

* singulo rework
added collisiongroups underplating & passable

* yaml work:
- collision boxes
- singulo now unshaded

* no unlit

* misc changes

* pa wires

* add usability check

* nullable enable

* minor fix

* power need added

* reenables containment field energy drain
menu close button
singularity collider fix

* sprite replacement

* finished singulo pulling

* pjb fixes

* fixing sprites & minor adjustments

* decrease containmentfield power

* some yml adjustments

* unlit layers
singulogenerator

* singulogen

* everything works just not the powergetting on the pa
i wanna die

* Adds PA construction graphs, PA construction works

* Snap to grid parts when completing construction

* updated to newest master

* inb4 i work on power

* fixes upstream merge
adds power need to particleaccelerator

* properly implements power & apc power

* Emitters are now fancy.

* I have actually no idea how this happened.

* Give PA a wiring LayoutId

* PA is an acronym

* indicators
fixes hacking

* Singulo is a word you blasphemous IDE.

* Rewrite the PA.

* Fancy names for PA parts.

* Wiring fixes, strength wire cutting.

* fixes projectile & ignores components

* nullability errors

* fixes integration tests

Co-authored-by: unusualcrow <unusualcrow@protonmail.com>
Co-authored-by: L.E.D <10257081+unusualcrow@users.noreply.github.com>
Co-authored-by: Remie Richards <remierichards@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <zddm@outlook.es>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-10-28 19:19:47 +01: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
Víctor Aguilera Puerto
4c34a12c67 Adds IThrowCollide, Creaming people with cream pies and tactical stun baton throws (#2122) 2020-09-22 15:34:30 +02:00
Víctor Aguilera Puerto
69059eac80 Adds new different reaction types. (#2114)
* Adds new different reaction types.
- Adds touch, injection and ingestion reactions for entities.
- Adds tile reactions.
- Removes GasSprayerComponent in favor of SprayComponent.
- Gives fire extinguishers a safety.
- Gives spray puffs a sprite.
- Improved spray and fire extinguisher in general.
- Fire extinguisher now ACTUALLY puts out fires. Amazing, eh?
- Fire extinguisher sprays three 'clouds' at once.
- Spraying flammable chemicals at fire makes them worse. Whoops!
- Gives spray and fire extinguisher their classic sounds.
- Most chemicals now don't make puddles. Too bad!
- Space lube now makes a very slippery puddle. Honk.
- Spraying water (or using a fire extinguisher) on existing puddles makes them bigger.

* Fix solution tests

* food base now has solution container with noexamine caps
2020-09-21 17:51:07 +02:00
Víctor Aguilera Puerto
2927ab5cd1 Fix missing light mask 2020-09-21 01:27:14 +02:00