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 [11.07.2024] #338

Merged
merged 70 commits into from
Jul 11, 2024
Merged

Merge upstream [11.07.2024] #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
28b8748
Living flesh now has a 30/70% chance to touch the targeted thing inst…
SmArtKar Jul 9, 2024
9e900c5
Automatic changelog for PR #84752 [ci skip]
comfyorange Jul 9, 2024
6d85d32
Cake baking autotest (#84795)
MTandi Jul 9, 2024
69aacab
[NO GBP] Fixing fishing bait-related calculations (#84784)
Ghommie Jul 9, 2024
431ee81
Automatic changelog for PR #84784 [ci skip]
comfyorange Jul 9, 2024
efd5adf
Fixed paralyzed characters being able to walk post-amputation. (#84805)
lizardqueenlexi Jul 9, 2024
d1799dc
Fixed lights stopping emitting light in some situations (#84299)
Kocma-san Jul 9, 2024
4ab3ac0
Automatic changelog for PR #84805 [ci skip]
comfyorange Jul 9, 2024
cb5a5c1
Automatic changelog for PR #84299 [ci skip]
comfyorange Jul 9, 2024
e4015a6
Remote materials don't block multitool on failure (#84797)
SyncIt21 Jul 9, 2024
9f7d165
Makes docked shuttle departure timer reset when a hostile environment…
GoblinBackwards Jul 9, 2024
fc768e5
Automatic changelog for PR #84797 [ci skip]
comfyorange Jul 9, 2024
7d7a6da
Automatic changelog for PR #84771 [ci skip]
comfyorange Jul 9, 2024
c3562f8
Automatic changelog compile [ci skip]
actions-user Jul 10, 2024
aba588a
Buffs the Matrix Flip skillchip (#84658)
Ghommie Jul 10, 2024
a3b9c92
[no gbp] fixes sleeping mobs getting the surgery (#84732)
ShizCalev Jul 10, 2024
a39c0a8
Automatic changelog for PR #84658 [ci skip]
comfyorange Jul 10, 2024
dcca367
Random language trait tweak (#84816)
MrMelbert Jul 10, 2024
bd289b1
Automatic changelog for PR #84816 [ci skip]
comfyorange Jul 10, 2024
4166e25
Blackbox tally for successful emags (#84837)
MrMelbert Jul 10, 2024
5f2c598
refactor: move `status_display_bottom_text` and `fire_alarm_light_col…
Gaxeer Jul 10, 2024
6b74548
Automatic changelog for PR #84830 [ci skip]
comfyorange Jul 10, 2024
56aaef7
Vapes use correct fill level overlays (#84821)
SmArtKar Jul 10, 2024
910f4eb
Automatic changelog for PR #84821 [ci skip]
comfyorange Jul 10, 2024
9046e3c
You can emag grapple gun to use it on station. (#84829)
Xackii Jul 11, 2024
f55dd25
Automatic changelog for PR #84829 [ci skip]
comfyorange Jul 11, 2024
6268b8d
Fix newly created cardhands not inheriting singlecard offsets (#84838)
00-Steven Jul 11, 2024
3771f2a
Automatic changelog for PR #84838 [ci skip]
comfyorange Jul 11, 2024
b40cc6d
You no longer try to pull out someones eyes in combat mode if they ha…
SmArtKar Jul 11, 2024
f1f13c5
Automatic changelog for PR #84822 [ci skip]
comfyorange Jul 11, 2024
0b843b0
Fixed vomit category knockdown stunning (#84852)
carlarctg Jul 11, 2024
c447936
Automatic changelog for PR #84852 [ci skip]
comfyorange Jul 11, 2024
a3e65cd
Fixes meat producing copious amounts of blood (#84820)
SmArtKar Jul 11, 2024
d64c5eb
Automatic changelog for PR #84820 [ci skip]
comfyorange Jul 11, 2024
d71595f
Automatic changelog compile [ci skip]
actions-user Jul 11, 2024
b7fb912
Adds in airlock helpers for inaccessible doors (#84792)
Ical92 Jul 11, 2024
6ab5274
Makes gigabeacon easier to research (#84823)
zoomachina Jul 11, 2024
9583806
Fixes grounding rods (#84839)
GPeckman Jul 11, 2024
736d977
Automatic changelog for PR #84823 [ci skip]
comfyorange Jul 11, 2024
a327f4f
Automatic changelog for PR #84839 [ci skip]
comfyorange Jul 11, 2024
ddef344
Resprites Catwalk Tiles to match TG's floortiles (#84819)
OrionTheFox Jul 11, 2024
7fe5964
fixes wawa cryo cell (but good) (#84682)
mc-oofert Jul 11, 2024
3d4e404
Automatic changelog for PR #84819 [ci skip]
comfyorange Jul 11, 2024
a42d6e7
Automatic changelog for PR #84682 [ci skip]
comfyorange Jul 11, 2024
34d5c83
You can now see whether or not a piece of clothing is pressure-proof …
GPeckman Jul 11, 2024
e9b9b82
Fixes improvised cauterization of wounds (#84803)
GoblinBackwards Jul 11, 2024
c902051
Automatic changelog for PR #84807 [ci skip]
comfyorange Jul 11, 2024
699e58b
Automatic changelog for PR #84803 [ci skip]
comfyorange Jul 11, 2024
e693034
Adds a crash report to the imprint_gps proc and removes an unnecessar…
imedial Jul 11, 2024
fc5d641
Automatic changelog for PR #84818 [ci skip]
comfyorange Jul 11, 2024
c4c4179
TV helmet no longer has fov or makes you flash sensitive (#84815)
carlarctg Jul 11, 2024
8e42f92
Redesigns Tram's Tool Storage + Fixes disposals (#84802)
Ical92 Jul 11, 2024
6e5350a
Automatic changelog for PR #84815 [ci skip]
comfyorange Jul 11, 2024
852e027
[Birdshot] Small mapping fixes (#84808)
Jolly-66 Jul 11, 2024
4d3c9b3
Automatic changelog for PR #84802 [ci skip]
comfyorange Jul 11, 2024
d070883
Automatic changelog for PR #84808 [ci skip]
comfyorange Jul 11, 2024
43e6216
Adds a Contraband trait, and implements contraband as a mechanic to s…
ArcaneMusic Jul 11, 2024
128d4de
Automatic changelog for PR #84003 [ci skip]
comfyorange Jul 11, 2024
63b94cd
Adds six new strange object powers! (#84775)
carlarctg Jul 11, 2024
13de865
Automatic changelog for PR #84775 [ci skip]
comfyorange Jul 11, 2024
0bccade
Adds three stacks of iron sheets to Wawastation at roundstart (#84785)
r3dj4ck0424 Jul 11, 2024
3ea410f
Automatic changelog for PR #84785 [ci skip]
comfyorange Jul 11, 2024
3e4721b
Incident displays: wallening edition (#84812)
lessthnthree Jul 11, 2024
e215181
Automatic changelog for PR #84812 [ci skip]
comfyorange Jul 11, 2024
9032f8c
[NO GBP] the random spawner loot weight config is not an integer (#84…
Ghommie Jul 11, 2024
b30faed
The techweb no longer erroneously refers to MODsuits as exosuits (#84…
GPeckman Jul 11, 2024
a167298
Automatic changelog for PR #84800 [ci skip]
comfyorange Jul 11, 2024
409dbc8
Adds new hairstyle - Short Bangs 2 (#84804)
Hardly3D Jul 11, 2024
d3f6c15
Automatic changelog for PR #84804 [ci skip]
comfyorange Jul 11, 2024
2bc8837
Merge remote-tracking branch 'off/master' into merge-upstream
Gaxeer Jul 11, 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
153 changes: 99 additions & 54 deletions _maps/map_files/Birdshot/birdshot.dmm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16232,7 +16232,7 @@
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/incident_display/delam/directional/south,
/obj/machinery/incident_display/bridge/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"dXO" = (
Expand Down
8 changes: 3 additions & 5 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,10 +1688,6 @@
},
/turf/open/floor/plating,
/area/station/science/robotics/lab)
"aAf" = (
/obj/machinery/incident_display/delam,
/turf/closed/wall/r_wall,
/area/station/command/bridge)
"aAi" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/table/wood/fancy/red,
Expand Down Expand Up @@ -41645,6 +41641,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
/obj/machinery/incident_display/bridge/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"mDw" = (
Expand Down Expand Up @@ -48144,6 +48141,7 @@
"oxe" = (
/obj/machinery/computer/cargo/request,
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/machinery/incident_display/bridge/directional/north,
/turf/open/floor/iron,
/area/station/command/bridge)
"oxh" = (
Expand Down Expand Up @@ -242658,7 +242656,7 @@ xwC
utR
pAZ
bln
aAf
qWZ
oxe
vmj
aqB
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35009,7 +35009,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
/obj/machinery/incident_display/delam/directional/south,
/obj/machinery/incident_display/bridge/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"mwj" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/NorthStar/north_star.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42273,7 +42273,7 @@
pixel_x = -22
},
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/incident_display/delam/directional/north,
/obj/machinery/incident_display/bridge/directional/north,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"kWJ" = (
Expand Down Expand Up @@ -90788,7 +90788,7 @@
},
/obj/machinery/shower/directional/south,
/obj/structure/fluff/shower_drain,
/turf/open/floor/catwalk_floor/flat_white,
/turf/open/floor/catwalk_floor/iron_white,
/area/station/medical/treatment_center)
"xrh" = (
/obj/effect/turf_decal/tile/blue{
Expand Down
Loading
Loading