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

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

Browse Source 
Conflicts:
	code/modules/virus2/disease2.dm
This commit is contained in:
GinjaNinja32
2015-02-03 15:33:37 +00:00
parent 1b08463b7e c3559556a0
commit c4788ad6f5
581 changed files with 3139 additions and 18688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/virus2/items_devices.dm
View File

@@ -6,7 +6,7 @@
icon_state = "health"
w_class = 2.0
item_state = "electronic"
flags = FPRINT | TABLEPASS | CONDUCT
flags = CONDUCT
/obj/item/device/antibody_scanner/attack(mob/M as mob, mob/user as mob)
if(!istype(M,/mob/living/carbon/))