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 17.03.2024 #1105

Merged
merged 12 commits into from
Mar 17, 2024
Merged

Merge upstream 17.03.2024 #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9c338a3
Edits the descriptions of the MMI and SMMI, adds extended description…
Fordoxia Mar 16, 2024
4cf311c
Reworks last resort. Reverts #23992 (#24389)
GDNgit Mar 16, 2024
dcb0167
BSA UI size fix & TGUI input list (#24500)
AyIong Mar 16, 2024
a65809e
Adds an action button for succumbing, broadcasts last words (#24501)
lewcc Mar 16, 2024
b703a52
Alters Command access to include weapons permits + Telebatons are now…
ItsMarmite Mar 16, 2024
426ee61
Plasma cutter no longer requires a permit (#24622)
Adrer Mar 16, 2024
1799458
Overrides the proc (#24635)
DGamerL Mar 16, 2024
b067b8b
Added a setting that gates random station traits on round start. (#24…
FunnyMan3595 Mar 16, 2024
d01d3e4
Don't try to run queries when the database isn't enabled. (#24598)
FunnyMan3595 Mar 16, 2024
08f9a81
use directional helpers for ATMs (#24426)
warriorstar-orion Mar 16, 2024
0c25bf4
Cloning Rework (#21683)
JimKil3 Mar 16, 2024
81de55d
Merge remote-tracking branch 'official/master' into merge-upstream
m-dzianishchyts Mar 16, 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
116 changes: 51 additions & 65 deletions _maps/map_files/Delta/delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,9 +1038,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"ait" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
Expand Down Expand Up @@ -60021,9 +60019,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
Expand Down Expand Up @@ -64411,16 +64407,6 @@
/obj/item/crowbar/red,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/apmaint)
"dSB" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dSD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
Expand Down Expand Up @@ -67200,9 +67186,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
"eEG" = (
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
Expand Down Expand Up @@ -69068,9 +69052,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"fJp" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
Expand Down Expand Up @@ -71544,6 +71526,16 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/rd)
"hli" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"hly" = (
/obj/structure/table/wood,
/turf/simulated/floor/plasteel/dark,
Expand Down Expand Up @@ -74289,10 +74281,12 @@
icon_state = "bar"
},
/area/station/service/kitchen)
"iVe" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
/area/station/service/chapel/office)
"iVg" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -76136,15 +76130,6 @@
icon_state = "whiteblue"
},
/area/station/medical/storage)
"kdg" = (
/obj/structure/sign/vacuum{
pixel_x = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"kdm" = (
/obj/machinery/power/apc/critical/directional/north,
/obj/machinery/firealarm{
Expand Down Expand Up @@ -76245,6 +76230,15 @@
},
/turf/simulated/floor/plasteel/dark,
/area/station/medical/morgue)
"kfC" = (
/obj/structure/sign/vacuum{
pixel_x = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"kfT" = (
/obj/structure/cable{
d2 = 4;
Expand Down Expand Up @@ -77036,9 +77030,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/library)
"kGm" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -77686,9 +77678,7 @@
},
/area/station/service/hydroponics)
"lbc" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
Expand Down Expand Up @@ -81729,7 +81719,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"nsl" = (
/obj/machinery/clonepod/biomass,
/obj/machinery/clonepod,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -91901,6 +91891,21 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/research)
"tjT" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tkb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
Expand Down Expand Up @@ -92940,21 +92945,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block)
"tSp" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tSt" = (
/obj/structure/table,
/obj/item/reagent_containers/drinks/drinkingglass{
Expand Down Expand Up @@ -93386,7 +93376,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/medical/surgery/observation)
"udS" = (
/obj/machinery/dna_scannernew,
/obj/machinery/clonescanner,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -93598,10 +93588,6 @@
icon_state = "darkred"
},
/area/station/security/processing)
"uil" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
/area/station/service/chapel/office)
"uit" = (
/obj/machinery/atmospherics/unary/vent_pump{
dir = 4;
Expand Down Expand Up @@ -137312,7 +137298,7 @@ dIx
dIx
dIx
dIx
uil
iVe
abj
aaa
aaa
Expand Down Expand Up @@ -137823,7 +137809,7 @@ dPM
dkq
dSs
dSP
dSB
hli
dIH
dIH
dIH
Expand Down Expand Up @@ -138081,8 +138067,8 @@ dKo
dXJ
dKo
dUj
kdg
tSp
kfC
tjT
dIH
abj
aaa
Expand Down
50 changes: 19 additions & 31 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10309,9 +10309,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aTi" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
Expand Down Expand Up @@ -24421,9 +24419,7 @@
c_tag = "Arrivals - Middle Arm";
dir = 1
},
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
Expand Down Expand Up @@ -37484,13 +37480,13 @@
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
"cAj" = (
/obj/machinery/clonepod/biomass,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/effect/turf_decal/siding{
dir = 5
},
/obj/machinery/clonepod,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -39931,13 +39927,13 @@
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
"cIR" = (
/obj/machinery/dna_scannernew,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/siding{
dir = 1
},
/obj/machinery/clonescanner,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -42135,9 +42131,7 @@
},
/area/station/medical/surgery/secondary)
"cRq" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand Down Expand Up @@ -67055,6 +67049,16 @@
icon_state = "whiteblue"
},
/area/station/security/permabrig)
"mgu" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
/area/station/science/toxins/launch)
"mgZ" = (
/obj/machinery/atmospherics/air_sensor{
autolink_id = "air_sensor";
Expand Down Expand Up @@ -68569,16 +68573,6 @@
icon_state = "greenblue"
},
/area/station/service/hydroponics)
"mQW" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
/area/station/science/toxins/launch)
"mRj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
Expand Down Expand Up @@ -73031,9 +73025,7 @@
},
/area/station/maintenance/asmaint)
"oPi" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
"oPO" = (
Expand Down Expand Up @@ -78974,9 +78966,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"rmg" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
Expand Down Expand Up @@ -93428,9 +93418,7 @@
/area/station/service/chapel)
"xKg" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
Expand Down Expand Up @@ -128756,7 +128744,7 @@ wtQ
jQZ
eGn
iXy
mQW
mgu
tQW
czx
naq
Expand Down
Loading
Loading