cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conveyor switches not affecting belts on the shuttle (#36614)

Browse Source
This commit is contained in:
Tad Hardesty
2018-03-22 22:52:22 -04:00
committed by ShizCalev
parent a0958b260b
commit dc4b8e2a77
1 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/conveyor2.dm
+41 -20
View File
@@ -1,6 +1,8 @@
//conveyor2 is pretty much like the original, except it supports corners, but not diverters.
//note that corner pieces transfer stuff clockwise when running forward, and anti-clockwise backwards.
GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor
icon = 'icons/obj/recycling.dmi'
icon_state = "conveyor0"
@@ -44,11 +46,27 @@
icon_state = "conveyor[operating * verted]"
// create a conveyor
/obj/machinery/conveyor/Initialize(mapload, newdir)
/obj/machinery/conveyor/Initialize(mapload, newdir, newid)
. = ..()
if(newdir)
setDir(newdir)
if(newid)
id = newid
update_move_direction()
LAZYADD(GLOB.conveyors_by_id[id], src)
/obj/machinery/conveyor/Destroy()
LAZYREMOVE(GLOB.conveyors_by_id[id], src)
. = ..()
/obj/machinery/conveyor/vv_edit_var(var_name, var_value)
if (var_name == "id")
// if "id" is varedited, update our list membership
LAZYREMOVE(GLOB.conveyors_by_id[id], src)
. = ..()
LAZYADD(GLOB.conveyors_by_id[id], src)
else
return ..()
/obj/machinery/conveyor/proc/update_move_direction()
switch(dir)
@@ -198,29 +216,34 @@
var/id = "" // must match conveyor IDs to control them
var/list/conveyors // the list of converyors that are controlled by this switch
anchored = TRUE
speed_process = TRUE
/obj/machinery/conveyor_switch/Initialize(mapload, newid)
..()
if(!id)
. = ..()
if (newid)
id = newid
update()
update_icon()
LAZYADD(GLOB.conveyors_by_id[id], src)
return INITIALIZE_HINT_LATELOAD //for machines list
/obj/machinery/conveyor_switch/Destroy()
LAZYREMOVE(GLOB.conveyors_by_id[id], src)
. = ..()
/obj/machinery/conveyor_switch/LateInitialize()
conveyors = list()
for(var/obj/machinery/conveyor/C in GLOB.machines)
if(C.id == id)
conveyors += C
/obj/machinery/conveyor_switch/vv_edit_var(var_name, var_value)
if (var_name == "id")
// if "id" is varedited, update our list membership
LAZYREMOVE(GLOB.conveyors_by_id[id], src)
. = ..()
LAZYADD(GLOB.conveyors_by_id[id], src)
else
return ..()
// update the icon depending on the position
/obj/machinery/conveyor_switch/proc/update()
/obj/machinery/conveyor_switch/update_icon()
if(position<0)
icon_state = "switch-rev"
else if(position>0)
@@ -237,7 +260,7 @@
return
operated = 0
for(var/obj/machinery/conveyor/C in conveyors)
for(var/obj/machinery/conveyor/C in GLOB.conveyors_by_id[id])
C.operating = position
C.update_move_direction()
CHECK_TICK
@@ -260,13 +283,12 @@
position = 0
operated = 1
update()
update_icon()
// find any switches with same id as this one, and set their positions to match us
for(var/obj/machinery/conveyor_switch/S in GLOB.machines)
if(S.id == src.id)
S.position = position
S.update()
for(var/obj/machinery/conveyor_switch/S in GLOB.conveyors_by_id[id])
S.position = position
S.update_icon()
CHECK_TICK
/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params)
@@ -307,8 +329,7 @@
if(A == user.loc)
to_chat(user, "<span class='notice'>You cannot place a conveyor belt under yourself.</span>")
return
var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A,cdir)
C.id = id
var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A, cdir, id)
transfer_fingerprints_to(C)
qdel(src)