cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
This commit is contained in:
PsiOmegaDelta
2015-07-20 08:28:32 +02:00
parent dbca9f61fc bfe21b66c6
commit 388343a84e
15 changed files with 4089 additions and 4132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_onclick/click.dm
View File

@@ -80,8 +80,10 @@
return
if(in_throw_mode)
throw_item(A)
return
if(isturf(A) || isturf(A.loc))
throw_item(A)
return
throw_mode_off()
if(!istype(A,/obj/item/weapon/gun) && !isturf(A) && !istype(A,/obj/screen))
last_target_click = world.time