Dropship Gun Gun (#422)

Co-authored-by: KoishiVibe <[email protected]>
cmss13-devs · Sep 4, 2024 · fc4ce39 · fc4ce39
1 parent d7cd893
commit fc4ce39
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 29 deletions.
diff --git a/code/modules/shuttle/dropship.dm b/code/modules/shuttle/dropship.dm
@@ -222,40 +222,95 @@
 	opacity = TRUE
 
 /obj/structure/shuttle/part/midway/transparent
+	desc = "The cockpit canopy transparency of a UD-4 gunship. Composed of a composite material that matches the hull's radar absorbency while providing protection against glare and sniping lasers."
 	opacity = FALSE
 
+/obj/structure/shuttle/part/midway/transparent/nosecone
+	desc = "Part of the nose assembly of the UD-4 Cheyenne. Contains the forward sensor complex."
+
+/obj/structure/shuttle/part/midway/gunpod_prop
+	name = "\improper Midway"
+	desc = "The nose of a UD-4 Cheyenne dropship. Contains the AESA radar system and the chin-mounted powered gunpod containing the GAU-113/B 25mm rotary autocannon with a 900 round drum."
+	icon = 'icons/turf/dropship4.dmi'
+	icon_state = "101a"
+	opacity = TRUE
+
 /obj/structure/shuttle/part/cyclone
 	name = "\improper Cyclone"
 	icon = 'icons/turf/dropship2.dmi'
 	icon_state = "1"
 	opacity = TRUE
 
 /obj/structure/shuttle/part/cyclone/transparent
+	desc = "The cockpit canopy transparency of a UD-4 gunship. Composed of a composite material that matches the hull's radar absorbency while providing protection against glare and sniping lasers."
 	opacity = FALSE
 
+/obj/structure/shuttle/part/cyclone/transparent/nosecone
+	desc = "Part of the nose assembly of the UD-4 Cheyenne. Contains the forward sensor complex."
+
+/obj/structure/shuttle/part/cyclone/gunpod_prop
+	name = "\improper Cyclone"
+	desc = "The nose of a UD-4 Cheyenne dropship. Contains the AESA radar system and the chin-mounted powered gunpod containing the GAU-113/B 25mm rotary autocannon with a 900 round drum."
+	icon = 'icons/turf/dropship2.dmi'
+	icon_state = "101a"
+	opacity = TRUE
+
 /obj/structure/shuttle/part/tornado
 	name = "\improper Tornado"
 	icon = 'icons/turf/dropship3.dmi'
 	icon_state = "1"
 	opacity = TRUE
 
 /obj/structure/shuttle/part/tornado/transparent
+	desc = "The cockpit canopy transparency of a UD-4 gunship. Composed of a composite material that matches the hull's radar absorbency while providing protection against glare and sniping lasers."
 	opacity = FALSE
 
+/obj/structure/shuttle/part/tornado/transparent/nosecone
+	desc = "Part of the nose assembly of the UD-4 Cheyenne. Contains the forward sensor complex."
+
+/obj/structure/shuttle/part/tornado/gunpod_prop
+	name = "\improper Tornado"
+	desc = "The nose of a UD-4 Cheyenne dropship. Contains the AESA radar system and the chin-mounted powered gunpod containing the GAU-113/B 25mm rotary autocannon with a 900 round drum."
+	icon = 'icons/turf/dropship3.dmi'
+	icon_state = "101a"
+	opacity = TRUE
+
 /obj/structure/shuttle/part/typhoon
 	name = "\improper Typhoon"
 	icon = 'icons/turf/dropship3.dmi'
 	icon_state = "1"
 	opacity = TRUE
 
 /obj/structure/shuttle/part/typhoon/transparent
+	desc = "The cockpit canopy transparency of a UD-4 gunship. Composed of a composite material that matches the hull's radar absorbency while providing protection against glare and sniping lasers."
 	opacity = FALSE
 
+/obj/structure/shuttle/part/typhoon/transparent/nosecone
+	desc = "Part of the nose assembly of the UD-4 Cheyenne. Contains the forward sensor complex."
+
+/obj/structure/shuttle/part/typhoon/gunpod_prop
+	name = "\improper Typhoon"
+	desc = "The nose of a UD-4 Cheyenne dropship. Contains the AESA radar system and the chin-mounted powered gunpod containing the GAU-113/B 25mm rotary autocannon with a 900 round drum."
+	icon = 'icons/turf/dropship3.dmi'
+	icon_state = "101a"
+	opacity = TRUE
+
 /obj/structure/shuttle/part/tripoli
 	name = "\improper Tripoli"
 	icon = 'icons/turf/dropship.dmi'
 	icon_state = "1"
 	opacity = TRUE
 
 /obj/structure/shuttle/part/tripoli/transparent
+	desc = "The cockpit canopy transparency of a UD-4 gunship. Composed of a composite material that matches the hull's radar absorbency while providing protection against glare and sniping lasers."
 	opacity = FALSE
+
+/obj/structure/shuttle/part/tripoli/transparent/nosecone
+	desc = "Part of the nose assembly of the UD-4 Cheyenne. Contains the forward sensor complex."
+
+/obj/structure/shuttle/part/tripoli/gunpod_prop
+	name = "\improper Tripoli"
+	desc = "The nose of a UD-4 Cheyenne dropship. Contains the AESA radar system and the chin-mounted powered gunpod containing the GAU-113/B 25mm rotary autocannon with a 900 round drum."
+	icon = 'icons/turf/dropship.dmi'
+	icon_state = "101a"
+	opacity = TRUE
diff --git a/icons/turf/dropship.dmi b/icons/turf/dropship.dmi
diff --git a/icons/turf/dropship2.dmi b/icons/turf/dropship2.dmi
diff --git a/icons/turf/dropship3.dmi b/icons/turf/dropship3.dmi
diff --git a/icons/turf/dropship4.dmi b/icons/turf/dropship4.dmi
diff --git a/maps/shuttles/dropship_cyclone.dmm b/maps/shuttles/dropship_cyclone.dmm
@@ -334,9 +334,7 @@
 /turf/template_noop,
 /area/shuttle/cyclone)
 "yA" = (
-/obj/structure/shuttle/part/cyclone/transparent{
-	icon_state = "101"
-	},
+/obj/structure/shuttle/part/cyclone/gunpod_prop,
 /turf/template_noop,
 /area/shuttle/cyclone)
 "yP" = (
@@ -364,7 +362,7 @@
 	},
 /area/shuttle/cyclone)
 "zL" = (
-/obj/structure/shuttle/part/cyclone/transparent{
+/obj/structure/shuttle/part/cyclone/transparent/nosecone{
 	icon_state = "102"
 	},
 /turf/template_noop,
@@ -578,7 +576,7 @@
 /turf/template_noop,
 /area/shuttle/cyclone)
 "RR" = (
-/obj/structure/shuttle/part/cyclone/transparent{
+/obj/structure/shuttle/part/cyclone/transparent/nosecone{
 	icon_state = "100"
 	},
 /turf/template_noop,

diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm
@@ -49,7 +49,7 @@
 /turf/template_noop,
 /area/shuttle/midway)
 "go" = (
-/obj/structure/shuttle/part/midway/transparent{
+/obj/structure/shuttle/part/midway/transparent/nosecone{
 	icon_state = "102"
 	},
 /turf/template_noop,
@@ -215,10 +215,6 @@
 	},
 /area/shuttle/midway)
 "tf" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
-	pixel_y = 26;
-	pixel_x = -10
-	},
 /turf/closed/shuttle/midway/transparent{
 	icon_state = "97a"
 	},
@@ -350,7 +346,7 @@
 	},
 /area/shuttle/midway)
 "Cr" = (
-/obj/structure/shuttle/part/midway/transparent{
+/obj/structure/shuttle/part/midway/transparent/nosecone{
 	icon_state = "100"
 	},
 /turf/template_noop,
@@ -528,9 +524,7 @@
 	},
 /area/shuttle/midway)
 "LY" = (
-/obj/structure/shuttle/part/midway/transparent{
-	icon_state = "101"
-	},
+/obj/structure/shuttle/part/midway/gunpod_prop,
 /turf/template_noop,
 /area/shuttle/midway)
 "LZ" = (

diff --git a/maps/shuttles/dropship_tornado.dmm b/maps/shuttles/dropship_tornado.dmm
@@ -174,9 +174,7 @@
 	},
 /area/shuttle/tornado)
 "hE" = (
-/obj/structure/shuttle/part/tornado/transparent{
-	icon_state = "101"
-	},
+/obj/structure/shuttle/part/tornado/gunpod_prop,
 /turf/template_noop,
 /area/shuttle/tornado)
 "jP" = (
@@ -259,7 +257,7 @@
 	},
 /area/shuttle/tornado)
 "sx" = (
-/obj/structure/shuttle/part/tornado/transparent{
+/obj/structure/shuttle/part/tornado/transparent/nosecone{
 	icon_state = "100"
 	},
 /turf/template_noop,
@@ -536,7 +534,7 @@
 	},
 /area/shuttle/tornado)
 "Pi" = (
-/obj/structure/shuttle/part/tornado/transparent{
+/obj/structure/shuttle/part/tornado/transparent/nosecone{
 	icon_state = "102"
 	},
 /turf/template_noop,

diff --git a/maps/shuttles/dropship_tripoli.dmm b/maps/shuttles/dropship_tripoli.dmm
@@ -320,7 +320,7 @@
 /turf/template_noop,
 /area/shuttle/tripoli)
 "wL" = (
-/obj/structure/shuttle/part/tripoli{
+/obj/structure/shuttle/part/tripoli/transparent/nosecone{
 	icon_state = "100"
 	},
 /turf/template_noop,
@@ -347,9 +347,7 @@
 /turf/template_noop,
 /area/shuttle/tripoli)
 "yF" = (
-/obj/structure/shuttle/part/tripoli{
-	icon_state = "101"
-	},
+/obj/structure/shuttle/part/tripoli/gunpod_prop,
 /turf/template_noop,
 /area/shuttle/tripoli)
 "zt" = (
@@ -461,7 +459,7 @@
 /turf/template_noop,
 /area/shuttle/tripoli)
 "Fq" = (
-/obj/structure/shuttle/part/tripoli{
+/obj/structure/shuttle/part/tripoli/transparent/nosecone{
 	icon_state = "102"
 	},
 /turf/template_noop,

diff --git a/maps/shuttles/dropship_typhoon.dmm b/maps/shuttles/dropship_typhoon.dmm
@@ -105,7 +105,7 @@
 	},
 /area/shuttle/tornado)
 "jt" = (
-/obj/structure/shuttle/part/typhoon/transparent{
+/obj/structure/shuttle/part/typhoon/transparent/nosecone{
 	icon_state = "102"
 	},
 /turf/template_noop,
@@ -172,9 +172,7 @@
 /turf/template_noop,
 /area/shuttle/tornado)
 "qa" = (
-/obj/structure/shuttle/part/typhoon/transparent{
-	icon_state = "101"
-	},
+/obj/structure/shuttle/part/typhoon/gunpod_prop,
 /turf/template_noop,
 /area/shuttle/tornado)
 "rb" = (
@@ -354,7 +352,7 @@
 	},
 /area/shuttle/tornado)
 "FO" = (
-/obj/structure/shuttle/part/typhoon/transparent{
+/obj/structure/shuttle/part/typhoon/transparent/nosecone{
 	icon_state = "100"
 	},
 /turf/template_noop,