cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

aaah

Browse Source
This commit is contained in:
DeityLink
2015-11-11 15:44:08 +01:00
parent b21aa497a7
commit acca7053cd
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/gamemodes/vampire/vampire_powers.dm
View File

@@ -197,9 +197,9 @@
if(!C.vampire_affected(M))
M.current << "<span class='warning'>They seem to be unaffected.</span>"
return
log_admin("[ckey(src.key)] has death-touched [ckey(H.key)]. The latter will die in moments.")
message_admins("[ckey(src.key)] has death-touched [ckey(H.key)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</A>). The latter will die in moments.")
var/datum/disease2/disease/shutdown = new /datum/disease2/disease("Created by vamp [key_name(C)].")
log_admin("[ckey(src.key)] has death-touched [ckey(C.key)]. The latter will die in moments.")
message_admins("[ckey(src.key)] has death-touched [ckey(C.key)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[C.x];Y=[C.y];Z=[C.z]'>JMP</A>). The latter will die in moments.")
var/datum/disease2/disease/shutdown = new /datum/disease2/disease("Created by vamp [key_name(M)].")
var/datum/disease2/effectholder/holder = new /datum/disease2/effectholder
var/datum/disease2/effect/organs/vampire/O = new /datum/disease2/effect/organs/vampire
holder.effect += O

4
code/game/gamemodes/wizard/wizard.dm
View File

@@ -56,8 +56,8 @@
message_admins("Failed to set-up a round of wizard. Couldn't find any wizard spawn points.")
return 0
for(var/datum/mind/wizard in wizards)
wizard.current.loc = pick(wizardstart)
for(var/datum/mind/wwizard in wizards)
wwizard.current.loc = pick(wizardstart)
log_admin("Starting a round of wizard with [wizards.len] wizards.")
message_admins("Starting a round of wizard with [wizards.len] wizards.")

2
code/modules/bomberman/bomberman.dm
View File

@@ -964,7 +964,7 @@ var/global/list/arena_spawnpoints = list()//used by /mob/dead/observer/Logout()
log_game("[key_name_admin(user.client)] created a \"[size]\" Bomberman arena at [center.loc.name] ([center.x],[center.y],[center.z]) ")
for(var/mob/dead/observer/O in observers)
O << "<spawn class='notice'><b>[user.client.key] created a \"[size]\" Bomberman arena at [center.loc.name]. <A HREF='?src=\ref[O];jumptoarenacood=1;X=[center.x];Y=[center.y];Z=[center.z]'>Click here to JUMP to it.</A></b></span>"
O << "<spawn class='notice'><b>[user.client.key] created a \"[size]\" Bomberman arena at [center.loc.name]. <A HREF='?src=\ref[O];jumptoarenacood=1;targetarena=\ref[src]'>Click here to JUMP to it.</A></b></span>"
else
qdel(src)

11
code/modules/mob/dead/observer/observer.dm
View File

@@ -847,6 +847,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
usr << "Reached [arena_target]"
usr.loc = arena_target.center
usr << "Remember to enable darkness to be able to see the spawns. Click on a green spawn between rounds to register on it."
/mob/dead/observer/Topic(href, href_list)
if (href_list["reentercorpse"])
@@ -903,13 +904,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
following = null
if(href_list["jumptoarenacood"])
var/x = text2num(href_list["X"])
var/y = text2num(href_list["Y"])
var/z = text2num(href_list["Z"])
var/client/C = usr.client
sleep(2)
C.jumptocoord(x,y,z)
var/datum/bomberman_arena/targetarena = locate(href_list["targetarena"])
usr.loc = targetarena.center
usr << "Remember to enable darkness to be able to see the spawns. Click on a green spawn between rounds to register on it."
..()