cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14114 from Hatterhat/fgs

Browse Source 
itt: i dont test my code again - free golem ship GPSes start disabled
This commit is contained in:
silicons
2021-01-25 22:59:09 -07:00
committed by GitHub
parent b0d2983bf4 95db018de8
commit efecc1804b
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
_maps/RandomRuins/AnywhereRuins/golem_ship.dmm
View File

@@ -18,7 +18,7 @@
/obj/item/mining_scanner, /obj/item/mining_scanner,
/obj/item/flashlight/lantern, /obj/item/flashlight/lantern,
/obj/item/card/id/mining, /obj/item/card/id/mining,
/obj/item/gps/mining, /obj/item/gps/mining/off,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/powered/golem_ship) /area/ruin/powered/golem_ship)
"d" = ( "d" = (
@@ -32,7 +32,7 @@
/obj/item/mining_scanner, /obj/item/mining_scanner,
/obj/item/flashlight/lantern, /obj/item/flashlight/lantern,
/obj/item/card/id/mining, /obj/item/card/id/mining,
/obj/item/gps/mining, /obj/item/gps/mining/off,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/powered/golem_ship) /area/ruin/powered/golem_ship)
"e" = ( "e" = (
@@ -71,8 +71,8 @@
/area/ruin/powered/golem_ship) /area/ruin/powered/golem_ship)
"k" = ( "k" = (
/obj/machinery/computer/arcade/battle{ /obj/machinery/computer/arcade/battle{
icon_state = "arcade"; dir = 4;
dir = 4 icon_state = "arcade"
}, },
/turf/open/floor/mineral/titanium/purple, /turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship) /area/ruin/powered/golem_ship)
@@ -112,8 +112,8 @@
/area/ruin/powered/golem_ship) /area/ruin/powered/golem_ship)
"s" = ( "s" = (
/obj/machinery/computer/arcade/orion_trail{ /obj/machinery/computer/arcade/orion_trail{
icon_state = "arcade"; dir = 4;
dir = 4 icon_state = "arcade"
}, },
/turf/open/floor/mineral/titanium/purple, /turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship) /area/ruin/powered/golem_ship)

4
code/datums/components/gps.dm
View File

@@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
var/updating = TRUE //Automatic updating of GPS list. Can be set to manual by user. var/updating = TRUE //Automatic updating of GPS list. Can be set to manual by user.
var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown
/datum/component/gps/item/Initialize(_gpstag = "COM0", emp_proof = FALSE) /datum/component/gps/item/Initialize(_gpstag = "COM0", emp_proof = FALSE, starton = TRUE)
. = ..() . = ..()
if(. == COMPONENT_INCOMPATIBLE || !isitem(parent)) if(. == COMPONENT_INCOMPATIBLE || !isitem(parent))
return COMPONENT_INCOMPATIBLE return COMPONENT_INCOMPATIBLE
@@ -33,6 +33,8 @@ GLOBAL_LIST_EMPTY(GPS_list)
RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act) RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act)
RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)
RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_AltClick) RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_AltClick)
if(!starton)
tracking = FALSE
///Called on COMSIG_ITEM_ATTACK_SELF ///Called on COMSIG_ITEM_ATTACK_SELF
/datum/component/gps/item/proc/interact(datum/source, mob/user) /datum/component/gps/item/proc/interact(datum/source, mob/user)

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

@@ -8,10 +8,11 @@
slot_flags = ITEM_SLOT_BELT slot_flags = ITEM_SLOT_BELT
obj_flags = UNIQUE_RENAME obj_flags = UNIQUE_RENAME
var/gpstag = "COM0" var/gpstag = "COM0"
var/starton = TRUE
/obj/item/gps/Initialize() /obj/item/gps/Initialize()
. = ..() . = ..()
AddComponent(/datum/component/gps/item, gpstag) AddComponent(/datum/component/gps/item, gpstag, starton)
/obj/item/gps/science /obj/item/gps/science
icon_state = "gps-s" icon_state = "gps-s"
@@ -26,6 +27,9 @@
gpstag = "MINE0" gpstag = "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." 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/gps/mining/off
starton = FALSE
/obj/item/gps/cyborg /obj/item/gps/cyborg
icon_state = "gps-b" icon_state = "gps-b"
gpstag = "BORG0" gpstag = "BORG0"