cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	html/changelogs/.all_changelog.yml
This commit is contained in:
PsiOmegaDelta
2015-10-14 08:41:38 +02:00
parent f245e41db2 3fd172ee63
commit 3fd28dd361
20 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials.dm
-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)