Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
Browse files Browse the repository at this point in the history 
…o ParadiseSS13-master
  • Loading branch information
@Legendaxe
Legendaxe committed Feb 4, 2024
2 parents 79dacf0 + 8ab107c commit d87f341
Show file tree
Hide file tree
Showing 65 changed files with 770 additions and 633 deletions.
157 changes: 52 additions & 105 deletions _maps/map_files/Delta/delta.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65373,18 +65373,14 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"dSs" = (
/obj/machinery/camera{
c_tag = "Departure Lounge North";
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/effect/turf_decal/stripes/line{
dir = 10
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
Expand All @@ -65410,15 +65406,13 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/apmaint)
"dSB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/effect/turf_decal/stripes/corner{
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dSD" = (
Expand Down Expand Up @@ -65602,8 +65596,11 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"dTh" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/delivery,
/obj/machinery/camera{
c_tag = "Departure Lounge North";
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dTi" = (
Expand Down Expand Up @@ -66163,9 +66160,12 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"dUT" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
pixel_y = -24
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dUU" = (
Expand Down Expand Up @@ -66666,22 +66666,6 @@
icon_state = "neutralfull"
},
/area/station/hallway/secondary/exit)
"dXK" = (
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/machinery/light_switch{
dir = 4;
name = "west bump";
pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dXQ" = (
/obj/machinery/light,
/obj/effect/turf_decal/delivery,
Expand Down Expand Up @@ -75996,20 +75980,10 @@
/turf/simulated/floor/plating,
/area/station/security/checkpoint/secondary)
"jJq" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
autolink_id = "escape_vent"
},
/obj/machinery/airlock_controller/air_cycler{
pixel_x = -26;
pixel_y = 6;
vent_link_id = "escape_vent";
ext_door_link_id = "escape_door_ext";
int_door_link_id = "escape_door_int";
ext_button_link_id = "escape_btn_ext";
int_button_link_id = "escape_btn_int"
},
/obj/effect/turf_decal/delivery,
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"jJI" = (
Expand Down Expand Up @@ -76684,12 +76658,12 @@
},
/area/station/medical/storage)
"kdg" = (
/obj/machinery/door/airlock/external{
id_tag = "escape_door_ext";
locked = 1;
name = "Escape External Access"
/obj/structure/sign/vacuum{
pixel_x = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"kdm" = (
Expand Down Expand Up @@ -91427,18 +91401,12 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"sYX" = (
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/access_button{
autolink_id = "escape_btn_int";
name = "interior access button";
pixel_x = -24;
pixel_y = -24;
req_access_txt = "10;13"
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
},
/obj/structure/sign/vacuum{
pixel_x = -32
/obj/effect/turf_decal/delivery,
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
Expand Down Expand Up @@ -92689,13 +92657,18 @@
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block)
"tSp" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tSt" = (
Expand Down Expand Up @@ -93352,15 +93325,9 @@
},
/area/station/security/processing)
"uil" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
/obj/effect/spawner/airlock,
/turf/simulated/wall,
/area/station/service/chapel/office)
"uit" = (
/obj/machinery/atmospherics/unary/vent_pump{
dir = 4;
Expand Down Expand Up @@ -95722,15 +95689,6 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
"vJP" = (
/obj/machinery/door/airlock/external{
id_tag = "escape_door_int";
locked = 1;
name = "Escape External Access"
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"vKf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
Expand Down Expand Up @@ -99317,17 +99275,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
"xRm" = (
/obj/machinery/access_button{
autolink_id = "escape_btn_ext";
name = "exterior access button";
pixel_x = 24;
pixel_y = 24;
req_access_txt = "10;13"
},
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
"xRD" = (
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/obj/structure/closet/firecloset,
Expand Down Expand Up @@ -136739,7 +136686,7 @@ dIx
dIx
dIx
dIx
dIx
uil
abj
aaa
aaa
Expand Down Expand Up @@ -136994,10 +136941,10 @@ dSo
dKP
dTh
sYX
vJP
dVb
jJq
kdg
xRm
dVb
acF
acF
aaa
aaa
Expand Down Expand Up @@ -137249,11 +137196,11 @@ dPM
dPM
dkq
dSs
dSP
dSB
dIH
dIH
dIH
uil
dIH
abj
aaa
aaa
Expand Down Expand Up @@ -137505,11 +137452,11 @@ dKo
dKo
dKo
dKo
dSB
dXJ
dKo
dUj
kdg
tSp
dXK
dIH
dIH
dIH
abj
aaa
Expand Down Expand Up @@ -137764,8 +137711,8 @@ dNa
dKo
dXJ
uaj
dUj
dSP
dKo
dKo
dUT
dIH
abj
Expand Down
Loading

0 comments on commit d87f341

Please sign in to comment.