Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream6 #240

Merged
merged 73 commits into from
Jan 16, 2025
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
72ddc50
Fland Reporters Room (#34408)
SlimmSlamm Jan 12, 2025
8bc4c35
Automatic changelog update
PJBot Jan 12, 2025
606e452
Add a high-capacity water tank to the janitor's closet of Oasis (#34366)
Booblesnoot42 Jan 12, 2025
91bc1f8
Darkened Service job interface icons for better contrast (#34270)
frobnic8 Jan 13, 2025
5fff6bb
Amber Station - Moved Vents Around (#34410)
southbridge-fur Jan 13, 2025
b00bf40
Insuls Spawner (#34407)
southbridge-fur Jan 13, 2025
ac0a8d1
Manual Valves Resprite (#34378)
Deerstop Jan 13, 2025
f2cd615
Automatic changelog update
PJBot Jan 13, 2025
9cf4cba
loop station door access fixes and air sink (#34414)
TytosB Jan 13, 2025
182f0c0
Raise syndicate kobold reinforcement HP crit threshold from 75 to 100…
hyperDelegate Jan 13, 2025
423e48a
Anomaly dragging exploit fix and QOL changes (#34280)
JustinWinningham Jan 13, 2025
25a01b0
Fixed doors being blocked with mousetraps, and other Collidable items…
zHonys Jan 13, 2025
de78bed
Fixed Jazz Instrument for Electric Guitars (#33363)
Coolsurf6 Jan 13, 2025
b308589
Automatic changelog update
PJBot Jan 13, 2025
6c41d96
Porting Pride-O-Mat to Upstream (#34412)
southbridge-fur Jan 13, 2025
2bebaa7
Automatic changelog update
PJBot Jan 13, 2025
8e7f440
Oasis Power Rebalance + Misc fixes (#34425)
ArtisticRoomba Jan 14, 2025
8ad91b8
Update locale (#2928)
Morb0 Jan 14, 2025
2e6c149
add server lobby names (#2932)
lzk228 Jan 14, 2025
13edd30
Fix IPIntel causing frequent errors with the cleanup job. (#34428)
VasilisThePikachu Jan 14, 2025
786d4d5
craftable pet carrier (#34431)
Killerqu00 Jan 14, 2025
198dd82
Automatic changelog update
PJBot Jan 14, 2025
a967fc7
Adds omnisexual pin (#34439)
juliangiebel Jan 14, 2025
ca96aeb
Fix bad Rider analysis error in AccessOverriderWindow.xaml.cs (#34213)
PJB3005 Jan 14, 2025
47042cc
Disable meta-atlas for big rare RSIs (#33643)
PJB3005 Jan 14, 2025
c2e050c
Persist deadmin to database, add admin suspension system (#34048)
PJB3005 Jan 14, 2025
99580e0
Automatic changelog update
PJBot Jan 14, 2025
2dead48
STAThread client content start (#34212)
PJB3005 Jan 15, 2025
e885a8f
Minor client packaging changes (#33787)
PJB3005 Jan 15, 2025
771278d
Fix muzzle accent (#34419)
themias Jan 15, 2025
bb1a3c4
Automatic changelog update
PJBot Jan 15, 2025
8777925
Add Discord webhook on watchlist connection (#33483)
Palladinium Jan 15, 2025
9d5ef57
Automatic changelog update
PJBot Jan 15, 2025
332fc18
Fixed Thief starting gear failing on specific bag inventories. (#34430)
Alpha-Two Jan 15, 2025
6e205ad
Pearl Fix-Update (#2933)
RinidOps Jan 15, 2025
77c1d27
[Maps] Rename maps (#2935)
Ko4ergaPunk Jan 15, 2025
e446889
Added missing details from worn capes to head of department beadsheet…
Alpaccalypse Jan 15, 2025
d83b5ac
Replace ERT Medic's Advanced Medkits with 2 Combat Medkits (#34380)
Alpha-Two Jan 15, 2025
e752561
Fix nonsensical RegEx for name restriction (#34375)
HyperB1 Jan 15, 2025
922251a
Remove the ability to print the station anchor circuit board (#34358)
ArtisticRoomba Jan 15, 2025
4d1581d
Automatic changelog update
PJBot Jan 15, 2025
d86bf06
Meta hotfix (#34306)
Nox38 Jan 15, 2025
33c421b
Merge Meta hotfix (#34306) into master (#34451)
ScarKy0 Jan 15, 2025
d6e55ed
Make Mime PDA interactions silent (#34426)
ArtisticRoomba Jan 15, 2025
c4c00cd
Automatic changelog update
PJBot Jan 15, 2025
3cac75f
Smite vending machine (#34420)
Alpaccalypse Jan 15, 2025
2691071
Automatic changelog update
PJBot Jan 15, 2025
3dd9307
Printable bedsheets (#34034)
kosticia Jan 15, 2025
9ede1f3
Automatic changelog update
PJBot Jan 15, 2025
fdb2f16
Update RT to v239.0.1 (#34454)
PJB3005 Jan 15, 2025
484af25
Remove christmas anomaly spawn (#34053)
TheShuEd Jan 15, 2025
c6dbdc9
Automatic changelog update
PJBot Jan 15, 2025
6041c82
Remove baby jail (#34443)
VasilisThePikachu Jan 15, 2025
40fc499
Add a CCVar to allow from hiding admins in the reported player count.…
VasilisThePikachu Jan 15, 2025
a7d5c8f
Automatic changelog update
PJBot Jan 15, 2025
c92c52f
Fix Mixed puddles not updating slips when evap (#34303)
poklj Jan 15, 2025
f01db3f
Automatic changelog update
PJBot Jan 15, 2025
59a14b5
WizDen config update for IPIntel (#34457)
PJB3005 Jan 15, 2025
6d218f2
Fix DNA scrambler updating station record (#34091)
themias Jan 15, 2025
e094b79
Automatic changelog update
PJBot Jan 15, 2025
87ff3a2
New and Modified Map Spawners (#34424)
southbridge-fur Jan 16, 2025
d0a2d7b
Elkridge Depot Fixes Again (#34461)
Deerstop Jan 16, 2025
0c1608d
Space Ruins Variant (#34445)
SlimmSlamm Jan 16, 2025
d0b2e46
Plasma Station (#33991)
Compilatron144 Jan 16, 2025
37bde33
Automatic changelog update
PJBot Jan 16, 2025
83eb5dc
Plasma station population tweak (#34462)
Compilatron144 Jan 16, 2025
85b9f91
Automatic changelog update
PJBot Jan 16, 2025
996b761
Merge remote-tracking branch 'wizards/master' into upstream-sync
Morb0 Jan 16, 2025
1dffb09
Update locale
Morb0 Jan 16, 2025
d29ea9b
Update locale
Morb0 Jan 16, 2025
671c52d
Disable lawyer on Plasma map
Morb0 Jan 16, 2025
feaa11e
Merge pull request #2936 from space-syndicate/upstream-sync
Morb0 Jan 16, 2025
34ef573
Merge remote-tracking branch 'corvax/master' into Upstream6
FireNameFN Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Darkened Service job interface icons for better contrast (#34270)
* Darkened Service job interface icons for better contrast

* Fixed Botanist job interface icon dark handle hole

* Change to new, darker, service color in all resource yml files

* Revert Map file service color changes

* Use new darker service color on id cards

* Revert Service color change in mapping_actions.yml

* Revert salvage difficulties service color

* Redo service ID and job colors to match advanced palette

* Revert all service color yml file changes

* Switch icons to use existing service pallete colors from advanced pallete

* Update meta.json for darkened service icons

---------

Co-authored-by: Erskin Cherry <frobnic8@gmail.com>
frobnic8 and Erskin Cherry authored Jan 13, 2025
commit 91bc1f8cac8b9361ee0f9ae6c0465342ac9796e8
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github)",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github)",

"size": {
"x": 8,
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github)",
"size": {
"x": 32,
"y": 32