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

Upstream Sync #33

Merged
merged 1,155 commits into from
Jan 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
1155 commits
Select commit Hold shift + click to select a range
9c62da3
Fix unlocalized name deep-fried-burnt-item (#535)
jzburda Dec 21, 2023
5154bd4
Automatic Changelog Update (#535)
Dec 21, 2023
e5141b7
HoP gets back his armored coat (#570)
Adrian16199 Dec 21, 2023
6ecfa78
Automatic Changelog Update (#570)
Dec 21, 2023
f8273b5
nerf loneop and ninja spawn rate (#586)
deltanedas Dec 22, 2023
1d5c59f
deep frier slice fix (#581)
deltanedas Dec 22, 2023
4e8390a
Ectoplasm fix for normality crystals (#538)
Guess-My-Name Dec 22, 2023
7477166
add power sensor (#20400)
deltanedas Dec 16, 2023
7224100
Automatic changelog update
PJBot Dec 16, 2023
2ed0dce
Standardizes / nerfs material sheets to 10u, no more lead in steel sh…
Flareguy Dec 16, 2023
ffc7965
Automatic changelog update
PJBot Dec 16, 2023
e070ac2
Include URL in Discord bot changelog to link to the Github PR page
SlamBamActionman Dec 16, 2023
268d9cc
crystals drop shards and ore crab tweaks. (#20930)
brainfood1183 Dec 16, 2023
42b835c
fix some pdas (#22617)
lzk228 Dec 16, 2023
29977c7
medibot toctou gaming (#22608)
deltanedas Dec 16, 2023
3c326f4
fix ninja draining in no grav (#22610)
deltanedas Dec 16, 2023
18a66de
evil pen (#22598)
Ilya246 Dec 16, 2023
9b23dbd
Update the emergency shuttle Rod (#22592)
UbaserB Dec 16, 2023
ee2087f
add (#22597)
UbaserB Dec 16, 2023
10e71dd
Fix spray nozzle (#22624)
themias Dec 17, 2023
b3425db
Add description in lathe recipe mouseover tooltip (#22621)
Bobtron Dec 17, 2023
13718c9
Fixes Clown Recorder causing client freeze (#22629)
Mirino97 Dec 17, 2023
d4ef5be
mild reagent prototype cleanup + other misc garbage (#22630)
EmoGarbage404 Dec 17, 2023
2552b01
Update Credits (#22626)
github-actions[bot] Dec 17, 2023
eae37fd
the boxening (#22643)
Ilya246 Dec 17, 2023
0e31c6b
Engineering Chunk Salvage (#22529)
Blackern5000 Dec 17, 2023
14f3500
cull engineering-chunk size (#22664)
Emisse Dec 17, 2023
05df25a
Replaces the broken hallelujah.ogg file with a new one (#22670)
Mirino97 Dec 17, 2023
edd3766
decrease hypodart cost from 3 to 2 (#22671)
TheShuEd Dec 17, 2023
098c53e
Adds construction effect to RCD (#22633)
chromiumboy Dec 17, 2023
b3581eb
Fix nix devShell (#22663)
yathxyz Dec 17, 2023
16bdb6e
Better tear gas grenade belt sprite (#22666)
JoeHammad1844 Dec 17, 2023
600bb27
HOS's parade uniform available at the uniform printer (#22667)
UbaserB Dec 17, 2023
2e79852
Adds RCD and RCD ammo to all engineer lockers. (#22688)
Aexxie Dec 18, 2023
c8bfabb
Chemical Synthesis Kit (#22631)
UbaserB Dec 18, 2023
3f3394a
Rubber gloves for janitors (#22668)
UbaserB Dec 18, 2023
23b09d6
Add atmos error log (#22696)
ElectroJr Dec 18, 2023
4f7d00f
Adds coal (#22559)
IamVelcroboy Dec 18, 2023
18c227f
Super Bonk Smite (#22413)
nikthechampiongr Dec 18, 2023
94cb22b
Highboots (#22382)
IProduceWidgets Dec 18, 2023
5b911e7
Weapon Random Fixes (documented and removed hardcoded cluwnecomp) (#2…
brainfood1183 Dec 18, 2023
9cd2bd4
Makes external & shuttle airlocks bump-openable (#22706)
Flareguy Dec 18, 2023
c0a1194
Craftable Steel Closet (#21987)
iacore Dec 18, 2023
a549bc5
Remove duplicate milks (#22721)
IamVelcroboy Dec 18, 2023
a28d300
Broadcast MoveEvent -> C# event (#22689)
mirrorcult Dec 19, 2023
e1edf78
Add more centcomm spawning logs (#22726)
ElectroJr Dec 19, 2023
5cbe671
structural damage rework / melee damage curve flattening (#22705)
Emisse Dec 19, 2023
013ec1b
Remove RCD from tech and make it a crate (#22720)
EmoGarbage404 Dec 19, 2023
05ed172
Rebalance fireaxe (#22731)
ElectroJr Dec 19, 2023
405349c
Hardsuit and EVA helmets allow using internals without a mask (#22716)
SapphicOverload Dec 19, 2023
ed17f05
fix jug suit (#22734)
Emisse Dec 19, 2023
50384d8
fix sec suit (#22735)
Emisse Dec 19, 2023
7730039
Adds janitorial service lights (#22732)
SpaceRox1244 Dec 19, 2023
1fcfc6c
Check if url exists in changelog and adjust Discord message for it (#…
SlamBamActionman Dec 19, 2023
2e6d980
Automatic changelog update
PJBot Dec 19, 2023
16cce7a
Give security sunglasses the security HUD (#19904)
Partmedia Dec 19, 2023
c77d217
Automatic changelog update
PJBot Dec 19, 2023
50f25db
resprite every captain item (#22739)
Emisse Dec 19, 2023
9b7ac49
Automatic changelog update
PJBot Dec 19, 2023
795fd83
Added ore bag of holding (#22680)
Stanislav4ix Dec 19, 2023
5153ce0
Automatic changelog update
PJBot Dec 19, 2023
0088530
Shuttle timers (#19471)
graevy Dec 19, 2023
8d04ad9
Fix master (#22757)
metalgearsloth Dec 19, 2023
251ef69
CVar for custom name in client-side ahelp menu. (#22069)
Simyon264 Dec 19, 2023
d79a642
Automatic changelog update
PJBot Dec 20, 2023
a915bcc
Update engine to v194.0.1
DebugOk Dec 22, 2023
fba1952
Fix item cabinet's visual state desyncing when toggled by a different…
DrSmugleaf Dec 20, 2023
6cefcb9
Stop AtmosphereSystem from logging errors if an atmosphere gets delet…
ElectroJr Dec 20, 2023
c672a1d
Toy sword now specifies BaseItem as parent (#22746)
Tayrtahn Dec 20, 2023
c4f916b
Make airlocks able to be broken down (still strong) and modify a dama…
Emisse Dec 20, 2023
85222ca
Make ethylredoxrazine effective at curing drunkness (#22763)
Veritius Dec 20, 2023
38ea93b
Automatic changelog update
PJBot Dec 20, 2023
a365f6f
Unbreak the Geneva Conventions (#22741)
Errant-4 Dec 20, 2023
d19ea46
Automatic changelog update
PJBot Dec 20, 2023
647c0d7
New plant (#22704)
ERORR404V1 Dec 20, 2023
1ddb39c
Automatic changelog update
PJBot Dec 20, 2023
500e964
Fix shuttle loading error (#22767)
ElectroJr Dec 20, 2023
8b5c541
Update engine to v194.0.2 (#22769)
ElectroJr Dec 20, 2023
c51891c
Fix index out of range exception in atmosphere system (#22770)
ElectroJr Dec 20, 2023
8e25e7a
Improve gas analyzer interface (#22779)
qwerltaz Dec 20, 2023
1abe993
Automatic changelog update
PJBot Dec 20, 2023
d37dcb8
Reduce frezon price (#22784)
Partmedia Dec 20, 2023
a24c6b2
Automatic changelog update
PJBot Dec 20, 2023
fb7d507
CentCom Agent Suit (#22700)
joshepvodka Dec 20, 2023
49aa709
Added CentCom clipboard, folder and added a normal green folder. (#22…
joshepvodka Dec 20, 2023
410a930
Automatic changelog update
PJBot Dec 20, 2023
556c986
Fix ghosts following a moving entity causing them to be offset (#22783)
PJB3005 Dec 20, 2023
3877950
Automatic changelog update
PJBot Dec 20, 2023
18885e9
put new centcom outfit in centdrobe for easy admin shits (#22786)
Emisse Dec 20, 2023
1d7a658
Reduce absolute temperature tolerance (#22782)
Partmedia Dec 20, 2023
0c2d011
fixed nocturine locale (#22737)
Moomoobeef Dec 20, 2023
69fbfb7
fix: ExtensionCableSystem to be consistent (#22745)
koteq Dec 20, 2023
a04b02b
Add coal distribution to progen (#22755)
IamVelcroboy Dec 20, 2023
7c38960
Automatic changelog update
PJBot Dec 20, 2023
b61b65c
centcomm update (#22788)
Emisse Dec 20, 2023
0b0e113
Add nitrous oxide synthesis reaction (#22774)
whateverusername0 Dec 21, 2023
a2da111
Automatic changelog update
PJBot Dec 21, 2023
621dc73
Add nitrous oxide decomposition reaction (#22738)
whateverusername0 Dec 21, 2023
83b2abe
Automatic changelog update
PJBot Dec 21, 2023
961cd04
Structural Balancing Pass (#22790)
Emisse Dec 21, 2023
84a21c9
Automatic changelog update
PJBot Dec 21, 2023
a23dce4
Rename Miasma to Ammonia (#22791)
mirrorcult Dec 21, 2023
581b6d2
Automatic changelog update
PJBot Dec 21, 2023
714d913
Updated (most) medipen sprites (#22789)
joshepvodka Dec 21, 2023
dd2be7b
Automatic changelog update
PJBot Dec 21, 2023
39dc5b9
Resprited carpet sprites (#22674)
Tunguso4ka Dec 21, 2023
c2dec59
Automatic changelog update
PJBot Dec 21, 2023
4d98a7d
add Fresium, a chillingly complex chemical to prank your friends with…
CrigCrag Dec 21, 2023
71644f9
Automatic changelog update
PJBot Dec 21, 2023
0de9550
Raise cryo metabolism min temperature (#22785)
Partmedia Dec 21, 2023
98e9848
Resprites energy sword and double energy sword (#22797)
SpaceRox1244 Dec 21, 2023
0c745cd
Fix right click not showing the context menu in AHelps, players tab a…
DrSmugleaf Dec 21, 2023
dfd114e
Automatic changelog update
PJBot Dec 21, 2023
159aec9
Add missing admin changelog for #22798 (#22801)
DrSmugleaf Dec 21, 2023
f6c226b
Change SpawnerSystem to use SpawnAtPosition instead of Spawn (#22800)
DrSmugleaf Dec 21, 2023
8250bf7
borgs know who is crew now (#22802)
Emisse Dec 21, 2023
270c688
Automatic changelog update
PJBot Dec 21, 2023
7af0d53
Gauze Markings 2 - Medical Boogaloo (#22452)
KittenColony Dec 21, 2023
b4df17b
Fireaxe icon resprite (#22805)
KittenColony Dec 21, 2023
ac72de6
Automatic changelog update
PJBot Dec 21, 2023
4aad5f5
Cleanup forensic cleaning (#22715)
themias Dec 21, 2023
5755e04
Automatic changelog update
PJBot Dec 21, 2023
eff8b9c
remove base agent id from nukie operatives (#22811)
Emisse Dec 21, 2023
e6ae048
Automatic changelog update
PJBot Dec 21, 2023
fd5ac78
give service borg syringe so they can mix drinks (#22813)
Emisse Dec 21, 2023
d9c7344
Prevent mice from spilling containers. (#22812)
Titian3 Dec 21, 2023
374a885
Automatic changelog update
PJBot Dec 21, 2023
a55133a
Fix gas canister random item insertion prediction (#22809)
Lukasz825700516 Dec 21, 2023
41661d8
Automatic changelog update
PJBot Dec 21, 2023
de9d9e8
infiltrator update (#22820)
Emisse Dec 21, 2023
f8ecae6
Automatic changelog update
PJBot Dec 21, 2023
534eec0
Fix for #22516 - mobs can no longer cause clumsy mobs to get hurt on …
DrMelon Dec 21, 2023
0b2d01a
Automatic changelog update
PJBot Dec 21, 2023
d86ac88
Uranium Ammo (#22406)
Boaz1111 Dec 21, 2023
99d079a
Automatic changelog update
PJBot Dec 21, 2023
e2eb8a3
Makes sabre sheathe use ItemSlots (#22792)
joshepvodka Dec 21, 2023
88aba7a
Add migration for MiasmaCanister (#22830)
Partmedia Dec 21, 2023
86af7b7
Fix glorfcode for real (#22838)
mirrorcult Dec 22, 2023
7decaa2
Convert atmos device events to ref events (#22843)
mirrorcult Dec 22, 2023
c86cd99
Change range of 10-sided dice (#22833)
Tayrtahn Dec 22, 2023
78c6c3a
nukie planet update (#22818)
JoeHammad1844 Dec 22, 2023
bc75826
Try fix invalid entities in device networks (#22845)
ElectroJr Dec 22, 2023
22f0364
Fix a collection enumeration modification exception in ArrivalsSystem…
ElectroJr Dec 22, 2023
96d27ae
adds embedding + throw damage to cybersun pen (#22822)
Ilya246 Dec 22, 2023
408aa86
Adds top surgery scar markings to the character creator (#22806)
SpaceRox1244 Dec 22, 2023
dd5af1e
Added ashtrays (#22837)
joshepvodka Dec 22, 2023
9d6fc40
add gambling to cargo (#22842)
Emisse Dec 22, 2023
65a15ca
DumpableComponent on an empty container no longer stops other interac…
LordCarve Dec 22, 2023
d7d165e
Fixed issue with the station map UI (#22848)
chromiumboy Dec 22, 2023
9aeac60
PARTY HATS YIPPIE (#22850)
lzk228 Dec 22, 2023
54faa6b
Glossary (#22840)
2013HORSEMEATSCANDAL Dec 22, 2023
adee2a7
Fix various errors/exceptions (#22841)
ElectroJr Dec 22, 2023
11e697c
Add some clothes to the uniform printer (#22829)
MACMAN2003 Dec 22, 2023
67d3f2b
Add YAML gas reactions (#22803)
Partmedia Dec 22, 2023
60fa1a2
hotfix for party hats (#22852)
lzk228 Dec 22, 2023
97786db
It's time to build a barbershop! (#22565)
TheShuEd Dec 22, 2023
5511a05
Rigged boxing gloves have variant TC costs. (#22851)
Dec 22, 2023
8494bd0
Use ECS prototype-reload events (#22613)
ElectroJr Dec 22, 2023
4b9e628
Consistent Absorbent System behavior (#22723)
LordCarve Dec 22, 2023
2dc6a19
Use different chatbox placeholder when dependent keys unbound (#22747)
LordCarve Dec 22, 2023
eaa272f
Miasma? Who's that
DebugOk Dec 22, 2023
5c0c779
Update migration.yml
DebugOk Dec 22, 2023
f127a41
Ew, gridinv
DebugOk Dec 22, 2023
ccefde5
Update miningrock.yml
DebugOk Dec 22, 2023
7175825
Fix oracle static shit
DebugOk Dec 22, 2023
6bac324
More gridinv
DebugOk Dec 22, 2023
de249c4
Missing locs
DebugOk Dec 22, 2023
e1763c7
Merge pull request #588 from DebugOk/WizMerge-22/12
DebugOk Dec 22, 2023
1feff04
Automatic Changelog Update (#588)
Dec 22, 2023
b6abced
Added rules for Smile (#590)
Colin-Tel Dec 23, 2023
6df7ba7
Reverts New E-Sword Sprites (#591)
ps3moira Dec 24, 2023
681b92d
Automatic Changelog Update (#591)
Dec 24, 2023
f8b1f70
bluespace ore bag use bluespace (#597)
deltanedas Dec 24, 2023
2e72d5f
Automatic Changelog Update (#597)
Dec 24, 2023
0f15db7
Trigger mapserver refresh?
DebugOk Dec 24, 2023
1b185d5
Fix to cyborgs being able to spawn with nearsighted. (#606)
Adrian16199 Dec 27, 2023
3006e2b
Automatic Changelog Update (#606)
Dec 27, 2023
a81ac6b
Updates more variation of mraowing. (#604)
Adrian16199 Dec 27, 2023
52a3e45
Adds more classic hair. (#603)
Adrian16199 Dec 27, 2023
f8c9e05
Automatic Changelog Update (#603)
Dec 27, 2023
0fa2caa
Laika changes (#602)
BramvanZijp Dec 28, 2023
43afc69
Automatic Changelog Update (#602)
Dec 28, 2023
8d5733e
Gives oxygen miner to shoukou. (#610)
Adrian16199 Dec 28, 2023
6b2d0a8
Automatic Changelog Update (#610)
Dec 28, 2023
11d4a39
Crime Assist pda program (#464)
Timfa2112 Dec 29, 2023
2246b2e
Automatic Changelog Update (#464)
Dec 29, 2023
985b2f9
Prevent pseudoitems from being transferred between bags (#553)
DebugOk Dec 29, 2023
fe526b7
death to eorg (#598)
deltanedas Dec 29, 2023
d2ca30c
Scottish Trait (#608)
ps3moira Dec 29, 2023
b44c8df
Automatic Changelog Update (#608)
Dec 29, 2023
3027486
Remove potential psionic from Laika (#611)
FluffiestFloof Dec 29, 2023
04ab40d
Adjust book spawner (#612)
IamVelcroboy Dec 29, 2023
2f55960
remove throw damage from mail (#609)
deltanedas Dec 29, 2023
768f79d
Automatic Changelog Update (#609)
Dec 29, 2023
aa3da5b
Fix changelog order
DebugOk Dec 29, 2023
87b2fd0
Remove Yule (#613)
IamVelcroboy Dec 30, 2023
d3028e7
Automatic Changelog Update (#613)
Dec 30, 2023
26f18d1
fix ftl reference in yaml (#619)
Timfa2112 Dec 30, 2023
e77bae0
Automatic Changelog Update (#619)
Dec 30, 2023
5bf246c
Fluffy tail for felinids (#433)
Adrian16199 Dec 30, 2023
3a72289
Automatic Changelog Update (#433)
Dec 30, 2023
39a7f0c
Remove cargo gambling (#623)
DebugOk Dec 31, 2023
e09112b
Fix Crime Assist incorrect entires and add a test (#624)
DebugOk Dec 31, 2023
a5d5f4c
Logistics airlocks sprite fixes (#618)
DarkenedSynergy Dec 31, 2023
513c382
Automatic Changelog Update (#618)
Dec 31, 2023
7b07614
Listening outpost (#578)
VMSolidus Dec 31, 2023
99448ce
Automatic Changelog Update (#578)
Dec 31, 2023
2a16108
Increase barber scissors' doafter time (#627)
DebugOk Dec 31, 2023
df92f0f
Fix barber scissors prototype
DebugOk Dec 31, 2023
e360303
Listening Outpost Tweaks (#634)
VMSolidus Jan 1, 2024
ddca9a1
Automatic Changelog Update (#634)
Jan 1, 2024
71d80b8
Reverts Shot Gun Sprites (#594)
ps3moira Jan 1, 2024
bf3e17b
Automatic Changelog Update (#594)
Jan 1, 2024
c7c09e3
Bbgun (#580)
IamVelcroboy Jan 2, 2024
f66a755
Automatic Changelog Update (#580)
Jan 2, 2024
443d516
give revs a chance (#636)
deltanedas Jan 2, 2024
754166c
Automatic Changelog Update (#636)
Jan 2, 2024
335c7a3
Listening Outpost hotfix (#638)
VMSolidus Jan 2, 2024
7a6da5f
Automatic Changelog Update (#638)
Jan 2, 2024
6d29704
Outpost emergency hotfix (#640)
VMSolidus Jan 2, 2024
b4c06fb
Seperate flag for whitelist commands (#637)
DebugOk Jan 2, 2024
0074819
Adjust tidy tool (#645)
IamVelcroboy Jan 3, 2024
60b2d9a
Janidrobe has once again maiden outfits. (#648)
Adrian16199 Jan 7, 2024
57774c5
Automatic Changelog Update (#648)
Jan 7, 2024
3bfb147
Fixes prison guard. (#654)
Adrian16199 Jan 7, 2024
755ffa1
Automatic Changelog Update (#654)
Jan 7, 2024
6c07bec
Map Edits (#646)
IamVelcroboy Jan 7, 2024
18e6b21
Map Edits: Tortuga (#649)
IamVelcroboy Jan 7, 2024
a10c109
Map Edits: The Hive (#653)
IamVelcroboy Jan 7, 2024
6afde59
Hopefully fix atmos issues (#656)
DebugOk Jan 7, 2024
10a1433
Automatic Changelog Update (#656)
Jan 7, 2024
480e25c
Update CODEOWNERS
DebugOk Jan 10, 2024
0145407
Added ChemVend to Pebble (#662)
Bribrooo Jan 11, 2024
273a142
Automatic Changelog Update (#662)
Jan 11, 2024
0dfd86d
Shoukou update, the reckoning. (#657)
Adrian16199 Jan 12, 2024
893e025
Automatic Changelog Update (#657)
Jan 12, 2024
a4dd72a
prevent shock collar clock (#665)
deltanedas Jan 13, 2024
3fe758a
Nerf borg AA (#672)
DebugOk Jan 14, 2024
ec51232
Spare ID safe (#671)
DebugOk Jan 14, 2024
9f4dc00
Automatic Changelog Update (#671)
Jan 14, 2024
09b05c1
Map Edits (#674)
IamVelcroboy Jan 15, 2024
c7660e2
Added Drain on Pebble (#669)
Bribrooo Jan 15, 2024
6b9ce2e
Map Edits- Pebble (#675)
IamVelcroboy Jan 15, 2024
d53b971
Pebble Hotfix (#676)
IamVelcroboy Jan 15, 2024
9c0520f
Seperate migrations into multiple files (#673)
DebugOk Jan 15, 2024
f9dd0de
Update README.md
BasedPugilist Jan 16, 2024
66bca14
Oh no, tracking links! (#684)
DebugOk Jan 16, 2024
76345d5
Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v in…
DEATHB4DEFEAT Jan 16, 2024
eaebc7b
fix weird duplicates of things
DEATHB4DEFEAT Jan 16, 2024
4f81387
chocolate
DEATHB4DEFEAT Jan 17, 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
Prev Previous commit
Next Next commit
Fixes Clown Recorder causing client freeze (#22629)
Mirino97 authored and DebugOk committed Dec 22, 2023
commit 13718c9a9132e88697489d29ceefa4433e3a23e2
Binary file modified Resources/Audio/Items/Toys/sitcom_laugh.ogg
Binary file not shown.
Binary file modified Resources/Audio/Items/Toys/sitcom_laugh2.ogg
Binary file not shown.