diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index cee434a61e7..fb4ac3c3220 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -460,11 +460,17 @@ var/list/asset_datums = list() "horizon.png" = 'html/images/scans/horizon.png', "intrepid.png" = 'html/images/scans/intrepid.png', "spark.png" = 'html/images/scans/spark.png', + "canary.png" = 'html/images/scans/canary.png', "corvette.png" = 'html/images/scans/corvette.png', "elyran_corvette.png" = 'html/images/scans/elyran_corvette.png', "dominian_corvette.png" = 'html/images/scans/dominian_corvette.png', "tcfl_cetus.png" = 'html/images/scans/tcfl_cetus.png', "unathi_corvette.png" = 'html/images/scans/unathi_corvette.png', + "unathi_freighter1.png" = 'html/images/scans/unathi_freighter1.png', + "unathi_freighter2.png" = 'html/images/scans/unathi_freighter2.png', + "unathi_guild_station.png" = 'html/images/scans/unathi_guild_station.png', + "unathi_diona_freighter.png" = 'html/images/scans/unathi_diona_freighter.png', + "hegemony_corvette.png" = 'html/images/scans/hegemony_corvette.png', "ranger.png" = 'html/images/scans/ranger.png', "oe_platform.png" = 'html/images/scans/oe_platform.png', "hospital.png" = 'html/images/scans/hospital.png', diff --git a/html/changelogs/kyres1-epic_unathi_ships.yml b/html/changelogs/kyres1-epic_unathi_ships.yml new file mode 100644 index 00000000000..099d7afa617 --- /dev/null +++ b/html/changelogs/kyres1-epic_unathi_ships.yml @@ -0,0 +1,7 @@ +author: kyres1 + +delete-after: True + +changes: + - bugfix: "Fixed the Canary's scan image output not showing." + - rscadd: "Added skybox sprites and scan images for the Tarwa freighter and the various Unathi third party ships." diff --git a/html/images/scans/hegemony_corvette.png b/html/images/scans/hegemony_corvette.png new file mode 100644 index 00000000000..7ae7c61643e Binary files /dev/null and b/html/images/scans/hegemony_corvette.png differ diff --git a/html/images/scans/unathi_diona_freighter.png b/html/images/scans/unathi_diona_freighter.png new file mode 100644 index 00000000000..e4ff2a4046f Binary files /dev/null and b/html/images/scans/unathi_diona_freighter.png differ diff --git a/html/images/scans/unathi_freighter1.png b/html/images/scans/unathi_freighter1.png new file mode 100644 index 00000000000..c8e1099d21c Binary files /dev/null and b/html/images/scans/unathi_freighter1.png differ diff --git a/html/images/scans/unathi_freighter2.png b/html/images/scans/unathi_freighter2.png new file mode 100644 index 00000000000..e061aa03686 Binary files /dev/null and b/html/images/scans/unathi_freighter2.png differ diff --git a/html/images/scans/unathi_guild_station.png b/html/images/scans/unathi_guild_station.png new file mode 100644 index 00000000000..ddcaad8a4af Binary files /dev/null and b/html/images/scans/unathi_guild_station.png differ diff --git a/icons/skybox/subcapital_ships.dmi b/icons/skybox/subcapital_ships.dmi index 8962b87e080..f72d6da2317 100644 Binary files a/icons/skybox/subcapital_ships.dmi and b/icons/skybox/subcapital_ships.dmi differ diff --git a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm index 6856267b245..6e32ec63fe6 100644 --- a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm +++ b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm @@ -79,6 +79,7 @@ icon_state = "generic" moving_state = "generic_moving" colors = list("#95de9c") + scanimage = "unathi_freighter1.png" max_speed = 1/(2 SECONDS) burn_delay = 2 SECONDS vessel_mass = 7500 //This truck is too damn big @@ -86,6 +87,12 @@ fore_dir = SOUTH comms_name = "modified" +/obj/effect/overmap/visitable/ship/landable/unathi_pirate_izharshan/get_skybox_representation() + var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "unathi_freighter1") + skybox_image.pixel_x = rand(0,64) + skybox_image.pixel_y = rand(128,256) + return skybox_image + /obj/machinery/computer/shuttle_control/explore/unathi_pirate_izharshan name = "shuttle control console" shuttle_tag = "Izharshan Freighter" diff --git a/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa.dm b/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa.dm index 0cc87bb90e9..3bfa7e3db02 100644 --- a/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa.dm +++ b/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa.dm @@ -19,6 +19,7 @@ icon_state = "tramp" moving_state = "tramp_moving" colors = list("#c2c1ac", "#1b4720") + scanimage = "unathi_diona_freighter.png" max_speed = 1/(2 SECONDS) burn_delay = 1 SECONDS vessel_mass = 5000 @@ -44,6 +45,12 @@ designation = "[pick("Silent Sentinel", "Symbiosis", "Flying Dead", "Immortal", "Blood for Blood", "Unnatural Compatibility", "Barkscale", "Boneclaw", "Watcher in the Dark")]" ..() +/obj/effect/overmap/visitable/ship/tarwa/get_skybox_representation() + var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "unathi_diona_freighter") + skybox_image.pixel_x = rand(0,64) + skybox_image.pixel_y = rand(128,256) + return skybox_image + /obj/effect/shuttle_landmark/tarwa_ship base_turf = /turf/space/dynamic base_area = /area/space diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm index 507ecdc4cc8..1b7f546f97c 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm @@ -19,7 +19,7 @@ icon_state = "foundation" moving_state = "foundation-moving" colors = list("#e38222", "#f0ba3e") - scanimage = "unathi_corvette.png" + scanimage = "hegemony_corvette.png" designer = "Hephaestus Industries, Izweski Hegemonic Naval Guilds" volume = "75 meters length, 35 meters beam/width, 21 meters vertical height" drive = "Low-Speed Warp Acceleration FTL Drive" @@ -45,6 +45,12 @@ designation = "[pick("Three Heads' Chosen", "Revenge for Gakal'zaal", "Child of Chanterel", "Horns of the Hegemon", "Hide of Steel", "Battle-Talon", "Roaming Warrior", "Abiding Victory", "Scorched Scales", "Wildfire of Moghes", "Travakh Unending", "Blessed By The Spirits", "Blackened Tail", "Legend Foretold", "Molten Claws", "Unfading River", "Emberstorm")]" ..() +/obj/effect/overmap/visitable/ship/hegemony_corvette/get_skybox_representation() + var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "hegemony_corvette") + skybox_image.pixel_x = rand(0,64) + skybox_image.pixel_y = rand(128,256) + return skybox_image + /obj/effect/shuttle_landmark/hegemony_corvette base_turf = /turf/space/dynamic base_area = /area/space @@ -118,4 +124,4 @@ docking_controller = "hegemony_shuttle_dock" base_area = /area/space base_turf = /turf/space - movable_flags = MOVABLE_FLAG_EFFECTMOVE \ No newline at end of file + movable_flags = MOVABLE_FLAG_EFFECTMOVE diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm index 6457b044e8a..3e3141906df 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm @@ -25,7 +25,7 @@ vessel_mass = 5000 fore_dir = SOUTH vessel_size = SHIP_SIZE_SMALL - scanimage = "tramp_freighter.png" + scanimage = "unathi_freighter2.png" designer = "Hephaestus Industries, Izweski Hegemonic Naval Guilds" volume = "65 meters length, 35 meters beam/width, 18 meters vertical height" drive = "Low-Speed Warp Acceleration FTL Drive" @@ -46,6 +46,12 @@ designation = "[pick("Fisher's Bounty", "Scales of Silver", "Gharr's Greed", "Pride of Skalamar", "Horns of Diamond", "Memory of Dukhul", "Glory through Profit", "Razi's Pride")]" ..() +/obj/effect/overmap/visitable/ship/merchants_guild/get_skybox_representation() + var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "unathi_freighter2") + skybox_image.pixel_x = rand(0,64) + skybox_image.pixel_y = rand(128,256) + return skybox_image + /obj/effect/shuttle_landmark/merchants_guild base_turf = /turf/space/dynamic base_area = /area/space diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm index 3a011840fcc..9c040ff7643 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm @@ -19,6 +19,7 @@ icon = 'icons/obj/overmap/overmap_stationary.dmi' icon_state = "outpost" color = "#b07810" + scanimage = "unathi_guild_station.png" comms_support = TRUE comms_name = "Miners' Guild" initial_generic_waypoints = list( @@ -49,7 +50,11 @@ name = "Miners' Guild Outpost - Aft" landmark_tag = "miners_guild_nav4" - +/obj/effect/overmap/visitable/sector/miners_guild_station/get_skybox_representation() + var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "guild_station") + skybox_image.pixel_x = rand(0,64) + skybox_image.pixel_y = rand(128,256) + return skybox_image //Shuttle /obj/effect/overmap/visitable/ship/landable/miners_guild @@ -100,4 +105,4 @@ /obj/effect/shuttle_landmark/miners_guild/transit name = "In transit" landmark_tag = "miners_guild_navtransit" - base_turf = /turf/space/transit/north \ No newline at end of file + base_turf = /turf/space/transit/north