Adds new shuttle sprites (#8770)

code/game/turfs/simulated/shuttle_turfs.dm

@@ -147,10 +147,221 @@
 /turf/simulated/wall/shuttle/skrell/corner
 	icon = 'icons/turf/shuttle.dmi'
 	icon_state = "skrell_diagonal"
-	use_set_icon_state = 1
+	use_set_icon_state = TRUE
 	smooth = null
 	canSmoothWith = null
 
+//--Unique Shuttles--//
+
+/turf/simulated/wall/shuttle/unique
+	name = "shuttle hull"
+	icon = 'icons/turf/shuttle.dmi'
+	icon_state = "floor5"
+	use_set_icon_state = TRUE
+	smooth = null
+	canSmoothWith = null
+
+/obj/structure/shuttle_part //For placing them over space, if sprite covers not whole tile.
+	name = "shuttle part"
+	icon = 'icons/turf/shuttle.dmi'
+	icon_state = "door0"
+	anchored = TRUE
+	density = TRUE
+	var/outside_part = TRUE
+
+/obj/structure/window/shuttle/unique
+	name = "shuttle window"
+	desc = "It looks extremely strong. Might take many good hits to crack it."
+	icon = 'icons/turf/shuttle.dmi'
+	icon_state = "wall2"
+	health = 500
+	maxhealth = 500
+	smooth = null
+	canSmoothWith = null
+	can_be_unanchored = FALSE
+
+//merchant shuttle
+
+/turf/simulated/wall/shuttle/unique/merchant
+	icon = 'icons/turf/shuttles_unique/merchant_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/merchant
+	icon = 'icons/turf/shuttles_unique/merchant_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/merchant
+	icon = 'icons/turf/shuttles_unique/merchant_shuttle.dmi'
+	icon_state = "6,2"
+
+//cargo shuttle
+
+/turf/simulated/wall/shuttle/unique/cargo
+	icon = 'icons/turf/shuttles_unique/cargo_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/cargo
+	icon = 'icons/turf/shuttles_unique/cargo_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/cargo
+	icon = 'icons/turf/shuttles_unique/cargo_shuttle.dmi'
+	icon_state = "6,2"
+
+//ccia shuttle
+
+/turf/simulated/wall/shuttle/unique/ccia
+	icon = 'icons/turf/shuttles_unique/ccia_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/ccia
+	icon = 'icons/turf/shuttles_unique/ccia_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/ccia
+	icon = 'icons/turf/shuttles_unique/ccia_shuttle.dmi'
+	icon_state = "6,2"
+
+//ert shuttle
+
+/turf/simulated/wall/shuttle/unique/ert
+	icon = 'icons/turf/shuttles_unique/ert_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/ert
+	icon = 'icons/turf/shuttles_unique/ert_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/ert
+	icon = 'icons/turf/shuttles_unique/ert_shuttle.dmi'
+	icon_state = "6,2"
+
+//escape pod
+
+/turf/simulated/wall/shuttle/unique/escape_pod
+	icon = 'icons/turf/shuttles_unique/escape_pod.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/escape_pod
+	icon = 'icons/turf/shuttles_unique/escape_pod.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/escape_pod
+	icon = 'icons/turf/shuttles_unique/escape_pod.dmi'
+	icon_state = "6,2"
+
+//hapt shuttle
+
+/turf/simulated/wall/shuttle/unique/hapt
+	icon = 'icons/turf/shuttles_unique/escape_pod.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/hapt
+	icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/hapt
+	icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'
+	icon_state = "6,2"
+
+//raider shuttle
+
+/turf/simulated/wall/shuttle/unique/raider
+	icon = 'icons/turf/shuttles_unique/raider_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/raider
+	icon = 'icons/turf/shuttles_unique/raider_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/raider
+	icon = 'icons/turf/shuttles_unique/raider_shuttle.dmi'
+	icon_state = "6,2"
+
+//tcfl shuttle
+
+/turf/simulated/wall/shuttle/unique/tcfl
+	icon = 'icons/turf/shuttles_unique/tcfl_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/tcfl
+	icon = 'icons/turf/shuttles_unique/tcfl_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/tcfl
+	icon = 'icons/turf/shuttles_unique/tcfl_shuttle.dmi'
+	icon_state = "6,2"
+
+//transfer shuttle
+
+/turf/simulated/wall/shuttle/unique/transfer
+	icon = 'icons/turf/shuttles_unique/transfer_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/transfer
+	icon = 'icons/turf/shuttles_unique/transfer_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/transfer
+	icon = 'icons/turf/shuttles_unique/transfer_shuttle.dmi'
+	icon_state = "6,2"
+
+//mercenary shuttle
+
+/turf/simulated/wall/shuttle/unique/mercenary
+	icon = 'icons/turf/shuttles_unique/merc_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/mercenary
+	icon = 'icons/turf/shuttles_unique/merc_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/mercenary
+	icon = 'icons/turf/shuttles_unique/merc_shuttle.dmi'
+	icon_state = "6,2"
+
+//arrivals shuttle
+
+/turf/simulated/wall/shuttle/unique/arrivals
+	icon = 'icons/turf/shuttles_unique/arrivals_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/arrivals
+	icon = 'icons/turf/shuttles_unique/arrivals_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/arrivals
+	icon = 'icons/turf/shuttles_unique/arrivals_shuttle.dmi'
+	icon_state = "6,2"
+
+//arrivals shuttle
+
+/turf/simulated/wall/shuttle/unique/research
+	icon = 'icons/turf/shuttles_unique/aurora_research_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/research
+	icon = 'icons/turf/shuttles_unique/aurora_research_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/research
+	icon = 'icons/turf/shuttles_unique/aurora_research_shuttle.dmi'
+	icon_state = "6,2"
+
+//distress team shuttle
+
+/turf/simulated/wall/shuttle/unique/distress
+	icon = 'icons/turf/shuttles_unique/distress_shuttle.dmi'
+	icon_state = "5,4"
+
+/obj/structure/shuttle_part/distress
+	icon = 'icons/turf/shuttles_unique/distress_shuttle.dmi'
+	icon_state = "4,1"
+
+/obj/structure/window/shuttle/unique/distress
+	icon = 'icons/turf/shuttles_unique/distress_shuttle.dmi'
+	icon_state = "6,2"
+
 
 //--Floors--//
 

code/modules/shuttles/shuttle.dm

@@ -215,6 +215,12 @@
 						continue
 					TA.ChangeTurf(ceiling_type, TRUE, TRUE, TRUE)
 
+	for(var/area/sub_area in shuttle_area)
+		for(var/obj/structure/shuttle_part/part in sub_area)
+			var/turf/target_turf = get_turf(part)
+			if(part.outside_part)
+				target_turf.ChangeTurf(destination.base_turf)
+
 	// Remove all powernets that were affected, and rebuild them.
 	var/list/cables = list()
 	for(var/datum/powernet/P in powernets)

html/changelogs/alberyk-newshuttles.yml

@@ -0,0 +1,6 @@
+author: Alberyk, Kyres1
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added new fancy shuttle sprites."

maps/aurora/aurora-5_interstitial.dmm

@@ -657,9 +657,6 @@
 /obj/machinery/anti_bluespace,
 /turf/simulated/floor/tiled/dark,
 /area/bridge/selfdestruct)
