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.

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

Dev credits + error fix + new lobby theme/removes old stuff entirely #2538

Merged
merged 5 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
419 changes: 317 additions & 102 deletions _maps/map_files/Mammoth_Mini/Mammoth_mini.dmm

Large diffs are not rendered by default.

101 changes: 81 additions & 20 deletions _maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,9 @@
dir = 4
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/drugs/lowrandom,
/obj/effect/spawner/random/ms13/medical/lowrandom,
/obj/effect/spawner/random/ms13/medical/lowrandom,
/turf/open/floor/ms13/tile/long/blue,
/area/ms13/town)
"adH" = (
Expand Down Expand Up @@ -823,6 +826,7 @@
dir = 1
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"afz" = (
Expand Down Expand Up @@ -3383,6 +3387,7 @@
/obj/structure/table/ms13/metal/small,
/obj/structure/noticeboard/ms13/cork,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/medical/medkit,
/turf/open/floor/wood/ms13/mosaic,
/area/ms13/town)
"awM" = (
Expand Down Expand Up @@ -4648,6 +4653,7 @@
/obj/structure/table/ms13/metal/grate,
/obj/machinery/light/ms13,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/tools/radio,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"aGd" = (
Expand Down Expand Up @@ -7199,6 +7205,10 @@
"aXK" = (
/obj/structure/closet/crate/ms13/woodcrate/compact/army,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/gun/lowrandom,
/obj/effect/spawner/random/ms13/gun/lowrandom,
/obj/effect/spawner/random/ms13/gun/lowrandom,
/obj/effect/spawner/random/ms13/gun/lowrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"aXN" = (
Expand Down Expand Up @@ -9346,6 +9356,11 @@
"dRT" = (
/obj/structure/closet/ms13/metal,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/clothing/under,
/obj/effect/spawner/random/ms13/clothing/hat,
/obj/effect/spawner/random/ms13/clothing/shoe,
/obj/effect/spawner/random/ms13/smokeable/general,
/obj/effect/spawner/random/ms13/smokeable/general,
/turf/open/floor/wood/ms13/mosaic,
/area/ms13/town)
"dRZ" = (
Expand Down Expand Up @@ -9650,11 +9665,9 @@
/turf/open/floor/wood/ms13/carpet,
/area/ms13/town)
"erL" = (
/obj/structure/closet/crate/ms13/woodcrate,
/obj/machinery/light/ms13{
dir = 4
},
/obj/structure/table/ms13/metal/grate,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/currency/mammoth/lowrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"erT" = (
Expand Down Expand Up @@ -10740,6 +10753,7 @@
/obj/structure/table/ms13/metal/grate,
/obj/structure/ms13/storage/vent,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/power_armor/parts,
/turf/open/floor/ms13/concrete/small,
/area/ms13/town)
"fLF" = (
Expand Down Expand Up @@ -10996,6 +11010,8 @@
dir = 4
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"gev" = (
Expand Down Expand Up @@ -11775,6 +11791,11 @@
/obj/structure/table/ms13/crafting/workbench,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"hno" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete/industrial/walkway,
/area/ms13/town)
"hnp" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/structure/ms13/trash/papers{
Expand Down Expand Up @@ -11877,8 +11898,8 @@
/turf/open/floor/wood/ms13/wide,
/area/ms13)
"hwG" = (
/obj/structure/closet/crate/ms13/woodcrate/compact,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/mob/living/simple_animal/hostile/ms13/robot/protectron,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"hwT" = (
Expand Down Expand Up @@ -12216,6 +12237,12 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"hXs" = (
/obj/structure/table/ms13/metal/grate,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/refined,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"hXV" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/structure/table/rolling/ms13,
Expand Down Expand Up @@ -12533,6 +12560,7 @@
},
/obj/structure/table/ms13/no_smooth/metal,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/tools/lights,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"iwv" = (
Expand Down Expand Up @@ -12575,6 +12603,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"iyQ" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/mob/living/simple_animal/hostile/ms13/robot/protectron/builder,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"iAx" = (
/obj/structure/table/ms13/wood/constructed,
/obj/effect/spawner/random/ms13/tools/farming,
Expand Down Expand Up @@ -13001,6 +13034,7 @@
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/structure/closet/crate/ms13/woodcrate,
/obj/effect/spawner/random/ms13/gun/military,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"jav" = (
Expand Down Expand Up @@ -14720,9 +14754,9 @@
/obj/structure/railing/ms13/solo/industrial{
dir = 4
},
/obj/structure/closet/crate/ms13/woodcrate,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/structure/lattice/catwalk/ms13,
/obj/effect/spawner/random/ms13/clothing/backpack/high,
/turf/open/openspace/ms13,
/area/ms13/town)
"lbX" = (
Expand Down Expand Up @@ -16894,6 +16928,14 @@
},
/turf/open/floor/wood/ms13/mosaic,
/area/ms13/town)
"nTL" = (
/obj/structure/ms13/storage/vent,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/metal/grate/border{
dir = 1
},
/area/ms13/town)
"nVn" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/tools/hardware,
Expand Down Expand Up @@ -17184,7 +17226,6 @@
/turf/open/floor/wood/ms13/common,
/area/ms13/town)
"orU" = (
/obj/structure/closet/crate/ms13/woodcrate/compact/army,
/obj/structure/ms13/pipes/horizontal/box,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/turf/open/floor/ms13/concrete,
Expand Down Expand Up @@ -17426,6 +17467,7 @@
/obj/machinery/light/ms13{
dir = 8
},
/obj/effect/spawner/random/ms13/ammo/lowrandom,
/turf/open/floor/plating/ms13/ground/sidewalk,
/area/ms13/town)
"oGu" = (
Expand Down Expand Up @@ -17951,6 +17993,7 @@
},
/obj/machinery/light/ms13,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/smokeable/lowrandom,
/turf/open/floor/wood/ms13/carpet/blue,
/area/ms13/town)
"pqr" = (
Expand Down Expand Up @@ -19383,6 +19426,9 @@
dir = 1
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/armor/lowrandom,
/obj/effect/spawner/random/ms13/armor/lowrandom,
/obj/effect/spawner/random/ms13/armor/lowrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"rum" = (
Expand Down Expand Up @@ -20257,6 +20303,11 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain,
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/underground/mountain)
"sBv" = (
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"sCj" = (
/obj/effect/decal/cleanable/blood/old{
pixel_x = -5;
Expand Down Expand Up @@ -20437,6 +20488,12 @@
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain,
/turf/open/floor/wood/ms13/wide,
/area/ms13/town)
"sPI" = (
/obj/structure/table/ms13/metal/grate,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/ammo/lowrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"sQo" = (
/obj/machinery/light/ms13/bulb{
dir = 4
Expand Down Expand Up @@ -20658,6 +20715,9 @@
"tgM" = (
/obj/structure/table/ms13/metal/small,
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/highrandom,
/obj/effect/spawner/random/ms13/crafting/electrical,
/obj/effect/spawner/random/ms13/crafting/electrical,
/turf/open/floor/ms13/concrete/industrial,
/area/ms13/town)
"tiv" = (
Expand Down Expand Up @@ -21304,6 +21364,7 @@
dir = 4
},
/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
/obj/effect/spawner/random/ms13/crafting/highrandom,
/turf/open/floor/ms13/concrete,
/area/ms13/town)
"tYI" = (
Expand Down Expand Up @@ -67056,7 +67117,7 @@ kES
ohc
oXt
oXt
ami
erL
ujL
aHe
aHe
Expand Down Expand Up @@ -68205,7 +68266,7 @@ ave
aCj
awg
awn
awn
hwG
awn
nzT
awn
Expand Down Expand Up @@ -70689,7 +70750,7 @@ alR
oXt
oXt
oXt
ami
hXs
awR
abJ
abJ
Expand Down Expand Up @@ -70916,7 +70977,7 @@ awn
oXt
oXt
oXt
ami
hXs
awR
abJ
abJ
Expand Down Expand Up @@ -71591,7 +71652,7 @@ aLH
aCj
amj
aPy
hwG
awn
aCj
aCj
aCj
Expand Down Expand Up @@ -71826,7 +71887,7 @@ ujL
rQB
awn
alI
ami
sPI
oEO
lqZ
aCj
Expand Down Expand Up @@ -72278,7 +72339,7 @@ aCj
aCj
ujL
gsG
awn
hwG
awn
aol
awn
Expand Down Expand Up @@ -73416,7 +73477,7 @@ awn
awn
awn
awn
awn
iyQ
atJ
awR
aLH
Expand Down Expand Up @@ -73633,7 +73694,7 @@ aLH
aLH
aCj
awn
erL
aRV
aAz
adI
awn
Expand Down Expand Up @@ -73867,7 +73928,7 @@ kEZ
awn
aHZ
uAK
tET
hno
awm
aWW
hOH
Expand Down Expand Up @@ -74318,7 +74379,7 @@ akw
awn
hkJ
awn
awn
iyQ
aKG
esO
tET
Expand Down Expand Up @@ -74772,7 +74833,7 @@ agA
gVh
adC
oGX
awn
sBv
awn
awn
aRV
Expand Down Expand Up @@ -75698,7 +75759,7 @@ apv
apv
apv
aCj
uKv
nTL
swi
lib
svX
Expand Down
Loading
Loading