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

Fixes particle accelerator construction. (#7232)

Browse Source 
Left is left and right is right.
This commit is contained in:
Atermonera
2020-05-24 14:31:43 -07:00
committed by VirgoBot
parent 5c130f413e
commit 5275847404
2 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -160,49 +160,54 @@
/obj/machinery/particle_accelerator/control_box/proc/part_scan() /obj/machinery/particle_accelerator/control_box/proc/part_scan()
for(var/obj/structure/particle_accelerator/fuel_chamber/F in orange(1,src)) for(var/obj/structure/particle_accelerator/fuel_chamber/F in orange(1,src))
src.set_dir(F.dir) src.set_dir(F.dir)
break
connected_parts = list() connected_parts = list()
var/tally = 0 assembled = 0
var/ldir = turn(dir,-90) var/ldir = turn(dir,90)
var/rdir = turn(dir,90) var/rdir = turn(dir,-90)
var/odir = turn(dir,180) var/odir = turn(dir,180)
var/turf/T = src.loc var/turf/T = src.loc
T = get_step(T,rdir)
if(check_part(T,/obj/structure/particle_accelerator/fuel_chamber))
tally++
T = get_step(T,odir)
if(check_part(T,/obj/structure/particle_accelerator/end_cap))
tally++
T = get_step(T,dir)
T = get_step(T,dir)
if(check_part(T,/obj/structure/particle_accelerator/power_box))
tally++
T = get_step(T,dir)
if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/center))
tally++
T = get_step(T,ldir) T = get_step(T,ldir)
if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/left)) if(!check_part(T,/obj/structure/particle_accelerator/fuel_chamber))
tally++
T = get_step(T,rdir)
T = get_step(T,rdir)
if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/right))
tally++
if(tally >= 6)
assembled = 1
return 1
else
assembled = 0
return 0 return 0
T = get_step(T,odir)
if(!check_part(T,/obj/structure/particle_accelerator/end_cap))
return 0
T = get_step(T,dir)
T = get_step(T,dir)
if(!check_part(T,/obj/structure/particle_accelerator/power_box))
return 0
T = get_step(T,dir)
if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/center))
return 0
T = get_step(T,ldir)
if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/left))
return 0
T = get_step(T,rdir)
T = get_step(T,rdir)
if(!check_part(T,/obj/structure/particle_accelerator/particle_emitter/right))
return 0
assembled = 1
return 1
/obj/machinery/particle_accelerator/control_box/proc/check_part(var/turf/T, var/type) /obj/machinery/particle_accelerator/control_box/proc/check_part(var/turf/T, var/type)
if(!(T)||!(type)) if(!(T)||!(type))
return 0 return 0
var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T
if(istype(PA, type)) if(istype(PA, type) && PA.connect_master(src) && PA.report_ready(src))
if(PA.connect_master(src)) src.connected_parts.Add(PA)
if(PA.report_ready(src)) return 1
src.connected_parts.Add(PA)
return 1
return 0 return 0

4
code/modules/power/singularity/particle_accelerator/particle_emitter.dm
View File

@@ -12,11 +12,11 @@
icon_state = "emitter_center" icon_state = "emitter_center"
reference = "emitter_center" reference = "emitter_center"
/obj/structure/particle_accelerator/particle_emitter/left /obj/structure/particle_accelerator/particle_emitter/right // It's looking for these in opposite directions.
icon_state = "emitter_left" icon_state = "emitter_left"
reference = "emitter_left" reference = "emitter_left"
/obj/structure/particle_accelerator/particle_emitter/right /obj/structure/particle_accelerator/particle_emitter/left
icon_state = "emitter_right" icon_state = "emitter_right"
reference = "emitter_right" reference = "emitter_right"