cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
This commit is contained in:
PsiOmegaDelta
2015-12-06 11:34:36 +01:00
parent 6997361c3c 52e8f71c7f
commit 6a22086c17
25 changed files with 165 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/chameleonproj.dm
+2
View File
@@ -18,9 +18,11 @@
/obj/item/device/chameleon/dropped()
disrupt()
..()
/obj/item/device/chameleon/equipped()
disrupt()
..()
/obj/item/device/chameleon/attack_self()
toggle()