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:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14239 from Hatterhat/golem-gps-pass2

Browse Source 
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
This commit is contained in:
Lin
2021-02-17 17:29:03 -06:00
committed by GitHub
parent e5e66be6b3 c5a9a8905a
commit 3b9f1cb4ec
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,15 +26,16 @@ GLOBAL_LIST_EMPTY(GPS_list)
if(. == COMPONENT_INCOMPATIBLE || !isitem(parent)) if(. == COMPONENT_INCOMPATIBLE || !isitem(parent))
return COMPONENT_INCOMPATIBLE return COMPONENT_INCOMPATIBLE
var/atom/A = parent var/atom/A = parent
A.add_overlay("working") if(starton)
A.add_overlay("working")
else
tracking = FALSE
A.name = "[initial(A.name)] ([gpstag])" A.name = "[initial(A.name)] ([gpstag])"
RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact) RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
if(!emp_proof) if(!emp_proof)
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)

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

@@ -8,11 +8,12 @@
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/emp_proof = FALSE
var/starton = TRUE var/starton = TRUE
/obj/item/gps/Initialize() /obj/item/gps/Initialize()
. = ..() . = ..()
AddComponent(/datum/component/gps/item, gpstag, starton) AddComponent(/datum/component/gps/item, gpstag, emp_proof, starton)
/obj/item/gps/science /obj/item/gps/science
icon_state = "gps-s" icon_state = "gps-s"