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

16648 Commits

Author SHA1 Message Date
Ed
5d0bef74a1 alchemy mini fix (#181) 
* hotfix

* Update herbals.yml
 2024-05-27 18:18:31 +03:00
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
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
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
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
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
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
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
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
Jaraten
82013c2be1 Wooden Window Fix (#162) 2024-05-21 11:54:45 +03: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
PJBot
4ed12b60d3 Automatic changelog update 2024-05-20 13:33:31 +00: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
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
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
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