Commit Graph

29142 Commits

Author SHA1 Message Date
Джексон Миссиссиппи
935127f25f Give botanists droppers (#26839)
Start botanists with droppers so that they can better dose robust harvest or mutagen.
2024-04-10 10:28:03 -07:00
Ed
e04725f7ed Merge pull request #76 from crystallpunk-14/races
Тифлинги!
2024-04-10 16:48:24 +03:00
Pieter-Jan Briers
3aee197923 Revert "Game server api" (#26871)
Revert "Game server api (#24015)"

This reverts commit 297853929b.
2024-04-10 14:19:32 +02:00
Tornado Tech
4e47d31f4e Тифлинги готовы 2024-04-10 21:24:25 +10:00
Tornado Tech
3c2d9d04c6 Merge branch 'master' into races 2024-04-10 20:25:25 +10:00
Simon
297853929b Game server api (#24015)
* Revert "Revert "Game server api (#23129)""

* Review pt.1

* Reviews pt.2

* Reviews pt. 3

* Reviews pt. 4
2024-04-10 02:37:16 -07:00
Ed
5a5224a577 Merge pull request #74 from crystallpunk-14/upstream2
Upstream sync
2024-04-10 11:54:51 +03:00
Ed
d0e2e15d8c Merge remote-tracking branch 'space-station-14/master' into upstream2 2024-04-10 11:38:32 +03:00
Ed
7d0bb3d1d1 Merge pull request #73 from crystallpunk-14/new-upstream
New upstream?
2024-04-10 11:34:18 +03:00
Tornado Tech
685f85b1ad Флаги в систему одежды 2024-04-10 13:33:39 +10:00
Tornado Tech
4f0d11144c Добавлены флаги для слотов и их отображение 2024-04-10 13:28:06 +10:00
PJBot
28e5db7be5 Automatic changelog update 2024-04-09 22:22:02 +00:00
SkaldetSkaeg
aa2e1facbd Flippolighter_fix (#26846)
Flippolighter has realy loud sound, no UseDelay and server errors
2024-04-09 18:20:57 -04:00
PJBot
3ae4b5884b Automatic changelog update 2024-04-09 22:19:13 +00:00
Killerqu00
fd067731b5 Skipping bounties (#26537)
* add button to menu

* networking and component work

* try to add access stuff

* main functionality done

* add access lock? I think?

* remove extra line

* fix access system

* move SkipTime to StationCargoBountyDatabaseComponent

* Disable/Enable skip button based on cooldown

* remove debugging

* add access denied sound

* remove DataField tags

* dynamic timer
2024-04-09 18:18:07 -04:00
Wrexbe (Josh)
682afd4ae4 Improve access overlay (#26667)
* Improve access overlay

* review changes

---------

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2024-04-09 18:16:42 -04:00
PJBot
862f820708 Automatic changelog update 2024-04-09 15:26:27 +00:00
Pieter-Jan Briers
d879665b52 Add new "grant_connect_bypass" admin command (#26771)
This command allows you to grant a player temporary privilege to join regardless of player cap, whitelist, etc. It does not bypass bans.

The API for this is IConnectionManager.AddTemporaryConnectBypass().

I shuffled around the logic inside ConnectionManager. Bans are now checked before panic bunker.
2024-04-09 17:25:21 +02:00
deltanedas
6d695dd326 dirty after calling SetAccesses (#26849)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-09 09:17:31 -04:00
Ed
d3c147ae28 Update meta.json 2024-04-09 12:17:59 +03:00
Ed
9ca762564c Merge remote-tracking branch 'space-station-14/master' into new-upstream 2024-04-09 12:15:46 +03:00
PJBot
694ae001fd Automatic changelog update 2024-04-09 08:05:58 +00:00
KittenColony
a1fcfed7d9 Gauze Markings 3 - Revenge of the Wrap (#25481)
* Insectoid Gauze, Added racial marks to variants

* removed excess r from gauze_moth_lowerleg_r

* Update gauze.ftl

* moved all markings to Overlay Category

* fixed localization error

* a
2024-04-09 10:04:51 +02:00
Tayrtahn
a0de0ab1f8 Server-only component YAML cleanup (#26836)
* First pass cleaning up server-only YAML errors.

* Second pass
2024-04-09 00:20:49 -04:00
Mr. 27
e64288a8fe add ratvar to ion storm laws (#26833)
Praise Ratvar
2024-04-08 18:37:13 -04:00
Hannah Giovanna Dawson
2cc4098406 Ion Storm Laws Review (#26703)
* Ion Storm Laws Review

Have reviewed the Ion Storm law dictionary
and tidied it up.

Specifically I've tried to keep the same number
of entries in each section, or slightly
increased them, where I've removed or
altered a string.

Of note, specific colours and "rainbow" have been
removed from adjectives and replaced with words
like "Cheese-Eating", as colours are kinda boring
themselves and they've been a cause of a few
accidentally-racist laws.

* Resolve some feedback.

* Remove the pull request joke, noooooo

* Re-add big bite burgers as they are actually a thing

* Append some more suggestions
2024-04-08 16:18:11 -04:00
PJBot
14866173c0 Automatic changelog update 2024-04-08 15:35:41 +00:00
Hanz
263469dffa Spears equippable to suit storage (#26724)
* meat and potatoes

hahaha

* DAMAGE

yes

* come on

* Check again

* Guhhhhh

guh
2024-04-08 11:34:35 -04:00
deltanedas
2f5c639a15 predict humanoid identity examine (#26769)
* predict humanoid identity examine

* actually server doesnt need proto anymore

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-08 11:16:21 -04:00
c4llv07e
3d6d7820d6 Fix tray scanner not updating it's range. (#26789)
Fix tray scanner not updating it's range on change.

Add range value to the tray scanner state.to synchronize it between
client and server.
2024-04-08 11:12:39 -04:00
PJBot
7f56ba0155 Automatic changelog update 2024-04-08 15:12:04 +00:00
lzk
6ce53709bd Make clothing cheaper and split clothing restock (#26805)
* Make clothing cheaper

* bueah

* proper price

* :trollface:
2024-04-08 11:10:58 -04:00
PJBot
2bbae3ecc8 Automatic changelog update 2024-04-08 15:07:04 +00:00
lzk
4a7aa300c8 Make bombsuits similar (#26806) 2024-04-08 11:05:57 -04:00
lzk
7188b509df fix bodybag id case (#26823)
* Fix body bag id

* migration
2024-04-08 10:27:26 -04:00
Crotalus
a9df8cf18a Fix lathe materials list bug (#26826)
Fix lathe material list bug
2024-04-08 09:46:42 -04:00
deepdarkdepths
3851fcbc32 Fixes elite operative figurine description (#26814)
desc
2024-04-08 06:14:23 -04:00
PJBot
5e2f1e735d Automatic changelog update 2024-04-08 03:18:35 +00:00
chromiumboy
f784e9ca4e Bug fixes for RCD (#26792)
Various fixes
2024-04-08 13:17:28 +10:00
PJBot
9811173a1a Automatic changelog update 2024-04-08 03:17:18 +00:00
Crotalus
a178754980 Show missing materials in lathes tooltip (#26795)
* Lathes: Show missing materials amount in tooltip

* Use AppendLine and remove the last newline at the end
2024-04-07 23:16:11 -04:00
BriBrooo
356c2799cf fixed cigarette sprites (#26801) 2024-04-07 23:08:33 -04:00
Nemanja
c95bbce4a6 prevent placing dead bodies in cryostorage (#26810) 2024-04-08 13:07:23 +10:00
deepdarkdepths
5ecff8a04b Sanitizes "tbf" into "to be fair" (#26811)
add
2024-04-08 13:02:46 +10:00
Ed
9597d6a84a Приподнимаем стены (#68)
* remake debug wall

* wood wall

* Update walls.yml
2024-04-07 11:23:10 +03:00
Ubaser
f4ca034075 Update Core (#26791)
* add

* invalid
2024-04-06 23:54:25 -06:00
Tornado Tech
a78b9103a7 Сделана нормальная раскладка слотов кражи 2024-04-07 12:25:55 +10:00
Tornado Tech
fc9596a101 Сделана нормальная раскладка слотов 2024-04-07 12:13:58 +10:00
Tornado Tech
daf300af28 Новый шаблончик инвентаря для нашего человека 2024-04-07 11:37:22 +10:00
Tornado Tech
0dea6f5c9c Добавил новую тему 2024-04-07 11:35:55 +10:00