cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6248 from Heroman3003/gpsing

Browse Source 
Adds more GPS variety
This commit is contained in:
Atermonera
2019-07-01 16:46:52 -08:00
committed by VirgoBot
parent 75d6e509d2
commit 4f601a94b8
4 changed files with 84 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
code/game/objects/items/devices/gps.dm
View File

@@ -4,12 +4,12 @@ var/list/GPS_list = list()
name = "global positioning system"
desc = "Triangulates the approximate co-ordinates using a nearby satellite network. Alt+click to toggle power."
icon = 'icons/obj/gps.dmi'
icon_state = "gps-c"
icon_state = "gps-gen"
w_class = ITEMSIZE_TINY
slot_flags = SLOT_BELT
origin_tech = list(TECH_MATERIAL = 2, TECH_BLUESPACE = 2, TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 500)
var/gps_tag = "COM0"
var/gps_tag = "GEN0"
var/emped = FALSE
var/tracking = FALSE // Will not show other signals or emit its own signal if false.
var/long_range = FALSE // If true, can see farther, depending on get_map_levels().
@@ -171,22 +171,43 @@ var/list/GPS_list = list()
/obj/item/device/gps/on // Defaults to off to avoid polluting the signal list with a bunch of GPSes without owners. If you need to spawn active ones, use these.
tracking = TRUE
/obj/item/device/gps/command
icon_state = "gps-com"
gps_tag = "COM0"
/obj/item/device/gps/command/on
tracking = TRUE
/obj/item/device/gps/security
icon_state = "gps-sec"
gps_tag = "SEC0"
/obj/item/device/gps/security/on
tracking = TRUE
/obj/item/device/gps/medical
icon_state = "gps-med"
gps_tag = "MED0"
/obj/item/device/gps/medical/on
tracking = TRUE
/obj/item/device/gps/science
icon_state = "gps-s"
icon_state = "gps-sci"
gps_tag = "SCI0"
/obj/item/device/gps/science/on
tracking = TRUE
/obj/item/device/gps/engineering
icon_state = "gps-e"
icon_state = "gps-eng"
gps_tag = "ENG0"
/obj/item/device/gps/engineering/on
tracking = TRUE
/obj/item/device/gps/mining
icon_state = "gps-m"
icon_state = "gps-mine"
gps_tag = "MINE0"
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. Alt+click to toggle power."
@@ -194,15 +215,15 @@ var/list/GPS_list = list()
tracking = TRUE
/obj/item/device/gps/explorer
icon_state = "gps-ex"
gps_tag = "EX0"
icon_state = "gps-exp"
gps_tag = "EXP0"
desc = "A positioning system helpful for rescuing trapped or injured explorers, keeping one on you at all times while exploring might just save your life. Alt+click to toggle power."
/obj/item/device/gps/explorer/on
tracking = TRUE
/obj/item/device/gps/robot
icon_state = "gps-b"
icon_state = "gps-borg"
gps_tag = "SYNTH0"
desc = "A synthetic internal positioning system. Used as a recovery beacon for damaged synthetic assets, or a collaboration tool for mining or exploration teams. \
Alt+click to toggle power."

65
code/modules/research/designs/misc.dm
View File

