Commit Graph

776 Commits

Author SHA1 Message Date
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
Víctor Aguilera Puerto
cec3eca896 Make power generators anchored by default. 2020-10-28 13:50:42 +01:00
Peter Wedder
b81b8612b6 Add Botanist, Warden, Quartermaster and Chaplain (#2402)
* Add Botanist, Warden and Quartermaster

* QM ID card, warden sprite state

* Add missing sprites

* Chaplain + some fixes

* typo fix

* capitalization

* copyrihgght

* add spawnpoints
2020-10-27 21:28:39 +01:00
Swept
9b5950e380 Updates a bunch of entities physics yaml. (#2404)
* Initial

* Reverts firelocks
2020-10-27 21:15:54 +01:00
Víctor Aguilera Puerto
870d052354 Gas tanks and masks (#2409)
Co-authored-by: a.rudenko <creadth@gmail.com>
Co-authored-by: creadth <creadth@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-10-27 20:53:44 +01:00
Peter Wedder
f04818437d Fix scientist's locker sprite (#2401) 2020-10-27 00:35:19 +01:00
Swept
077b5d1a4e Adds botany stuff to IgnoredComponents.cs and fixes Science locker ID. (#2400) 2020-10-27 00:08:29 +01:00
Peter Wedder
2c18a6788a Fix reinforced table HP (#2399) 2020-10-26 23:37:44 +01:00
Peter Wedder
e62f66e692 Access lock lockers and add some more access types (#2389)
* access lock lockers and add some more access

* Forgot something
2020-10-26 23:32:55 +01:00
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
Peter Wedder
7c57d10531 Implement PDA ID lights (#2397)
* add PDA id light (yaml changes pending)

* the rest of the owl

* Do it better
2020-10-26 19:35:20 +01:00
Ygg01
9838a994b9 Fix various description and description related fields (#2386)
* Added descriptions

* Fix punctuation in various .yml files

* Update Resources/Prototypes/Catalog/VendingMachines/seeds.yml

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-10-26 10:45:23 +01:00
F77F
c21920df6c Add examine tooltip to ghosts. (#2382)
* Add examine tooltip to ghosts.

* remove ghost name in examine tmsg. reformat time since death

Co-authored-by: scuffedjays <yetanotherscuffed@gmail.com>
2020-10-25 12:08:22 +01:00
Víctor Aguilera Puerto
45ace1d345 Fix prototype filename typo 2020-10-25 00:10:05 +02:00
Swept
3103e60c3f Fixes icons on consoles (#2351) 2020-10-21 22:01:28 +02:00
Swept
227b4ae689 Fixes broken double-barrel shotgun sprites. (#2350) 2020-10-21 21:40:33 +02:00
Swept
5501b2c5c5 Fixes missing CE equipment headset (#2344) 2020-10-21 10:26:31 +02:00
py01
c7e7ff4065 Scrubber and vent rotation fix (#2298)
Co-authored-by: py01 <pyronetics01@gmail.com>
2020-10-20 14:35:00 +02:00
py01
717a375abb Half-pipe rotation fix (#2296)
* missing sprite comp

* Half pipe rotation fix

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-10-19 11:34:23 +02:00
DrSmugleaf
8f98e14522 Remove plural property from body parts (#2294) 2020-10-19 09:06:50 +02:00
Exp
a7ca11611d Adds a Visualizer for the Gravity Generator (#2277)
* Adds Visualizer to GravityGenerator

* nullable

* snake bad

* -Reads layers from yaml
-Reads sprite states from yaml

* Fix GravityGridTest
2020-10-18 13:08:41 +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
DrSmugleaf
3989e20c29 Fix gasping for real this time I promise (#2285)
* Fix gasping I promise for real this time

* Remove comments.

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-10-17 13:21:26 +02:00
Víctor Aguilera Puerto
dc6fb649ea No, taser shots shouldn't be anchored by default. 2020-10-17 01:02:43 +02:00
DrSmugleaf
b1fe4bad01 Add client pulling prediction (#2041)
* WIP changes

* Merge conflict fixes

* Bring pull controlelr to current year

* Sync and predict PullController on the client

* Clean imports

* Slow down pullers and make pulling tighter

* Stop pulls on pullable or puller component removals

* Make pulling not occur when moving towards the pulled entity
2020-10-16 20:35:09 +02:00
metalgearsloth
0345fbbd22 Turn off gravity gen sprite netsync (#2273)
It also needs a visualizer which I'll make an issue for.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-10-16 17:57:53 +02:00
Pieter-Jan Briers
edc01b20a5 Revert "Tweaks player BB" (#2264)
This reverts commit 4fa4e42462.
2020-10-15 10:16:17 +02:00
Swept
7d4da8950b Test implants are abstract for now. (#2248) 2020-10-14 23:19:44 +02:00
DrSmugleaf
1098035fd9 Remove context menu from drag shadows (#2262) 2020-10-14 22:48:45 +02:00
Víctor Aguilera Puerto
6be80c119b Rename last usages of Collidable to Physics (#2258) 2020-10-14 22:44:31 +02:00
DrSmugleaf
17ee9814b0 Fix ghosts being conveyed (#2260) 2020-10-14 22:34:27 +02:00
DrSmugleaf
41cbcc85e0 Rename last usages of Collidable to Physics 2020-10-14 20:16:57 +02:00
Swept
bd6697b9bb Fixes Satchels not being equippable. (#2245) 2020-10-14 15:24:45 +02:00
Swept
4f00acbb69 Fixes icons for lockers, guns and flare. (#2247)
* Pistols

* Fixes gun icons

* Fixes all locker sprites

* Moved cursed locker from fills

* Fixes flare icon
2020-10-14 10:58:07 +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
Víctor Aguilera Puerto
c023f26a1c The construction system can now prevent recipes from being rotated. 2020-10-12 14:22:31 +02:00
Víctor Aguilera Puerto
eb125b7d61 Adds different StackTypes for MV and HV cables, rename APC Extension Cable Coil to cable coil. 2020-10-12 14:16: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
Víctor Aguilera Puerto
f07e5484b2 Fix some jobs specifying an inexistent headset prototype. 2020-10-12 12:41:53 +02:00
Víctor Aguilera Puerto
f57ff3eb02 Fix soda dispenser inventory prototype having invalid entries 2020-10-12 12:37:11 +02:00
DrSmugleaf
c029329070 Where is the brute pack officer (#2237)
* Fix roll of gauze texture

* Fix the id and stack type too

* Readd brute pack
2020-10-11 17:24:20 +02:00
DrSmugleaf
53cc5abdcd Fix roll of gauze texture (#2235) 2020-10-11 17:09:03 +02:00
DrSmugleaf
748946db32 Add temporary damageable component to humans (#2234) 2020-10-11 17:00:15 +02:00
DrSmugleaf
b64cb24059 Rename usages of collidable to physics (#2230)
* Rename usages of collidable to physics

* high tier PANIQUE

* aaaaaaaaAAAAAa

* cursed commit dont research

* Fix urist and items being anchored

* Fix the rest
2020-10-11 16:36:58 +02:00
DrSmugleaf
f7c69d7b9a Replace Physics with Collidable in YAML prototypes (#2229)
* Replace Physics with Collidable in YAML prototypes

* Revert "Replace Physics with Collidable in YAML prototypes"

This reverts commit d8dd4b609979314c42742da01e1c0fba4d08192e.

* Replace Physics with Collidable in YAML prototypes
2020-10-11 15:21:33 +02:00
Víctor Aguilera Puerto
6e33c15fd7 Computers now spawn with circuit boards, add arcade circuitboards. 2020-10-11 13:37:38 +02:00
Víctor Aguilera Puerto
03b1a78238 Fixes edge firelock serialization 2020-10-10 19:43:50 +02:00
DrSmugleaf
dd385a0511 Change all of body system to use entities and components (#2074)
* Early commit

* Early commit 2

* merging master broke my git

* does anyone even read these

* life is fleeting

* it just works

* this time passing integration tests

* Remove hashset yaml serialization for now

* You got a license for those nullables?

* No examine, no context menu, part and mechanism parenting and visibility

* Fix wrong brain sprite state

* Removing layers was a mistake

* just tear body system a new one and see if it still breathes

* Remove redundant code

* Add that comment back

* Separate damage and body, component states, stomach rework

* Add containers for body parts

* Bring layers back pls

* Fix parts magically changing color

* Reimplement sprite layer visibility

* Fix tests

* Add leg test

* Active legs is gone

Crab rave

* Merge fixes, rename DamageState to CurrentState

* Remove IShowContextMenu and ICanExamine
2020-10-10 15:25:13 +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
5aa866548b Gas Canisters and Ports (#2151)
* CanisterComponent start

* GasCanisterPort

* canister

* GasCanister yaml

* More Gas Canisters

* Canister & port fixes

* Placeholder canister and port sprites

* GasMixture serialization

* Component ignores

* Fix duplicate component ignore

Co-authored-by: py01 <pyronetics01@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-10-10 13:37:52 +02:00