Commit Graph

25411 Commits

Author SHA1 Message Date
Ed
f8564b3661 Agaric shroom! (#172)
* agaric shrooms!

* add agaric reagents

* add agaric into worldgen
2024-05-25 13:30:33 +03:00
Ed
505a12606a add wallet (#169) 2024-05-24 18:59:10 +03:00
Ed
907b41a4d1 Water floor antity (#168)
* add rivers and lake test generation

* add water animation
2024-05-23 18:35:38 +03: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
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
Verm
dce2bfe2b8 Remove extra gear prototype (#28062)
Remove extra prototype
2024-05-20 13:24:15 +02:00
PJBot
5863700a56 Automatic changelog update 2024-05-19 23:05:22 +00:00
TsjipTsjip
daac303783 Admin access configurator (#28107)
* Port spritework and initial prototypes by @Arimah

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>

* Make Admin PDA's spawn with a universal ID card

* Add universal access configurator to aghost satchel of holding

* Add Admin suffixes to adminonly items: AdminPDA, UniversalIDCard, AccessConfiguratorUniversal

* Admin jobicon

---------

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>
2024-05-19 17:04:16 -06:00
PJBot
27088a38f4 Automatic changelog update 2024-05-19 23:02:50 +00:00
Flesh
c551cafdae Add plant metabolism effects to chemical guidebook (#28038)
* draft one of plant metabolism guidebook

* loc fix?

* add attributes loc

* fix loc syntax

* improved appearance

* last commit was undercooked, my bad

* last commit was still undercooked, my worse

* last commit was even still undercooked, my worst

* Addressed comments?

* Fix newlines

* Hopefully this works

* Cleanup, I think

* 2xs
2024-05-19 17:01:44 -06:00
PJBot
f2df51660d Automatic changelog update 2024-05-19 22:37:01 +00:00
Nemanja
a30fb2661f Fix magic mirror (#28084)
* Fix magic mirror

* buff magic mirror
2024-05-19 16:35:55 -06:00
DrSmugleaf
b7eed5c348 Make standing state down sound nullable (#28132) 2024-05-19 16:35:22 -06:00
PJBot
0307cb2a83 Automatic changelog update 2024-05-19 22:23:52 +00:00
Killerqu00
3c4295697a add (un)equip delay for EVA helmets to fix sound spam (#28142)
add equip delay for EVA helmets
2024-05-19 16:23:38 -06:00
Teemu Kauhanen
d5875fd4a1 add WhiteCane recipe (#28146) 2024-05-19 16:22:45 -06:00
Leon Friedrich
53213a0200 Fix gun cooldown timespan overflow exception (#28136) 2024-05-19 16:07:45 -06:00
lzk
e06b58abce Resprite zookeper id (#28131)
Change zookeper id
2024-05-19 16:05:12 -06:00
MilenVolf
c8a72e1aa6 Fix toilet texture & fixture (#28125)
* Fix toilet texture & fixture

Passangers that got stuck between wall and a toilet will thank you

* Fix mask, add layer None
2024-05-19 16:04:55 -06:00
Tayrtahn
16aa1c206b Improve "points at self" messages (#28147) 2024-05-19 13:01:54 -07:00
Ed
dbff4c1397 Merge pull request #159 from crystallpunk-14/ed-19-05-2024-upstream
Ed 19 05 2024 upstream
2024-05-19 17:20:56 +03:00
Ed
1dbb4e7e94 Merge branch 'master' into ed-19-05-2024-upstream 2024-05-19 15:57:20 +03:00
Ed
6a639107b3 Merge remote-tracking branch 'space-station-14/master' into ed-19-05-2024-upstream
# Conflicts:
#	Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
2024-05-19 15:43:25 +03:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158)
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
2024-05-19 15:40:28 +03:00
Leon Friedrich
6e83c4d570 Update component query benchmarks (#27967)
* Add more component query benchmarks.

* Rename benchmark
2024-05-19 11:55:10 +10:00
Leon Friedrich
b4a5399ad4 Modify battery assert to avoid floating point errors (#28007) 2024-05-19 11:54:52 +10:00
PJBot
e5f30b12d2 Automatic changelog update 2024-05-19 01:36:52 +00:00
DrSmugleaf
3d41d5f2bc Make wielding automatically drop the item on your other hand (#27975)
* Make wielding automatically drop the item on your other hand

* Fix docs

* Remove redundant parameter

* Fix not deleting virtuals on fail

* Make count freeable hands method

* Add popup when dropping item
2024-05-18 18:35:46 -07:00