juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,434 Commits 57 Branches 0 Tags
e216eeae20a1df68bfeba0f59360b22abdb700b2
Commit Graph

25434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
e216eeae20 Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream 
# Conflicts:
#	Content.Server/Atmos/Components/FlammableComponent.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-05-25 18:49:49 +03:00
Ed
af114a93f6 Chromium slime (#174) 
* added chromium slime

* inverse poison damage
 2024-05-25 17:41:29 +03:00
Ed
f8564b3661 Agaric shroom! (#172) 
* agaric shrooms!

* add agaric reagents

* add agaric into worldgen
 2024-05-25 13:30:33 +03:00
Leon Friedrich
a58323cca1 Update engine to v223.1.2 (#28273) 2024-05-25 19:49:46 +10:00
Leon Friedrich
d0cf620a85 Fix weapon error logs (#28264) 2024-05-25 13:13:24 +10:00
Tayrtahn
98503fc793 Hotfix for crashes from bad item names (#28256) 2024-05-24 12:57:02 -07:00
Ed
505a12606a add wallet (#169) 2024-05-24 18:59:10 +03:00
PJBot
aa09741a41 Automatic changelog update 2024-05-24 14:45:49 +00:00
nikthechampiongr
b2ca9b6a9c Fix firelock prediction issues with periodic pulses of closing lights (#28227) 
* Fix firelock prediction issues with periodic pulses of closing lights

For some reason this function was setting a time for the next state
which was triggering the door system to try to close the firelock.
This does not happen serverside because the function only fires from an
event called clientside apparently.
It appears to be an attempt to stop firelocks from closing instantly
that did not function properly, and I cannot discern any other purpose.
As such I have removed it.

* Remove redundant serverside check

This became redundant with commit 439a87f2
 2024-05-24 16:44:42 +02:00
Leon Friedrich
926f72ee13 Update engine to v223.1.1 (#28245) 
* Update engine to v223.1.0

* Update engine to v223.1.1
 2024-05-24 17:02:04 +10:00
PJBot
933a679c1a Automatic changelog update 2024-05-24 05:04:10 +00:00
Leon Friedrich
76e13eed35 Improve InteractionSystem range & BUI checks (#27999) 
* Improve InteractionSystem range & BUI checks

* Ghost fixes

* AAA

* Fix test

* fix nullable

* revert to broadcast event

* Fixes for eengine PR

* Ah buckle code

* )
 2024-05-24 15:03:03 +10:00
Leon Friedrich
01e7c9c37e Update engine to v223.0.0 (#28239) 2024-05-24 14:11:45 +10:00
Leon Friedrich
5d50467466 Content changes for engine delta-state PR (#28134) 
* Update GasTileOverlayState

* Update DecalGridState

* Update NavMapState

* poke

* poke2

* poke3

* Poke dem tests
 2024-05-24 14:08:23 +10:00
Nemanja
8a95cb186c Remove AlertType and AlertCategory (#27933) 2024-05-23 22:43:04 -04:00
DrSmugleaf
594a898260 Fix whatever the fuck is going on in storage system slightly (#28236) 
* Fix whatever the fuck is going on in storage system slightly

* Fix inverted check

* h

* Add silent bool

* Silent
 2024-05-23 18:23:55 -07:00
PJBot
5cb914e4a6 Automatic changelog update 2024-05-23 20:28:53 +00:00
blueDev2
2ccd8e234d Add Fruit Tag to watermelon slice (#28226) 2024-05-23 16:27:45 -04:00
Ed
907b41a4d1 Water floor antity (#168) 
* add rivers and lake test generation

* add water animation
 2024-05-23 18:35:38 +03:00
DrSmugleaf
0e0f50f3d1 Prioritize empty item slots when inserting (#28203) 
* Prioritize empty item slots when inserting

* Revert "Prioritize empty item slots when inserting"

This reverts commit 4272a65cba5fc18df801812b0af20123aec08409.

* Prioritize empty item slots when inserting

* Try drop

* Check for any can insert before dropping
 2024-05-23 14:16:14 +10:00
Ed
2e91620630 Wall lantern + floor water (PLaceholders) (#167) 
* fix lamp sprite

* Update wallmount_torch.yml

* add water test sprite

* add simple water entity

* add reversed crystall sprites

* add sand tile
 2024-05-22 23:18:18 +03:00
Ed
8da9910814 Merge pull request #164 from Jaraten/NewChests 
New Chests
 2024-05-22 22:14:21 +03:00
Ed
327ee24b19 Update meta.json 2024-05-22 22:13:46 +03:00
Ed
5b653eea4f Update meta.json 2024-05-22 22:13:12 +03:00
lzk
c082773b5f Remove dupe closet janitor bombsuit (#28177) 
* Remove dupe closet janitor bombsuit

* Update Resources/migration.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-05-22 10:59:49 -06:00
Doctor-Cpu
79d4c0eee0 misc atlas fixes (#28191) 
misc fixes
 2024-05-22 10:59:33 -06:00
Julian Giebel
1fa493e1af Implement permissive version of AddMarkup and use it for tips (#28204) 
* Implement permissive version of ddMarkup
Use permissive ddMarkup for news article input
Use permissive ddMarkup for tips

* Fix doc comment format
 2024-05-22 10:23:55 -04:00
ShadowCommander
687bf8caaa Revert "Make hotplate and grill anchorable on table" (#28202) 
Revert "Make hotplate and grill anchorable on table (#28026)"

This reverts commit 26747be232.
 2024-05-22 05:29:19 -07:00
PJBot
456e6f07ec Automatic changelog update 2024-05-22 11:17:27 +00:00
nikthechampiongr
df8b9a659e Firelock improvements part 1 (#26582) 
* Change prying system and pryunpoweredcomp to allow for custom time modifiers

This will be useful if I go the route of making firelocks pryable when
unpowered instead of just being able to open and close instantly when
unpowered.

* Make firelocks properly predicted

Shared system made. Since atmos checks can only be done on the server we
just have it set relevant bools on the component and then dirty it.
Ditched atmos checks on trying to open, they now only happen whenever
firelocks are updated.

* Make firelocks pryable without a crowbar

While this usually would only allow you to do this when a door is
unpowered, firelocks do not have the airlock component which actually
does that check. As such firelocks will always allow you to pry them
open/closed by hand.

* Clean up System. Change update interval to be based on ticks. Move as much as possible to shared

* Make firelocks unable to emergency close for 2 seconds after being pried open

* Clean up

* More cleanup

* Reorganize SharedFirelockSystem methods to match Initialize order

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-05-22 04:16:20 -07:00
Ed
8fde83c821 Merge pull request #165 from crystallpunk-14/ed-22-05-2024-upstream 
Ed 22 05 2024 upstream
 2024-05-22 13:40:07 +03:00
Ed
6d51ea95a1 Merge remote-tracking branch 'upstream/master' into ed-22-05-2024-upstream 2024-05-22 13:29:42 +03:00
PJBot
6a9139b4e1 Automatic changelog update 2024-05-22 07:54:04 +00:00
Ed
ede1406128 Artifact portal effect changes (#28200) 
Update portal.yml
 2024-05-22 00:52:57 -07:00
Jaraten
41c505afa0 New Chests 2024-05-21 18:06:41 +05:00
Jaraten
26f91c3a5a resprite tiles (#163) 2024-05-21 15:50:37 +03:00
DrSmugleaf
dbb7dcd16d Add defib event, add fields to be able to disable crit defib and do after movement (#28174) 
* Add defib event, add fields to be able to disable crit defib and do after movement

* Fix check
 2024-05-21 14:11:49 +02:00
PJBot
68a0e568e4 Automatic changelog update 2024-05-21 10:17:43 +00:00
Killerqu00
79c77635fa sleeper agent appear later into the round and only once (#28160) 2024-05-21 12:16:35 +02:00
Ed
c0f158bd19 Ed anomalies (#28175) 
Update CODEOWNERS
 2024-05-21 12:23:55 +03:00
Jaraten
82013c2be1 Wooden Window Fix (#162) 2024-05-21 11:54:45 +03:00
Ed
f9394f4da2 Update PULL_REQUEST_TEMPLATE.md 2024-05-21 11:48:56 +03:00
Leon Friedrich
0f6e1196d8 Use non-generic TryComp() for metadata & transform (#28133) 2024-05-20 22:40:35 -07:00
Ed
18e4e86b21 Ed 19 05 2024 building2 (#161) 
* added wooden planks from wooden logs

* update construction crafts from new wood planks

* Update simple.yml

* add wall frame and wall construction graph

* noSpawn old planks, fix wooden frame layering

* update Jaraten sprites

* add wooden window and restruct files

* fix

* Update wall.yml

* add new walls!

* restruct wallmounts, fix bugs

* door fix

* Update walls.yml

* Update simple.yml
 2024-05-21 00:07:51 +03:00
Killerqu00
3b61368946 rotate forensic scanner stored sprite (#28162) 
rotate forensic scanner
 2024-05-20 15:59:07 -04:00
PJBot
c22329b86c Automatic changelog update 2024-05-20 14:13:11 +00:00
Tayrtahn
8995810ade Fix non-ghosts and admins counting toward most followed (#28120) 
* Fixed non-ghosts and admins counting toward most followed

* Redone to better leverage EntityQueryEnumerator

* Remember to test your code before you commit it, kids

* Review revisions

* Update Content.Shared/Follower/FollowerSystem.cs

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Update Content.Shared/Follower/FollowerSystem.cs

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Update Content.Shared/Follower/FollowerSystem.cs

* Clean up

---------

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-05-20 07:12:05 -07:00
Tayrtahn
fa06783986 Prevent ghosts from spawning on terminating maps/grids (#28099) 
* Extra checks to prevent ghosts spawning on terminating maps/grids

* Add test for grid deletion
 2024-05-20 06:52:49 -07:00
PJBot
4ed12b60d3 Automatic changelog update 2024-05-20 13:33:31 +00:00
Tayrtahn
68ec204a67 Slightly emphasize popup when someone points at you (#28152) 
Slightly emphasize when someone points at you
 2024-05-20 15:32:25 +02:00