cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

to_chat and I.forcemove changes. Noticed half (almost exactly) of the conveyors weren't synced to their levers, so put Spawn(5) back in.

Browse Source
This commit is contained in:
GeneralChaos81
2016-09-13 11:28:28 +10:00
parent d9bd16a0db
commit fb335d3a4f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/conveyor2.dm
+13 -13
View File
@@ -131,20 +131,19 @@
var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
C.id = id
transfer_fingerprints_to(C)
user << "<span class='notice'>You remove the conveyor belt.</span>"
to_chat(usr,"<span class='notice'>You remove the conveyor belt.</span>")
qdel(src)
else if(istype(I, /obj/item/weapon/wrench))
if(!(stat & BROKEN))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
//setDir(turn(dir,-45)) //No such proc
dir = turn(dir,-45)
update_move_direction()
user << "<span class='notice'>You rotate [src].</span>"
to_chat(user, "<span class='notice'>You rotate [src].</span>")
else if(user.a_intent != "harm")
if(user.drop_item())
I.loc = src.loc
I.forceMove(loc)
else
return ..()
@@ -220,10 +219,11 @@
id = newid
update()
conveyors = list()
for(var/obj/machinery/conveyor/C in machines)
if(C.id == id)
conveyors += C
spawn(5)
conveyors = list()
for(var/obj/machinery/conveyor/C in machines)
if(C.id == id)
conveyors += C
// update the icon depending on the position
@@ -250,7 +250,7 @@
CHECK_TICK
/obj/machinery/conveyor_switch/oneway
convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.)
convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.) - Cargo uses a reverse belt.
// attack with hand, switch position
/obj/machinery/conveyor_switch/attack_hand(mob/user)
@@ -288,7 +288,7 @@
var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
C.id = id
transfer_fingerprints_to(C)
user << "<span class='notice'>You deattach the conveyor switch.</span>"
to_chat(user,"<span class='notice'>You deattach the conveyor switch.</span>")
qdel(src)
else if(istype(I, /obj/item/device/multitool))
@@ -325,7 +325,7 @@
/obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/conveyor_switch_construct))
user << "<span class='notice'>You link the switch to the conveyor belt assembly.</span>"
to_chat(user, "<span class='notice'>You link the switch to the conveyor belt assembly.</span>")
var/obj/item/conveyor_switch_construct/C = I
id = C.id
@@ -334,7 +334,7 @@
return
var/cdir = get_dir(A, user)
if(A == user.loc)
user << "<span class='notice'>You cannot place a conveyor belt under yourself.</span>"
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
@@ -362,7 +362,7 @@
found = 1
break
if(!found)
user << "\icon[src]<span class=notice>The conveyor switch did not detect any linked conveyor belts in range.</span>"
to_chat(usr, "\icon[src]<span class=notice>The conveyor switch did not detect any linked conveyor belts in range.</span>")
return
var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id)
transfer_fingerprints_to(NC)