juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,788 Commits 57 Branches 0 Tags
373c368b94de808ff8da1f9956b489daecee64d8
Commit Graph

24788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DrSmugleaf
8a14725539 Add extension methods for getting adjacent tiles randomly and to offset coordinates in a direction 2020-09-01 23:28:59 +02:00
DrSmugleaf
549c8c595e Add extension method to shuffle an entity by a random value 2020-09-01 22:04:55 +02:00
DrSmugleaf
1186552629 Add an entire nullable to buckle 2020-09-01 21:49:32 +02:00
Swept
2e12d8b758 Adds the Mime (#1798) 
* Adds mime job

* Adds mime spawn point

* Moves the ID prototypes/textures to Objects/Misc

* The things I do to avoid conflicts

* identification_cards.yml's final resting place

* Adds ID card and PDA

* Center mime id

* Puts pen and paper in the mimes pocket

* Adds mime spawnpoint to Saltern

* Revert "Adds mime spawnpoint to Saltern"

This reverts commit 56c6cf729baae0958b8b41dd83f71355e4e5f9aa.

* Add mime spawn point

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2020-09-01 21:42:31 +02:00
DrSmugleaf
e0928d78e0 Make verbs be created through IDynamicTypeFactory 
To allow for dependencies to be declared on them
 2020-09-01 21:11:17 +02:00
Víctor Aguilera Puerto
9398f90e7c Lights now use dependencies. 2020-09-01 16:19:32 +02:00
Víctor Aguilera Puerto
2d92432830 Fix certain prototypes' clickable bounds 2020-09-01 16:16:29 +02:00
Víctor Aguilera Puerto
850586d3d7 GLES2: companion PR to engine PR (#1956) 
* GLES2: Content shader stuff (possibly unfinished)

* GLES2: More shader stuff to get things working

* GLES2: Fixes, clarifications to shaders
 2020-09-01 15:32:54 +02:00
Víctor Aguilera Puerto
627e5414e2 Update submodule. 2020-09-01 15:32:35 +02:00
Swept
111ad63dce Installing a new power infrastructure for Saltern. (#1559) 
* Removes all deprecated wires, generators and apcs

* Removes all deprecated power entities

* Updates to master

* Map g2g

* Map new power system and some materials

* Remove old power entities from stationstation

* Removes deprecated shit AGAIN

* Remove outdated wires from stationstation

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
Co-authored-by: juliangiebel <juliangiebel@live.de>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2020-09-01 12:44:48 +02:00
DrSmugleaf
8f9ed2f562 Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods (#1965) 
* Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods

* Remove redundant code
 2020-09-01 12:34:53 +02:00
DrSmugleaf
14259ed920 Change EntityTest.SpawnTest to not use stationstation (#1984) 2020-09-01 12:29:58 +02:00
DrSmugleaf
a937e67d38 Add delete entities with prototype id command (#1983) 
* Add delete entities with prototype id command

* Add command to groups

* Add feedback and lowercasing
 2020-09-01 12:24:28 +02:00
Swept
ae03c633cf Adds Duffelbags. And Mime, Botany and Chemistry backpacks. (#1982) 
* Sprite added

* Duffel prototypes

* Updates the surgery tools to ID standards

* Revert "Updates the surgery tools to ID standards"

This reverts commit a9997ea979230e090793f85c1e779c5d0a0f2217.

* Adds a filled surgical duffelbag

* Adds Mime, Botany and Chemistry backpack
 2020-09-01 12:24:12 +02:00
Víctor Aguilera Puerto
db12634bd5 Merge branch 'master' into 2020-08-31-click-attack 2020-09-01 03:25:14 +02:00
Víctor Aguilera Puerto
fdd61d1c94 Fix instrument crash when you put an instrument in Urist's hands 2020-09-01 03:08:32 +02:00
Víctor Aguilera Puerto
3fb4adeb0f Update submodule. 2020-09-01 02:35:13 +02:00
Víctor Aguilera Puerto
c8b55714cc Increase barotrauma timer to 3 seconds. 2020-09-01 02:25:19 +02:00
creadth
12801ccf2c Moved the uplink creation code to the PresetSuspicion.Start method to ensure uplink created when we give the traitor role (#1974) 
Moved the starting TC balance to cvars
 2020-09-01 00:36:49 +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
Víctor Aguilera Puerto
391444c879 Add an effect that shows the item you're using to attack with when attacking 2020-08-31 20:54:33 +02:00
Víctor Aguilera Puerto
b927fddf4c Better click attack effect 2020-08-31 19:32:06 +02:00
ancientpower
f41e39410d Tweaks damage types and classes (#1969) 
Co-authored-by: ancientpower <ancientpowerer@gmail.com>
 2020-08-31 19:11:22 +02:00
Víctor Aguilera Puerto
69bd44c94c Adds click attacks 2020-08-31 18:58:22 +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
9d5278ab0d Volume and pressure pump (#1955) 
* PressurePump and VolumePump

* VolumePump fix

* PressurePump fix

* volume pump simplification

* Fixes GridAtmosphereComponent not updating pumps

Co-authored-by: py01 <pyronetics01@gmail.com>
 2020-08-31 02:13:23 +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
Víctor Aguilera Puerto
52e98e29d7 Support for non-fulltile firelocks! 2020-08-30 15:00:40 +02:00
Víctor Aguilera Puerto
c137d1bc16 changes dunno 2020-08-30 13:20:08 +02:00
DrSmugleaf
b83c8126d7 Change component tests to not use stationstation (#1963) 2020-08-30 12:00:47 +02:00
DrSmugleaf
9d6c394f6b Refactor InRangeUnobstructed and add extension methods (#1925) 
* Sort out InRangeUnobstructed and add extension methods

* Rename client RangeChecks to RangeExtensions

* Add container extension methods and test

* Add missing component methods

Component to container
Grid coordinates to container
Map coordinates to container
Local player to container

* Actually use the field

* Merge fixes

* Add popup argument to local player extension methods

* Reduce code repetition for client range extensions
 2020-08-30 11:37:06 +02:00
DrSmugleaf
9ec3ddf368 Add popup message extension for players in range except for the source (#1962) 2020-08-30 11:28:46 +02:00
DrSmugleaf
827eab17d0 Add body part and body manager interfaces (#1939) 
* Add body part and body manager interfaces

* Merge fixes
 2020-08-30 11:26:52 +02:00
DrSmugleaf
a8aa088058 Add invulnerable damage flag, godmode and damage flag commands (#1949) 
* Add invulnerable damage flag and commands

* Add serialization for damage flags

* Add godmode command
 2020-08-30 11:16:47 +02:00
metalgearsloth
72eb1fdc1c Add door welding (#1951) 
* Add door welding

Surprised this wasn't in already.

* smug's feedback

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-08-30 11:16:29 +02:00
Julian Giebel
38b9a5a901 Remove collision from disposal pipes (#1958) 
Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
 2020-08-30 11:10:14 +02:00
Swept
b4fc79bcc8 Adds components from #1784 to IgnoredComponents.cs (#1961) 2020-08-30 11:09:32 +02:00
20kdc
8acb0ba1a5 GLES2: Fixes, clarifications to shaders 2020-08-29 19:55:16 +01:00
DrSmugleaf
5a0f7d9316 Add missing localization to verb names (#1953) 2020-08-29 13:36:02 +02:00
metalgearsloth
65a9a09049 Add post-checks for do_after (#1940) 
* Add post-checks for do_after

So you can do InRangeUnobstructed or whatever at the end.

Individual components should do their own check upfront to avoid the state ever being sent. I added a pre-made function for people to do InRangeUnobstructed.

* Woops imports

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-08-29 13:35:03 +02:00
Exp
b993ebb30a Status Effect Tooltip & Notify on click (#1943) 
* -Show tooltip on hover
-Show notify on click

* -Status Effects now get removed instead of going invisible
-Removed empty textures for that

* Revert break in HungerComponent
 2020-08-29 13:33:38 +02:00
DrSmugleaf
1ecf8aad1a Add prediction for standing states and mob states (#1937) 2020-08-29 13:20:37 +02:00
DrSmugleaf
4d23bbf4df Fix slippery items not being slippery (#1948) 
* Fix slippery items not being slippery

* Fix slippery not being slippery part 2 redux electric boogaloo

* You got a license for that hard collidable?
 2020-08-29 13:13:22 +02:00
DrSmugleaf
c37c39fe3c Fix not checking both perspectives of a disposals tube connection (#1947) 
* Fix not checking both perspectives of a disposals tube connection

* Good night LINQ

Switch to Reactive whence

* by god
 2020-08-29 13:13:08 +02:00
Swept
a57c5265be Tweaks suicide to be a little more personal. (#1887) 
* Copied code from ClimableComponent.cs to make Welder suicides way better

* ass nath

* Adds other types of suicide and addresses review

* fixes conflicts

* Welder updates

* Welder fixes x2

* themselves

* Fix typo

* Remove crate textures

* Merge remote-tracking branch 'upstream/master' into pr/1887

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2020-08-29 13:12:21 +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
DrSmugleaf
6156ce3534 Update submodule 2020-08-29 13:00:16 +02:00
DTanxxx
ebc2d59f2e Bullet only damage the first entity it collided with (#1912) 
Co-authored-by: David Tan <>
 2020-08-29 12:50:43 +02:00
metalgearsloth
033ddb04e0 Parent muzzle flashes to the shooter (#1935) 
I didn't do hitscan because it would look weird af unless someone has a better idea.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-08-29 12:47:03 +02:00
metalgearsloth
cc1125cd91 No context menu through occluder (#1934) 
* No context menu through occluder

* Fix disabled occluders

* Comment

* Server-side verb ray check

Decided to add a buffer because the entity is at the very edge of the context box (0.5, 0.5) then need to make sure that entities at the other end of the box are ignored.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-08-29 12:46:42 +02:00