From 56d3b095778d33e352b923f6530e98d34b3028f7 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 5 Nov 2013 04:10:33 -0500 Subject: [PATCH] Renamed telesci gps system because XenoArch conflict --- code/game/objects/items/devices/gps.dm | 18 +++++++++--------- maps/tgstation-redux-WIP.dmm | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 13daf364950..5867b5c67d7 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -1,4 +1,4 @@ -/obj/item/device/gps +/obj/item/device/sps name = "Space Positioning System" desc = "Helping lost spacemen find their way through the galaxy since 3016." icon = 'icons/obj/telescience.dmi' @@ -10,11 +10,11 @@ var/gpstag = "COM0" var/emped = 0 -/obj/item/device/gps/New() +/obj/item/device/sps/New() name = "Space Positioning System ([gpstag])" overlays += "working" -/obj/item/device/gps/emp_act(severity) +/obj/item/device/sps/emp_act(severity) emped = 1 overlays -= "working" overlays += "emp" @@ -23,15 +23,15 @@ overlays -= "emp" overlays += "working" -/obj/item/device/gps/attack_self(mob/user as mob) - var/obj/item/device/gps/t = "" +/obj/item/device/sps/attack_self(mob/user as mob) + var/obj/item/device/sps/t = "" if(emped) t += "ERROR" else t += "
Set Tag " t += "
Tag: [gpstag]" - for(var/obj/item/device/gps/G in world) + for(var/obj/item/device/sps/G in world) var/turf/pos = get_turf(G) var/area/gps_area = get_area(G) var/tracked_gpstag = G.gpstag @@ -45,7 +45,7 @@ popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() -/obj/item/device/gps/Topic(href, href_list) +/obj/item/device/sps/Topic(href, href_list) if(href_list["tag"] ) var/a = input("Please enter desired tag.", name, gpstag) as text a = copytext(sanitize(a), 1, 20) @@ -57,10 +57,10 @@ name = "Space Positioning System ([gpstag])" return -/obj/item/device/gps/science +/obj/item/device/sps/science icon_state = "gps-s" gpstag = "SCI0" -/obj/item/device/gps/engineering +/obj/item/device/sps/engineering icon_state = "gps-e" gpstag = "ENG0" \ No newline at end of file diff --git a/maps/tgstation-redux-WIP.dmm b/maps/tgstation-redux-WIP.dmm index 3c26e2ae358..147ecea6d73 100644 --- a/maps/tgstation-redux-WIP.dmm +++ b/maps/tgstation-redux-WIP.dmm @@ -4746,7 +4746,7 @@ "bNn" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/misc_lab) "bNo" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/misc_lab) "bNp" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/misc_lab) -"bNq" = (/obj/structure/table/reinforced,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/rcs,/obj/item/weapon/rcs,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/misc_lab) +"bNq" = (/obj/structure/table/reinforced,/obj/item/weapon/rcs,/obj/item/weapon/rcs,/obj/item/device/sps,/obj/item/device/sps,/obj/item/device/sps,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/misc_lab) "bNr" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/camera{c_tag = "Miscellaneous Research"; dir = 8; network = list("RD"); pixel_y = -22},/obj/machinery/camera{c_tag = "Miscellaneous Lab"; dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/misc_lab) "bNs" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/research{name = "Toxins Storage"; req_access_txt = "8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor,/area/toxins/storage) "bNt" = (/obj/structure/sign/nuke,/turf/simulated/wall,/area)