-"bt" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/locker/locker_toilet)
 "bu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
@@ -894,13 +891,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/maintenance/bridge_elevator)
-"bN" = (
-/obj/structure/lattice,
-/turf/simulated/open,
-/area/crew_quarters/locker/locker_toilet)
-"bO" = (
-/turf/simulated/open,
-/area/crew_quarters/locker/locker_toilet)
 "bP" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
@@ -947,9 +937,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/interstitial_main)
-"bS" = (
-/turf/simulated/floor/plating,
-/area/crew_quarters/locker/locker_toilet)
 "bT" = (
 /turf/simulated/floor/reinforced/airless,
 /area/mine/unexplored)
@@ -46893,13 +46880,13 @@ aa
 aa
 aa
 aa
-bt
-bt
-bt
-bt
-bt
-bt
-bt
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -47150,13 +47137,13 @@ aa
 aa
 aa
 aa
-bt
-bN
-bN
-bN
-bN
-bN
-bt
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -47407,13 +47394,13 @@ aa
 aa
 aa
 aa
-bt
-bO
-bO
-bO
-bO
-bO
-bt
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -47664,13 +47651,13 @@ aa
 aa
 aa
 aa
-bt
-bS
-bS
-bS
-bS
-bS
-bt
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -47921,13 +47908,13 @@ aa
 aa
 aa
 aa
