Skip to content

Commit

Permalink
Merge branch 'Fucking-Surgury-On-Crashed-Ships' of https://github.com…
Browse files Browse the repository at this point in the history
…/hislittlecuzingames/cmss13 into Fucking-Surgury-On-Crashed-Ships
  • Loading branch information
hislittlecuzingames committed Jan 28, 2024
2 parents a464a29 + 74507bb commit bca6f2a
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 138 deletions.
48 changes: 24 additions & 24 deletions maps/map_files/BigRed/standalone/crashlanding-eva.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
/area/bigredv2/outside/general_offices)
"aE" = (
/obj/structure/computerframe,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"aF" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -105,18 +105,18 @@
/turf/open/mars,
/area/bigredv2/caves_north)
"aR" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_top_left,
/turf/open/shuttle/dropship/can_surgery/light_grey_top_left,
/area/bigredv2/outside/general_offices)
"aS" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_left_to_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/bigredv2/outside/general_offices)
"aT" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_top_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_top_right,
/area/bigredv2/outside/general_offices)
"aU" = (
/obj/structure/surface/rack,
/obj/item/map/big_red_map,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"aV" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -181,24 +181,24 @@
/area/bigredv2/outside/general_offices)
"bg" = (
/obj/structure/machinery/door/airlock/almayer/generic,
/turf/open/shuttle/dropship/can_surgury,
/turf/open/shuttle/dropship/can_surgery,
/area/bigredv2/outside/general_offices)
"bh" = (
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bi" = (
/obj/item/paper/crumpled/bloody,
/obj/effect/decal/cleanable/blood{
icon_state = "u_psycopath_l"
},
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_up_to_down,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bj" = (
/obj/structure/bed/chair/dropship/passenger,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bk" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_up_to_down,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bl" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -229,7 +229,7 @@
/area/bigredv2/outside/general_offices)
"bq" = (
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"br" = (
/turf/closed/shuttle/ert{
Expand All @@ -240,16 +240,16 @@
/obj/structure/bed/chair/dropship/passenger{
dir = 4
},
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bt" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_up_to_down,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bu" = (
/obj/effect/decal/cleanable/blood,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bv" = (
/obj/structure/bed/chair/dropship/passenger{
Expand All @@ -259,7 +259,7 @@
dir = 1;
icon_state = "gib6"
},
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"bw" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -309,7 +309,7 @@
dir = 1;
icon_state = "gib6"
},
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_up_to_down,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/general_offices)
"bG" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -449,17 +449,17 @@
"cb" = (
/obj/structure/surface/rack,
/obj/item/restraints,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"cc" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_bottom_left,
/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_left,
/area/bigredv2/outside/general_offices)
"cd" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_bottom_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_right,
/area/bigredv2/outside/general_offices)
"ce" = (
/obj/structure/surface/rack,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"cf" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -506,7 +506,7 @@
"cm" = (
/obj/effect/spawner/gibspawner/human,
/obj/effect/decal/cleanable/blood,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_left_to_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/bigredv2/outside/general_offices)
"cn" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -544,7 +544,7 @@
"cu" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/remains,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
"cv" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -1005,7 +1005,7 @@
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 2
},
/turf/open/shuttle/dropship/can_surgury,
/turf/open/shuttle/dropship/can_surgery,
/area/bigredv2/outside/general_offices)
"eM" = (
/obj/item/stack/rods,
Expand Down Expand Up @@ -1058,7 +1058,7 @@
"Zt" = (
/obj/structure/bed/chair/dropship/passenger,
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)

(1,1,1) = {"
Expand Down
24 changes: 12 additions & 12 deletions maps/map_files/DesertDam/Desert_Dam.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19723,17 +19723,17 @@
/obj/structure/shuttle/diagonal{
icon_state = "swall_f9"
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bjb" = (
/obj/structure/computerframe,
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bjc" = (
/obj/structure/shuttle/diagonal{
icon_state = "swall_f5"
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bjd" = (
/obj/structure/machinery/light{
Expand Down Expand Up @@ -19788,10 +19788,10 @@
/area/desert_dam/interior/dam_interior/hanger)
"bjl" = (
/obj/structure/machinery/light,
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bjm" = (
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bjn" = (
/obj/structure/machinery/light,
Expand Down Expand Up @@ -19873,7 +19873,7 @@
/area/desert_dam/interior/dam_interior/hanger)
"bjA" = (
/obj/structure/machinery/door/unpowered/shuttle,
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bjB" = (
/turf/closed/shuttle{
Expand Down Expand Up @@ -20031,7 +20031,7 @@
/obj/structure/bed/chair{
dir = 4
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bke" = (
/obj/structure/machinery/light{
Expand All @@ -20040,7 +20040,7 @@
/obj/structure/bed/chair{
dir = 8
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bkf" = (
/turf/open/desert/dirt{
Expand Down Expand Up @@ -20099,13 +20099,13 @@
/obj/structure/bed/chair{
dir = 4
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bkp" = (
/obj/structure/bed/chair{
dir = 8
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bkt" = (
/turf/open/desert/dirt{
Expand Down Expand Up @@ -20947,13 +20947,13 @@
/obj/structure/shuttle/diagonal{
icon_state = "swall_f10"
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bne" = (
/obj/structure/shuttle/diagonal{
icon_state = "swall_f6"
},
/turf/open/shuttle/can_surgury/red,
/turf/open/shuttle/can_surgery/red,
/area/desert_dam/interior/dam_interior/hanger)
"bnf" = (
/obj/structure/shuttle/diagonal{
Expand Down
30 changes: 15 additions & 15 deletions maps/map_files/DesertDam/standalone/crashlanding-upp-alt1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pixel_y = -5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_top_to_bottom,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom,
/area/desert_dam/exterior/valley/valley_civilian)
"bz" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -82,7 +82,7 @@
"fg" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_top_to_bottom,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom,
/area/desert_dam/exterior/valley/valley_civilian)
"fp" = (
/obj/effect/decal/sand_overlay/sand1{
Expand Down Expand Up @@ -169,7 +169,7 @@
"jU" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_top_to_bottom,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom,
/area/desert_dam/exterior/valley/valley_civilian)
"jX" = (
/obj/effect/decal/sand_overlay/sand1,
Expand Down Expand Up @@ -214,7 +214,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_top_to_bottom,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom,
/area/desert_dam/exterior/valley/valley_civilian)
"mw" = (
/turf/open/desert/dirt{
Expand Down Expand Up @@ -289,15 +289,15 @@
"oj" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_bottom_left,
/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_left,
/area/desert_dam/exterior/valley/valley_civilian)
"os" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_left_to_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/desert_dam/exterior/valley/valley_civilian)
"oL" = (
/obj/effect/decal/cleanable/blood,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_top_to_bottom,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom,
/area/desert_dam/exterior/valley/valley_civilian)
"oX" = (
/obj/structure/desertdam/decals/road_edge{
Expand Down Expand Up @@ -443,7 +443,7 @@
/turf/open/floor/plating,
/area/desert_dam/exterior/valley/valley_civilian)
"xE" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_top_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_top_right,
/area/desert_dam/exterior/valley/valley_civilian)
"xK" = (
/obj/effect/decal/cleanable/dirt,
Expand All @@ -459,7 +459,7 @@
/area/desert_dam/exterior/valley/valley_civilian)
"xP" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_left_to_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/desert_dam/exterior/valley/valley_civilian)
"yl" = (
/turf/closed/shuttle/ert{
Expand Down Expand Up @@ -854,7 +854,7 @@
/area/desert_dam/exterior/valley/valley_civilian)
"OG" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_top_to_bottom,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom,
/area/desert_dam/exterior/valley/valley_civilian)
"OJ" = (
/obj/effect/decal/sand_overlay/sand1{
Expand Down Expand Up @@ -903,11 +903,11 @@
/turf/open/desert/dirt,
/area/desert_dam/exterior/valley/valley_civilian)
"Rq" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_top_left,
/turf/open/shuttle/dropship/can_surgery/light_grey_top_left,
/area/desert_dam/exterior/valley/valley_civilian)
"Ry" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/shuttle/dropship/can_surgury/light_grey_bottom_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_right,
/area/desert_dam/exterior/valley/valley_civilian)
"RG" = (
/obj/effect/decal/sand_overlay/sand1{
Expand Down Expand Up @@ -950,7 +950,7 @@
"SN" = (
/obj/effect/spawner/gibspawner/human,
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_left_to_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/desert_dam/exterior/valley/valley_civilian)
"SV" = (
/obj/structure/prop/invuln/fire{
Expand Down Expand Up @@ -988,7 +988,7 @@
pixel_y = 21
},
/obj/effect/decal/cleanable/dirt,
/turf/open/shuttle/dropship/can_surgury/dark_grey,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/desert_dam/exterior/valley/valley_civilian)
"UB" = (
/obj/structure/prop/invuln/fire{
Expand Down Expand Up @@ -1031,7 +1031,7 @@
},
/area/desert_dam/exterior/valley/valley_civilian)
"Wy" = (
/turf/open/shuttle/dropship/can_surgury/light_grey_single_wide_left_to_right,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/desert_dam/exterior/valley/valley_civilian)
"WU" = (
/obj/effect/decal/sand_overlay/sand1{
Expand Down
Loading

0 comments on commit bca6f2a

Please sign in to comment.