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

Adds a Blahaj to every map #6487

Closed
wants to merge 1 commit into from
Closed
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
12 changes: 11 additions & 1 deletion maps/map_files/BigRed/BigRed.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -33189,6 +33189,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
"lTr" = (
/obj/structure/bed,
/obj/item/bedsheet/brown{
layer = 3.1
},
/obj/item/toy/plush/shark,
/turf/open/floor{
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
"lTC" = (
/obj/structure/machinery/light{
dir = 4
Expand Down Expand Up @@ -62158,7 +62168,7 @@ aNL
aOM
szi
aof
aNQ
lTr
aOO
aOO
aOO
Expand Down
8 changes: 7 additions & 1 deletion maps/map_files/CORSAT/Corsat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -46803,6 +46803,12 @@
icon_state = "red"
},
/area/corsat/sigma/airlock/east/id)
"kog" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
/obj/item/toy/plush/shark,
/turf/open/floor/wood,
/area/corsat/gamma/residential/east)
"koh" = (
/obj/structure/pipes/vents/pump{
dir = 8
Expand Down Expand Up @@ -78998,7 +79004,7 @@ aaq
abs
abs
abD
abv
kog
abs
aaq
abD
Expand Down
9 changes: 8 additions & 1 deletion maps/map_files/DesertDam/Desert_Dam.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -61582,6 +61582,13 @@
},
/turf/open/desert/dirt,
/area/desert_dam/exterior/valley/valley_hydro)
"iUm" = (
/obj/structure/bed,
/obj/item/toy/plush/shark,
/turf/open/floor{
icon_state = "wood"
},
/area/desert_dam/building/dorms/hallway_westwing)
"iVN" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal9"
Expand Down Expand Up @@ -107788,7 +107795,7 @@ ebb
dZz
dBr
xzc
dEt
iUm
dBr
dTs
dTs
Expand Down
8 changes: 7 additions & 1 deletion maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -47113,6 +47113,12 @@
icon_state = "floor_plate"
},
/area/prison/cellblock/highsec/south/north)
"oHZ" = (
/obj/structure/bed,
/obj/item/bedsheet/purple,
/obj/item/toy/plush/shark,
/turf/open/floor/wood,
/area/prison/quarters/research)
"oIj" = (
/obj/effect/decal/warning_stripes{
icon_state = "E"
Expand Down Expand Up @@ -91188,7 +91194,7 @@ aIb
aED
rtS
aJU
aCe
oHZ
ssJ
aMy
aNQ
Expand Down
12 changes: 11 additions & 1 deletion maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27174,6 +27174,16 @@
icon_state = "darkbrownfull2"
},
/area/fiorina/tumor/aux_engi)
"qzU" = (
/obj/structure/bed{
icon_state = "psychbed"
},
/obj/item/toy/plush/shark,
/turf/open/floor/prison{
dir = 4;
icon_state = "greenfull"
},
/area/fiorina/tumor/servers)
"qzZ" = (
/obj/structure/barricade/sandbags{
dir = 8;
Expand Down Expand Up @@ -47013,7 +47023,7 @@ tbG
ach
jXz
peA
tbG
qzU
jXz
cPs
xHV
Expand Down
7 changes: 6 additions & 1 deletion maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -34390,6 +34390,11 @@
icon_state = "dark2"
},
/area/ice_colony/surface/research)
"hzL" = (
/obj/structure/bed,
/obj/item/toy/plush/shark,
/turf/open/floor/wood,
/area/ice_colony/surface/dorms)
"hAX" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/plating,
Expand Down Expand Up @@ -64744,7 +64749,7 @@ avW
arE
arP
arQ
ast
hzL
axl
axL
ayt
Expand Down
7 changes: 6 additions & 1 deletion maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20878,6 +20878,11 @@
},
/turf/open/floor/wood,
/area/shiva/interior/colony/medseceng)
"qbD" = (
/obj/structure/bed,
/obj/item/toy/plush/shark,
/turf/open/floor/wood,
/area/shiva/interior/colony/botany)
"qbF" = (
/turf/open/auto_turf/ice/layer0,
/area/shiva/exterior/junkyard/cp_bar)
Expand Down Expand Up @@ -47208,7 +47213,7 @@ vNJ
hmQ
rBH
gKQ
wZW
qbD
rBH
ejt
ejt
Expand Down
1 change: 1 addition & 0 deletions maps/map_files/Kutjevo/Kutjevo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8837,6 +8837,7 @@
/area/kutjevo/interior/complex/botany)
"mbR" = (
/obj/structure/closet/crate/trashcart,
/obj/item/toy/plush/shark,
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/interior/construction)
"mbS" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7823,6 +7823,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb2,
/obj/effect/spider/spiderling/nogrow,
/obj/item/toy/plush/shark,
/turf/open/floor/wood,
/area/lv522/indoors/a_block/executive)
"dFz" = (
Expand Down
1 change: 1 addition & 0 deletions maps/map_files/LV624/LV624.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4653,6 +4653,7 @@
/area/lv624/lazarus/robotics)
"axo" = (
/obj/structure/closet/cabinet,
/obj/item/toy/plush/shark,
/turf/open/floor/wood{
icon_state = "wood-broken"
},
Expand Down
1 change: 1 addition & 0 deletions maps/map_files/New_Varadero/New_Varadero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -24934,6 +24934,7 @@
/obj/item/bedsheet{
layer = 3.1
},
/obj/item/toy/plush/shark,
/turf/open/floor/wood,
/area/varadero/interior/bunks)
"pYI" = (
Expand Down
1 change: 1 addition & 0 deletions maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -30809,6 +30809,7 @@
/obj/structure/bed,
/obj/structure/machinery/light/small,
/obj/item/bedsheet/medical,
/obj/item/toy/plush/shark,
/turf/open/floor/strata{
dir = 4;
icon_state = "cyan2"
Expand Down
21 changes: 20 additions & 1 deletion maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5307,6 +5307,25 @@
},
/turf/open/floor/prison,
/area/whiskey_outpost/inside/supply)
"tg" = (
/obj/structure/window/reinforced{
dir = 8;
layer = 3.3;
pixel_y = 4
},
/obj/structure/bed{
can_buckle = 0
},
/obj/structure/bed{
buckling_y = 13;
layer = 3.5;
pixel_y = 13
},
/obj/item/toy/plush/shark,
/turf/open/floor/almayer{
icon_state = "bluefull"
},
/area/whiskey_outpost/inside/living)
"th" = (
/obj/structure/disposalpipe/junction{
dir = 8
Expand Down Expand Up @@ -27644,7 +27663,7 @@ mT
mT
mT
pq
am
tg
am
am
rD
Expand Down
Loading