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

24497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
1eba437555 Merge pull request #100 from crystallpunk-14/17-04-2024-melting 
+Ores
 2024-04-19 00:15:59 +03:00
Ed
98503cca7c Update tiles.yml 2024-04-18 23:41:02 +03:00
Ed
81d2a4730e Merge pull request #99 from crystallpunk-14/revert-90-nospawn 
Revert "NoSpawn markers and weapons"
 2024-04-18 23:37:32 +03:00
Ed
0b4c5bb988 +2 ores 2024-04-18 23:34:45 +03:00
Ed
05ca2baa3d Revert "NoSpawn markers and weapons (#90)" 
This reverts commit 3dff87b3e1.
 2024-04-18 22:56:51 +03:00
Ed
02bcfc4593 revert melting 2024-04-18 22:45:01 +03:00
Ed
79b4ae3998 add wall destructions 2024-04-18 22:37:49 +03:00
Ed
59b8757f14 add iron and ore fragments items 2024-04-18 14:16:09 +03:00
Ed
390249f0cc add ore vein wall dumb proto 2024-04-18 13:37:16 +03:00
Ed
dc1b38054e add iron and gold ore 2024-04-18 12:53:15 +03:00
Ed
c5b4df22a6 modified cave wall 2024-04-17 20:42:28 +03:00
Ed
e94cd726e1 init melting reagent and system 2024-04-17 17:49:47 +03:00
Ed
45d351b2b2 Merge pull request #98 from crystallpunk-14/17-04-2024-upstream 
17 04 2024 upstream
 2024-04-17 11:58:34 +03:00
Ed
05d6e621d3 Update loadout_groups.yml 2024-04-17 11:44:37 +03:00
Ed
cbf766780b adapt loadouts 2024-04-17 11:32:54 +03:00
Ed
0285c3896c Merge remote-tracking branch 'space-station-14/master' into 17-04-2024-upstream 
# Conflicts:
#	Content.Client/Movement/Systems/WaddleAnimationSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Resources/Changelog/Changelog.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/zweichhender.rsi/meta.json
 2024-04-17 11:16:24 +03:00
