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

29118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emisse
d86438c22b martathon update (#30731) 
martathon
 2024-08-07 02:49:28 -06:00
Emisse
d10fa77372 bagel update (#30730) 
big gas miners
 2024-08-07 02:49:17 -06:00
PJBot
c61384122b Automatic changelog update 2024-08-07 07:43:07 +00:00
Lye
7dc6a56969 Space Dragons can't be flashed (#30658) 
* added flash immunity component to Space Dragon

* Changed use of component to use of whitelist
 2024-08-07 09:42:00 +02:00
Ed
d4001598d4 workbench ui clean up (#399) 
* workbench ui clean fix

* stack localization
 2024-08-07 09:32:27 +03:00
Nemanja
ce97225c2d Replace IClickAlert with events (#30728) 
* Replace IAlertClick with events

* whoop

* eek!
 2024-08-07 15:15:35 +10:00
Brandon Hu
2dabf33d46 fix(FieldGenerators): Add missing connection check (#30468) 
.
 2024-08-06 23:43:21 -04:00
PJBot
9903d36c7d Automatic changelog update 2024-08-07 03:42:48 +00:00
Errant
6ccc10e240 Vox Medical Mask sprite fix (#30702) 
vox medical mask
 2024-08-06 23:41:40 -04:00
NakataRin
5247878060 Fix Mind Transfer and Role Assignment Logic for Antagonists (#30711) 
* AntagSelectionSystemFix

* readded the stuff that shouldn've been deleted in the first place

* re-arrange

* undo indentation

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-08-06 23:38:47 -04:00
Emisse
05630bd4ba bagel update (#30727) 
* bagel update

* remove invalid
 2024-08-06 19:32:31 -06:00
Leon Friedrich
b4dfeec696 Add more storage admin logs & fix some interaction validation (#30725) 2024-08-07 10:15:41 +10:00
metalgearsloth
e5fe6f7824 Add mapping load acts (#30722) 
Smug doesn't seem to have time to fix mapping state and I don't want to dump more time into it so.
 2024-08-07 10:04:44 +10:00
Emisse
bd36ff93d2 train update (#30721) 
* train update

* train
 2024-08-06 17:50:39 -06:00
Emisse
1caddfa110 packed update (#30716) 2024-08-06 17:29:36 -06:00
Emisse
bb80d44331 marathon update (#30714) 
* marathon update

* marathon update
 2024-08-06 17:29:29 -06:00
Brandon Hu
048da47f32 fix(emergency_meta): Lock the doors on evac shuttle (#29255) 
* fix(emergency_meta): Lock the doors on evac shuttle
 2024-08-06 15:09:24 -06:00
Ed
78e140b4ae Revert "SpawnSpell tweak (#393)" (#398) 
This reverts commit dc853b6662.
 2024-08-06 20:25:29 +03:00
PJBot
de98531a5d Automatic changelog update 2024-08-06 13:13:20 +00:00
Flareguy
37e36bfa7c Vox head displacement map (#30699) 
* head displacement for vox

* fixe
 2024-08-06 16:12:14 +03:00
Tornado Tech
1b0bf2ad18 Added base workbench window (#372) 
* Added base workbench window

* Fixed serialization errors

* Created base UI layout

* Updated ui

* Updated UI after crafting
 2024-08-06 14:25:59 +03:00
Plykiya
a87efd7d01 Replace xform.WorldPosition with xformSystem method for Setting/Getting (#30029) 
* GET WORLD POSITON, ROTATION

* Missing parentheses

* ui system depndency

* the issue

* Unused

* Let the function do the transform

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-06 21:02:01 +10:00
PJBot
7b3ff00129 Automatic changelog update 2024-08-06 11:01:21 +00:00
slarticodefast
7117b925a5 Add whitelist to cryostorage (#30574) 2024-08-06 21:00:15 +10:00
PJBot
4426ce123a Automatic changelog update 2024-08-06 10:59:39 +00:00
Nemanja
53719bded3 better examine text for radiation collectors (#30606) 
* better examine text for radiation collectors

* this?

* penis
 2024-08-06 20:59:37 +10:00
Errant
9522dbc655 Vox nukies and ninjafix (#29783) 
* Nukie species gear

* antagselectionsystem autointernals

* nukie vox

* skrek

* Remove duplicate code

* skrek

* EVA tank loadouts, vox ninja update

* fix prototype duplication

* skrek

* fix summary

* fixed empty startinggear error

* enable vox ninjas

* Comments

* removed comment because startinggearprototype should not be used on antagselection aaaanyway

* squish that if

* Update Content.Shared/Clothing/LoadoutSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-08-06 20:58:28 +10:00
PJBot
26ad898105 Automatic changelog update 2024-08-06 10:52:42 +00:00
Ed
fb994e8d21 Add comment into jetpack system, to prevent future grid jetpack PRs (#30682) 
Update SharedJetpackSystem.cs
 2024-08-06 20:51:59 +10:00
Nemanja
e477a49cc6 Make biofab distinct from biogen (#30696) 
* Make biofab distinct from biogen

* biocube fabricator
 2024-08-06 20:51:33 +10:00
Brandon Hu
a8c74ca4e1 add(emergency_omega): Add defib to medical treatment area (#30693) 2024-08-05 21:49:23 -06:00
Brandon Hu
c948bd08c6 add(reach): Add a space cleaner dispenser to flands janitoral department (#30697) 2024-08-05 21:49:05 -06:00
Brandon Hu
f8c5a514bc add(fland): Add a space cleaner dispenser to flands janitoral department (#30695) 2024-08-05 21:48:41 -06:00
DrSmugleaf
edd17072ae Fix admin logs cache caching rounds forever if multiple game servers are ran on the same db (#30687) 2024-08-05 16:13:27 -07:00
Brandon Hu
9bb9e80ede tweak(SolutionTransfer): Raise default max transfer amount. (#29969) 
* fix(jugs): Make max and minimum transfer amounts make sense

* fix name

* Better

* Implement bounds checks

* large beaker too

* More logical solution

* Bleh

* remove

* Doesn't make sense yet

WAS MISTAKEN AAAAAAAAAAAAAAD@ @!
 2024-08-06 00:59:51 +02:00
Ed
dc853b6662 SpawnSpell tweak (#393) 
* some refactor

* Update flame_creation.yml
 2024-08-06 00:42:53 +03:00
Ed
37e0ffa173 Workshop update (#392) 
* kreks spell icons

* vladimirs walls update

* add flora material
 2024-08-05 22:46:22 +03:00
Ed
38c3bf2595 Merge branch 'master' into ed-05-08-2024-upstream 2024-08-05 21:08:20 +03:00
Ed
6ab9ca6bd0 yupiiii (#391) 2024-08-05 21:08:10 +03:00
Nim
934c1e44a6 second rebalance (#390) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-05 21:00:40 +03:00
Nim
818eb30d2d spells (#389) 2024-08-05 20:59:40 +03:00
Tornado Tech
12d2af692f Update wave.swsl (#388) 2024-08-05 16:48:22 +03:00
Ed
f5c0efd3cd Update departments.yml 2024-08-05 16:06:10 +03:00
Ed
f2b2da41a6 fix again 2024-08-05 15:50:12 +03:00
Ed
f2eccdc3dd loadout update 2024-08-05 15:37:54 +03:00
Ed
dd580c68c9 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml
 2024-08-05 15:28:42 +03:00
Ed
1f4b7f68bf Playtest polishing (#383) 
* fix predicting sharpening

* finish shadow step

* tweak ice dagger

* shadow grab test

* fireball spell

* ice shards spell

* battle royale crates

* loot tables

* remove expedition ship

* dev update

* br map update

* spells tweak

* tips update

* some fixes

* biome forest spawner

* give keys to orgs

* mobs and aura spawners

* expedition update: goal, new ship, new map

* fix doors layers

* add new map proto

* translate keys

* Update crates.yml

* Update PostMapInitTest.cs

* fix spawning on expedition ship

* Fuck you, Randy. Remove nails

* fix lock systems

* localize tips

* some tweaks

* update ship, remove shrooms.

* fixes

* Update StationSystem.cs

* Revert "Update StationSystem.cs"

This reverts commit f632241324.

* Update expedition_test.yml
 2024-08-05 15:22:14 +03:00
metalgearsloth
f7d8b4e7d4 Fix verb sub (#30667) 
* Fix verb sub

Mapping casualty, verbs are weird.

* also this
 2024-08-05 19:24:56 +10:00
Mervill
c1eb319bda Refactor the hungry debug command to be in line with thirsty (#30591) 
refactor the hungry debug command to be in line with thirsty

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-08-05 18:12:07 +10:00
PJBot
d45810bbdb Automatic changelog update 2024-08-05 08:08:08 +00:00