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] #1408

Merged
merged 37 commits into from
Aug 1, 2024
Merged

Merge Upstream [01.08.2024] #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9924287
Repairs the law of physics (#26289)
Sirryan2002 Jul 30, 2024
381124e
yer (#26290)
Sirryan2002 Jul 30, 2024
163a325
The Cooking Continuation (#26306)
AffectedArc07 Jul 30, 2024
5a5670c
Fixes blood spraying from the summoner when a holoparasite is healed …
FaronCD Jul 30, 2024
fde4125
Fixes crafting multiples of recipes in a sublist (#26315)
Migratingcocofruit Jul 30, 2024
c804705
Falsebottom Briefcase now shoots the weapon within the false bottom o…
Spaghetti-bit Jul 30, 2024
872424a
chairfix (#26286)
Sirryan2002 Jul 30, 2024
dfd1810
Guillotine no longer nullspaces people upon being destroyed. (#26337)
Spaghetti-bit Jul 30, 2024
abf5163
fix: syndie depot bots patrol correctly (#26332)
warriorstar-orion Jul 30, 2024
6f00060
added a t-manifold pipe (#26327)
haydenredacted Jul 30, 2024
cbeedfc
Parrying Refactor, Adding Parrying to Select Two-handed Weapons: Parr…
Spaghetti-bit Jul 30, 2024
b497e4c
Removes a lot of redefined procs (#26186)
DGamerL Jul 30, 2024
5ee277a
Fix TGUI Dev Server (#26334)
AyIong Jul 30, 2024
14f9554
Fix transparent buttons (#26333)
AyIong Jul 30, 2024
6027715
NanoMap Auto-Update (Tue Jul 30 01:20:05 UTC 2024) (#26336)
paradisess13[bot] Jul 30, 2024
521c43e
Getting Medieval - Snakesfang (#26296)
PollardTheDragon Jul 30, 2024
2411c62
[FEATURE/BALANCE] Parrying with Chairs and Fighting Lions! (#26039)
Spaghetti-bit Jul 30, 2024
495afc5
Moves almost all wrench checks in attackby to wrench_act() (#25687)
lewcc Jul 30, 2024
4ad7892
Makes tarot cards not disappear when not hitting a mob (#25919)
DGamerL Jul 30, 2024
165b941
Adds firecrackers and decoy grenades (#25923)
lewcc Jul 30, 2024
9ef756d
Ports a Modified Version of the CM Defib Charge Sound (#26028)
Fordoxia Jul 30, 2024
81aafad
[NEW/REVIEW RDY] Midround Event: Tourist Arrivals (#26084)
LetXxx Jul 30, 2024
efb735a
Adds/ports the AI Triumvirate station trait. (triple ai mode as a VER…
1080pCat Jul 30, 2024
a96e634
Research & Development Console Restructure (#25653)
Arthri Jul 30, 2024
9a69130
Space Ruin Rework: deepstorage (#25906)
kano-dot Jul 30, 2024
f84f09b
Corrects the price comments for alot of the syndicate bundles (#26293)
1080pCat Jul 30, 2024
256d6d6
Refactors `load_fuel` (#26304)
DGamerL Jul 30, 2024
899b66a
Fixes door/windoor superconductivity, again. (#26351)
FunnyMan3595 Jul 31, 2024
2f91dcb
Hold my brain, brain holder. (#26352)
1080pCat Jul 31, 2024
69e7b89
NanoMap QoL Changes (#25487)
Arthri Jul 31, 2024
5234b63
Revert attacked_by changes (#26330)
HMBGERDO Jul 31, 2024
2a949e1
Adds Some Extra Blind Messages and Tweaks Some Too. (#25855)
Fordoxia Jul 31, 2024
7b35161
Adds CI for simple pipe and unary connections (#26340)
Contrabang Jul 31, 2024
6502805
Merge branch 'master-offs' into merge_upstream
dj-34 Jul 31, 2024
28fb10a
Rebuild TGUI
dj-34 Jul 31, 2024
ca79f65
Adds a missing `|` to the player panel after "make super hero" (#26353)
1080pCat Aug 1, 2024
c3c2310
Merge branch 'master-offs' into merge_upstream
dj-34 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
18,405 changes: 12,723 additions & 5,682 deletions _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 13 additions & 14 deletions _maps/map_files/stations/boxstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41341,6 +41341,7 @@
pixel_x = 3;
pixel_y = -3
},
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
Expand Down Expand Up @@ -52029,6 +52030,15 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"dLj" = (
/obj/machinery/door/poddoor/preopen{
name = "Biohazard Shutter";
id_tag = "RnDChem"
},
/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"dLF" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/preopen{
Expand Down Expand Up @@ -52106,10 +52116,6 @@
icon_state = "purplecorner"
},
/area/station/hallway/primary/starboard/east)
"dMK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/wall,
/area/station/public/toilet/unisex)
"dMM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/effect/spawner/random_spawners/oil_maybe,
Expand Down Expand Up @@ -64148,8 +64154,6 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"jzZ" = (
Expand Down Expand Up @@ -79554,11 +79558,6 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"qRE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/wall,
/area/station/command/meeting_room)
"qRU" = (
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 1;
Expand Down Expand Up @@ -124830,7 +124829,7 @@ aWZ
thN
xVe
qcB
dMK
aUQ
cts
csD
csD
Expand Down Expand Up @@ -125061,7 +125060,7 @@ brb
bpt
jju
nvC
qRE
bxl
bxl
lOo
lOo
Expand Down Expand Up @@ -143863,7 +143862,7 @@ cDG
cFU
cHp
cIF
cJP
dLj
oEK
cLe
tWz
Expand Down
Loading
Loading