Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
310e1bd
Adds stasis pods
MrMelbert Apr 1, 2024
78c9cc6
UI and updates
MrMelbert May 4, 2024
bea507a
Merge branch 'master' into med_machines
MrMelbert Mar 21, 2026
5ebd5c5
Updates and neural suppressor
MrMelbert Mar 21, 2026
5eab405
General maintenance and repair for looping fan sfx (#87453)
grungussuss Oct 26, 2024
fc0e87b
Fix
MrMelbert Mar 21, 2026
3ed9376
Fix
MrMelbert Mar 21, 2026
86b4af2
Fixes
MrMelbert Mar 21, 2026
a7f4720
Tweak
MrMelbert Mar 21, 2026
09dd71d
Tweaks
MrMelbert Mar 21, 2026
9f219f3
Tweak
MrMelbert Mar 21, 2026
30bc5bb
Undo
MrMelbert Mar 21, 2026
5342a30
Postround stuff
MrMelbert Jun 22, 2026
e06532b
Resprites Extinguisher Cabinets (#89240)
Jan 29, 2025
e3f6cc6
Fix closets, crates, and drawers missing material tags (#94273)
timothymtorres Dec 9, 2025
b320f67
Add recipes for flare, washer machine, lamp, lantern, cabinet, alien …
timothymtorres Dec 21, 2025
d75c645
Photocopier Improvements (#91258)
timothymtorres Jun 8, 2025
13a744a
Personality can now be re-viewed from the mood hud icon (#96341)
Ghommie Jun 5, 2026
e1a12d3
Merge branch 'master' into med_machines
MrMelbert Jul 1, 2026
9a1d5ea
Merge branch 'master' into med_machines
MrMelbert Jul 1, 2026
7bbfe94
Omega
MrMelbert Jul 1, 2026
cf48310
Shut up for now
MrMelbert Jul 1, 2026
83d4055
Merge branch 'med_machines' of https://github.com/MrMelbert/MapleStat…
MrMelbert Jul 1, 2026
e4eb663
Medical larp: Adds vitals monitors to medbay (#94704)
MrMelbert Jan 4, 2026
bf32efa
Fixes
MrMelbert Jul 2, 2026
0733d78
Adds USB to vitals monitor (#95079)
MrMelbert Feb 25, 2026
dc53f4f
Tweaks
MrMelbert Jul 2, 2026
8556deb
Tram fix
MrMelbert Jul 2, 2026
b0790be
RND
MrMelbert Jul 2, 2026
65dc5d1
These too
MrMelbert Jul 2, 2026
9da9272
Fix
MrMelbert Jul 2, 2026
5ef5fb0
Fix
MrMelbert Jul 2, 2026
a7d0587
Fix
MrMelbert Jul 2, 2026
048720d
Fix
MrMelbert Jul 6, 2026
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
492 changes: 241 additions & 251 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

371 changes: 198 additions & 173 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm

Large diffs are not rendered by default.

496 changes: 248 additions & 248 deletions _maps/map_files/KiloStation/KiloStation.dmm

Large diffs are not rendered by default.

460 changes: 231 additions & 229 deletions _maps/map_files/LimaStation/LimaStation.dmm

Large diffs are not rendered by default.

422 changes: 219 additions & 203 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

651 changes: 338 additions & 313 deletions _maps/map_files/NebulaStation/NebulaStation.dmm

Large diffs are not rendered by default.

176 changes: 89 additions & 87 deletions _maps/map_files/NorthStar/north_star.dmm

Large diffs are not rendered by default.

2,313 changes: 1,158 additions & 1,155 deletions _maps/map_files/OmegaStation/OmegaStation.dmm

Large diffs are not rendered by default.

340 changes: 159 additions & 181 deletions _maps/map_files/PubbyStation/PubbyStation.dmm

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions _maps/map_files/debug/runtimestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2582,6 +2582,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white/corner,
/area/station/medical/medbay)
"SK" = (
Expand Down
29 changes: 8 additions & 21 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5537,22 +5537,11 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
"zH" = (
/obj/item/scalpel{
pixel_y = 12
},
/obj/item/circular_saw,
/obj/item/retractor{
pixel_x = 4
},
/obj/item/hemostat{
pixel_x = -4
},
/obj/item/clothing/gloves/latex,
/obj/item/clothing/mask/surgical,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
/obj/item/surgery_tray/full/advanced,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"zI" = (
Expand Down Expand Up @@ -5662,7 +5651,6 @@
/area/centcom/central_command_areas/control)
"Aq" = (
/obj/structure/table/optable,
/obj/item/surgical_drapes,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
Expand Down Expand Up @@ -5708,10 +5696,10 @@
/obj/machinery/computer/operating{
dir = 4
},
/obj/machinery/status_display/ai/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
/obj/machinery/vitals_reader/directional/west,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"AV" = (
Expand Down Expand Up @@ -5870,7 +5858,6 @@
"BF" = (
/obj/item/defibrillator/loaded,
/obj/structure/table/reinforced,
/obj/machinery/status_display/evac/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
Expand Down Expand Up @@ -5911,6 +5898,7 @@
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"BH" = (
Expand All @@ -5924,7 +5912,6 @@
/area/centcom/central_command_areas/control)
"BI" = (
/obj/machinery/light/directional/south,
/obj/structure/noticeboard/directional/south,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand All @@ -5949,6 +5936,7 @@
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"BL" = (
Expand Down Expand Up @@ -6852,7 +6840,6 @@
/area/centcom/central_command_areas/evacuation/ship)
"Fg" = (
/obj/structure/closet/crate/bin,
/obj/machinery/status_display/evac/directional/south,
/obj/machinery/status_display/evac/directional/west,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 8
Expand Down Expand Up @@ -57207,9 +57194,9 @@ zI
nq
Ar
BG
iu
io
Sg
iu
io
iC
io
iu
Expand Down Expand Up @@ -58235,9 +58222,9 @@ zJ
nq
Ar
BK
iu
io
Ns
iu
io
iC
io
io
Expand Down
Loading
Loading