@@ -85,22 +85,65 @@ datum/design/item/laserpointer
build_path = /obj/item/device/communicator
sort_string = "VABAJ"
/datum/design/item/gps
req_tech = list(TECH_MATERIAL = 2, TECH_DATA = 2, TECH_BLUESPACE = 2)
materials = list(DEFAULT_WALL_MATERIAL = 500)
/datum/design/item/gps/generic
name = "Triangulating device design (GEN)"
id = "gps_gen"
build_path = /obj/item/device/gps
sort_string = "VADAA"
/datum/design/item/gps/comand
name = "Triangulating device design (COM)"
id = "gps_com"
build_path = /obj/item/device/gps/command
sort_string = "VADAB"
/datum/design/item/gps/security
name = "Triangulating device design (SEC)"
id = "gps_sec"
build_path = /obj/item/device/gps/security
sort_string = "VADAC"
/datum/design/item/gps/medical
name = "Triangulating device design (MED)"
id = "gps_med"
build_path = /obj/item/device/gps/medical
sort_string = "VADAD"
/datum/design/item/gps/engineering
name = "Triangulating device design (ENG)"
id = "gps_eng"
build_path = /obj/item/device/gps/engineering
sort_string = "VADAE"
/datum/design/item/gps/science
name = "Triangulating device design (SCI)"
id = "gps_sci"
build_path = /obj/item/device/gps/science
sort_string = "VADAF"
/datum/design/item/gps/mining
name = "Triangulating device design (MINE)"
id = "gps_mine"
build_path = /obj/item/device/gps/mining
sort_string = "VADAG"
/datum/design/item/gps/explorer
name = "Triangulating device design (EXP)"
id = "gps_exp"
build_path = /obj/item/device/gps/explorer
sort_string = "VADAH"
/datum/design/item/beacon
name = "Bluespace tracking beacon design"
id = "beacon"
req_tech = list(TECH_BLUESPACE = 1)
materials = list (DEFAULT_WALL_MATERIAL = 20, "glass" = 10)
build_path = /obj/item/device/radio/beacon
sort_string = "VADAA"
/datum/design/item/gps
name = "Triangulating device design"
desc = "Triangulates approximate co-ordinates using a nearby satellite network."
id = "gps"
req_tech = list(TECH_MATERIAL = 2, TECH_DATA = 2, TECH_BLUESPACE = 2)
materials = list(DEFAULT_WALL_MATERIAL = 500)
build_path = /obj/item/device/gps
sort_string = "VADAB"
sort_string = "VADBA"
/datum/design/item/beacon_locator
name = "Beacon tracking pinpointer"
@@ -109,7 +152,7 @@ datum/design/item/laserpointer
req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3)
materials = list(DEFAULT_WALL_MATERIAL = 1000,"glass" = 500)
build_path = /obj/item/device/beacon_locator
sort_string = "VADAC"
sort_string = "VADBB"
/datum/design/item/bag_holding
name = "'Bag of Holding', an infinite capacity bag prototype"

BIN
icons/obj/gps.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
maps/southern_cross/southern_cross-3.dmm
View File

@@ -2202,7 +2202,7 @@ aaaaaaaaaaaaaaaaabababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaabab
"ho" = (/obj/structure/closet/secure_closet/sar,/obj/machinery/light,/obj/item/weapon/storage/box/bodybags,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/white/border,/obj/item/roller/adv,/obj/item/weapon/storage/pill_bottle/spaceacillin,/turf/simulated/floor/tiled,/area/surface/outpost/main/first_aid)
"hp" = (/obj/structure/closet/secure_closet/sar,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/paleblue/border,/obj/item/roller/adv{pixel_y = 5},/obj/item/weapon/storage/pill_bottle/spaceacillin,/turf/simulated/floor/tiled,/area/surface/outpost/main/first_aid)
"hq" = (/obj/structure/table/steel,/obj/machinery/recharger,/obj/machinery/status_display{pixel_x = 0; pixel_y = -32},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/white/border,/turf/simulated/floor/tiled,/area/surface/outpost/main/first_aid)
"hr" = (/obj/structure/table/steel,/obj/item/device/gps,/obj/item/device/gps{pixel_x = 3; pixel_y = 3},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled,/area/surface/outpost/main/first_aid)
"hr" = (/obj/structure/table/steel,/obj/item/device/gps/medical,/obj/item/device/gps/medical{pixel_x = 3; pixel_y = 3},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled,/area/surface/outpost/main/first_aid)
"hs" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/surface/outpost/mining_main/gen_room)
"ht" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/surface/outpost/mining_main/gen_room)
"hu" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/surface/outpost/mining_main/gen_room)