Commit graph

24005 commits

Author SHA1 Message Date
Morb0
a29a01ac28 Remove WindoorSecureParamedicLocked from Outpost map 2023-12-14 01:13:26 +03:00
Morb0
33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
PJBot
7a45f09c88 Automatic changelog update 2023-12-13 16:35:32 -05:00
Ubaser
7a63c78f5b
"Uneven" hair (#22454)
* add

* comma

* yay

* hair
2023-12-13 14:34:28 -07:00
deltanedas
e1ff79b4b1
let cyberpen edit stamped papers (#22457)
* let cyberpen edit stamped papers

* desc

* little more desc

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-13 14:33:31 -07:00
Dakamakat
1821bbd546
Let bee corpses be put into garbage bags, wielded, etc (#22451) 2023-12-13 14:32:40 -07:00
PJBot
f72daadf81 Automatic changelog update 2023-12-13 16:21:44 -05:00
Errant
711eafd747
Last Words can no longer be prefixed with a radio channel identifier (#22459) 2023-12-13 14:20:38 -07:00
qwerltaz
cd58be1034
Fix frezon intoxication (#22453) 2023-12-13 12:17:48 -08:00
poeMota
28b63ff05e
Delta update (#1637)
Co-authored-by: poeMota <belochuc@gmail.com>
2023-12-13 16:20:30 +03:00
poeMota
95ae8bab99
Silly update (#1635)
Co-authored-by: poeMota <belochuc@gmail.com>
2023-12-13 16:20:16 +03:00
SonicHDC
3742bbc62d
[Resprite] Headsets (#1636) 2023-12-13 12:41:39 +03:00
PJBot
f3de9cdb69 Automatic changelog update 2023-12-13 03:54:08 -05:00
Ubaser
0552cd2e10
New pinpointer sprites (#22435)
* add

* fix?

* a

* maybe

* aaa
2023-12-13 01:53:05 -07:00
PJBot
6c87f74487 Automatic changelog update 2023-12-13 03:52:13 -05:00
DrSmugleaf
77e872fe8b
Add ahelp bwoink sound cvar (#22439) 2023-12-13 01:51:30 -07:00
Ubaser
9e46b35207
Jetpack buff (#22444)
* add

* tweak
2023-12-13 01:51:09 -07:00
Ubaser
9a1f845d97
add (#22441) 2023-12-13 01:51:00 -07:00
Emisse
6419f3d5d9
smartfridge semi functional (#22443)
* smartfridge

* leftovers from when it was powered

* real
2023-12-13 01:19:40 -07:00
DrSmugleaf
ad6dc94c60
Move MaskComponent to shared and add toggle events (#22395)
* Move MaskComponent to shared and add toggle events

* Datafield and network IsToggled

* Add missing dirty
2023-12-12 19:02:35 -07:00
Pieter-Jan Briers
16bd6802df
More UI fixes (#22431)
* Fix chat filter button

Oh look, the popup code was copy pasted between chat filter and channel selector.

Hilarious.

Anyways same stuff as 995f506aaf. I pulled it all out into a base class so NO MORE COPY PASTE.

Fixes #22360

* Remove all further EnableAllKeybinds buttons.

Fixes #22346

Yeah none of these are valid use cases, why is this set...
2023-12-12 19:02:19 -07:00
PJBot
93f8c4ef60 Automatic changelog update 2023-12-12 20:59:24 -05:00
Vasilis
3cb6b2c3b8
Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430) 2023-12-12 17:58:20 -08:00
TsjipTsjip
7a12f1fcfb
Remove paramedic windoor (#22400) 2023-12-12 17:07:34 -07:00
tgrkzus
b968dea478
improve deconstruction text (#22404) 2023-12-12 17:07:04 -07:00
metalgearsloth
d72506d54b
Hide verb expansion indicators on debug (#22415)
I forget if it's actually going to popup or not.
2023-12-12 17:03:46 -07:00
PJBot
971c07c35d Automatic changelog update 2023-12-12 19:02:57 -05:00
Velcroboy
2fe4772f92
Add proper suffix (#22417)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-12 17:02:43 -07:00
Errant
21be01acdf
Blood-red medic armor ID change (#22422)
* Rename blood-red medic hardsuit prototype

* Update guidebook

* Migration
2023-12-12 17:02:29 -07:00
themias
9257703ef9
Fix construction graph ghost examine message (#22424) 2023-12-12 17:01:51 -07:00
themias
e7de7fa075
Add fill layers to Hot Cocoa drink (#22419) 2023-12-12 17:01:24 -07:00
luckyshotpictures
942e91884d
Tracking & Implanter Crate (#22414)
This adds a crate containing mindshield and tracking implanters, locked by security access. The crate contains 4 items of both implanters. This has been requested by some mappers. The crate is not obtainable through normal means like cargo.
2023-12-12 16:43:27 -07:00
Ed
4d87f1eb42
New map "Outpost" (#1632) 2023-12-13 01:51:51 +03:00
Ed
7b8db65783
Gate map return (#1631) 2023-12-13 01:50:31 +03:00
lzk
876e18e3aa
Bring back corvax knife shoes (#1634) 2023-12-13 01:50:04 +03:00
KP
17270bb321
Fix glorfcode again (#22420) 2023-12-12 13:57:54 -08:00
Emisse
84fedaee13
aspid update (#22409) 2023-12-12 03:27:32 -07:00
Kevin Zheng
454eb5307f
Turn off speedup and heat scaling to isolate bug (#22405) 2023-12-12 03:03:01 -07:00
JoeHammad1844
1f700d9c9f
Adds nitrile gloves to syndie medical bundle (#22147)
* Add files via upload

* removed selling point

* rollah bed

* hopefully fixes angry test
2023-12-12 03:02:08 -07:00
PJBot
09180e9929 Automatic changelog update 2023-12-12 04:21:36 -05:00
metalgearsloth
0e7275a74c
Restricted range cleanup (#22402) 2023-12-12 20:20:33 +11:00
IProduceWidgets
90a3a35572
Make ERT PDAs and give them to the right presets. (#22392)
* Pdas made

* ID cards

* Role fills

* Trim Item heldPrefix overrides.

* Sorta funky parenting.
2023-12-12 01:38:42 -07:00
mhamster
a47689ba43
MealsJsonGenerator typo fix (#1628) 2023-12-12 11:30:35 +03:00
lzk
52f0b4eac3
Dataset ops p2 (#1627) 2023-12-12 11:30:07 +03:00
lzk
b4256f1cfa
Remove lol emote chat sanitize (#1630) 2023-12-12 11:29:37 +03:00
Morb
920918bad1
Merge pull request #1629 from space-syndicate/upstream-sync
Upstream sync
2023-12-12 11:29:06 +03:00
Morb0
9cc7771e2c Fix upstream 2023-12-12 11:24:06 +03:00
Morb0
f4f2d8b86c Update locale 2023-12-12 11:07:38 +03:00
PJBot
4fee0dcd36 Automatic changelog update 2023-12-12 03:03:54 -05:00
IProduceWidgets
6ab7ecdd53
Instruments, plushies, gunpet, and bibles. (#22398)
* Some instrument sizes and gunpet sidearm

* Cello

* bagpipe

* Crippling balance PR made bananium horn Small not Tiny

* plushie and toy sizes.

* Scroll bigger

* Make bible same size as other books.

* size rgb staff to other staffs.

* add sprite update json
2023-12-12 01:03:47 -07:00