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

Merge pull request #5781 from Aurorablade/Bugzapper

Browse Source 
Bugzapper
This commit is contained in:
Fox McCloud
2016-11-23 16:28:28 -05:00
committed by GitHub
parent 86eac97aa7 c0f28fd0aa
commit e0e930b63b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+1 -1
View File
@@ -179,7 +179,7 @@
if(has_gravity(src))
return 1
if(pulledby)
if(pulledby && !pulledby.pulling)
return 1
if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier
code/modules/recycling/conveyor2.dm
+1 -1
View File
@@ -300,7 +300,7 @@
/obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)
return {"
<ul>
<li><b>One direction only:</b> <a href='?src=\ref[src];toggle_logic=1'>[convdir ? "On" : "Off"]</a></li>
<li><b>One direction only:</b> <a href='?src=[UID()];toggle_logic=1'>[convdir ? "On" : "Off"]</a></li>
</ul>"}