saving existing changes

cmss13-devs · Sep 6, 2023 · a3533f7 · a3533f7
1 parent 5e2cfdf
commit a3533f7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 35 deletions.
diff --git a/code/modules/dropships/attach_points/templates.dm b/code/modules/dropships/attach_points/templates.dm
@@ -116,20 +116,53 @@
 	UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
 
 /obj/effect/attach_point/fuel/proc/on_dir_change(datum/source, old_dir, new_dir)
+	return
+
+/obj/effect/attach_point/fuel/left/on_dir_change(datum/source, old_dir, new_dir)
 	SIGNAL_HANDLER
-	log_debug("fuel attach [old_dir] [new_dir]")
 	switch(new_dir)
 		if(NORTH)
 			pixel_x = 0
 			pixel_y = 0
-		if(SOUTH)
-			pixel_x = -32
+		if(EAST)
+			pixel_x = 27
 			pixel_y = -8
+		if(WEST)
+			pixel_x = 5
+			pixel_y = -7
+		if(SOUTH)
+			pixel_x = 32
+			pixel_y = 9
+
+/obj/effect/attach_point/fuel/right
+	pixel_x = -32
 
-/obj/effect/attach_point/fuel/dropship1
+/obj/effect/attach_point/fuel/right/on_dir_change(datum/source, old_dir, new_dir)
+	SIGNAL_HANDLER
+	switch(new_dir)
+		if(NORTH)
+			pixel_x = 32
+			pixel_y = 0
+		if(EAST)
+			pixel_x = -27
+			pixel_y = -24
+		if(WEST)
+			pixel_x = 5
+			pixel_y = -7
+		if(SOUTH)
+			pixel_x = 0
+			pixel_y = 9
+
+/obj/effect/attach_point/fuel/left/dropship1
 	ship_tag = DROPSHIP_ALAMO
 
-/obj/effect/attach_point/fuel/dropship2
+/obj/effect/attach_point/fuel/right/dropship1
+	ship_tag = DROPSHIP_ALAMO
+
+/obj/effect/attach_point/fuel/left/dropship2
+	ship_tag = DROPSHIP_NORMANDY
+
+/obj/effect/attach_point/fuel/right/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
 /obj/effect/attach_point/computer

diff --git a/icons/obj/structures/props/almayer_props64.dmi b/icons/obj/structures/props/almayer_props64.dmi
diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm
@@ -172,8 +172,9 @@
 	},
 /area/shuttle/drop1/sulaco)
 "os" = (
-/obj/effect/attach_point/fuel/dropship1{
-	pixel_x = -32
+/obj/effect/attach_point/fuel/right/dropship1{
+	pixel_x = -32;
+	dir = 1
 	},
 /turf/closed/shuttle/dropship1/transparent{
 	icon_state = "33"
@@ -485,18 +486,6 @@
 	icon_state = "62"
 	},
 /area/shuttle/drop1/sulaco)
-"KC" = (
-/obj/structure/machinery/door/airlock/hatch/cockpit{
-	req_access = null;
-	req_access_txt = "22";
-	req_one_access = null;
-	dir = 1
-	},
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/shuttle/drop1/sulaco)
 "KJ" = (
 /turf/closed/shuttle/dropship1{
 	icon_state = "81"
@@ -644,7 +633,9 @@
 	},
 /area/shuttle/drop1/sulaco)
 "Ua" = (
-/obj/effect/attach_point/fuel/dropship1,
+/obj/effect/attach_point/fuel/left/dropship1{
+	dir = 1
+	},
 /turf/closed/shuttle/dropship1/transparent{
 	icon_state = "28"
 	},

diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm
@@ -45,8 +45,9 @@
 	},
 /area/shuttle/drop2/sulaco)
 "es" = (
-/obj/effect/attach_point/fuel/dropship2{
-	pixel_x = -32
+/obj/effect/attach_point/fuel/right/dropship2{
+	pixel_x = -32;
+	dir = 1
 	},
 /turf/closed/shuttle/dropship2/transparent{
 	icon_state = "33"
@@ -268,7 +269,9 @@
 	},
 /area/shuttle/drop2/sulaco)
 "vw" = (
-/obj/effect/attach_point/fuel/dropship2,
+/obj/effect/attach_point/fuel/left/dropship2{
+	dir = 1
+	},
 /turf/closed/shuttle/dropship2/transparent{
 	icon_state = "28"
 	},
@@ -692,18 +695,6 @@
 	icon_state = "45"
 	},
 /area/shuttle/drop2/sulaco)
-"VW" = (
-/obj/structure/machinery/door/airlock/hatch/cockpit/two{
-	req_access = null;
-	req_access_txt = "22";
-	req_one_access = null;
-	dir = 1
-	},
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/shuttle/drop2/sulaco)
 "VZ" = (
 /obj/item/device/radio/intercom/normandy{
 	layer = 3.5;