cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-16 18:36:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mark of wizard fix and missing uniform name (#2062)

Browse Source 
-unfucks the path of the mark of wizard
-fix the name i may have erased from two uniforms
This commit is contained in:
Alberyk
2017-04-09 07:00:22 -03:00
committed by skull132
parent 6b3c969584
commit 5d025d9ac6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/miscellaneous.dm
+3 -1
View File
@@ -76,13 +76,14 @@
//This set of uniforms looks fairly fancy and is generally used for high-ranking NT personnel from what I've seen, so lets give them appropriate ranks.
/obj/item/clothing/under/rank/centcom
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain.\""
name = "\improper officer's dress uniform"
name = "officer's dress uniform"
icon_state = "officer"
item_state = "lawyer_black"
worn_state = "officer"
displays_id = 0
/obj/item/clothing/under/rank/centcom_officer
name = "officer's dress uniform"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral.\""
icon_state = "officer"
item_state = "lawyer_black"
@@ -90,6 +91,7 @@
displays_id = 0
/obj/item/clothing/under/rank/centcom_captain
name = "officer's dress uniform"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral-Executive.\""
icon_state = "centcom"
item_state = "lawyer_black"
code/modules/spells/general/mark_recall.dm
+6 -6
View File
@@ -29,7 +29,7 @@
return 0
var/target = targets[1]
if(istext(target))
mark = new /obj/effect/cleanable/wizard_mark(get_turf(user),src)
mark = new /obj/effect/decal/wizard_mark(get_turf(user),src)
return 1
if(!istype(target,/obj)) //something went wrong
return 0
@@ -47,7 +47,7 @@
return "You no longer have to be conscious to activate this spell."
/obj/effect/cleanable/wizard_mark
/obj/effect/decal/wizard_mark
name = "mark of the wizard"
desc = "A strange rune, probably someone playing with crayons again."
icon = 'icons/obj/rune.dmi'
@@ -59,22 +59,22 @@
var/spell/mark_recall/spell
/obj/effect/cleanable/wizard_mark/New(var/newloc,var/mrspell)
/obj/effect/decal/wizard_mark/New(var/newloc,var/mrspell)
..()
spell = mrspell
/obj/effect/cleanable/wizard_mark/Destroy()
/obj/effect/decal/wizard_mark/Destroy()
spell.mark = null //dereference pls.
spell = null
..()
/obj/effect/cleanable/wizard_mark/attack_hand(var/mob/user)
/obj/effect/decal/wizard_mark/attack_hand(var/mob/user)
if(user == spell.holder)
user.visible_message("\The [user] mutters an incantation and \the [src] disappears!")
qdel(src)
..()
/obj/effect/cleanable/wizard_mark/attackby(var/obj/item/I, var/mob/user)
/obj/effect/decal/wizard_mark/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/weapon/nullrod) || istype(I, /obj/item/weapon/spellbook))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
src.visible_message("\The [src] fades away!")