Skip to content

Commit

Permalink
Merge https://github.com/MeowEmiya/Paradise into small-things
Browse files Browse the repository at this point in the history
  • Loading branch information
MeowEmiya committed Sep 22, 2024
2 parents 960279b + 9c4bfea commit eacb97b
Show file tree
Hide file tree
Showing 134 changed files with 800 additions and 1,929 deletions.
111 changes: 26 additions & 85 deletions _maps/map_files/Delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,7 @@
/area/crew_quarters/fitness)
"aaA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/mob/living/carbon/human/lesser/monkey{
icon = 'icons/mob/monkey.dmi';
icon_state = "monkey1"
},
/mob/living/carbon/human/lesser/monkey,
/turf/simulated/floor/engine,
/area/toxins/test_chamber)
"aaB" = (
Expand Down Expand Up @@ -283,10 +280,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
/mob/living/carbon/human/lesser/monkey{
icon = 'icons/mob/monkey.dmi';
icon_state = "monkey1"
},
/mob/living/carbon/human/lesser/monkey,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand All @@ -299,10 +293,7 @@
pixel_y = -26
},
/obj/structure/cable,
/mob/living/carbon/human/lesser/monkey{
icon = 'icons/mob/monkey.dmi';
icon_state = "monkey1"
},
/mob/living/carbon/human/lesser/monkey,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -10128,9 +10119,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/atmos/control)
Expand Down Expand Up @@ -12896,9 +12885,7 @@
/area/security/prisonershuttle)
"bEw" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
dir = 4;
Expand Down Expand Up @@ -15735,9 +15722,7 @@
},
/area/crew_quarters/bar)
"bSw" = (
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/turf/simulated/floor/plating,
/area/hydroponics)
"bSA" = (
Expand Down Expand Up @@ -20813,9 +20798,7 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/serviceyard)
"crJ" = (
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
Expand Down Expand Up @@ -22216,7 +22199,6 @@
/area/gateway)
"cyt" = (
/mob/living/carbon/human/lesser/monkey/punpun{
icon = 'icons/mob/monkey.dmi';
icon_state = "punpun1"
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -26497,9 +26479,7 @@
/area/toxins/test_chamber)
"cQB" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
location = "Mime"
Expand Down Expand Up @@ -28277,9 +28257,7 @@
/area/crew_quarters/chief)
"cXT" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
location = "Clown"
Expand Down Expand Up @@ -34358,9 +34336,7 @@
codes_txt = "delivery";
location = "Chemistry"
},
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
Expand Down Expand Up @@ -45414,9 +45390,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 0
},
/obj/machinery/door/firedoor/closed,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -53382,9 +53356,7 @@
/area/hallway/secondary/exit)
"gVN" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=1";
dir = 1;
Expand Down Expand Up @@ -64410,9 +64382,7 @@
/area/toxins/test_area)
"jIl" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
location = "Chapel"
Expand Down Expand Up @@ -68353,9 +68323,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/storage/primary)
Expand Down Expand Up @@ -68515,9 +68483,7 @@
},
/area/hallway/primary/fore)
"kMb" = (
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/navbeacon{
codes_txt = "delivery";
Expand Down Expand Up @@ -68857,9 +68823,7 @@
/area/medical/cmo)
"kQH" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
location = "Bar"
Expand Down Expand Up @@ -76247,9 +76211,7 @@
"mHa" = (
/obj/effect/decal/warning_stripes/north,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 0
},
/obj/machinery/door/firedoor/closed,
/turf/simulated/floor/plating,
/area/maintenance/consarea_virology)
"mHd" = (
Expand Down Expand Up @@ -83062,9 +83024,7 @@
/area/security/checkpoint/south)
"olI" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery";
dir = 1;
Expand Down Expand Up @@ -86400,10 +86360,7 @@
"pbv" = (
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/mob/living/carbon/human/lesser/monkey{
icon = 'icons/mob/monkey.dmi';
icon_state = "monkey1"
},
/mob/living/carbon/human/lesser/monkey,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -88837,9 +88794,7 @@
},
/area/hallway/primary/central/south)
"pCQ" = (
/obj/machinery/door/firedoor/closed{
opacity = 0
},
/obj/machinery/door/firedoor/closed,
/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
"pCW" = (
Expand Down Expand Up @@ -102700,9 +102655,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 0
},
/obj/machinery/door/firedoor/closed,
/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
"sNY" = (
Expand Down Expand Up @@ -104476,10 +104429,7 @@
"tjA" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/mob/living/carbon/human/lesser/monkey{
icon = 'icons/mob/monkey.dmi';
icon_state = "monkey1"
},
/mob/living/carbon/human/lesser/monkey,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -113467,10 +113417,7 @@
/area/assembly/chargebay)
"vom" = (
/obj/machinery/light,
/mob/living/carbon/human/lesser/monkey{
icon = 'icons/mob/monkey.dmi';
icon_state = "monkey1"
},
/mob/living/carbon/human/lesser/monkey,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -119512,9 +119459,7 @@
"wJM" = (
/obj/structure/grille/broken,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 0
},
/obj/machinery/door/firedoor/closed,
/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
"wJR" = (
Expand Down Expand Up @@ -123100,9 +123045,7 @@
/area/maintenance/asmaint2)
"xzw" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
/obj/structure/plasticflaps,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
dir = 4;
Expand Down Expand Up @@ -124895,9 +124838,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/door/firedoor/closed{
opacity = 0
},
/obj/machinery/door/firedoor/closed,
/turf/simulated/floor/plating,
/area/maintenance/consarea_virology)
"xSf" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,6 @@
"zc" = (
/obj/structure/sign/mining/survival{
dir = 1;
icon_state = "survival";
tag = "icon-survival (NORTH)"
},
/turf/simulated/wall/mineral/titanium/survival/pod,
Expand Down
Loading

0 comments on commit eacb97b

Please sign in to comment.