cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 02:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm
This commit is contained in:
skull132
2017-09-09 21:38:02 +03:00
parent 0d8fe2e6a4 4199d3a2d8
commit 16d33365c2
79 changed files with 1476 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mining/mine_items.dm
View File

@@ -1131,8 +1131,7 @@ var/list/total_extraction_beacons = list()
single_spark(O.loc)
do_teleport(O, user, 0)
if (TICK_CHECK)
return
CHECK_TICK
/******************************Sculpting*******************************/
/obj/item/weapon/autochisel