Merge pull request #489 from Markolie/master

Bug fixes
This commit is contained in:
ZomgPonies
2015-03-02 21:19:01 -05:00
11 changed files with 37 additions and 32 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
var/quick_create_object_html = null
var/pathtext = null
pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/machinery")
pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/item/clothing","/obj/machinery","/obj/mecha")
var path = text2path(pathtext)
+2 -1
View File
@@ -70,7 +70,8 @@
else if(A.a_right == src)
A.a_right = null
src.holder = null
..()
pulsed(var/radio = 0)
if(holder && (wires & WIRE_RECEIVE))
activate()