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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoUI

Browse Source 
Conflicts:
	code/game/machinery/adv_med.dm
This commit is contained in:
SinTwo
2016-06-20 11:51:25 -04:00
parent 1e2136781c c727d57872
commit 32e9c4a34b
552 changed files with 14848 additions and 9750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/holodeck/HolodeckObjects.dm
View File

@@ -263,9 +263,6 @@
return 1
return 0
/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob)
..()
/obj/item/weapon/holo/esword/New()
item_color = pick("red","blue","green","purple")