Skip to content

Commit

Permalink
Merge branch 'Monkestation:master' into twitch-tokens-real
Browse files Browse the repository at this point in the history
  • Loading branch information
wraith-54321 authored Nov 17, 2023
2 parents 914ad1f + 7b83d75 commit 6d95204
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 10 deletions.
5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-552.yml

This file was deleted.

6 changes: 6 additions & 0 deletions html/changelogs/archive/2023-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,9 @@
2023-11-14:
lmenvs:
- rscadd: TTNT's donator item set!
2023-11-15:
Glyphee:
- bugfix: changed atmos on the dirt tiles to `"o2=22;n2=82;TEMP=293.15"`
wraith-54321:
- bugfix: Admins can now actually force events
- bugfix: fixed some midrounds spawning without their antag datum
20 changes: 15 additions & 5 deletions monkestation/_maps/RandomBars/Tram/tram_slum_bar.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@
/area/station/service/kitchen)
"hb" = (
/obj/machinery/light/dim/directional/west,
/turf/open/misc/dirt,
/turf/open/misc/dirt{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/area/station/commons/lounge)
"he" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
Expand Down Expand Up @@ -547,7 +549,9 @@
/area/station/service/theater)
"vb" = (
/obj/effect/landmark/start/hangover,
/turf/open/misc/dirt,
/turf/open/misc/dirt{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/area/station/commons/lounge)
"vA" = (
/obj/structure/chair/stool/directional/east,
Expand Down Expand Up @@ -742,7 +746,9 @@
/turf/open/floor/wood/tile,
/area/station/service/bar/atrium)
"Co" = (
/turf/open/misc/dirt,
/turf/open/misc/dirt{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/area/station/commons/lounge)
"Cs" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -783,7 +789,9 @@
/area/station/service/theater)
"Eu" = (
/obj/effect/landmark/start/assistant,
/turf/open/misc/dirt,
/turf/open/misc/dirt{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/area/station/commons/lounge)
"EE" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1114,7 +1122,9 @@
/area/station/service/theater)
"RK" = (
/obj/machinery/light/dim/directional/north,
/turf/open/misc/dirt,
/turf/open/misc/dirt{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/area/station/commons/lounge)
"RT" = (
/obj/structure/table/wood,
Expand Down

0 comments on commit 6d95204

Please sign in to comment.