NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-08 20:14:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
23767 commits 14 branches 0 tags 3 GiB
Commit graph

23767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kerudion
9409e19e26
Add some station goals (#1461) 2023-12-08 16:42:44 +03:00
lzk
55066d1573
Some more loc tweaks (#1593) 2023-12-08 16:39:57 +03:00
lzk
4d406a3082
Locale moth accent (#1610) 2023-12-08 16:38:10 +03:00
lzk
6cb14b8652
Delete toolshed-feature-request.md (#1615) 2023-12-08 16:35:24 +03:00
lapatison
88a5272bfd
New lobby art (#1617) 2023-12-08 16:35:09 +03:00
Morb
7968bdcb28
Merge pull request #1616 from space-syndicate/upstream-sync 
Upstream sync
 2023-12-08 16:32:18 +03:00
Morb0
8e82b670a0 Fix locale 2023-12-08 16:20:48 +03:00
Morb0
81f07a94d2 Update locale 2023-12-08 16:04:09 +03:00
Morb0
5e9e55da0e Remove ClothingShoesBootsJackSecFilled 2023-12-08 16:03:51 +03:00
Morb0
0003e1e57c Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-08 14:40:04 +03:00
PJBot
dbdb9bc3ff Automatic changelog update 2023-12-08 05:59:28 -05:00
Emisse
b83e3e07d3
hellfire (#22243) 2023-12-08 04:58:25 -06:00
Morb0
caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/wrench.rsi/meta.json
 2023-12-08 13:54:31 +03:00
PJBot
dc59a36316 Automatic changelog update 2023-12-08 00:25:38 -05:00
Nim
d1241c5735
psychologist bed (#22223) 2023-12-08 00:24:34 -05:00
PJBot
828b787d80 Automatic changelog update 2023-12-07 21:39:11 -05:00
Nemanja
b01f0b5f82
add tooltip with entity name on inventory hover (#22203) 2023-12-07 21:38:07 -05:00
PJBot
8fe3f3f975 Automatic changelog update 2023-12-07 18:28:22 -05:00
Aexxie
beb8c262ae
Paramedic loses external access (#22228) 
* CMO has external access

* the tides have turned. If cmo cant have it nobody can >:)
 2023-12-07 16:27:17 -07:00
Flareguy
fcad47832f
fixes the descriptions of the ert hardsuit helmets + some other misc shit (#22207) 2023-12-07 15:07:36 -07:00
Flareguy
7a109a3ee7
Implements greyscale (white) chairs (#22209) 
* implements greyscale chairs

* bob
 2023-12-07 15:04:54 -07:00
liltenhead
039e5d41a7
added classic cornrows 2 (#22210) 2023-12-07 15:04:13 -07:00
Leon Friedrich
5f2a4f970c
Fix inventory enumerator resolve error (#22227) 2023-12-08 08:46:51 +11:00
Leon Friedrich
287d22cc49
Inventory slot enumerator rejig (#21788) 2023-12-08 08:20:51 +11:00
PJBot
445c474c2c Automatic changelog update 2023-12-07 13:52:50 -05:00
deltanedas
50e8707477
fix explosion resistance (#22224) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-07 10:51:45 -08:00
Arthur Asimov
52ddb407df Uncomment Discord changelog workflow 2023-12-07 16:09:35 +03:00
lapatison
6c17ce1039
Translate Upstream #1596 (#1611) 2023-12-07 13:45:04 +03:00
Nemanja
2553bade1a
Narsie test bandaid (#22206) 2023-12-07 16:58:08 +11:00
PJBot
b5f931b0ff Automatic changelog update 2023-12-06 22:42:33 -05:00
Nemanja
fb10dff335
Mirror speed penalty for worn duffels and hardsuits when in-hand (#22168) 
* Add speed penalty for holding hardsuits and duffels

* just inherit from ClothingSpeedModifier

* comment godo
 2023-12-06 20:41:29 -07:00
PJBot
6509681f00 Automatic changelog update 2023-12-06 22:06:33 -05:00
CrigCrag
fe41e20439
3 New Brute Chemicals (And Razorium) (#22103) 
* guidebook

* like everything else

* increase razorium damage

* nerf a lil bit
 2023-12-06 22:05:29 -05:00
PJBot
d652e64dd4 Automatic changelog update 2023-12-06 20:27:01 -05:00
Nim
460bfdc73c
Space cobra 1.1 (#20298) 
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
 2023-12-06 20:25:57 -05:00
deltanedas
88119c6469
nar'sie fake (#20299) 
* import narsie sprite

* narsie_rises audio

* rename SmokeDissipateSpawnComponent to SpawnOnDespawnComponent

* add AnnounceOnSpawn system

* oop

* NAR'SIE HAS RISEN

* suffix

* base prototype, changes

* fix

* mapinit

* downscale

* new toys

* singuloose

* still not fix

* honki sprite

* add honki spawn animation

* revert spawnondespawn change

* really revert

* use LocId for announceonspawn

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-06 20:24:33 -05:00
TemporalOroboros
0c63f2ee57
Make test EntitySpecifiers ignore entities with null prototypes (#22174) 2023-12-06 20:09:44 -05:00
PJBot
17e01430fb Automatic changelog update 2023-12-06 20:06:47 -05:00
Nairod
a5d16404f4
Lizard Underbelly Marking (#22200) 
* Underbelly marking

* Locale
 2023-12-06 20:05:43 -05:00
Nemanja
8000428e6a
tweak crowbar storage sprites (#22202) 
* grid inventory sprite rotation

* eek
 2023-12-06 20:04:30 -05:00
Nemanja
c047f19fdc
Inventory sprite rotation (#22201) 2023-12-07 11:59:16 +11:00
PJBot
629fa48b67 Automatic changelog update 2023-12-06 19:54:01 -05:00
TemporalOroboros
f98322ad5d
T shaped pickaxe and grid UI fix (#22197) 2023-12-06 19:52:57 -05:00
deltanedas
6ccce8b018
atlas dispenser update (#22190) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-06 16:24:21 -07:00
deltanedas
281e80822c
saltern dispenser update (#22189) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-06 16:24:10 -07:00
Pieter-Jan Briers
b4f8393f42
Log server ID in connection logs table (#21911) 2023-12-07 09:48:56 +11:00
PJBot
e639006d42 Automatic changelog update 2023-12-06 16:59:57 -05:00
lzk
fc921ce134
trim bibles.yml (#22184) 2023-12-07 08:59:11 +11:00
deathride58
a4027a3344
Fixes speech bubbles now lacking names for the living (#22191) 2023-12-07 08:58:53 +11:00
deltanedas
4b76c4b3e3
Make boots with storage use itemslot (#22186) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-12-07 08:58:25 +11:00