diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm index 62a22425926..43aa3cd98c7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -832,6 +832,10 @@ /obj/item/shard, /turf/space, /area/space/nearstation) +"Hv" = ( +/obj/item/gps/ruin, +/turf/simulated/wall/r_wall, +/area/ruin/unpowered) (1,1,1) = {" aa @@ -973,7 +977,7 @@ aa at at aF -at +Hv aU ay ay diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index 22d4c0798aa..17d49d666bc 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -269,6 +269,10 @@ icon_state = "freezerfloor" }, /area/ruin/powered) +"Y" = ( +/obj/item/gps/ruin, +/turf/simulated/wall/r_wall, +/area/ruin/powered) (1,1,1) = {" a @@ -960,7 +964,7 @@ b f f p -f +Y f f j diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm index 2a5c0eae533..b4e36942d6a 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm @@ -240,6 +240,13 @@ /obj/structure/shuttle/engine/propulsion, /turf/simulated/shuttle/plating, /area/ruin/powered) +"U" = ( +/obj/item/gps/ruin, +/turf/simulated/shuttle/wall{ + tag = "icon-swall12"; + icon_state = "swall12" + }, +/area/ruin/powered) (1,1,1) = {" a @@ -313,7 +320,7 @@ a c g l -q +U r u t diff --git a/code/modules/awaymissions/mission_code/ruins/gps.dm b/code/modules/awaymissions/mission_code/ruins/gps.dm new file mode 100644 index 00000000000..fa26eea5d0d --- /dev/null +++ b/code/modules/awaymissions/mission_code/ruins/gps.dm @@ -0,0 +1,13 @@ +//local gps units to let the ruins be found easier. + +/obj/item/gps/ruin + name = "navigation console" + desc = "A console for navigation in local space, gives off a weak signal that can be picked up if sufficiently close." + icon = 'icons/obj/terminals.dmi' + icon_state = "gps_console" + anchored = TRUE + local = TRUE + gpstag = "Unknown Signal" + +/obj/item/gps/ruin/attack_hand(mob/user) + attack_self(user) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 94920587b54..9b7ba72209b 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/gps - name = "global positioning system" + name = "default gps" desc = "Helping lost spacemen find their way through the planets since 2016." icon = 'icons/obj/telescience.dmi' icon_state = "gps-c" @@ -16,7 +16,8 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/gps/New() ..() GLOB.GPS_list.Add(src) - name = "global positioning system ([gpstag])" + if(name == "default gps") //use default naming scheme + name = "global positioning system ([gpstag])" overlays += "working" /obj/item/gps/Destroy() diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index 45baaf3f7ba..c47cd86e6d3 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ diff --git a/paradise.dme b/paradise.dme index 7324ffaf044..4e45fe53e84 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1313,6 +1313,7 @@ #include "code\modules\awaymissions\mission_code\wildwest.dm" #include "code\modules\awaymissions\mission_code\ghost_role_spawners\golems.dm" #include "code\modules\awaymissions\mission_code\ghost_role_spawners\oldstation.dm" +#include "code\modules\awaymissions\mission_code\ruins\gps.dm" #include "code\modules\awaymissions\mission_code\ruins\oldstation.dm" #include "code\modules\awaymissions\mission_code\ruins\wizardcrash.dm" #include "code\modules\buildmode\bm_mode.dm"