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

Merge upstream #295

Merged
merged 177 commits into from
Jun 8, 2024
Merged

Merge upstream #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
bfcd46d
Floor diseases are easier to cure (#83613)
MTandi Jun 2, 2024
0e156b5
Automatic changelog for PR #83613 [ci skip]
comfyorange Jun 2, 2024
2159faa
Added the zipzap to the ocean sources (#83645)
jwc1015 Jun 2, 2024
8181735
Automatic changelog for PR #83645 [ci skip]
comfyorange Jun 2, 2024
1454c1c
Revert "Blade creation ritual returns lost blades" (#83594)
MrMelbert Jun 2, 2024
b5247e8
Automatic changelog compile [ci skip]
actions-user Jun 3, 2024
4d891c7
Adds Soup boiling SFX (#83649)
MrMelbert Jun 3, 2024
7c38cb2
Fix null authors breaking test merge bot (#83640)
Mothblocks Jun 3, 2024
e72bcc3
Bumps rust-g to `3.3.0` (#83635)
GoldenAlpharex Jun 3, 2024
0cd8bf3
Automatic changelog for PR #83649 [ci skip]
comfyorange Jun 3, 2024
4ef51fe
[Fix] Removes ability from non-cargonia plebians to confirm cargo ord…
Iajret Jun 3, 2024
66e2448
Automatic changelog for PR #83627 [ci skip]
comfyorange Jun 3, 2024
a3e2885
Fixes crutches crippling you and giving infinite speedboosts (#83660)
Time-Green Jun 3, 2024
8c8311e
Automatic changelog for PR #83660 [ci skip]
comfyorange Jun 3, 2024
707b5ef
Minor Spider Rebalance (#83554)
DrAmazing343 Jun 3, 2024
96b5ba3
Automatic changelog for PR #83554 [ci skip]
comfyorange Jun 3, 2024
cfa77b3
Automatic changelog compile [ci skip]
actions-user Jun 4, 2024
1360293
The memories for Smoker and Alcoholic now actually mention the prefer…
Absolucy Jun 4, 2024
06af0c1
Make AI's jump to AI Core button work while on backup power (#83669)
Wayland-Smithy Jun 4, 2024
bf0b3ba
Adds a tiny fan to Tramstation's disposals room (#83668)
Derpguy3 Jun 4, 2024
26384e6
Fix Meta cargo lobby being unconnected to power (#83666)
Goat-Real Jun 4, 2024
6bce1bc
Automatic changelog for PR #83674 [ci skip]
comfyorange Jun 4, 2024
190d25e
Automatic changelog for PR #83669 [ci skip]
comfyorange Jun 4, 2024
9ec5176
Automatic changelog for PR #83668 [ci skip]
comfyorange Jun 4, 2024
9374410
Automatic changelog for PR #83666 [ci skip]
comfyorange Jun 4, 2024
0a38c85
Ash Ascension spells have high transparency (#83662)
carlarctg Jun 4, 2024
8b85034
Fixes grammar in cat_house.dm (#83651)
vendingmachine24 Jun 4, 2024
65510ae
Automatic changelog for PR #83651 [ci skip]
comfyorange Jun 4, 2024
994bfbe
Removes references to no-longer-existent "Tesla Energy Relay" from nu…
PapaMichae1 Jun 4, 2024
c7e5c98
Automatic changelog for PR #83644 [ci skip]
comfyorange Jun 4, 2024
ccddbe3
removes the force drop when trying to attack with an unwielded crushe…
necromanceranne Jun 4, 2024
2553f37
Automatic changelog for PR #83641 [ci skip]
comfyorange Jun 4, 2024
3a88327
Fixes incorrect arguments in Status Displays (#83611)
san7890 Jun 4, 2024
abb51ba
Automatic changelog for PR #83611 [ci skip]
comfyorange Jun 4, 2024
1209f89
Resprites: Antag mechs (#83600)
githubuser4141 Jun 4, 2024
120b76a
Automatic changelog for PR #83600 [ci skip]
comfyorange Jun 4, 2024
c57afc4
Wawastation (#82298)
mc-oofert Jun 4, 2024
a2d6242
Automatic changelog for PR #82298 [ci skip]
comfyorange Jun 4, 2024
c7b6d8a
Icebox service hall disposal unit (#83675)
lessthnthree Jun 4, 2024
b503601
Automatic changelog for PR #83675 [ci skip]
comfyorange Jun 4, 2024
a786b6f
[METASTATION] Connects the vault APC to the powernet (#83696)
norsvenska Jun 4, 2024
951cb66
Spacecoin market now shows where it will land with animated circle (#…
MelokGleb Jun 4, 2024
f46c369
Automatic changelog for PR #83696 [ci skip]
comfyorange Jun 4, 2024
c368fa4
Automatic changelog for PR #83699 [ci skip]
comfyorange Jun 4, 2024
234eb80
Adds Biomes to the Cave Generator, for all of your procedurally-place…
GoldenAlpharex Jun 4, 2024
563aae7
Automatic changelog for PR #83138 [ci skip]
comfyorange Jun 4, 2024
2ed1ed6
Probital and disgust vomit are knockdowns, not stuns (#83475)
carlarctg Jun 4, 2024
d8a5af6
Automatic changelog for PR #83475 [ci skip]
comfyorange Jun 4, 2024
a533db3
Updates wendigo, adamantine and berserker armor icons (#83677)
githubuser4141 Jun 4, 2024
24df4eb
Automatic changelog for PR #83677 [ci skip]
comfyorange Jun 4, 2024
e05e7fd
nerfs the frog ear rape (#83691)
Sadboysuss Jun 4, 2024
5ad5716
Automatic changelog for PR #83691 [ci skip]
comfyorange Jun 4, 2024
75a755b
Automatic changelog compile [ci skip]
actions-user Jun 5, 2024
8470f74
Minor maintenance for plumbing (#83629)
SyncIt21 Jun 5, 2024
d12a0da
Automatic changelog for PR #83629 [ci skip]
comfyorange Jun 5, 2024
7ea65a3
Legioned Monkeys create different mobs (#83698)
Jacquerel Jun 5, 2024
eee6717
Automatic changelog for PR #83698 [ci skip]
comfyorange Jun 5, 2024
5613419
Cultist shades no longer count as cultists for the purposes of invoki…
Rhials Jun 5, 2024
268c8b7
Increase wildcard slots on grey and silver IDs [NO GBP] (#83697)
lessthnthree Jun 5, 2024
6b99ba7
Automatic changelog for PR #83487 [ci skip]
comfyorange Jun 5, 2024
b1a1e46
Automatic changelog for PR #83697 [ci skip]
comfyorange Jun 5, 2024
af58cb8
cult stun gets weaker at when cult gets red eyes, and then also halo …
mc-oofert Jun 5, 2024
668f4ab
Automatic changelog for PR #83659 [ci skip]
comfyorange Jun 5, 2024
167c55b
Sentient mobs can slowly subtract slime stacks by shaking (#83471)
Jacquerel Jun 5, 2024
b7225d8
Automatic changelog for PR #83471 [ci skip]
comfyorange Jun 5, 2024
55c41fb
basic honkbots (#81920)
Ben10Omintrix Jun 5, 2024
69e928b
Automatic changelog for PR #81920 [ci skip]
comfyorange Jun 5, 2024
4339c0b
Mutadone restores your original monkey status (#83720)
Jacquerel Jun 5, 2024
7cffec5
Automatic changelog for PR #83720 [ci skip]
comfyorange Jun 5, 2024
e29c240
Automatic changelog compile [ci skip]
actions-user Jun 6, 2024
50f57b4
tgui: changes typescript module resolution to recommended setting (#8…
jlsnow301 Jun 6, 2024
d6d13f3
janitor keyring now spawns in all janitor's backpacks instead of only…
RedBaronFlyer Jun 6, 2024
8e80467
Automatic changelog for PR #83103 [ci skip]
comfyorange Jun 6, 2024
35216f1
Paradox clones copy the voice. (#83729)
Pickle-Coding Jun 6, 2024
3c6fe8f
Automatic changelog for PR #83729 [ci skip]
comfyorange Jun 6, 2024
29e99dd
Fixes COMSIG_ATOM_POST_DIR_CHANGE sending the wrong oldDir argument (…
nikothedude Jun 6, 2024
e39925a
Automatic changelog for PR #83727 [ci skip]
comfyorange Jun 6, 2024
078a4a2
Fixes RLD glowsticks not actually glowing (#83725)
00-Steven Jun 6, 2024
b8fb222
Automatic changelog for PR #83725 [ci skip]
comfyorange Jun 6, 2024
98ee18f
Fixes a sorting pipe in Birdshot (#83723)
EEASAS Jun 6, 2024
486ebf6
Automatic changelog for PR #83723 [ci skip]
comfyorange Jun 6, 2024
f7ad080
Fixes Using 'ESC' Key To Unbind Keybindings + Adds Function to Check …
san7890 Jun 6, 2024
96aab0b
Automatic changelog for PR #83710 [ci skip]
comfyorange Jun 6, 2024
f26e2bb
Fixes tool-based flashes being stuck at intensity 1 (#83703)
zxaber Jun 6, 2024
6cabe58
Automatic changelog for PR #83703 [ci skip]
comfyorange Jun 6, 2024
7204db1
Makes transferring functional wings to new bodies actually work (#83705)
Absolucy Jun 6, 2024
f907dbe
Automatic changelog for PR #83705 [ci skip]
comfyorange Jun 6, 2024
73dfd61
[NO GBP] Fixes drake empowerment for berserker armor by adding drake …
necromanceranne Jun 6, 2024
b663fbf
Syndicate AI fixes (#83317)
ShizCalev Jun 6, 2024
21c3986
Fixes Bubblegums Melee Cooldown (#83694)
Whoneedspacee Jun 6, 2024
adb9c96
Automatic changelog for PR #83700 [ci skip]
comfyorange Jun 6, 2024
2bd002d
Automatic changelog for PR #83317 [ci skip]
comfyorange Jun 6, 2024
f0f3459
Fix Pre-Loaded Syndicate AI appearing in PDA messenger (#83692)
Wayland-Smithy Jun 6, 2024
0d679c0
Automatic changelog for PR #83694 [ci skip]
comfyorange Jun 6, 2024
c5f1367
Automatic changelog for PR #83692 [ci skip]
comfyorange Jun 6, 2024
4cc4345
Fixes brig cell timer adjusting reducing the time by the time served …
Pickle-Coding Jun 6, 2024
83e4c65
Automatic changelog for PR #83520 [ci skip]
comfyorange Jun 6, 2024
9087058
Makes the Clown Stamp give out clown cells (#83585)
EuSouAFazer Jun 6, 2024
7a9e37b
Auto Lathe Runtime Fixes (#83587)
SyncIt21 Jun 6, 2024
36db5b9
Automatic changelog for PR #83585 [ci skip]
comfyorange Jun 6, 2024
5f07f55
Automatic changelog for PR #83587 [ci skip]
comfyorange Jun 6, 2024
ac1afe3
Fixes some coffee inconsistencies (#83607)
necromanceranne Jun 6, 2024
413dc66
Tram crossing signal logic fixes (#83610)
lessthnthree Jun 6, 2024
f6569b4
Little QOL change for AI cyborg display power (#83625)
Erol509 Jun 6, 2024
8d69edb
Automatic changelog for PR #83607 [ci skip]
comfyorange Jun 6, 2024
3292170
Automatic changelog for PR #83610 [ci skip]
comfyorange Jun 6, 2024
511211d
Automatic changelog for PR #83625 [ci skip]
comfyorange Jun 6, 2024
8a2bfdf
Fixes curator whip disarming even after getting parried (#83543)
Sadboysuss Jun 6, 2024
768ba2e
Automatic changelog for PR #83543 [ci skip]
comfyorange Jun 6, 2024
c4587bf
Centcom/Nukie mechs receive better innate armor but cannot be upgrade…
githubuser4141 Jun 6, 2024
e033153
Automatic changelog for PR #83580 [ci skip]
comfyorange Jun 6, 2024
e9c45c4
Blindfold Color Preference (#83670)
BlitzArde Jun 6, 2024
a2d3d21
Automatic changelog for PR #83670 [ci skip]
comfyorange Jun 6, 2024
12c4688
making installing card readers and airlock electronics into closets e…
Sadboysuss Jun 6, 2024
c6c8d7e
Automatic changelog for PR #83664 [ci skip]
comfyorange Jun 6, 2024
fb6d892
[NO GBP] Only add the armor plate prefix once. (#83650)
necromanceranne Jun 6, 2024
db5907a
Automatic changelog for PR #83650 [ci skip]
comfyorange Jun 6, 2024
f3e2efa
Automatic changelog compile [ci skip]
actions-user Jun 7, 2024
79ff783
Fix actionspeed modifiers with IDs being broken (#83758)
MrMelbert Jun 7, 2024
e364cf5
Automatic changelog for PR #83758 [ci skip]
comfyorange Jun 7, 2024
8925d03
Fix borg emag modules stuck in inventory/screen after losing emag sta…
thegrb93 Jun 7, 2024
a6efd3b
Automatic changelog for PR #83734 [ci skip]
comfyorange Jun 7, 2024
d91650e
Alt right click refactor (#83736)
SyncIt21 Jun 7, 2024
da242e6
Automatic changelog for PR #83736 [ci skip]
comfyorange Jun 7, 2024
331f479
Change the pAI display face selection to a radial (#83770)
LikeLakers2 Jun 7, 2024
103fb7c
Automatic changelog for PR #83770 [ci skip]
comfyorange Jun 7, 2024
08ae5a6
Fixes techfab print runtime for non apc areas (#83768)
SyncIt21 Jun 7, 2024
260ec88
Automatic changelog for PR #83768 [ci skip]
comfyorange Jun 7, 2024
20c3b0e
[NO GBP] Post-Rust Heretic's Rework adjustments. (#83765)
EnterTheJake Jun 7, 2024
94bfcaf
Fix smoking pipe sprite typo (#83759)
projectkepler-ru Jun 7, 2024
6252621
adds final destination deathmatch map (#83757)
sylvia-from-fulp-station Jun 7, 2024
108880a
Sneeze Rework: Projectile Combat Edition (#83361)
Time-Green Jun 7, 2024
6187b64
[NO GBP] Only filled graves will provide a mood modifier (#83752)
Rhials Jun 7, 2024
dd9504d
remove human requirement for invisible_wall (#83751)
lizelive Jun 7, 2024
522adb3
Automatic changelog for PR #83765 [ci skip]
comfyorange Jun 7, 2024
144d5ba
Automatic changelog for PR #83759 [ci skip]
comfyorange Jun 7, 2024
3763a0a
Automatic changelog for PR #83752 [ci skip]
comfyorange Jun 7, 2024
ed7a03c
Adds a random martial arts modifier to deathmatch + Adds a blackliste…
nikothedude Jun 7, 2024
a8495fd
Automatic changelog for PR #83465 [ci skip]
comfyorange Jun 7, 2024
f5287e7
Fixes space ruin blacklist (#83748)
DaCoolBoss Jun 7, 2024
fe62944
Fixes borg chargers constantly (abet slowly) draining borg cells. (#8…
zxaber Jun 7, 2024
2eaa3df
Automatic changelog for PR #83748 [ci skip]
comfyorange Jun 7, 2024
ecf02f9
Automatic changelog for PR #83743 [ci skip]
comfyorange Jun 7, 2024
9a01bf5
Fix wrench screentip typo for smart fridge (#83767)
SyncIt21 Jun 7, 2024
5fe708c
Automatic changelog for PR #83767 [ci skip]
comfyorange Jun 7, 2024
dd71e81
Wall button refactor and qol (#83774)
00-Steven Jun 7, 2024
77efe41
Automatic changelog for PR #83774 [ci skip]
comfyorange Jun 7, 2024
d01c4be
Automatic changelog compile [ci skip]
actions-user Jun 8, 2024
69e46a6
Fixes a weird formatting problem with the intern announcer (#83630)
Watermelon914 Jun 8, 2024
ea26bd4
Automatic changelog for PR #83630 [ci skip]
comfyorange Jun 8, 2024
57744f6
Icemoon Comms agent (#83404)
DATA-xPUNGED Jun 8, 2024
2a37380
Automatic changelog for PR #83404 [ci skip]
comfyorange Jun 8, 2024
1e60447
Fix crew records not accounting for quirks for latejoiners (#83740)
00-Steven Jun 8, 2024
ccbcb91
Automatic changelog for PR #83740 [ci skip]
comfyorange Jun 8, 2024
f2644ab
Fix admin borg panel unable to install/remove upgrades (#83733)
thegrb93 Jun 8, 2024
105520e
reactive armor spelling (#83724)
Sadboysuss Jun 8, 2024
cbf1dbc
Automatic changelog for PR #83733 [ci skip]
comfyorange Jun 8, 2024
3c83e81
Automatic changelog for PR #83724 [ci skip]
comfyorange Jun 8, 2024
c46995b
Plexagon Access Management now tells you that you need a Trim to use …
zxaber Jun 8, 2024
e057d80
Automatic changelog for PR #83683 [ci skip]
comfyorange Jun 8, 2024
3164c35
[no gbp] fixes lobstrosities fishing infinite resources (#83661)
Ben10Omintrix Jun 8, 2024
09d8fe7
Automatic changelog for PR #83661 [ci skip]
comfyorange Jun 8, 2024
6348dc9
Fixes admins not being able to force some rulesets with Stationwide B…
Time-Green Jun 8, 2024
ec919e9
Automatic changelog for PR #83657 [ci skip]
comfyorange Jun 8, 2024
d2dc233
Makes The Automute Thingo Yell At You A Bit Louder (#83636)
Jackraxxus Jun 8, 2024
16c1f7d
Automatic changelog for PR #83636 [ci skip]
comfyorange Jun 8, 2024
6934b13
Adds a TRAIT_NO_TRANSFORM check to AI movement. (#83621)
Goat-Real Jun 8, 2024
f5b7e4e
Automatic changelog for PR #83621 [ci skip]
comfyorange Jun 8, 2024
50def31
Fix air alarm silicon lock/unlock (#83609)
Wayland-Smithy Jun 8, 2024
c86c27a
Automatic changelog for PR #83609 [ci skip]
comfyorange Jun 8, 2024
6a9ca67
New operating sounds for wrench, crowbar and wirecutter (#83462)
TheBoondock Jun 8, 2024
432f643
Automatic changelog for PR #83462 [ci skip]
comfyorange Jun 8, 2024
2e4e5a0
Fixes Icebox active turfs in an attempt to save Peter Junior from col…
Iajret Jun 8, 2024
a6e07bf
Fix icon cutter readme file (#83776)
optimumtact Jun 8, 2024
862a029
Adds a few more pulsar star station trait reports (#83591)
Rhials Jun 8, 2024
fbcae8a
Automatic changelog for PR #83591 [ci skip]
comfyorange Jun 8, 2024
e58386c
Merge remote-tracking branch 'off/master' into merge-upstream
Gaxeer Jun 8, 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
4,215 changes: 4,215 additions & 0 deletions _maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/anomaly_research.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
dir = 6
},
/obj/structure/table/reinforced,
/obj/item/reactive_armour_shell,
/obj/item/reactive_armor_shell,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/misc/anomaly_research)
Expand Down
1 change: 1 addition & 0 deletions _maps/_basemap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\NorthStar\north_star.dmm"
#include "map_files\tramstation\tramstation.dmm"
#include "map_files\wawastation\wawastation.dmm"

#ifdef CIBUILDING
#include "templates.dm"
Expand Down
Loading
Loading