cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2014-05-03 16:56:19 +01:00
parent 270724bfc8 5586439dc8
commit e1ddec4a73
75 changed files with 1663 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/horsemask.dm
+15 -4
View File
@@ -28,12 +28,23 @@
user << "<span class='notice'>They are too far away!</span>"
return
var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
magichead.canremove = 0 //curses!
magichead.flags_inv = null //so you can still see their face
magichead.voicechange = 1 //NEEEEIIGHH
var/obj/item/clothing/mask/horsehead/magic/magichead = new /obj/item/clothing/mask/horsehead/magic
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>")
target.equip_to_slot(magichead, slot_wear_mask)
flick("e_flash", target.flash)
//item used by the horsehead spell
/obj/item/clothing/mask/horsehead/magic
//flags_inv = null //so you can still see their face... no. How can you recognize someone when their face is completely different?
voicechange = 1 //NEEEEIIGHH
dropped(mob/user as mob)
canremove = 1
..()
equipped(var/mob/user, var/slot)
if (slot == slot_wear_mask)
canremove = 0 //curses!
..()