Skip to content

Commit

Permalink
Merge pull request #573 from molnizz/cringe9
Browse files Browse the repository at this point in the history 
Minor ship fixes
  • Loading branch information
@MysticalFaceLesS
MysticalFaceLesS committed May 22, 2024
2 parents d54ad80 + 6cd67b7 commit a16d0df
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 37 deletions.
16 changes: 12 additions & 4 deletions _maps/_mod_celadon/shuttles/elysim/elysim_aldaama.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@
},
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/warning,
/obj/structure/closet/secure_closet/engineering_personal,
/obj/structure/closet/secure_closet/engineering_personal{
req_access = null
},
/turf/open/floor/plasteel/tech,
/area/ship/crew)
"bu" = (
Expand Down Expand Up @@ -2661,7 +2663,9 @@
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/light/directional/north,
/obj/effect/decal/cleanable/glitter,
/obj/structure/closet/secure_closet/engineering_personal,
/obj/structure/closet/secure_closet/engineering_personal{
req_access = null
},
/turf/open/floor/plasteel/tech,
/area/ship/crew)
"At" = (
Expand Down Expand Up @@ -2908,7 +2912,9 @@
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/warning,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet/secure_closet/engineering_personal,
/obj/structure/closet/secure_closet/engineering_personal{
req_access = null
},
/turf/open/floor/plasteel/tech,
/area/ship/crew)
"CR" = (
Expand Down Expand Up @@ -4951,7 +4957,9 @@
/obj/structure/sign/poster/contraband/missing_gloves{
pixel_y = 32
},
/obj/structure/closet/secure_closet/engineering_personal,
/obj/structure/closet/secure_closet/engineering_personal{
req_access = null
},
/turf/open/floor/plasteel/tech,
/area/ship/crew)

