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

7500 Commits

Author SHA1 Message Date
Ed
b092f190f6 cp14 2024-04-21 17:55:18 +03:00
Ed
b701804836 Merge branch '21-04-2024-deathmatch-gamemode' of https://github.com/crystallpunk-14/crystall-punk-14 into 21-04-2024-deathmatch-gamemode 2024-04-21 17:33:13 +03:00
Ed
49b39e9535 fixes 2024-04-21 17:32:52 +03:00
Ed
59dc76b423 Merge branch 'master' into 21-04-2024-deathmatch-gamemode 2024-04-21 17:19:26 +03:00
Ed
ba03750394 add map and gamerule 2024-04-21 17:14:03 +03:00
Ed
8f135d9745 localize human names 2024-04-21 15:43:26 +03:00
Ed
d342db3d65 Merge branch 'master' into 21-04-2024-species-naming 2024-04-21 15:26:41 +03:00
Ed
b2226cbe16 localized tiefling name 2024-04-21 15:25:22 +03:00
Ed
d29afc0f4c add species name generation 2024-04-21 14:42:12 +03:00
Ed
fb96392077 add torch crafting 2024-04-21 13:52:22 +03:00
Ed
966a54fbc6 add torch 2024-04-20 16:54:03 +03:00
Ed
f271c8cff0 add aristocratic set 2024-04-20 15:59:15 +03:00
Ed
bbbf7172a9 fixes 2024-04-20 14:54:01 +03:00
Ed
6db92d86b5 Update walls.yml 2024-04-20 14:43:27 +03:00
Ed
4763bffeac locale update 2 2024-04-20 14:16:11 +03:00
Ed
d74a33d46b locale update 2024-04-20 14:10:10 +03:00
Ed
c70b267bbb barrel update 2024-04-20 14:03:06 +03:00
Ed
c3f7ad2fae fix character preview 2024-04-20 13:26:41 +03:00
Ed
5e498f68a6 fixes 2 2024-04-20 13:01:45 +03:00
Ed
af734dc5c2 fixes 2024-04-20 12:45:25 +03:00
Ed
bb24ead3b9 Update barrel.yml 2024-04-20 12:28:33 +03:00
Ed
ca01030da1 Fucking big refactor 2024-04-20 11:51:04 +03:00
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
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
e94cd726e1 init melting reagent and system 2024-04-17 17:49:47 +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
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
MACMAN2003
c31b3fdf5a Lower player requirements for nukies back down to 20 (#27036) 
Update roundstart.yml
 2024-04-16 20:19:29 -07: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
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
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
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
Velcroboy
b23ef00d37 Add QM maintenance airlock (#26982) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2024-04-16 07:34:35 +03: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
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
Token
7a6067989f Make lockers can be deconstructed only when unlocked now (#26961) 
* Fix lockers are not deconstrucable now

Lockers are was deconstructable event when they closed and you didn't have access to them. In short - get stuff by 5 seconds, 5 sec it's time to screw down any locker, except LockerBaseSecure one

* Revert un-destructable lockers fix

Make lockers destructable again

* Fix lockers that deconstructable only when unlocked now
 2024-04-15 00:26:46 +02:00
lzk
cf8f68c7e5 Fix rubber hammer being unshaded (#26956) 2024-04-14 23:53:45 +02:00