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 [01.08.2024] #477

Merged
merged 94 commits into from
Aug 1, 2024
Merged

Merge upstream [01.08.2024] #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
925b9a3
RD can emag mech fabricator(like roboticist). (#85404)
Xackii Jul 31, 2024
de65883
Automatic changelog for PR #85404 [ci skip]
comfyorange Jul 31, 2024
e768c7b
Discounts now pick 4-6 items each from a unique category. Items that …
SmArtKar Jul 31, 2024
dfbf94c
Automatic changelog for PR #85398 [ci skip]
comfyorange Jul 31, 2024
2535df3
Carps, frogs and young lobstrosities now fear the fishing hat! (#85380)
Ghommie Jul 31, 2024
538cb5e
Automatic changelog for PR #85380 [ci skip]
comfyorange Jul 31, 2024
121bec7
Replaces the "eyelight" with a "flashlight" in an ice ruin (#85374)
Sadboysuss Jul 31, 2024
9133dc7
Automatic changelog for PR #85374 [ci skip]
comfyorange Jul 31, 2024
de5c9f5
Heart eater wizard perk no longer works activates on organs that have…
SmArtKar Jul 31, 2024
c424628
Automatic changelog for PR #85367 [ci skip]
comfyorange Jul 31, 2024
3b364b1
Mining MODsuit sprite changes + balance (#85353)
SmArtKar Jul 31, 2024
3306b80
Automatic changelog for PR #85353 [ci skip]
comfyorange Jul 31, 2024
2e8f457
Players can now reorder items inside storages by dragging them (#85318)
SmArtKar Jul 31, 2024
751b92b
Automatic changelog for PR #85318 [ci skip]
comfyorange Jul 31, 2024
f0575ec
The Soundening: Security and guns edition. (#85309)
Sadboysuss Jul 31, 2024
36ca9a8
Raising lobstrosities from chrabs is now a component. Adds in tadpole…
Ghommie Jul 31, 2024
927e6b8
Automatic changelog for PR #85346 [ci skip]
comfyorange Jul 31, 2024
d4bd728
[NO GBP] Lil' fix to fishing hat PR. (#85459)
Ghommie Jul 31, 2024
b57095c
Revert "Heretic spell invocations now use one dead language per path"…
carlarctg Jul 31, 2024
4dd1f54
Automatic changelog for PR #85417 [ci skip]
comfyorange Jul 31, 2024
c3b67c7
Fixing one way of duplicating iron sheets (#85373)
Axidyuwu Jul 31, 2024
8ae3fce
Automatic changelog for PR #85373 [ci skip]
comfyorange Jul 31, 2024
b9dfb7a
Power cell overlay now updates when exiting an object's contents (#85…
Momo8289 Jul 31, 2024
6c4b06e
Automatic changelog for PR #85079 [ci skip]
comfyorange Jul 31, 2024
134a84d
Turfs in lua will no longer null out their reference on deletion. (#8…
Watermelon914 Jul 31, 2024
6577c58
Fixes lua function SS13.wait. (#85427)
Watermelon914 Jul 31, 2024
dfb31ec
Automatic changelog for PR #85429 [ci skip]
comfyorange Jul 31, 2024
17fa573
Automatic changelog for PR #85427 [ci skip]
comfyorange Jul 31, 2024
3c8c61a
Portable atmos machine circuit boards fixes [NO GBP] (#85414)
MTandi Jul 31, 2024
eb77b29
Scanner gate fixes (#85436)
lessthnthree Jul 31, 2024
d1210d0
Automatic changelog for PR #85414 [ci skip]
comfyorange Jul 31, 2024
0fb8b85
Chem master containers use DMIcon (#85422)
MTandi Jul 31, 2024
ffe9ec8
Automatic changelog for PR #85436 [ci skip]
comfyorange Jul 31, 2024
e999bb5
Automatic changelog for PR #85422 [ci skip]
comfyorange Jul 31, 2024
8f21403
Fixes recursive_loc_check (#85411)
SmArtKar Jul 31, 2024
5cfd4dc
Automatic changelog for PR #85411 [ci skip]
comfyorange Jul 31, 2024
c81b1f5
Fixes gravity generator hard del (#85390)
vinylspiders Jul 31, 2024
eeb2890
Fix justice design and mecha melee attack to other mechs. (#85403)
Xackii Jul 31, 2024
7d2ae8f
Automatic changelog for PR #85403 [ci skip]
comfyorange Jul 31, 2024
6b62110
The clown planet domain is now completable (#85376)
Sadboysuss Jul 31, 2024
cb738f7
Automatic changelog for PR #85376 [ci skip]
comfyorange Jul 31, 2024
099745d
Silicons and simplemobs can also hear radio chatter now (#85347)
SmArtKar Jul 31, 2024
8ff166d
Automatic changelog for PR #85347 [ci skip]
comfyorange Jul 31, 2024
37029f1
Fixes AI Mech Control GBJing the AI (#85354)
Jackraxxus Jul 31, 2024
32ca904
Fixed NT Frontier discounts not applying (#85351)
SmArtKar Jul 31, 2024
bf557dc
Automatic changelog for PR #85354 [ci skip]
comfyorange Jul 31, 2024
4c82fdc
Automatic changelog for PR #85351 [ci skip]
comfyorange Jul 31, 2024
b5d13ca
Fix some wonky anchored_tabletop_offset rendering (#85372)
00-Steven Jul 31, 2024
3a91c8b
Automatic changelog for PR #85372 [ci skip]
comfyorange Jul 31, 2024
7544d0d
Removed a rogue wall grinder on icebox (#85391)
SmArtKar Jul 31, 2024
44948df
Automatic changelog for PR #85391 [ci skip]
comfyorange Jul 31, 2024
f5c0103
Renamed "Pack of *** seeds" to "*** seed pack" (#85370)
MTandi Jul 31, 2024
01fea94
Attempting to fix search_object hard dels (#85394)
vinylspiders Jul 31, 2024
0199b50
Automatic changelog for PR #85370 [ci skip]
comfyorange Jul 31, 2024
2895060
You no longer goofily swap with others trying to move in the same dir…
SmArtKar Jul 31, 2024
ea90150
Automatic changelog for PR #85379 [ci skip]
comfyorange Jul 31, 2024
281c844
Spies can now set their own custom objectives (#85438)
Rhials Jul 31, 2024
d4ae6a8
Automatic changelog for PR #85438 [ci skip]
comfyorange Jul 31, 2024
3439445
Fixes echolocation creating the wrong screen overlay state when used …
Majkl-J Jul 31, 2024
000a70e
Automatic changelog for PR #85413 [ci skip]
comfyorange Jul 31, 2024
7232369
Fridge UI adjustments [NO GBP] (#85366)
MTandi Jul 31, 2024
93bb672
Automatic changelog for PR #85366 [ci skip]
comfyorange Jul 31, 2024
be9a9c0
[NO GBP] Fixes emergency climbing hooks spawning on not multi-z stati…
Helg2 Jul 31, 2024
92730f9
Automatic changelog for PR #85381 [ci skip]
comfyorange Jul 31, 2024
7e7adf6
fix: add support for multibyte chars for `truncate`, `stripped_input`…
Gaxeer Jul 31, 2024
43046f0
Durathread robes can now hold botany gear (#85359)
rroqc Jul 31, 2024
6a126b7
Automatic changelog for PR #85359 [ci skip]
comfyorange Jul 31, 2024
4a2f491
Sentience potions can now be used without a summon reason (#85446)
Rhials Jul 31, 2024
ceaa96c
Automatic changelog for PR #85446 [ci skip]
comfyorange Jul 31, 2024
d4a2246
NODE drones now show their wave progress on the sprite (#85405)
ArcaneMusic Jul 31, 2024
1263b6a
[no gbp] Fixes rods not having sound_vary on (#85361)
Sadboysuss Jul 31, 2024
30bf8a1
[no gbp] Assorted birdshot engineering feedback (#85314)
Sadboysuss Jul 31, 2024
070bfa5
[no gbp] adds a hand labeller to wawa pharmacy (#85421)
mc-oofert Jul 31, 2024
0885752
Machines check their parts during initialization (#85345)
Metekillot Jul 31, 2024
d1dd046
Automatic changelog for PR #85405 [ci skip]
comfyorange Jul 31, 2024
cc03eff
Automatic changelog for PR #85361 [ci skip]
comfyorange Jul 31, 2024
f1c4e28
Automatic changelog for PR #85314 [ci skip]
comfyorange Jul 31, 2024
11bc6b3
Automatic changelog for PR #85421 [ci skip]
comfyorange Jul 31, 2024
d6e3646
Automatic changelog for PR #85345 [ci skip]
comfyorange Jul 31, 2024
3ff056b
Automatic changelog compile [ci skip]
actions-user Aug 1, 2024
8006baf
Fix gas meters (#85445)
FlufflesTheDog Aug 1, 2024
ae800ba
Automatic changelog for PR #85445 [ci skip]
comfyorange Aug 1, 2024
efe043f
Unfucks all the broken vendors that I broke [no gbp] (#85483)
Metekillot Aug 1, 2024
281dac4
Adds a bronze dimensional theme (#85448)
carlarctg Aug 1, 2024
66bc142
Automatic changelog for PR #85448 [ci skip]
comfyorange Aug 1, 2024
28855c4
Bamboo staffs can now be wielded, bostaff no longer disappears foreve…
SmArtKar Aug 1, 2024
c4e8212
Fixed rice hat toggling, now toggle uses alt click (#85457)
SmArtKar Aug 1, 2024
b65b5ab
Automatic changelog for PR #85443 [ci skip]
comfyorange Aug 1, 2024
8ce6419
Automatic changelog for PR #85457 [ci skip]
comfyorange Aug 1, 2024
2077d9a
Add some missing mob traits to VV list (#85462)
Jacquerel Aug 1, 2024
30a3cd7
Automatic changelog for PR #85462 [ci skip]
comfyorange Aug 1, 2024
cd615e0
Fixes flashdark (#85454)
Majkl-J Aug 1, 2024
6ad1f68
Automatic changelog for PR #85454 [ci skip]
comfyorange Aug 1, 2024
0e3b893
Merge remote-tracking branch 'off/master' into merge-upstream
Gaxeer Aug 1, 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 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
/obj/item/clothing/shoes/galoshes{
pixel_y = -5
},
/obj/item/flashlight/eyelight{
pixel_y = 11
/obj/item/flashlight{
pixel_y = 8
},
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
Expand Down
Loading
Loading