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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-20 21:16:01 -04:00
committed by GitHub
parent fa6ec29be6
commit 1902d10543
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/game/machinery/pointdefense.dm
View File

@@ -25,15 +25,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
. = ..() . = ..()
if(id_tag) if(id_tag)
//No more than 1 controller please. //No more than 1 controller please.
<<<<<<< HEAD
for(var/thing in GLOB.pointdefense_controllers)
var/obj/machinery/pointdefense_control/PC = thing
||||||| parent of 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
for(var/thing in pointdefense_controllers)
var/obj/machinery/pointdefense_control/PC = thing
=======
for(var/obj/machinery/pointdefense_control/PC as anything in pointdefense_controllers) for(var/obj/machinery/pointdefense_control/PC as anything in pointdefense_controllers)
>>>>>>> 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
if(PC != src && PC.id_tag == id_tag) if(PC != src && PC.id_tag == id_tag)
warning("Two [src] with the same id_tag of [id_tag]") warning("Two [src] with the same id_tag of [id_tag]")
id_tag = null id_tag = null
@@ -108,15 +100,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
var/new_ident = input(user, "Enter a new ident tag.", "[src]", id_tag) as null|text var/new_ident = input(user, "Enter a new ident tag.", "[src]", id_tag) as null|text
if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state)) if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state))
// Check for duplicate controllers with this ID // Check for duplicate controllers with this ID
<<<<<<< HEAD
for(var/thing in GLOB.pointdefense_controllers)
var/obj/machinery/pointdefense_control/PC = thing
||||||| parent of 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
for(var/thing in pointdefense_controllers)
var/obj/machinery/pointdefense_control/PC = thing
=======
for(var/obj/machinery/pointdefense_control/PC as anything in pointdefense_controllers) for(var/obj/machinery/pointdefense_control/PC as anything in pointdefense_controllers)
>>>>>>> 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
if(PC != src && PC.id_tag == id_tag) if(PC != src && PC.id_tag == id_tag)
to_chat(user, "<span class='warning'>The [new_ident] network already has a controller.</span>") to_chat(user, "<span class='warning'>The [new_ident] network already has a controller.</span>")
return return
@@ -222,15 +206,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
if(!id_tag) if(!id_tag)
return null return null
var/list/connected_z_levels = GetConnectedZlevels(get_z(src)) var/list/connected_z_levels = GetConnectedZlevels(get_z(src))
<<<<<<< HEAD
for(var/thing in GLOB.pointdefense_controllers)
var/obj/machinery/pointdefense_control/PDC = thing
||||||| parent of 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
for(var/thing in pointdefense_controllers)
var/obj/machinery/pointdefense_control/PDC = thing
=======
for(var/obj/machinery/pointdefense_control/PDC as anything in pointdefense_controllers) for(var/obj/machinery/pointdefense_control/PDC as anything in pointdefense_controllers)
>>>>>>> 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
if(PDC.id_tag == id_tag && (get_z(PDC) in connected_z_levels)) if(PDC.id_tag == id_tag && (get_z(PDC) in connected_z_levels))
return PDC return PDC