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] 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" = (