Expand Down
17 changes: 9 additions & 8 deletions _maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@
pixel_y = 6;
pixel_x = 2
},
/obj/item/radio/intercom/wideband/directional/east,
/turf/open/floor/carpet/green,
/area/ship/bridge)
"je" = (
Expand Down Expand Up @@ -783,13 +784,13 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
/turf/open/floor/plating,
/area/ship/hallway/central)
"vY" = (
Expand Down Expand Up @@ -1079,10 +1080,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -1198,10 +1199,10 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
},
/turf/open/floor/plating/rust,
Expand Down Expand Up @@ -1721,7 +1722,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
/turf/open/floor/plating,
Expand Down
93 changes: 75 additions & 18 deletions _maps/_mod_celadon/shuttles/independent/independent_junker.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
dir = 1;
id = "junk_driver"
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/turf/open/floor/plating,
/area/ship/maintenance/central)
"bl" = (
Expand Down Expand Up @@ -122,6 +125,12 @@
},
/turf/open/floor/pod/dark,
/area/ship/crew/canteen)
"cb" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/closed/wall/mineral/wood,
/area/ship/maintenance/central)
"cg" = (
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/ship/maintenance/starboard)
Expand Down Expand Up @@ -168,6 +177,12 @@
"cY" = (
/obj/structure/girder/reinforced,
/obj/structure/barricade/wooden/crude,
/obj/structure/sign/warning/fire{
pixel_y = 22
},
/obj/structure/sign/warning/fire{
pixel_y = -22
},
/turf/open/floor/plating/rust/conf_haz,
/area/ship/engineering/electrical)
"dd" = (
Expand Down Expand Up @@ -336,6 +351,14 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/pod/dark,
/area/ship/crew/canteen)
"hm" = (
/obj/structure/girder/reinforced,
/obj/structure/barricade/wooden/crude,
/obj/structure/sign/warning/fire{
pixel_y = 22
},
/turf/open/floor/plating/rust/conf_haz,
/area/ship/engineering/electrical)
"hn" = (
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -448,6 +471,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/turf/open/floor/plating,
/area/ship/storage/eva)
"jm" = (
Expand Down Expand Up @@ -711,6 +737,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
/obj/structure/disposalpipe/trunk,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
Expand Down Expand Up @@ -1015,12 +1042,10 @@
dir = 1
},
/obj/machinery/button/door{
dir = 1;
id = "tankr";
normaldoorcontrol = 1;
pixel_x = -27;
pixel_x = -24;
pixel_y = -23;
specialfunctions = 4
dir = 1
},
/turf/open/floor/engine/hull,
/area/ship/maintenance/fore)
Expand Down Expand Up @@ -1306,6 +1331,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
},
/obj/structure/disposalpipe/broken{
dir = 1
},
/turf/open/floor/plating,
/area/ship/maintenance/central)
"zY" = (
Expand Down Expand Up @@ -1342,6 +1370,11 @@
/obj/machinery/atmospherics/pipe/simple/general/hidden{
dir = 5
},
/obj/item/reagent_containers/food/snacks/burger/roburger{
pixel_x = 17;
name = "burger";
icon_state = "hburger"
},
/turf/open/floor/plating/rust/conf_haz,
/area/ship/maintenance/fore)
"AW" = (
Expand Down Expand Up @@ -1370,6 +1403,12 @@
},
/turf/open/floor/pod/dark,
/area/ship/crew/canteen)
"BI" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/closed/wall/mineral/titanium/survival,
/area/ship/maintenance/central)
"BN" = (
/obj/structure/cable{
icon_state = "5-8"
Expand Down Expand Up @@ -1417,7 +1456,7 @@
/turf/closed/wall/rust,
/area/ship/construction)
"CA" = (
/turf/closed/wall/mineral/titanium/survival,
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/ship/storage)
"Da" = (
/obj/structure/girder/reinforced,
Expand Down Expand Up @@ -1547,14 +1586,13 @@
/turf/open/floor/pod/dark,
/area/ship/cargo)
"En" = (
/obj/machinery/door/poddoor{
dir = 1;
id = "tankr"
},
/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
dir = 1
},
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/door/poddoor{
id = "tankr"
},
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"EA" = (
Expand Down Expand Up @@ -1583,6 +1621,9 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 5
},
/turf/open/floor/plating/rust/conf_haz,
/area/ship/maintenance/central)
"Fl" = (
Expand Down Expand Up @@ -1845,7 +1886,7 @@
/area/ship/maintenance/fore)
"Lh" = (
/obj/structure/sign/poster/contraband/tools,
/turf/closed/wall/mineral/titanium/survival,
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/ship/storage)
"Lu" = (
/turf/closed/wall/rust,
Expand Down Expand Up @@ -1934,6 +1975,10 @@
"MA" = (
/turf/closed/wall/mineral/titanium/survival,
/area/ship/storage/eva)
"MI" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall/r_wall/rust,
/area/ship/cargo)
"MJ" = (
/obj/machinery/power/ship_gravity/unanchored,
/obj/structure/cable{
Expand All @@ -1942,6 +1987,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 10
},
/turf/open/floor/wood/walnut{
icon_state = "wood-broken3"
},
Expand Down Expand Up @@ -2006,6 +2054,12 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/rust/conf_haz,
/area/ship/maintenance/starboard)
"NF" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/closed/wall/mineral/wood,
/area/ship/maintenance/central)
"NH" = (
/obj/effect/decal/cleanable/insectguts,
/obj/structure/cable{
Expand Down Expand Up @@ -2203,6 +2257,9 @@
pixel_y = -7;
pixel_x = -11
},
/obj/structure/disposalpipe/segment{
dir = 5
},
/turf/open/floor/pod/dark,
/area/ship/storage/eva)
"RK" = (
Expand Down Expand Up @@ -2722,7 +2779,7 @@ VG
VG
"}
(6,1,1) = {"
kF
La
kF
VG
vF
Expand All @@ -2733,14 +2790,14 @@ yf
Ej
Je
mq
NM
MI
RJ
uk
QB
MA
VG
kF
kF
La
"}
(7,1,1) = {"
La
Expand Down Expand Up @@ -2806,7 +2863,7 @@ VG
kT
"}
(10,1,1) = {"
kF
La
kF
VG
vF
Expand Down Expand Up @@ -2872,7 +2929,7 @@ VG
VG
VG
VG
Ry
BI
Fd
WC
Ry
Expand All @@ -2892,8 +2949,8 @@ VG
(14,1,1) = {"
VG
VG
me
me
cb
NF
MJ
zT
uK
Expand Down Expand Up @@ -2924,7 +2981,7 @@ xW
Mz
Gf
xW
cY
hm
fp
rg
dx
Expand Down
8 changes: 5 additions & 3 deletions _maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2377,7 +2377,9 @@
/turf/open/floor/plating,
/area/ship/external)
"dR" = (
/obj/docking_port,
/obj/docking_port{
dir = 8
},
/turf/template_noop,
/area/template_noop)
"dS" = (
Expand Down Expand Up @@ -2425,8 +2427,8 @@
/obj/docking_port/mobile{
dir = 2;
launch_status = 0;
port_direction = 1;
preferred_direction = 1
port_direction = 8;
preferred_direction = 4
},
/turf/open/floor/plating,
/area/ship/external)
Expand Down
Loading

0 comments on commit a16d0df

Please sign in to comment.