diff --git a/baystation12.dme b/baystation12.dme index b029869cf22..d37370c92b3 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -442,6 +442,7 @@ #include "code\game\gamemodes\wizard\soulstone.dm" #include "code\game\gamemodes\wizard\spellbook.dm" #include "code\game\gamemodes\wizard\spells.dm" +#include "code\game\gamemodes\wizard\veilrender.dm" #include "code\game\gamemodes\wizard\wizard.dm" #include "code\game\jobs\access.dm" #include "code\game\jobs\job_controller.dm" diff --git a/code/game/gamemodes/wizard/veilrender.dm b/code/game/gamemodes/wizard/veilrender.dm new file mode 100644 index 00000000000..2310b16ff41 --- /dev/null +++ b/code/game/gamemodes/wizard/veilrender.dm @@ -0,0 +1,41 @@ +/obj/item/weapon/veilrender + name = "veil render" + desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." + icon = 'wizard.dmi' + icon_state = "render" + item_state = "render" + flags = FPRINT | TABLEPASS + force = 15 + throwforce = 10 + w_class = 3 + var/charged = 1 + + +/obj/effect/rend + name = "Tear in the fabric of reality" + desc = "You should run now" + icon = 'biomass.dmi' + icon_state = "rift" + density = 1 + unacidable = 1 + anchored = 1.0 + + +/obj/effect/rend/New() + spawn(50) + new /obj/machinery/singularity/narsie/wizard(get_turf(src)) + del(src) + return + return + + +/obj/item/weapon/veilrender/attack_self(mob/user as mob) + if(charged == 1) + new /obj/effect/rend(get_turf(usr)) + charged = 0 + for(var/mob/M in viewers(usr, null)) + if ((M.client && !( M.blinded ))) + M.show_message("\red [src] hums with power as [usr] deals a blow to reality itself!") + else + user << "\red The unearthly energies that powered the blade are now dormant" + diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index f4ddf4d83bb..cbbb5505e8d 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -214,6 +214,8 @@ observer.real_name = observer.name observer.original_name = observer.name //Original name is only used in ghost chat! It is not to be edited by anything! + preferences.copy_to_observer(observer) + del(src) return 1