juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,081 Commits 57 Branches 0 Tags
3a0a4c17ea07fcc78c81eae0c8ea46a6d41929c1
Commit Graph

31081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nim
3a0a4c17ea Сrafting changes (#932) 
* crafting

* tweak
 2025-02-25 10:31:59 +03:00
Viator-MV
186a1a04bf Merge pull request #933 from Viator-MV/Comoss_update_22.02.25 
Comoss update 22.02.25
 2025-02-24 18:48:38 +03:00
Ed
37ff029956 return black roofs 2025-02-24 01:07:03 +03:00
Ed
a847b9be71 Merge branch 'master' into Comoss_update_22.02.25 2025-02-24 00:55:25 +03:00
Ed
7cc9eb9ab2 Merge pull request #935 from crystallpunk-14/ed-23-02-2025-upstream 
Upstream room sync
 2025-02-24 00:38:31 +03:00
Ed
ae5b1118d8 Update shield.yml 2025-02-24 00:17:41 +03:00
Ed
c60f65c901 Update CP14DemiplaneSystem.Echoes.cs 2025-02-24 00:09:19 +03:00
Ed
b8575aba8f roofs update 2025-02-23 23:29:45 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
 2025-02-23 23:07:55 +03:00
PJBot
408c6ab443 Automatic changelog update 2025-02-23 19:30:21 +00:00
deltanedas
3e7450802b fix chameleon projector ripley bug (#35070) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2025-02-23 20:29:15 +01:00
PJBot
9f4d6abd30 Automatic changelog update 2025-02-23 19:02:23 +00:00
Errant
cc74880061 version watermark (#35284) 
* version watermark

* force version watermarks on vulture
 2025-02-23 20:01:17 +01:00
PJBot
40fbbe3ae4 Automatic changelog update 2025-02-23 18:49:44 +00:00
pathetic meowmeow
fdf19c6a90 Add a tertiary header parser to the guidebook document parser (#35315) 2025-02-23 19:48:38 +01:00
pathetic meowmeow
cbecc4cc4b Use new engine APIs for setting the scroll target of views (#35401) 2025-02-23 18:47:13 +01:00
keronshb
3192914fc5 Fix/Addition - Wizard Survivor Antag Status (#35226) 2025-02-23 12:24:36 -05:00
Viator-MV
8de115e7d2 Merge branch 'crystallpunk-14:master' into Comoss_update_22.02.25 2025-02-23 19:55:35 +03:00
Viator-MV
aace9aafd1 Update comoss_d.yml 
Atmos fix
 2025-02-23 19:55:19 +03:00
PJBot
326bd7f93a Automatic changelog update 2025-02-23 15:25:51 +00:00
pathetic meowmeow
b7414d85b4 Add microwave recipes to the guidebook (#34105) 2025-02-23 16:24:44 +01:00
slarticodefast
55e22b6a94 Remove disablers from emagged lathe (#35423) 2025-02-23 10:05:23 -05:00
metalgearsloth
1d004f4945 Sentry review (#35424) 
Co-authored-by: chromiumboy <chromium.boy@gmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
 2025-02-24 00:57:27 +11:00
Tayrtahn
9cb6503319 Add interaction tests for prying airlocks (#35409) 2025-02-24 00:46:59 +11:00
chromiumboy
066c773965 Sentry turrets - Part 2: Basic prototype (#35031) 2025-02-24 00:39:44 +11:00
PJBot
b742afbe2c Automatic changelog update 2025-02-23 13:02:12 +00:00
ScarKy0
fad0b6a137 Swap price of EMAG and AD. (#35354) 
init
 2025-02-23 14:01:06 +01:00
PJBot
fd4988e3c5 Automatic changelog update 2025-02-23 12:59:04 +00:00
metalgearsloth
634c4a7780 Fix window positions not saving (#35055) 
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2025-02-23 23:57:57 +11:00
pathetic meowmeow
fabfdd0673 Refactor audio system to send collection IDs over the network (#33610) 2025-02-23 23:14:56 +11:00
PJBot
1d210b52e0 Automatic changelog update 2025-02-23 11:44:22 +00:00
K-Dynamic
17218b7277 Lattice tiles footsteps now sound like catwalks (#35421) 
change lattice from FootstepPlating to FootstepCatwalk
 2025-02-23 12:43:15 +01:00
Pieter-Jan Briers
c956f26d9f Update submodule (#35411) 2025-02-23 22:35:23 +11:00
Deerstop
f65183edb9 Elkridge Science 2.0 + misc fixes (#35392) 
* added radationblockercontainer component to pacman fuel crate so it doesnt leak rads, also more rad suits

* reworked science, misc fixes and changes
 2025-02-23 01:35:36 -07:00
Southbridge
f9c9ffadcc Amber Station Improvements (#35384) 
* Redid TEG, minor fixes around

* Ran fixgridatmos, variantize, fixrotations, tileswalls
 2025-02-23 01:31:04 -07:00
metalgearsloth
a457551108 Roof data rework (#35388) 2025-02-23 18:23:00 +11:00
PJBot
cb0d2b3472 Automatic changelog update 2025-02-23 02:02:39 +00:00
lzk
b8806759fd make opening storage on verb or on interact not silent (#35413) 
* make storage make sound

* remove

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
 2025-02-22 18:01:33 -08:00
Pieter-Jan Briers
e6d45961ac Update nuget packages (#34595) 2025-02-23 02:17:59 +01:00
Pieter-Jan Briers
f5c7809890 Stable merge for hotfix backport (#35412) 2025-02-23 02:15:34 +01:00
PJBot
54e0931836 Automatic changelog update 2025-02-23 01:01:18 +00:00
GrownSamoyedDog
91678f75da Fixed Guidebook Sorting / Ordering (#34960) 
* fixed all yml and cs

* Subjective Rearranging

* fixed my accidentally removed xml endline

* Accidentally included for a different PR

* Added .ThenBy and cleaned up newplayer.yml
 2025-02-23 02:00:10 +01:00
Errant
1d655f6712 [HOTFIX] Altered Silicon removal fails to trigger role update (#35399) 
minor sharedrolesystem refactor
 2025-02-23 01:52:48 +01:00
ScarKy0
a6861b0461 [HOTFIX] Borg emag notification and sound fix (#35394) 
epic stuff
 2025-02-23 01:49:58 +01:00
github-actions[bot]
a6d2948f75 Update Credits (#35410) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-02-23 01:46:28 +01:00
keronshb
c922b4f843 Wizard: Smoke Spell (#35403) 
* Adds smoke spell for wizard

* Adds the actual sprites oops

* Removes repulse attract change

* Removes change again?
 2025-02-22 15:04:42 -08:00
PJBot
1bd3887fa7 Automatic changelog update 2025-02-22 21:35:38 +00:00
Sparlight
e631fa893e Give dogs speech noises (#35383) 2025-02-22 22:34:29 +01:00
PJBot
a33189feb9 Automatic changelog update 2025-02-22 17:46:57 +00:00
Winkarst
b912dedbfc New Feature: Admin Only messages in AHelp (#35283) 
* Feature

* Update

* Update

* Update

* Update Resources/Locale/en-US/administration/bwoink.ftl

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Yes

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2025-02-22 09:45:50 -08:00