Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	html/changelogs/.all_changelog.yml
This commit is contained in:
PsiOmegaDelta
2015-10-14 08:41:38 +02:00
20 changed files with 41 additions and 49 deletions
+3 -2
View File
@@ -65,9 +65,10 @@
var/obj/item/stack/material/M = S
if(!istype(M) || material.name != M.material.name)
return 0
..(S,tamount,1)
var/transfer = ..(S,tamount,1)
if(src) update_strings()
if(M) M.update_strings()
return transfer
/obj/item/stack/material/attack_self(var/mob/user)
if(!material.build_windows(user, src))
@@ -207,4 +208,4 @@
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures. It is reinforced with few rods."
singular_name = "reinforced borosilicate glass sheet"
icon_state = "sheet-phoronrglass"
default_type = "reinforced borosilicate glass"
default_type = "reinforced borosilicate glass"
-2
View File
@@ -127,8 +127,6 @@ var/list/name_to_material
var/obj/item/stack/S = new rod_product(get_turf(user))
S.add_fingerprint(user)
S.add_to_stacks(user)
if(!(user.l_hand && user.r_hand))
user.put_in_hands(S)
/material/proc/build_wired_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
if(!wire_product)