-bt
-bO
-bS
-bO
-bS
-bO
-bt
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -48178,13 +48165,13 @@ aa
 aa
 aa
 aa
-bt
-bt
-bt
-bt
-bt
-bt
-bt
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa

maps/aurora/aurora-7_roof.dmm

@@ -2920,6 +2920,16 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/fitness/running)
+"oD" = (
+/obj/effect/floor_decal/industrial/warning{
+	icon_state = "warning";
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/mine/explored)
 "oH" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -32113,8 +32123,6 @@ af
 aq
 aq
 aq
-aq
-aq
 ff
 ah
 ah
@@ -32135,6 +32143,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 ac
 aa
@@ -32370,8 +32380,6 @@ aa
 aa
 aa
 aa
-aa
-aa
 ae
 ah
 ah
@@ -32388,6 +32396,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 fg
 ai
 ai
@@ -32627,8 +32637,6 @@ aa
 aa
 aa
 aa
-aa
-aa
 ae
 ah
 ah
@@ -32645,6 +32653,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 aa
 aa
@@ -32884,8 +32894,6 @@ aa
 aa
 aa
 aa
-aa
-aa
 ae
 ah
 ah
@@ -32902,6 +32910,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 aa
 aa
@@ -33141,8 +33151,6 @@ aa
 aa
 aa
 aa
-aa
-aa
 ae
 ah
 ah
@@ -33159,6 +33167,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 aa
 aa
@@ -33398,8 +33408,6 @@ aa
 aa
 aa
 aa
-aa
-aa
 ae
 ah
 ah
@@ -33416,6 +33424,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 aa
 aa
@@ -33654,9 +33664,7 @@ aa
 aa
 aa
 aa
-aa
 aC
-aa
 ae
 ah
 ah
@@ -33673,6 +33681,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 aa
 aa
@@ -33912,8 +33922,6 @@ aa
 aa
 aa
 aa
-aa
-aa
 ae
 ah
 ah
@@ -33930,6 +33938,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 aa
 aa
@@ -34169,8 +34179,6 @@ aa
 aa
 aa
 aa
-aa
-aa
 ae
 ah
 ah
@@ -34187,6 +34195,8 @@ ah
 ah
 ah
 ah
+ah
+ah
 al
 aa
 aa
@@ -34426,10 +34436,7 @@ aa
 aa
 aa
 aa
-aa
-aa
 af
-aq
 ff
 ah
 ah
@@ -34442,8 +34449,11 @@ ah
 ah
 ah
 ah
+ah
 fg
 aq
+aq
+aq
 am
 aa
 aa
@@ -34684,22 +34694,22 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
 ae
 ah
 fg
 ai
+ai
+ai
+ai
 ff
 ah
 ah
 ah
 fg
-ai
-ff
-ah
-al
+ao
+eK
+aa
+aa
 aa
 aa
 aa
@@ -34941,22 +34951,22 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
 ae
 ah
 al
 aa
+aa
+aa
+aa
 bn
 ah
 ah
 ah
 al
 aa
-bn
-ah
-al
+aa
+aa
+aa
 aa
 aa
 aa
@@ -35198,22 +35208,22 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
 ed
 ao
 am
 aa
+aa
+aa
+aa
 ed
 ai
 ai
 ai
 am
 aa
-ed
-ao
-am
+aa
+aa
+aa
 aa
 aa
 aa
@@ -58120,9 +58130,9 @@ aa
 aa
 aa
 aa
-ed
-aq
-ao
+bn
+ah
+al
 aa
 aa
 aa
@@ -58377,9 +58387,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -58634,9 +58644,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -58891,9 +58901,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -59148,9 +59158,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -59405,9 +59415,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -59662,9 +59672,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -59919,9 +59929,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -60176,9 +60186,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -60433,9 +60443,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -60690,9 +60700,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+bn
+ah
+al
 aa
 aa
 aa
@@ -60946,10 +60956,10 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+oD
+fe
+ah
+al
 aa
 aa
 aa
@@ -61203,10 +61213,10 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+bn
+ah
+ah
+al
 aa
 aa
 aa
@@ -61460,10 +61470,10 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+bn
+ah
+ah
+al
 aa
 aa
 aa
@@ -61717,10 +61727,10 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+ed
+aq
+aq
+ao
 aa
 aa
 aa