cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
This commit is contained in:
Mloc-Hibernia
2014-05-11 13:19:09 +00:00
parent 70ac5726dd 29a8059f53
commit e3a8d5eb43
30 changed files with 1576 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+8 -3
View File
@@ -90,12 +90,17 @@
origin_tech = "materials=2;syndicate=5"
/obj/item/weapon/pen/paralysis/attack(mob/M as mob, mob/user as mob)
/obj/item/weapon/pen/paralysis/attack(mob/living/M as mob, mob/user as mob)
if(!(istype(M,/mob)))
return
..()
if(reagents.total_volume)
if(M.reagents) reagents.trans_to(M, 50)
if(M.can_inject(user,1))
if(reagents.total_volume)
if(M.reagents) reagents.trans_to(M, 50)
return