From 7f76fedc310625fe5f12b1448a381949b6cb6dbf Mon Sep 17 00:00:00 2001 From: listerla <57296132+listerla@users.noreply.github.com> Date: Wed, 14 Sep 2022 07:35:44 -0400 Subject: [PATCH] Ports GPS sprites (#14787) --- .../crates_lockers/closets/secure/medical.dm | 2 +- code/modules/research/xenoarchaeology/misc.dm | 2 +- code/modules/telesci/gps.dm | 20 ++++++++++++------ html/changelogs/gps.yml | 6 ++++++ icons/obj/telescience.dmi | Bin 7374 -> 6936 bytes maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 14 ++++++------ maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 6 +++--- 7 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 html/changelogs/gps.yml diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 37d1fe41224..7dea8fea8c8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -95,7 +95,7 @@ new /obj/item/device/flashlight/pen(src) new /obj/item/clothing/accessory/stethoscope(src) new /obj/item/storage/belt/medical/first_responder(src) - new /obj/item/device/gps(src) + new /obj/item/device/gps/medical(src) new /obj/item/reagent_containers/hypospray(src) new /obj/item/taperoll/medical(src) new /obj/item/device/radio/med(src) diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index ebdf6ccf0ca..54bce541020 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -87,7 +87,7 @@ new /obj/item/device/ano_scanner(src) new /obj/item/device/depth_scanner(src) new /obj/item/device/core_sampler(src) - new /obj/item/device/gps(src) + new /obj/item/device/gps/science(src) new /obj/item/device/beacon_locator(src) new /obj/item/device/radio/beacon(src) new /obj/item/pickaxe(src) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 50c50e15bbd..4930c273479 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -4,7 +4,7 @@ var/list/GPS_list = list() name = "global positioning system" desc = "Helping lost spacemen find their way through the planets since 2016." icon = 'icons/obj/telescience.dmi' - icon_state = "gps-c" + icon_state = "gps-com" w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) @@ -274,32 +274,38 @@ var/list/GPS_list = list() . = next_initial_tag() /obj/item/device/gps/science - icon_state = "gps-s" + icon_state = "gps-sci" gps_prefix = "SCI" compass_color = "#993399" gpstag = "SCI0" /obj/item/device/gps/engineering - icon_state = "gps-e" + icon_state = "gps-eng" gps_prefix = "ENG" compass_color = "#A66300" gpstag = "ENG0" /obj/item/device/gps/mining - icon_state = "gps-m" + icon_state = "gps-min" gps_prefix = "MIN" compass_color = "#5F4519" gpstag = "MIN0" desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life." /obj/item/device/gps/janitor - icon_state = "gps-j" + icon_state = "gps-jan" gps_prefix = "JAN" compass_color = "#6eaa2c" gpstag = "JAN0" +/obj/item/device/gps/medical + icon_state = "gps-med" + gps_prefix = "MED" + compass_color = "#5EABEB" + gpstag = "MED0" + /obj/item/device/gps/marooning_equipment - icon_state = "gps-e" + icon_state = "gps-mar" gps_prefix = "MAROON" compass_color = "#EAD152" gpstag = "MAROON0" @@ -347,7 +353,7 @@ var/list/GPS_list = list() /obj/item/device/gps/stationary/mining_shuttle name = "static GPS (mining shuttle)" desc = "A static global positioning system helpful for finding your way back to the mining shuttle." - icon_state = "gps-m" + icon_state = "gps-min" anchored = TRUE layer = 2.1 gps_prefix = "MIN" diff --git a/html/changelogs/gps.yml b/html/changelogs/gps.yml new file mode 100644 index 00000000000..43c84f83076 --- /dev/null +++ b/html/changelogs/gps.yml @@ -0,0 +1,6 @@ +author: Tap0r & listerla + +delete-after: True + +changes: + - imageadd: "Ported new GPS sprites from Tau Ceti Station, including a new medical GPS." \ No newline at end of file diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi index ddcb0eb7ad3c9811eda77c685cbd5b91c219d9e8..5af898df4bec8adb3370101526ccf794881873bc 100644 GIT binary patch literal 6936 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 literal 7374 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 diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 7ac554e75a9..f892fc5e72d 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2409,17 +2409,15 @@ pixel_x = 5; pixel_y = 6 }, -/obj/item/device/gps{ - gpstag = "MED1"; - pixel_x = 5 - }, -/obj/item/device/gps{ - gpstag = "MED0"; - pixel_x = -7 - }, /obj/machinery/vending/wallmed2{ pixel_y = -29 }, +/obj/item/device/gps/medical{ + pixel_x = 5 + }, +/obj/item/device/gps/medical{ + pixel_x = -7 + }, /turf/simulated/floor/tiled, /area/medical/first_responder) "bdT" = ( diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index daa86d52096..c34c10c8693 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -2013,9 +2013,9 @@ pixel_y = 8 }, /obj/item/gun/launcher/syringe, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/device/gps/medical, +/obj/item/device/gps/medical, +/obj/item/device/gps/medical, /turf/simulated/floor/tiled/white, /area/medical/equipment) "dI" = (