Skip to content

Commit

Permalink
Merge pull request #849 from MrCat15352/fix_maps_part_2
Browse files Browse the repository at this point in the history
Fix: maps repairs computer/cargo
  • Loading branch information
molnizz authored Jul 20, 2024
2 parents e9d1d27 + f49f1e0 commit 92009f6
Show file tree
Hide file tree
Showing 72 changed files with 74 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/security)
"vr" = (
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/turf/open/floor/plasteel/patterned,
/area/ruin/jungle/cavecrew/cargo)
"vH" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3490,7 +3490,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 9
},
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/turf/open/floor/carpet/nanoweave/beige,
/area/ruin/space/has_grav/singularitylab/cargo)
"nT" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/outpost/hangar/nt_asteroid_20x20.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
},
/area/hangar)
"jw" = (
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/obj/structure/railing{
dir = 8;
layer = 4.1
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/outpost/hangar/nt_asteroid_40x20.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@
},
/area/hangar)
"tH" = (
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/obj/item/toy/plush/knight{
pixel_y = 25;
pixel_x = 9
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5582,7 +5582,7 @@
/turf/open/floor/concrete/reinforced,
/area/outpost/maintenance/aft)
"tW" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/techfloor{
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/elysium/elysium_aldaama.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@
/turf/closed/wall/rust,
/area/ship/maintenance/fore)
"tK" = (
/obj/machinery/computer/cargo/express/retro,
/obj/machinery/computer/cargo/retro,
/obj/machinery/newscaster/directional/north,
/turf/open/floor/carpet/green,
/area/ship/bridge)
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1665,7 +1665,7 @@
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"Nx" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/elysium_logo/three_three{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
/turf/open/floor/plasteel/freezer,
/area/ship/bridge)
"ut" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4770,7 +4770,7 @@
/area/ship/crew)
"UO" = (
/obj/effect/turf_decal/industrial/traffic/corner,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/machinery/light/directional/south,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1806,7 +1806,7 @@
/obj/effect/turf_decal/corner/opaque/blue{
dir = 4
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/machinery/firealarm/directional/south,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2635,7 +2635,7 @@
/turf/open/floor/plating,
/area/ship/maintenance)
"VR" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 4
},
/turf/open/floor/plasteel/mono/white,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/engineering)
"ws" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/blue/three_quarters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2827,7 +2827,7 @@
/area/ship/engineering/atmospherics)
"YL" = (
/obj/machinery/firealarm/directional/south,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/turf/open/floor/plasteel/tech/techmaint,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2024,7 +2024,7 @@
/obj/effect/turf_decal/corner/opaque/blue/half{
dir = 4
},
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 8
},
/obj/machinery/newscaster/directional/north,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3604,7 +3604,7 @@
/turf/open/floor/wood/maple,
/area/ship/crew/cryo)
"Sg" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/spline/fancy/wood{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@
/area/ship/crew)
"sW" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/machinery/airalarm/directional/east,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
/turf/open/floor/plasteel/white,
/area/ship/bridge)
"W" = (
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/black/three_quarters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
/turf/open/floor/plasteel,
/area/ship/external)
"bt" = (
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 4
},
/turf/open/floor/plasteel/patterned/cargo_one,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1831,7 +1831,7 @@
"vq" = (
/obj/effect/turf_decal/corner/opaque/white/mono,
/obj/effect/turf_decal/borderfloorblack,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8;
icon_state = "computer-right"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@
/obj/structure/sign/warning/incident{
pixel_x = -32
},
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 4
},
/turf/open/floor/plasteel/tech/grid,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2122,7 +2122,7 @@
/turf/open/floor/pod,
/area/ship/hallway/central)
"Ev" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 4
},
/obj/effect/turf_decal/siding/brown{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1953,7 +1953,7 @@
},
/obj/machinery/airalarm/directional/west,
/obj/machinery/firealarm/directional/north,
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/turf/open/floor/plasteel/mono/white,
/area/ship/bridge)
"dR" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@
/turf/open/floor/carpet/nanoweave/blue,
/area/ship/bridge)
"KY" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
icon_state = "computer-left";
dir = 8;
pixel_x = 7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1444,7 +1444,7 @@
icon_state = "siding_thinplating_line";
dir = 8
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
icon_state = "computer-left";
dir = 8
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2259,7 +2259,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/carpet/blue,
/area/ship/engineering/communications)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen)
"ka" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/item/radio/intercom/directional/south{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3295,7 +3295,7 @@
color = "#332521";
dir = 5
},
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/turf/open/floor/wood/ebony,
/area/ship/bridge)
"Eb" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4664,7 +4664,7 @@
dir = 8
},
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8;
icon_state = "computer-left"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6716,7 +6716,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew/toilet)
"LB" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/turf/open/floor/plasteel/telecomms_floor,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@
/area/ship/hallway/fore)
"iX" = (
/obj/item/radio/intercom/wideband/directional/south,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/effect/turf_decal/borderfloor,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2149,7 +2149,7 @@
/turf/open/floor/plasteel,
/area/ship/crew/office)
"ze" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/machinery/firealarm/directional/east,
Expand Down
4 changes: 2 additions & 2 deletions _maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2344,7 +2344,7 @@
/area/ship/crew/dorm)
"oT" = (
/obj/effect/turf_decal/corner/opaque/yellow/border,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/turf/open/floor/plasteel/dark,
Expand Down Expand Up @@ -7085,7 +7085,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo/office)
"Tu" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,7 @@
/obj/effect/turf_decal/steeldecal/steel_decals_central4{
dir = 1
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8;
icon_state = "computer-right"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/external)
"oo" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/brown{
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6438,7 +6438,7 @@
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/item/radio/intercom/directional/north{
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3950,7 +3950,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Ko" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/brown{
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"TK" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/yellow,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/misc/independent_bulk.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering/electrical)
"bA" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
icon_state = "computer";
dir = 8
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/misc/independent_sfwb.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/turf/open/floor/wood,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@
/obj/effect/turf_decal/siding/thinplating/dark,
/obj/machinery/light/small/directional/south,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/turf/open/floor/plasteel/patterned,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2354,7 +2354,7 @@
dir = 4
},
/obj/effect/turf_decal/corner/opaque/blue,
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 8
},
/obj/machinery/newscaster/directional/north,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/medical/surgery)
"ph" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8;
icon_state = "computer-left"
},
Expand Down
Loading

0 comments on commit 92009f6

Please sign in to comment.