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
PJBot
bca8d95191 Automatic changelog update 2024-10-31 14:54:44 +00:00
BramvanZijp
a08da9d31f More pda space (#32601) 
* Rebalance the max programs that a PDA can hold

* Give Caps PDA more programs too.

* Make the max programs a static 8

* I forgor sec and med

* CaseCase

* Empty commit to re-run checks

* The final change, I hope.
 2024-10-31 15:53:38 +01:00
PJBot
872adb5c93 Automatic changelog update 2024-10-31 14:13:33 +00:00
SlamBamActionman
55861b4fcf [#28722 fix] Add notification for dependent wearables being dropped (#33078) 
* add notification for dependent wearables being dropped

* fix dropped item popup redundancy
- did a check to see if any item was dropped, instead of making a notification for each item being dropped.

* change popup to client-only variant

* fix redundant messages, add plural locale string

* fix conventions, fix locale input to be more intuitive

---------

Co-authored-by: Justin <justinbrick1@gmail.com>
 2024-10-31 15:12:26 +01:00
PJBot
a875bf3c64 Automatic changelog update 2024-10-31 13:27:53 +00:00
Jarmer123
4261698371 Add a spare bible to PietyVend (#32363) 
Update chapel.yml
 2024-10-31 14:26:45 +01:00
AJCM-git
f5e5646400 New workflow to apply the pr approved label (#28358) 
* New workflow to apply the pr approved label

* Maybe fix permissions
 2024-10-31 12:22:13 +01:00
PJBot
826bd1ab45 Automatic changelog update 2024-10-31 10:57:15 +00:00
Boaz1111
a3dc0eb75a Pill Bottles can only store pills now (#33074) 
* no longer absurd

* Update Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-31 11:56:07 +01:00
PJBot
fdd713a0f0 Automatic changelog update 2024-10-30 09:16:36 +00:00
Alzore
4b467685b2 Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720) 
* a-few-injectors

* comment

* defib-ops-when
 2024-10-30 10:15:30 +01:00
PJBot
827d00eb18 Automatic changelog update 2024-10-30 07:42:56 +00:00
Alzore
6834bc1fbd Add 3 bottle boxes to nanomed plus (#33018) 
three bottle boxes in nanomed plus
 2024-10-30 01:41:51 -06:00
PJBot
0f1e11c356 Automatic changelog update 2024-10-30 07:41:40 +00:00
Alzore
010638d0e9 Make the security belt contain more useful items by default (#32291) 
* replace tear gas and flashbang with holobarrier and sec radio

* holobarrier-belt-fix
 2024-10-30 01:40:33 -06:00
PJBot
d4db338ec6 Automatic changelog update 2024-10-30 07:39:27 +00:00
Alzore
0aa46f6a2a Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) 
* inhands

* better inhands

* indent
 2024-10-30 01:38:19 -06:00
Flareguy
3d70cdf23c Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786) 
* various resprites (encryption keys + signal screens + station map)

* brig timer update

* fixes n shit
 2024-10-30 14:12:49 +11:00
Milon
440da3c640 fix chameleon projector bot whitelist (#33055) 
fix
 2024-10-30 02:03:06 +01:00
Preston Smith
907a9cef10 Fix: Make Plushie Damage Unexaminable (#33061) 
Set hidden to true
 2024-10-30 01:52:43 +01:00
Ed
16e23098db Merge pull request #520 from crystallpunk-14/ed-29-10-2024-upstream 
Stable upstream sync
 2024-10-29 15:15:14 +03:00
Ed
4e2af32ebe Merge pull request #522 from crystallpunk-14/ed-29-10-2024-guides-and-skills 
Ed 29 10 2024 guides and skills
 2024-10-29 14:55:50 +03:00
Ed
60f8c2c56f remove cvar! 2024-10-29 14:41:41 +03:00
Ed
df53f9a01f remove ship target point 2024-10-29 14:18:27 +03:00
Ed
2f57f11771 Cargo namespace 2024-10-29 12:18:35 +03:00
Ed
e6bbc3900f Delete CP14ExpeditionSystem 2024-10-29 12:15:16 +03:00
Ed
f5503352b9 add GuideHelp to alchemy equipment 2024-10-29 12:06:23 +03:00
Ed
817c53d98f Merge branch 'master' into ed-29-10-2024-upstream 2024-10-29 11:51:03 +03:00
Ed
cc80518d2f World minor changes (#519) 
* x2 weather time

* remove alchemy test and battle royale maps, add simple island map

* island map + ocean parallax

* map floor occluder sys

* undercliff test

* update sand and ocean sprite

* Revert "undercliff test"

This reverts commit c484fe630a.

* more experiments

* Revert "more experiments"

This reverts commit a7f30fd608.

* Update default.yml

* Update debug.yml
 2024-10-29 11:48:52 +03:00
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03:00
PJBot
a8c512c769 Automatic changelog update 2024-10-29 05:09:03 +00:00
metalgearsloth
94e686ca9c Fix separated game screen bumping (#33046) 
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
 2024-10-29 16:07:57 +11:00
PJBot
a5a5840ee0 Automatic changelog update 2024-10-29 05:01:37 +00:00
deltanedas
63f8aba359 fix lava expeds (#33042) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-10-29 00:00:28 -05:00
Moomoobeef
6236d1abb3 Updated an incorrect sprite in the smite menu (#33043) 
changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite
 2024-10-28 23:35:48 +01:00
lzk
dc3a2f6d28 add StartDelay bool to actions (#33026) 
* add StartDelay bool to actions

* forgot summary
 2024-10-28 23:21:14 +01:00
joshepvodka
7ac2d9a8bd Adds beacon to core station's vox box (#33004) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon

* fixes messed up diff
 2024-10-28 16:05:01 -06:00
joshepvodka
dbef6cbecc Adds beacon to oasis station's vox box (#33003) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:04:49 -06:00
joshepvodka
e900ad7742 Adds beacon to bagel station's vox box (#33002) 
* added vox beacon

* changed name to vox break room

* added voxbox station beacon
 2024-10-28 16:04:37 -06:00
joshepvodka
93315d4695 Adds beacon to box station's vox box (#33001) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:04:10 -06:00
joshepvodka
30017bc2d8 Adds beacon to cog station vox box (#33000) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:03:13 -06:00
PJBot
1ef5b2226a Automatic changelog update 2024-10-28 21:26:41 +00:00
August Sun
67332502c1 Extends the minimum round time for meteor swarm events (#32876) 
* adjusted minimum timers in meteorswarms.yml

* Updated timer minimum from 20 to 15 minutes

* Reduced minimum timer to 10 minutes as a result of other meteor changes

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
 2024-10-28 22:25:33 +01:00
PJBot
f86798792b Automatic changelog update 2024-10-28 18:01:10 +00:00
Stalen
0468c0f6bb Fix playtime formatting (#32974) 2024-10-28 19:00:37 +01:00
Stalen
24f79c3ecc Fix playtime formatting (#32974) 2024-10-28 19:00:00 +01:00
BramvanZijp
a4717556e1 Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942) 
Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
 2024-10-28 18:52:21 +01:00
Theodore Lukin
ee445c4938 make ai speak robotically (#33025) 2024-10-28 18:36:35 +01:00
FluffMe
08d0077719 Fix TestSuicideByHeldItem and TestSuicideByHeldItemSpreadDamage (#33030) 2024-10-28 11:52:49 +01:00
Ed
b14c75390c biological weapon (#518) 2024-10-28 13:05:01 +03:00