Mr. 27
5742dee84a add ancient jumpsuit to passenger loadout (#27035) 
inital
 2024-04-17 01:37:50 -06:00
PJBot
f825e5e38b Automatic changelog update 2024-04-17 03:37:49 +00:00
Bellwether
7114b1939c Add Nun Hood to Chaplain loadout options (#27025) 
Adds Nun Hood to starting Chaplain loadout options
 2024-04-17 13:36:44 +10:00
PJBot
5ee597d98c Automatic changelog update 2024-04-17 03:20:36 +00:00
MACMAN2003
c31b3fdf5a Lower player requirements for nukies back down to 20 (#27036) 
Update roundstart.yml
 2024-04-16 20:19:29 -07:00
PJBot
4fa245f723 Automatic changelog update 2024-04-17 02:56:00 +00:00
metalgearsloth
fcd6c25242 LobbyUI fixes (#27033) 
* LobbyUI fixes

I have no idea which were bugs prior but anyway fix stuff.

* More fixes

* Test moment
 2024-04-17 12:54:54 +10:00
PJBot
30f73cfb6c Automatic changelog update 2024-04-17 02:51:00 +00:00
Mr. 27
34fa48bff9 Add winter coats and shoes to loadouts (#27022) 
* inital

* Update loadout-groups.ftl

* fix order

* add winter boots

* fix test fails
 2024-04-17 12:49:53 +10:00
Doctor-Cpu
d5b7e4baf2 Add autism pins to loadout (#27034) 
add autism pins to loadout
 2024-04-17 11:10:52 +10:00
Pieter-Jan Briers
bbf0505fdc Re-add IAdminRemarksCommon to DB model for SS14.Admin (#27028) 
This was removed in #25280 as the relevant DB entities didn't go outside the DB layer anymore. SS14.Admin however still uses them directly (as it only supports Postgres), so the interface is still useful there.
 2024-04-17 00:19:36 +02:00
PJBot
5e7f2244fc Automatic changelog update 2024-04-16 20:18:12 +00:00
Mr. 27
e2be85bc52 Fix senior ID cards and other loadout shit (#27017) 
* remove senior backpacks

* fix ID cards

* Update atmospheric_technician.yml
 2024-04-16 22:17:06 +02:00
PJBot
33888b64d6 Automatic changelog update 2024-04-16 19:57:43 +00:00
Vasilis
46cfd63c4f Add changelog for loadouts (#27020) 2024-04-16 21:56:37 +02:00
PJBot
9102a065a9 Automatic changelog update 2024-04-16 18:49:45 +00:00
tosatur
11207a0649 Reduce clown snore volume (#27012) 
* reduced gain by 25dB

* changed volume again

---------

Co-authored-by: Martin Petkovski <63034378+martin69420@users.noreply.github.com>
 2024-04-16 20:48:38 +02:00
Agoichi
040497805f Adding the sinner's mask (#97) 
* adding sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask
 2024-04-16 17:51:11 +03:00
metalgearsloth
9bc3e07628 Fix starting gear (#27008) 
Slight blunder on the loadout prototype being used and all the names aligning means playtesting didn't catch it earlier.

Ideally player spawning code wouldn't have sucked so I could add tests like I wanted but it is what it is.
 2024-04-17 00:44:16 +10:00
metalgearsloth
12766fe6e3 Loadouts redux (#25715) 
* Loadouts redux

* Loadout window mockup

* More workout

* rent

* validation

* Developments

* bcs

* More cleanup

* Rebuild working

* Fix model and loading

* obsession

* efcore

* We got a stew goin

* Cleanup

* Optional + SeniorEngineering fix

* Fixes

* Update science.yml

* add

add

* Automatic naming

* Update nukeops

* Coming together

* Right now

* stargate

* rejig the UI

* weh

* Loadouts tweaks

* Merge conflicts + ordering fix

* yerba mate

* chocolat

* More updates

* Add multi-selection support

* test

h

* fikss

* a

* add tech assistant and hazard suit

* huh

* Latest changes

* add medical loadouts

* and science

* finish security loadouts

* cargo

* service done

* added wildcards

* add command

* Move restrictions

* Finalising

* Fix existing work

* Localise next batch

* clothing fix

* Fix storage names

* review

* the scooping room

* Test fixes

* Xamlify

* Xamlify this too

* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* ben

* Margins

---------

Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
 2024-04-16 22:57:43 +10:00
metalgearsloth
fff3fe2a24 Update submodule to 218.1.0 (#26997) 2024-04-16 22:42:53 +10:00
Velcroboy
b23ef00d37 Add QM maintenance airlock (#26982) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2024-04-16 07:34:35 +03:00
Leon Friedrich
faec39ced4 Give names to solution & identity entities (#26993) 2024-04-16 14:26:47 +10:00
Leon Friedrich
229caa10bf Fix some TryGetMind overrides relying on player data (#26992) 
* Fix some TryGetMind overrides relying on player data

* A

* Rider has bamboozled me

* Update `data.Mind` before attaching to entity.
 2024-04-16 14:26:32 +10:00
PJBot
faba129e78 Automatic changelog update 2024-04-15 22:23:23 +00:00
Velcroboy
cd46282e51 Fix some airlocks with multiple access types (#26980) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2024-04-15 15:22:16 -07:00
MilenVolf
34fbd2874e Fix dragon slowdown on damage (#26975) 
Fix dragon slow on damage
 2024-04-15 13:53:22 +02:00
Whisper
4a6cf480cc Mobs burn to ashes on excessive heat damage (#26971) 
* mobs burn to ashes on excessive heat damage

* remove comment, remove random lines I didn't mean to add

* combine code into behavior

* clean unused

* fix namespace

* drop next to

* fix spawn entities behavior spawning entities outside container
 2024-04-15 15:04:15 +10:00
Hannah Giovanna Dawson
3d0fc10673 SS14-26950 Fix Waddling During Improper States (#26965) 
* SS14-26950 Fix Waddling During Improper States

Fix some states when a clown can waddle when no clown should be able to waddle, no-matter their clowning powers.

1. You cannot waddle whilst weightless
2. You cannot waddle whilst stunned
3. You cannot waddle whilst slowed down due to stam damage
4. You cannot waddle whilst you're knocked down
5. You cannot waddle whilst you're buckled
6. You cannot waddle whilst crit
7. You cannot waddle whilst dead

There's some argument for being able to waddle whilst on the floor
and doing some bizarre floor-humping exercise but I'm not coding an animation layer system just to handle clowns doing the worm.

* Use a nicer "can move" check
 2024-04-14 21:53:22 -04:00
PJBot
637fc2d475 Automatic changelog update 2024-04-15 01:29:04 +00:00
no
7810cbe411 Fix StepTrigger blacklist not working (#26968) 2024-04-14 21:27:58 -04:00
HS
41d2f06ffc meatWall incorrect node fixed (#26966) 
changed node in construction meatWall
 2024-04-14 17:38:13 -07:00
deltanedas
516f5f3161 nerf incendiary grenade (#26959) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-04-14 20:11:28 -04:00
PJBot
563f304ac5 Automatic changelog update 2024-04-14 22:27:52 +00:00