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 [09.07.2024] #1365

Merged
merged 37 commits into from
Jul 9, 2024
Merged

Merge Upstream [09.07.2024] #1365

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
8e57d9a
10TC!!! (#26076)
HMBGERDO Jul 6, 2024
c70d75f
Correct areas for delta solars. (#26135)
warriorstar-orion Jul 6, 2024
f5bb6d1
Nanocalcium pens now inject 10u of epinephrine (#26034)
DGamerL Jul 6, 2024
608b422
Adds a traitor rapid healing item: "Hyperregenerative Medipen" (#26033)
Vilshen Jul 6, 2024
7764d13
Makes TGUI strip menu size toggleable (#25763)
HMBGERDO Jul 6, 2024
04949b4
Newspaper bap fix (#26112)
EmeraldCandy Jul 6, 2024
fdcbfc4
Fixes a very small oversight with blood DNA. (#26172)
Spaghetti-bit Jul 7, 2024
f1e98f7
Update medical_designs.dm (#26159)
FaronCD Jul 7, 2024
d075a68
Strange objects resprite (#26131)
Us3rn4me228 Jul 7, 2024
67353fd
Fixing fulton pack not working (#26153)
HMBGERDO Jul 7, 2024
421d7d8
Emotes now vary in frequency when they are not age based. (#26171)
Spaghetti-bit Jul 7, 2024
14a7b74
Dredd armor resprite - finally deconflicted (i hope) (#26167)
McRamon Jul 7, 2024
4a41007
Begone, sinner (#26116)
Onyxarias Jul 7, 2024
4747bb1
Destroy the child (#26114)
Onyxarias Jul 7, 2024
4a74724
Removes the 1s option from flashbangs (#26079)
1080pCat Jul 7, 2024
7a3daae
Update bio_chip_supercharge.dm (#26173)
Fordoxia Jul 7, 2024
d118388
Fix: Active mousetrap inhand sprite (#26176)
AyIong Jul 7, 2024
edc6695
Checks for emagged on firealarms to properly disable them from activa…
Spaghetti-bit Jul 7, 2024
5e7b0c0
Changes even more uses of `stat` comparisons to use the defines (#26154)
DGamerL Jul 7, 2024
7b357f5
[s] Refactor Cream-Master UI handling. (#26187)
FunnyMan3595 Jul 8, 2024
1ae53f2
Reverts a tweak (#26188)
DGamerL Jul 8, 2024
46ca5d3
Update glass.dm (#26184)
Fordoxia Jul 8, 2024
09a4ed7
Various rollie fixes (#26163)
DGamerL Jul 8, 2024
13af419
Fixes Some Minor Grammar Errors That Most People Will Never See (#26138)
Fordoxia Jul 8, 2024
e591584
Changes energy sword sharpening to use signals (#26157)
DGamerL Jul 8, 2024
9a37b71
Knuckledusters now change hitsound again (#26177)
DGamerL Jul 8, 2024
62dc3d5
cleanup: Remove all unused accesses. (#26146)
warriorstar-orion Jul 8, 2024
ca93f6b
Retrofit TG pathfinder with upstream improvements (#25583)
warriorstar-orion Jul 8, 2024
b287cdb
Fixed telekinesis putting beaker in hand when swapped (#26130)
EmeraldCandy Jul 8, 2024
c1e97f7
Minor throwing fixes (#26179)
chuga-git Jul 8, 2024
a9d51e2
Merge branch 'master-offs' into merge_upstream
dj-34 Jul 8, 2024
ca6d508
Rebuild TGUI
dj-34 Jul 8, 2024
39b7f57
Delete depreceated access
dj-34 Jul 8, 2024
c879657
Fix re-defines
dj-34 Jul 8, 2024
4cf6595
Makes all playsounds use bools for vary (#26183)
DGamerL Jul 8, 2024
8a6643f
Consolidation (#26139)
DGamerL Jul 9, 2024
e41e4a8
Merge branch 'master-offs' into merge_upstream
dj-34 Jul 9, 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
22 changes: 12 additions & 10 deletions _maps/map_files/stations/boxstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28434,7 +28434,6 @@
},
/area/station/hallway/secondary/exit)
"bNx" = (
/obj/machinery/alarm/directional/south,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
dir = 8;
Expand Down Expand Up @@ -52655,10 +52654,11 @@
},
/obj/machinery/door/airlock/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/security/doors,
/obj/effect/mapping_helpers/airlock/polarized{
id = "Courtroom"
},
/obj/effect/mapping_helpers/airlock/access/any/security/court,
/obj/effect/mapping_helpers/airlock/access/any/security/doors,
/turf/simulated/floor/wood,
/area/station/legal/courtroom/gallery)
"eba" = (
Expand Down Expand Up @@ -58946,6 +58946,10 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft)
"gTO" = (
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"gTV" = (
/obj/structure/fermenting_barrel,
/turf/simulated/floor/wood{
Expand Down Expand Up @@ -60084,10 +60088,11 @@
},
/obj/machinery/door/airlock/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/security/doors,
/obj/effect/mapping_helpers/airlock/polarized{
id = "Courtroom"
},
/obj/effect/mapping_helpers/airlock/access/any/security/court,
/obj/effect/mapping_helpers/airlock/access/any/security/doors,
/turf/simulated/floor/wood,
/area/station/legal/courtroom/gallery)
"hyk" = (
Expand Down Expand Up @@ -72474,10 +72479,6 @@
},
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"nKN" = (
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"nKO" = (
/obj/structure/table,
/obj/item/reagent_containers/spray/pestspray,
Expand Down Expand Up @@ -94003,12 +94004,13 @@
name = "Courtroom Maintenance";
security_level = 1
},
/obj/effect/mapping_helpers/airlock/access/all/security/doors,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/access/any/security/court,
/obj/effect/mapping_helpers/airlock/access/any/security/doors,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"yhP" = (
Expand Down Expand Up @@ -119382,7 +119384,7 @@ bTy
bYR
tpM
bYX
bTy
gTO
caw
bTy
cfq
Expand Down Expand Up @@ -119900,7 +119902,7 @@ hwK
bSi
cdT
cok
nKN
bTy
cgS
jNe
clR
Expand Down
10 changes: 6 additions & 4 deletions _maps/map_files/stations/cerestation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38590,10 +38590,11 @@
/obj/machinery/door/airlock/glass{
name = "Courtroom"
},
/obj/effect/mapping_helpers/airlock/access/all/security/doors,
/obj/effect/mapping_helpers/airlock/polarized{
id = "Courtroom"
},
/obj/effect/mapping_helpers/airlock/access/any/security/doors,
/obj/effect/mapping_helpers/airlock/access/any/security/court,
/turf/simulated/floor/carpet,
/area/station/security/processing)
"frV" = (
Expand Down Expand Up @@ -40605,13 +40606,14 @@
"gck" = (
/obj/machinery/door/airlock/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/security/doors,
/obj/effect/mapping_helpers/airlock/polarized{
id = "Courtroom"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/security/doors,
/obj/effect/mapping_helpers/airlock/access/any/security/court,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"gcN" = (
Expand Down Expand Up @@ -51427,11 +51429,12 @@
"jAr" = (
/obj/machinery/door/airlock/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/security/doors,
/obj/effect/mapping_helpers/airlock/polarized{
id = "Courtroom"
},
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/security/doors,
/obj/effect/mapping_helpers/airlock/access/any/security/court,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"jAy" = (
Expand Down Expand Up @@ -72568,7 +72571,6 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/alarm/directional/north,
/obj/structure/cable{
d1 = 2;
d2 = 8;
Expand Down
Loading
Loading