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.

Sign up for GitHub

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

Upstream Sync (License Change) #56

Merged
merged 763 commits into from
Jun 3, 2024
Merged

Upstream Sync (License Change) #56

Changes from 1 commit
Commits
Show all changes
763 commits
Select commit Hold shift + click to select a range
636c59a
Remove Eris UI theme (#25673)
UbaserB Feb 29, 2024
07243a6
Automatic changelog update
PJBot Feb 29, 2024
b9d2f5a
Refactor antag rule code (#23445)
Rainfey Feb 29, 2024
2d262ca
Automatic changelog update
PJBot Feb 29, 2024
20bc871
Fix typo (#25712)
lzk228 Feb 29, 2024
6f586ea
Buff Bulk Lizard Plushie Crate (#25122)
SpaceLizardSky Feb 29, 2024
34d0875
Automatic changelog update
PJBot Feb 29, 2024
5ecca5b
Fix PDA home icon (#25721)
LordCarve Feb 29, 2024
0f3c5ef
survival nutribricks, lizzers can eat nutribricks, moffs can eat the …
Aexxie Feb 29, 2024
fc6940e
Removes all big O2 tanks from non-emergency & fire lockers + removes …
Flareguy Feb 29, 2024
f8891e1
Add fill levels to bowls (#25639)
potato1234x Feb 29, 2024
633f190
Fix: Dragging items over atmos pipes is slow. (#25629)
Plykiya Feb 29, 2024
c514510
Automatic changelog update
PJBot Feb 29, 2024
ba36e51
Refactor AME to use ItemSlot for Fuel (#25558)
LordCarve Feb 29, 2024
bbb4fe2
Colourful curtains (#25684)
TheShuEd Feb 29, 2024
9779bbc
Automatic changelog update
PJBot Feb 29, 2024
8f62b1e
Under Toned Tail (#25685)
Nairodian Feb 29, 2024
0bde40d
Decal Beautification + Palette Update (#25689)
Hanzdegloker Feb 29, 2024
57e116f
Remove Grandpa from name list (#25725)
Skarletto Feb 29, 2024
0cc8396
Automatic changelog update
PJBot Feb 29, 2024
df35a0f
Minor .yaml cleanup (#25717)
lapatison Feb 29, 2024
71c14d9
New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitaniu…
Flareguy Feb 29, 2024
e322e58
Add handheld map to autolathe (#25719)
lzk228 Feb 29, 2024
ef1ecba
Automatic changelog update
PJBot Feb 29, 2024
0aa0fe6
Add alternative crafting recipes for reinforced plasma/uranium glass …
MACMAN2003 Feb 29, 2024
cead75f
Automatic changelog update
PJBot Feb 29, 2024
1fb496b
Add curtain spawner (#25729)
IamVelcroboy Feb 29, 2024
f2beed9
remove doorslam sound (#25737)
EmoGarbage404 Mar 1, 2024
34287d6
Cargo request console search now includes crate descriptions (#25708)
PolterTzi Mar 1, 2024
2ffd042
make suicide actions require confirming (#24609)
deltanedas Mar 1, 2024
9a9bd90
Automatic changelog update
PJBot Mar 1, 2024
56dd394
Make the round end sound collection a cvar (#25741)
DrSmugleaf Mar 1, 2024
b0d948a
feat(chameleon): Chameleon verb only shows to the wearer (#25746)
exincore Mar 1, 2024
20886f6
Automatic changelog update
PJBot Mar 1, 2024
dead5ca
CryoSleep Access Fix (#25752)
Nairodian Mar 1, 2024
b5ef7ce
Automatic changelog update
PJBot Mar 1, 2024
189e355
New item: Expensive coat (#25724)
Tunguso4ka Mar 1, 2024
c3a564f
Detective's rubber stamp (#25676)
IlyaElDunaev Mar 1, 2024
e781982
Automatic changelog update
PJBot Mar 1, 2024
fab84e5
Security Belts for Cadets (#25753)
Nairodian Mar 1, 2024
d14135f
Add test to check that there are no pending database model changes (#…
DrSmugleaf Mar 2, 2024
8025298
Additional Signage (#25766)
rosieposieeee Mar 2, 2024
e84684c
Automatic changelog update
PJBot Mar 2, 2024
205b1f0
move space heaters into cargo (#25735)
EmoGarbage404 Mar 2, 2024
8506abf
Automatic changelog update
PJBot Mar 2, 2024
1ae04eb
removes the free syndicate headset from the syndicate footsoldier (#2…
Flareguy Mar 2, 2024
795bb78
Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. (#…
exincore Mar 2, 2024
1fb8bad
Weight based AreaInsert and Dumpable delay, a janitor qol tweak (#24899)
Krunklehorn Mar 2, 2024
b43988e
Automatic changelog update
PJBot Mar 2, 2024
63e45f9
Alerts for breathing plasma/tritium (#24484)
Errant-4 Mar 2, 2024
cf44a25
Automatic changelog update
PJBot Mar 2, 2024
15a77b2
Remove 07 from emote chatsan (#25767)
lzk228 Mar 2, 2024
cde78ea
Make the MRE wrapper count as trash (#25760)
waylon531 Mar 2, 2024
bac7b0f
Automatic changelog update
PJBot Mar 2, 2024
a3a4f14
make thief a subgamemode (#25740)
deltanedas Mar 2, 2024
c59a00c
fix(seizures): remove seizures from the game (#25722)
Brandon-Huu Mar 2, 2024
4444cce
Small news manager localisation (#25718)
lapatison Mar 2, 2024
426b208
fix: lobby music volume will be changed on options change without res…
Fildrance Mar 2, 2024
076112f
Automatic changelog update
PJBot Mar 2, 2024
a66dc10
feat(inventory): Add secondary smart-equip star (#25696)
exincore Mar 2, 2024
1f21444
Automatic changelog update
PJBot Mar 2, 2024
841e051
Cleanup chairs.yml (#25682)
MACMAN2003 Mar 3, 2024
690fd89
Service and External Cadet Access (#25784)
Nairodian Mar 3, 2024
2cfc94b
Automatic changelog update
PJBot Mar 3, 2024
46e7aea
Moved Grapple to T1 Industrial (#25782)
FungiFellow Mar 3, 2024
abdca9e
Curadrobe Additions (#25732)
Plykiya Mar 3, 2024
b97afd8
Add prediction for puddle and spillable examines (#25794)
Tayrtahn Mar 3, 2024
297c97d
Make `ItemSlots` more verbose + AME proof of concept (#25779)
LordCarve Mar 3, 2024
026f530
patch QSI container issues (#25700)
EmoGarbage404 Mar 3, 2024
4880b2d
Automatic changelog update
PJBot Mar 3, 2024
32abbfd
Revert "make galoshes obtainable and slowing you" (#25795)
deltanedas Mar 3, 2024
30304d8
Automatic changelog update
PJBot Mar 3, 2024
1d86630
Update submodule to 212.0.0 (#25799)
metalgearsloth Mar 3, 2024
f53709b
Automatic changelog update
PJBot Mar 3, 2024
29230db
Remove doafter from toggling your own internals (#25781)
Errant-4 Mar 3, 2024
cec7f0f
Automatic changelog update
PJBot Mar 3, 2024
5839a84
Fix arachnids being unable to clean pie stains (#25713)
SlamBamActionman Mar 3, 2024
6be5ce4
Automatic changelog update
PJBot Mar 3, 2024
8388f8b
Update submodule to 212.0.1 (#25802)
metalgearsloth Mar 3, 2024
236bba5
System for single device net server per station functionality (#23946)
juliangiebel Mar 4, 2024
e86c30a
Blood-red monkey hardsuit (#22273)
Dutch-VanDerLinde Mar 4, 2024
be70e5b
Automatic changelog update
PJBot Mar 4, 2024
3871983
Syringe QoL improvements (#25480)
Plykiya Mar 4, 2024
76e32bc
Automatic changelog update
PJBot Mar 4, 2024
f57d895
Automatic changelog update
PJBot Mar 4, 2024
da5758b
Mineshaft (#25733)
TheShuEd Mar 4, 2024
62c3def
Suffix for boxes of hugs (#25829)
lzk228 Mar 4, 2024
2dabf10
Lathe-able Welding Masks (#25842)
Nairodian Mar 4, 2024
310481b
Automatic changelog update
PJBot Mar 4, 2024
56f5304
Frozen hydroponic dungeon (#25837)
TheShuEd Mar 4, 2024
db966b0
Shot glass max volume decrease (#25847)
Lawdog4817 Mar 4, 2024
09e756b
Automatic changelog update
PJBot Mar 4, 2024
c0bfa9f
fishops nerf real (#25148)
deltanedas Mar 5, 2024
bd16e74
Automatic changelog update
PJBot Mar 5, 2024
37f2d41
Remove the ability for command or any antag-safe role from being ini…
Brandon-Huu Mar 5, 2024
6ce2867
Automatic changelog update
PJBot Mar 5, 2024
4e509d7
Change keybindings for paper (#25853)
Brandon-Huu Mar 5, 2024
31a4cda
Fixed Emag wiping door access without bolting open (#25836)
exincore Mar 5, 2024
f2db506
Enforce Space Heater max/min temperatures server side (#25835)
Menshin Mar 5, 2024
4f3bed0
the bladed flatcap (#25780)
QuietlyWhisper Mar 5, 2024
2dbe46c
Automatic changelog update
PJBot Mar 5, 2024
bbc0f1e
Clockwork structures and furniture (#24673)
MACMAN2003 Mar 6, 2024
3ad22ad
Automatic changelog update
PJBot Mar 6, 2024
6e525f3
Adds paramedic cap to the uniform printer (#25861)
deepdarkdepths Mar 6, 2024
41dde77
Fixes glowsticks being unable to be inserted into trashbags (#25863)
deepdarkdepths Mar 6, 2024
8cb3645
Allow livestock and artifact crate to go under plastic flaps (#25862)
lzk228 Mar 6, 2024
c255822
Add prediction to hand labeler labels (#25869)
Tayrtahn Mar 6, 2024
95a50cf
Automatic changelog update
PJBot Mar 6, 2024
e01969b
Paper save button, back to ctrl+enter save. (#25870)
PJB3005 Mar 6, 2024
9858301
Separate Certain Walls (#25674)
ps3moira Mar 6, 2024
c07de9f
Automatic changelog update
PJBot Mar 6, 2024
b2d82de
Add water to water tiles. (#25825)
Froffy025 Mar 6, 2024
edbe981
Automatic changelog update
PJBot Mar 6, 2024
e158b92
Post light update (#25814)
Ko4ergaPunk Mar 6, 2024
26cba4a
Update wideswing rotations (#25868)
notquitehadouken Mar 6, 2024
250a76a
Automatic changelog update
PJBot Mar 6, 2024
e025ff7
buff gas leak event (#25864)
Ilya246 Mar 6, 2024
ac57098
New cloth & hair (#25772)
JustArt1m Mar 6, 2024
fedb412
Automatic changelog update
PJBot Mar 6, 2024
2dfb602
Automatic changelog update
PJBot Mar 6, 2024
bdcfcf1
Readmin enables Debug Coordinates in F3 overlay (#25063)
Errant-4 Mar 6, 2024
ad056f9
Fix pod launch offset (#25855)
metalgearsloth Mar 6, 2024
f4efbbe
Automatic changelog update
PJBot Mar 6, 2024
549d4f1
Add SharedPopupSystem.PopupPredicted (#25811)
Tayrtahn Mar 6, 2024
e6026ae
adds barber scissors to hristov bundle (#25695)
Brandon-Huu Mar 6, 2024
84078e7
Automatic changelog update
PJBot Mar 6, 2024
a8d0823
Remove all obsolete BatteryComponent method calls (#25871)
Tayrtahn Mar 6, 2024
3f54180
Hotfix for errors in handheld lights and radio jammers (#25880)
Tayrtahn Mar 6, 2024
6feaad0
Make flasks fit in dispensers again (#25883)
Tayrtahn Mar 6, 2024
2062e6d
Automatic changelog update
PJBot Mar 6, 2024
d4d8898
fix(emag): Emagging a lock properly unlocks the component (#25858)
exincore Mar 6, 2024
974c8b6
Monkeys can wear all types of masks, not just breath/gas masks (#25816)
Dutch-VanDerLinde Mar 6, 2024
9642ded
Update base.yml
DebugOk Mar 7, 2024
fc764f3
Update uplink_catalog.yml (#934)
DebugOk Mar 7, 2024
fc7e32f
Fixes
DebugOk Mar 7, 2024
d406524
Revert "Signage For Meee (#799)"
DebugOk Mar 7, 2024
852f646
Wacklights, untested
DebugOk Mar 7, 2024
0dc9fe6
Some drone tags
DebugOk Mar 7, 2024
189230a
News cartridge migration
DebugOk Mar 7, 2024
25de1b3
Migrate LockableButtonBrig
DebugOk Mar 7, 2024
98b1a39
Fix SyndicateMonitoringServer prototype
DebugOk Mar 7, 2024
9b2d304
Merge pull request #937 from DebugOk/2024/03/05-Merge-Master
DebugOk Mar 7, 2024
d504834
More Borg Lawsets (#706)
DangerRevolution Mar 7, 2024
f767c45
Automatic Changelog Update (#706)
Mar 7, 2024
5ac3da2
Another .38 special clean up / balance (#852)
FluffiestFloof Mar 7, 2024
560dd82
Recipe for the Pumpkin Pie (#855)
FluffiestFloof Mar 7, 2024
3a50aed
Automatic Changelog Update (#855)
Mar 7, 2024
e0b0067
Fixes the 2 pixels in the fluffy tail. (#865)
Adrian16199 Mar 7, 2024
717e81c
SignDirectionalICU > SignDirectionalIcu
DebugOk Mar 8, 2024
f831b47
Remove Hive maxpop (#938)
IamVelcroboy Mar 8, 2024
152a190
Revert AME buff (#930)
IamVelcroboy Mar 8, 2024
8373ac5
Automatic Changelog Update (#930)
Mar 8, 2024
344aa7b
Psychologist & Lawyer stamp (#849)
Guess-My-Name Mar 8, 2024
9dbb2eb
nukie medic medical medhud (#779)
JoeHammad1844 Mar 8, 2024
3684aa2
Automatic Changelog Update (#779)
Mar 8, 2024
9b783af
Prison communications (#715)
Bonktrauma Mar 8, 2024
1fcd282
Automatic Changelog Update (#715)
Mar 8, 2024
aa238da
Energy Gun Rebalancing (#846)
Tryded Mar 8, 2024
511b995
Automatic Changelog Update (#846)
Mar 8, 2024
2a195a6
Listening Post 2.0 (#639)
DangerRevolution Mar 8, 2024
1e1aee8
Automatic Changelog Update (#639)
Mar 8, 2024
29a7e25
Personal Protective Equipment - The Polished Version (#854)
Bribrooo Mar 8, 2024
1c0c087
Cap Gun Crate (#871)
dge21 Mar 8, 2024
a9f9b82
Automatic Changelog Update (#871)
Mar 8, 2024
d54b539
Adds DV fluff to captain's nolaser locker (#905)
IamVelcroboy Mar 8, 2024
4a87ac1
Makes Vulpkanin able to howl + adds some growling noises (#884)
Mar 8, 2024
d8f0821
Automatic Changelog Update (#884)
Mar 8, 2024
e271a5d
Revert "Revert AME buff" (#939)
DebugOk Mar 8, 2024
fa61952
Add trade stations (#23863)
metalgearsloth Jan 19, 2024
76d0641
Modify trade station for Delta
DebugOk Mar 8, 2024
8246734
Run fixgridatmos on trading outpost (#24264)
metalgearsloth Jan 19, 2024
b330429
Update Trading Outpost (#24281)
UbaserB Jan 19, 2024
fa3e17d
Clear cargo orders on approval (#24278)
metalgearsloth Jan 19, 2024
0f85467
Update Trade Station (#24295)
UbaserB Jan 19, 2024
5c7b5ac
Resave trading outpost (#24536)
metalgearsloth Jan 25, 2024
554f664
Fix centcom cargo gifts (#24701)
themias Jan 30, 2024
0129a6e
Update cargo guidebook entry and other minor guidebook changes (#24828)
Hmeister-real Feb 3, 2024
b7619d3
Fix guidebook (#24947)
Hmeister-real Feb 4, 2024
44613e6
Made ordering multiple crates at cargo order multiple crates (#25518)
PolterTzi Feb 25, 2024
f102e8f
Shuttle console + FTL rework (#24430)
metalgearsloth Mar 3, 2024
f5a6a11
Fix FTLToDock (#25803)
metalgearsloth Mar 3, 2024
772218a
Fix shuttle console UI scaling (#25807)
metalgearsloth Mar 3, 2024
5ada275
Fix FTL docks not opening (#25808)
metalgearsloth Mar 3, 2024
02c58d4
Fix shuttle IFF drawing (#25821)
metalgearsloth Mar 4, 2024
27f43cc
Fix drone console docking (#25822)
metalgearsloth Mar 4, 2024
132d026
Fix exped FTL (#25823)
metalgearsloth Mar 4, 2024
c30ff6e
Fix docking fallback (#25854)
metalgearsloth Mar 5, 2024
5de30d1
Fix shuttle disabling on ftl (#25859)
metalgearsloth Mar 5, 2024
c2d3090
Shoukou's security revamp. (#923)
Adrian16199 Mar 8, 2024
b44c2b3
Automatic Changelog Update (#923)
Mar 8, 2024
484ca92
Implement Ifriit (#661)
Adrian16199 Mar 9, 2024
1052250
Automatic Changelog Update (#661)
Mar 9, 2024
67191e7
Update Credits (#948)
github-actions[bot] Mar 10, 2024
c09afed
Update deltav.toml
DebugOk Mar 10, 2024
a2792cf
Makes ifriit immune to zombie-fication. (#950)
Adrian16199 Mar 10, 2024
0028b03
Automatic Changelog Update (#950)
Mar 10, 2024
dfd5e60
Update DV-pirateradio.yml (#951)
VMSolidus Mar 11, 2024
f2a4a9c
Merge pull request #941 from DebugOk/2024/03/08-Trading-posts
DebugOk Mar 11, 2024
a807993
Automatic Changelog Update (#941)
Mar 11, 2024
fd09635
Adds Delta V station beacons (#767)
IamVelcroboy Mar 11, 2024
4902b72
Create test.yml
DebugOk Mar 11, 2024
171e56d
Automatic changelog update
DeltaV-Bot Mar 11, 2024
f55bce9
Revert "Automatic changelog update"
DebugOk Mar 11, 2024
f3f719e
Automatic changelog update
DeltaV-Bot Mar 11, 2024
c7f9819
minor lawset fixes (#953)
DangerRevolution Mar 11, 2024
b31c802
Automatic changelog update
DeltaV-Bot Mar 11, 2024
6bd5092
Fix some trading post oopsies (#956)
DebugOk Mar 11, 2024
0999c10
Fix changelog order and admin changelog (#957)
DebugOk Mar 11, 2024
70ec8fa
Automatic changelog update
DeltaV-Bot Mar 11, 2024
14447ba
Remove bad CL entries and try admin changelogs a second time (#958)
DebugOk Mar 11, 2024
6c43266
Automatic changelog update
DeltaV-Bot Mar 11, 2024
c0f22a8
Rules Update (#952)
GreggTheFather Mar 12, 2024
6e8c3b9
Automatic changelog update
DeltaV-Bot Mar 12, 2024
b6e35d8
Update submodule to 212.0.2 (#959)
DebugOk Mar 12, 2024
b03faf4
Automatic changelog update
DeltaV-Bot Mar 12, 2024
fc1fb86
Fix Edge Boxer room access (#960)
Colin-Tel Mar 13, 2024
f53daf1
pebble hotfix two, eletric boogaloo (#943)
UnicornOnLSD Mar 13, 2024
d3089e5
Automatic changelog update
DeltaV-Bot Mar 13, 2024
810d04c
Update toys.yml
DebugOk Mar 14, 2024
a719ee0
Map Edits: Arena (#964)
IamVelcroboy Mar 14, 2024
42e9a27
Update README.md
VMSolidus Mar 16, 2024
c7571ea
readd root markdown docs
DEATHB4DEFEAT Mar 16, 2024
10e44d7
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
DEATHB4DEFEAT Mar 16, 2024
b3f7ba7
fix LEGAL merge conflict
DEATHB4DEFEAT Mar 16, 2024
a41c710
Update README.md
VMSolidus Mar 16, 2024
13d8ac1
Merge pull request #2 from Simple-Station/VMSolidus-patch-1
VMSolidus Mar 16, 2024
1f8e48b
Improve Several Project Markdown Files (#10)
DEATHB4DEFEAT Mar 18, 2024
0e0a7bd
[PORT] Harpy & Moth Clothing Fixes (#4)
DangerRevolution Mar 18, 2024
eae2194
Make Moths Unable to Eat Medals (#5)
DangerRevolution Mar 18, 2024
70a8cc6
Add More Labels to the Labeler Action (#9)
DEATHB4DEFEAT Mar 19, 2024
03625bf
Basic Debranding (#15)
stellar-novas Mar 19, 2024
fb2f9a8
Fix Changelog Running on SelfHosted Runners (#17)
DEATHB4DEFEAT Mar 19, 2024
9b780cf
Fix the .yml Linter (#18)
DangerRevolution Mar 19, 2024
39734b1
Remove Launcher Bias (#26)
VMSolidus Mar 20, 2024
0548c63
Prevent Actions From Running on Changelogs (#27)
DEATHB4DEFEAT Mar 20, 2024
b58ef28
Update the Credits Action (#28)
DEATHB4DEFEAT Mar 22, 2024
ee276f7
Species Information in Guidebooks and Shortcut in Character Editor (#7)
DEATHB4DEFEAT Mar 23, 2024
0f7cf28
Automatic Changelog Update (#7)
SimpleStation14 Mar 23, 2024
b083655
Light Replacer Fix (#21)
DangerRevolution Mar 23, 2024
f82ad18
New Splash/Banner and Logo (#29)
VMSolidus Mar 23, 2024
2047b04
Update Credits (#41)
github-actions[bot] Mar 24, 2024
f1b5baa
Rename Changelogs to Einstein Engines and Delete DV CLs (#44)
DEATHB4DEFEAT Mar 26, 2024
b702cbd
Code Cleanup: Puddles and Spreaders (#39)
stellar-novas Mar 27, 2024
e66ca4b
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
DEATHB4DEFEAT Mar 28, 2024
7c4e5ba
update mds
DEATHB4DEFEAT Mar 28, 2024
6bb672e
Merge branch 'master' of https://github.com/Simple-Station/Parkstatio…
DEATHB4DEFEAT Mar 28, 2024
3d31fd1
review changes
DEATHB4DEFEAT Apr 6, 2024
a0f3d17
review changes
DEATHB4DEFEAT May 3, 2024
e12a472
fix script names in README building section
DEATHB4DEFEAT Jun 3, 2024
bc40b68
correct our yml codebase comments
DEATHB4DEFEAT Jun 3, 2024
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
3 changes: 1 addition & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
View file
Open in desktop
DEATHB4DEFEAT marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
EpinephrineChemistryBottle: 3
Syringe: 5
Portafib: 1 # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml
ClothingEyesGlasses: 5 # SimpleStation14 NearsightedTrait
ClothingEyesGlasses: 5 # Parkstation NearsightedTrait
DEATHB4DEFEAT marked this conversation as resolved.
Show resolved Hide resolved
ClothingEyesHudMedical: 2
ClothingEyesEyepatchHudMedical: 2

Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.