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 ddcb0eb7ad3..5af898df4be 100644 Binary files a/icons/obj/telescience.dmi and b/icons/obj/telescience.dmi differ 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" = (