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
caf5ca3dc8
Merge pull request #102 from crystallpunk-14/20-04-2024-clothing-pack
...
Torch + aristocratic clothing set
2024-04-21 14:42:01 +03:00
Ed
fb96392077
add torch crafting
2024-04-21 13:52:22 +03:00
Ed
c266046cbd
nuke it
2024-04-20 18:02:09 +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
0b587e9fb9
Merge pull request #101 from crystallpunk-14/20-04-2024-nospawn-global
...
barrel + CP14 prefix
2024-04-20 15:03:38 +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
e98a6e17a3
Update structures.ftl
2024-04-20 14:18:22 +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
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
