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

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

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
This commit is contained in:
PsiOmega
2015-09-27 13:36:56 +02:00
parent 095f2c520d c3d6fd07fd
commit 807e7bf954
9 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/artifacts.dm
+3 -1
View File
@@ -19,5 +19,7 @@
user << "<span class='info'>You can see... everything!</span>"
visible_message("<span class='danger'>[user] stares into [src], their eyes glazing over.</span>")
announce_ghost_joinleave(user.ghostize(1), 1, "You feel that they used a powerful artifact to [pick("invade","disturb","disrupt","infest","taint","spoil","blight")] this place with their presence.")
user.teleop = user.ghostize(1)
announce_ghost_joinleave(user.teleop, 1, "You feel that they used a powerful artifact to [pick("invade","disturb","disrupt","infest","taint","spoil","blight")] this place with their presence.")
return