27488 Commits

Author SHA1 Message Date
Krunklehorn
26792a2cb0 Added cryosleeper beacon to Packed (#24515) 2024-01-24 21:40:38 -07:00
Krunklehorn
cee606ee69 Added cryosleeper beacon to Origin (#24514) 2024-01-24 21:40:22 -07:00
Krunklehorn
6c3d95fa64 Added cryosleeper beacon to Omega (#24513) 2024-01-24 21:40:13 -07:00
Krunklehorn
6a4ccfb70f Added cryosleeper beacon to Meta (#24512) 2024-01-24 21:40:00 -07:00
Krunklehorn
aae3bf4021 Added cryosleeper beacon to Marathon (#24511) 2024-01-24 21:39:49 -07:00
Krunklehorn
40298ca90c Added cryosleeper beacon to Gemini (#24510) 2024-01-24 21:39:33 -07:00
Krunklehorn
325926f39e Added cryosleeper beacon to Core (#24509) 2024-01-24 21:39:22 -07:00
Krunklehorn
eba5d3a6a1 Added cryosleeper beacon to Cluster (#24508) 2024-01-24 21:39:07 -07:00
Krunklehorn
41613dacd8 Added cryosleeper beacon to Box (#24507) 2024-01-24 21:38:58 -07:00
Krunklehorn
e6e34a3167 Added cryosleeper beacon to Bagel (#24506) 2024-01-24 21:38:49 -07:00
Krunklehorn
f226edb573 Added cryosleeper beacon to Atlas (#24505) 2024-01-24 21:38:28 -07:00
Krunklehorn
32c6c83893 Added cryosleeper beacon to Aspid (#24504) 2024-01-24 21:38:18 -07:00
PJBot
dcd2e1d767 Automatic changelog update 2024-01-25 01:38:16 +00:00
Alzore
3c1b8ced04 Botany no longer gets meta weapons (#24481)
Nomoredeath
2024-01-24 18:37:10 -07:00
Flareguy
1abbf37832 Better rusty wall sprites (#24471)
* makes rusty walls use their /tg/ sprites

* my furniture. is. broken

* robocop
2024-01-24 18:08:46 -07:00
Ed
b310565262 Tiny anomaly cores (#24483)
tiny cores
2024-01-24 18:07:06 -07:00
metalgearsloth
10b7ec5d29 Slight organ loss change (#24475)
Both should be sufficient to avoid the bandaid bug but this one is more accurate.
2024-01-24 18:06:49 -07:00
Emisse
ce46281e39 double bun long hair (#24493)
* new hair

* turn my swag on
2024-01-24 18:05:01 -07:00
PJBot
1838c7c14b Automatic changelog update 2024-01-25 01:03:39 +00:00
Krunklehorn
158beda666 Paper cups as party hats (#24334)
* Water cups wearable as party hats

* Removed extra commented lines
2024-01-24 18:02:33 -07:00
Krunklehorn
a100a0a1d2 Added beacon prototype for cryosleepers, relabeled medical's "Cryo" area to "Cryopods" (#24473)
Added beacons for cryosleepers, renamed med cryos to "Cryopods"
2024-01-24 17:57:47 -07:00
PJBot
461b1305a3 Automatic changelog update 2024-01-25 00:50:04 +00:00
Krunklehorn
00c83844ac Changed spawn priority to arrivals -> containers -> points. (#24476) 2024-01-24 17:48:58 -07:00
PJBot
055bc72e06 Automatic changelog update 2024-01-25 00:47:13 +00:00
lzk
0f01c0aade Fix escaping from locked artifact crate (#24442) 2024-01-24 17:46:06 -07:00
Hanz
dc707fe7cf Mantles in dressers (#24485)
* The code changes man

The code changes man

* Dressers are a wee bit bigger and mantles spawn in em

as it says on the tin
2024-01-24 13:20:13 -07:00
Aviu00
a29e004eba Всякое (#474)
* Economy price tweaks

* Fix slang & crit radio & explosion immunity & tweak spiders and slimes

* Fix vending message

* Typo

* Style
2024-01-24 15:25:34 +03:00
rhailrake
4e73e606c9 [Fluff] 17shu ghost 2024-01-24 15:11:38 +03:00
Aviu00
a01ad4e448 Traitor stuff (#472)
* Add uplink swat helmet

* Tweak blood dagger

* Esword reflect chance increase

* Fix desc

* Tweak snatcherprod

* Add smoke implant

* Fix sprite
2024-01-24 15:11:21 +03:00
Aviu00
8c75cde3e2 Health bar overlay refactor 2024-01-24 14:42:36 +03:00
Aviu00
b0e55ed2a9 Evac console emag (#469) 2024-01-24 14:30:16 +03:00
Aviu00
9a428e652c Rework eshield (#470) 2024-01-24 14:29:04 +03:00
Remuchi
154a854aa8 feat: флафф gusmopsik (#471) 2024-01-24 13:46:04 +03:00
Aviu00
df364f7f01 Migrate tags & size 2024-01-24 13:45:53 +03:00
RavMorgan
a315c02107 Ходить человек гусьмопсик давать деньги (#467)
Апдейт жукбокс системы
Добавлен волкман
2024-01-24 13:43:10 +03:00
RavMorgan
8e3d2b3f22 yes (#466)
Co-authored-by: Mona Hmiza <you@example.com>
2024-01-24 13:39:44 +03:00
RavMorgan
244b418375 dick (#465)
Co-authored-by: Mona Hmiza <you@example.com>
2024-01-24 13:39:35 +03:00
RavMorgan
b23441192a SALUS (#464)
Co-authored-by: Mona Hmiza
2024-01-24 13:39:25 +03:00
Aviu00
04f0c69b5a Фиксы (#462)
* Fix crafting steel tiles requiring silk (#19071)

* No gift uplinks

* Cargo hunter balance

* More prices

* Fix tests

* Price fixes

* Map fix

* No payment in lobby

* Fix cloth recipe

* Less money

---------

Co-authored-by: PixelTK <85175107+PixelTheKermit@users.noreply.github.com>
2024-01-24 13:37:10 +03:00
Aviu00
dff51b930b Doafter stuff 2024-01-24 13:20:14 +03:00
RavMorgan
587fdae494 shader (#461)
Co-authored-by: Mona Hmiza <>
2024-01-24 13:06:27 +03:00
Aviu00
16c8b95da4 Economy (#403)
* nasrano

* Add station budget & salary

* Initial balance

* Vending machine UI

* Pricing for vending machines

* Finish economy

* Eftpos

* Finish eftpos

* Put eftpos into lockers

* Vending machine prices

* Small fixes

* Fix atm UI

* Add atms to maps

* fix

* reset

* Add PDA program

* Maps again

---------

Co-authored-by: Mona Hmiza <>
Co-authored-by: rhailrake <49613070+rhailrake@users.noreply.github.com>
2024-01-24 13:04:22 +03:00
Remuchi
707cdf3afa Merge branch 'lazers-and-hop-console' into great-merge 2024-01-24 15:16:58 +07:00
Remuchi
e09cc7b802 feat: смена значков в консоли ID карт 2024-01-24 15:15:13 +07:00
Aviu00
f661561a59 Oppsie 2024-01-24 10:22:37 +03:00
HitPanda
4d4e2ef319 [Sponsor] M4ury fluff (#460) 2024-01-24 10:06:50 +03:00
Remuchi
cf8709f1ea feat: перенос лазеров-снарядов 2024-01-24 14:05:43 +07:00
ThereDrD0
98984b895a Куча звуков из сс13 (#457)
* Новые звуки

* И че блять оно

* Где звуки ебучие

* Чтобы ты обосрался

* Случайный насер
2024-01-24 10:04:58 +03:00
rhailrake
30fd182d4c [Fluff] MEow 2024-01-24 09:45:11 +03:00
KurokoTurbo
fb8834ac63 Seed analyzer (#433)
* hey

* added it to vending machine

* added to vending

* лицензия спрайта

* Update SeedAnalyzerWindow.xaml.cs

* fix my recently added bug

* обосрался знатно, пофиксил

* fix всего кроме null проверки

---------

Co-authored-by: melano <VildanMinnakhmetov>
Co-authored-by: KurokoTurbo <92106367+VildanMinnakhmetov@users.noreply.github.com>
2024-01-24 09:41:44 +03:00