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

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

Browse Source 
Conflicts:
	code/setup.dm
This commit is contained in:
PsiOmega
2015-02-05 12:37:15 +01:00
parent 566f6a104e 4ca0ea9bcf
commit a073cba477
49 changed files with 1319 additions and 1389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implanter.dm
+1 -1
View File
@@ -47,7 +47,7 @@
affected.implants += src.imp
imp.part = affected
H.hud_updateflag |= 1 << IMPLOYAL_HUD
BITSET(H.hud_updateflag, IMPLOYAL_HUD)
src.imp = null
update()