From 8496336fa61c083ac2cb25eb14c4cb4539a4f90e Mon Sep 17 00:00:00 2001 From: NervalARS <56166644+NervalARS@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:17:25 +0200 Subject: [PATCH 1/6] Faltaba un light switch en la enfermeria --- _maps/shuttles/shiptestHISPANIA/independent_corporate.dmm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm index 787eacbb0dd1..b0df06aa0934 100644 --- a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm +++ b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm @@ -2982,6 +2982,10 @@ pixel_y = 22 }, /obj/machinery/light/directional/north, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "xN" = ( From d3e55eba5ab0f69c2b963db821dd65b2d9dfc4a5 Mon Sep 17 00:00:00 2001 From: NervalARS <56166644+NervalARS@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:24:03 +0200 Subject: [PATCH 2/6] =?UTF-8?q?a=C3=B1ade=20luces=20al=20almacen=20de=20ci?= =?UTF-8?q?encias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shuttles/shiptestHISPANIA/independent_corporate.dmm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm index b0df06aa0934..b3ba3b2f00a7 100644 --- a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm +++ b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm @@ -921,6 +921,7 @@ /area/ship/bridge) "gr" = ( /obj/structure/closet/crate, +/obj/machinery/light/directional/north, /turf/open/floor/plasteel/tech/grid, /area/ship/science/robotics) "gv" = ( @@ -2703,6 +2704,7 @@ "uV" = ( /obj/structure/rack, /obj/item/mmi/posibrain, +/obj/machinery/light/directional/north, /turf/open/floor/plasteel/tech/grid, /area/ship/science/robotics) "vn" = ( @@ -6237,6 +6239,11 @@ /obj/machinery/light/directional/south, /turf/open/floor/carpet/stellar, /area/ship/bridge) +"YG" = ( +/obj/structure/closet/crate, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science) "YH" = ( /obj/machinery/computer/crew/syndie{ dir = 8 @@ -7163,7 +7170,7 @@ DD "} (19,1,1) = {" PY -mn +YG Ea PY ek From 4bf9c6b9702007ecec3ddcaeaa75baf72a0bfe32 Mon Sep 17 00:00:00 2001 From: NervalARS <56166644+NervalARS@users.noreply.github.com> Date: Sun, 15 Oct 2023 19:19:36 +0200 Subject: [PATCH 3/6] Se ha movido el fax al puente y se ha eliminado Weapons de la namelist --- .../independent_corporate.json | 3 +-- .../independent_corporate.dmm | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/_maps/HISPANIAconfigs/independent_corporate.json b/_maps/HISPANIAconfigs/independent_corporate.json index d580113a7253..c1cf1cd892e7 100644 --- a/_maps/HISPANIAconfigs/independent_corporate.json +++ b/_maps/HISPANIAconfigs/independent_corporate.json @@ -5,8 +5,7 @@ "namelists": [ "NANOTRASEN", "SPACE", - "MYTHOLOGICAL", - "WEAPONS" + "MYTHOLOGICAL" ], "map_short_name": "Corporate-class", "map_path": "_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm", diff --git a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm index b3ba3b2f00a7..9003a2c546fb 100644 --- a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm +++ b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm @@ -45,6 +45,9 @@ id = "bridge_lockdown"; pixel_x = -10 }, +/obj/machinery/light_switch{ + pixel_y = 20 + }, /turf/open/floor/carpet/black, /area/ship/bridge) "au" = ( @@ -266,14 +269,7 @@ "br" = ( /obj/structure/table/reinforced, /obj/machinery/light/directional/east, -/obj/item/megaphone/command{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/pen, -/obj/machinery/light_switch{ - pixel_y = 20 - }, +/obj/machinery/fax, /turf/open/floor/carpet/black, /area/ship/bridge) "bw" = ( @@ -3874,7 +3870,8 @@ "EL" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm/directional/north, -/obj/machinery/fax, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/dark, /area/ship/bridge) "ET" = ( @@ -5146,6 +5143,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 10; + pixel_y = -17 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew) "Pn" = ( From 434c113032c19a74f02545976443ed5af8c86123 Mon Sep 17 00:00:00 2001 From: NervalARS <56166644+NervalARS@users.noreply.github.com> Date: Sun, 15 Oct 2023 19:43:16 +0200 Subject: [PATCH 4/6] fix --- .../shiptestHISPANIA/independent_corporate.dmm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm index 9003a2c546fb..705527f9fd31 100644 --- a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm +++ b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm @@ -2967,6 +2967,12 @@ /obj/effect/turf_decal/corner/opaque/brown/border{ dir = 5 }, +/obj/item/storage/backpack/satchel/explorer, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/under/rank/cargo/miner, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/shovel, +/obj/item/storage/bag/ore, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo/office) "xL" = ( @@ -4749,6 +4755,12 @@ /obj/effect/turf_decal/corner/opaque/brown/border{ dir = 1 }, +/obj/item/storage/backpack/satchel/explorer, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/under/rank/cargo/miner, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/shovel, +/obj/item/storage/bag/ore, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo/office) "Mm" = ( From 25a129561a30fd6b5959febe4888d8011b9107fb Mon Sep 17 00:00:00 2001 From: NervalARS <56166644+NervalARS@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:00:54 +0200 Subject: [PATCH 5/6] fixea un cable --- _maps/shuttles/shiptestHISPANIA/independent_corporate.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm index 705527f9fd31..976a0d573cf9 100644 --- a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm +++ b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm @@ -5867,7 +5867,7 @@ dir = 4 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" }, /turf/open/floor/plasteel/grimy, /area/ship/crew) From 45fc3c7360f8168b8898ab9f326b81649a4fcaa3 Mon Sep 17 00:00:00 2001 From: NervalARS <56166644+NervalARS@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:04:49 +0200 Subject: [PATCH 6/6] fix light --- _maps/shuttles/shiptestHISPANIA/independent_corporate.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm index 976a0d573cf9..ca3c5fe6797a 100644 --- a/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm +++ b/_maps/shuttles/shiptestHISPANIA/independent_corporate.dmm @@ -2270,6 +2270,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/light_switch{ + pixel_y = 20 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "rJ" = (