Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes unit tests #2499

Merged
merged 6 commits into from
Dec 6, 2023
Merged

fixes unit tests #2499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a4df09
expands unit tests; refuses to dock docked ships
tmtmtl30 Nov 19, 2023
269b1d7
fixes jump_to_null_space() operator bullshit
tmtmtl30 Nov 19, 2023
aa8f679
fixes the superpill
tmtmtl30 Nov 26, 2023
cbff437
fixes rube + twinkle
tmtmtl30 Nov 26, 2023
28f2bce
fixes heron, hellfactory
tmtmtl30 Nov 26, 2023
ac00c23
further heron fixes
tmtmtl30 Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions _maps/RandomRuins/SpaceRuins/hellfactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
Expand All @@ -37,7 +37,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 1
},
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
dir = 1
},
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{
Expand All @@ -52,7 +52,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 8
},
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
Expand Down Expand Up @@ -119,7 +119,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 6
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
Expand All @@ -131,7 +131,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 4
},
/obj/structure/holobox,
Expand All @@ -144,7 +144,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{
Expand All @@ -165,7 +165,7 @@
/area/ruin/space/has_grav/hellfactory)
"aC" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4,
/turf/open/floor/plastic,
/area/ruin/space/has_grav/hellfactory)
Expand Down Expand Up @@ -203,7 +203,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 5
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
Expand All @@ -215,7 +215,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
Expand All @@ -227,7 +227,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 9
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 9
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
Expand Down Expand Up @@ -1029,7 +1029,7 @@
/area/ruin/space/has_grav/hellfactory)
"Nv" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4,
/turf/open/floor/plastic,
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/nanotrasen_heron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"namelists": ["WEAPONS"],
"map_name": "Heron-Class Dreadnaught",
"map_short_name": "Heron-class",
"map_path": "_maps/shuttles/shiptest/nanotrasen_heron.dmm",
"map_path": "_maps/shuttles/nanotrasen/nanotrasen_heron.dmm",
"map_id": "nanotrasen_heron",
"description": "The Heron-Class is the biggest ship available to NanoTrasen's frontier forces. These vessels served as the flagship of many fleets during the war, serving as a carrier for an operative team, or a command vessel for corporate units. Captains of this vessel were known to retrofit bluespace artillery onto the hangar, and directly fire it during combat. Since the end of the war, it has been repurposed for peacekeeping missions on backline sectors. Though the age of the design is starting to show, it stands as one of the remnants of NanoTrasen's once powerful hold over the cosmos.",
"limit": 1,
Expand Down
5 changes: 1 addition & 4 deletions _maps/shuttles/independent/independent_pillbottle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,9 +1721,6 @@
},
/turf/open/floor/plating,
/area/ship/hallway/fore)
"CP" = (
/turf/template_noop,
/area/space)
"CQ" = (
/turf/closed/wall,
/area/ship/bridge)
Expand Down Expand Up @@ -3919,5 +3916,5 @@ hT
hT
WS
tG
CP
Oz
"}
29 changes: 25 additions & 4 deletions _maps/shuttles/independent/independent_rube_goldberg.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"bb" = (
/obj/structure/cable/green,
/obj/effect/turf_decal/industrial/radiation/full,
/obj/machinery/power/grounding_rod,
/turf/open/floor/plating,
/area/ship/storage)
"be" = (
Expand Down Expand Up @@ -4162,6 +4163,19 @@
/obj/machinery/suit_storage_unit/atmos,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"Or" = (
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/effect/turf_decal/industrial/radiation{
dir = 8
},
/obj/effect/turf_decal/industrial/radiation{
dir = 4
},
/obj/machinery/power/grounding_rod,
/turf/open/floor/mineral/titanium,
/area/ship/storage)
"Ot" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
Expand Down Expand Up @@ -4450,7 +4464,14 @@
/turf/open/floor/plating/airless,
/area/ship/hallway)
"Sw" = (
/obj/machinery/atmospherics/components/unary/thermomachine,
/obj/structure/frame/machine,
/obj/item/circuitboard/machine/thermomachine/freezer,
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/obj/item/stack/cable_coil/cut,
/obj/item/stack/sheet/glass,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Sx" = (
Expand Down Expand Up @@ -7063,9 +7084,9 @@ Zy
mV
bB
SY
SY
SY
SY
Or
Or
Or
bb
zy
wg
Expand Down
13 changes: 8 additions & 5 deletions ...shuttles/independent/nanotrasen_heron.dmm → .../shuttles/nanotrasen/nanotrasen_heron.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@
dir = 5
},
/obj/machinery/computer/atmos_control/tank/air_tank{
sensors = list("hairon"="Heron Air Mix Tank")
sensors = list("hairon"="Heron Air Mix Tank")
},
/obj/machinery/light_switch{
pixel_y = 23
Expand Down Expand Up @@ -6003,6 +6003,9 @@
name = "Helm"
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"vC" = (
Expand Down Expand Up @@ -9711,7 +9714,7 @@
dir = 9
},
/obj/machinery/computer/atmos_control/tank/toxin_tank{
sensors = list("heron_plasm"="Heron Plasma Tank")
sensors = list("heron_plasm"="Heron Plasma Tank")
},
/obj/structure/cable{
icon_state = "0-4"
Expand Down Expand Up @@ -10759,6 +10762,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"NE" = (
Expand Down Expand Up @@ -13676,9 +13682,6 @@
/area/ship/science/robotics)
"YP" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/subshuttles/Subshuttle Catalog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Purpose = "Supposedly an manned torpedo. What is this. Subtest?"
File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"

Name = "Superpill"
Size = "1x3"
Size = "3x4"
Purpose = "A horrid merger of engineering platform and pill"
File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"

Expand Down
Loading