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

Browse Source 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
This commit is contained in:
Arokha Sieyes
2016-07-03 16:21:21 -04:00
parent 33c36365f6 f375595d30
commit 484fb96202
193 changed files with 4753 additions and 2383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/spells/targeted/equip/horsemask.dm
View File

@@ -26,7 +26,7 @@
for(var/mob/living/target in targets)
target.visible_message( "<span class='danger'>[target]'s face lights up in fire, and after the event a horse's head takes its place!</span>", \
"<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a horse!</span>")
flick("e_flash", target.flash)
target.flash_eyes()
/spell/targeted/equip_item/horsemask/summon_item(var/new_type)
var/obj/item/new_item = new new_type