cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 15:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few issues with the meme admin stuff.

Browse Source
This commit is contained in:
cib
2012-05-22 13:13:01 +02:00
parent 56b178f396
commit d887d8ae41
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+8 -3
View File
@@ -144,14 +144,19 @@ var/global/BSACooldown = 0
found = 1
newmeme.enter_host(H)
log_admin("[H] has become [newmeme.key]'s host")
message_admins("[H] has become [newmeme.key]'s host")
break
// if there was no host, abort
if(!found)
newmeme.mind.transfer_to(M)
log_admin("Failed to find host for meme [M.key]. Aborting.")
message_admins("Failed to find host for meme [M.key]. Aborting.")
if(delmob)
del(M)
@@ -2454,7 +2459,7 @@ var/global/BSACooldown = 0
body += "\[ Construct: <A href='?src=\ref[src];simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> , "
body += "<A href='?src=\ref[src];simplemake=constructbuilder;mob=\ref[M]'>Builder</A> , "
body += "<A href='?src=\ref[src];simplemake=constructwraith;mob=\ref[M]'>Wraith</A> \] "
body += "<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A>"
body += "<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A> "
body += "<A href='?src=\ref[src];simplemake=meme;mob=\ref[M]'>Meme</A>"
body += "<br>"
code/modules/mob/living/parasite/meme.dm
+6
View File
@@ -391,6 +391,7 @@ mob/living/parasite/meme/verb/SubtleJump(mob/living/carbon/human/target as mob i
usr << "<b>You successfully jumped to [target]."
log_admin("[src.key] has jumped to [target]")
message_admins("[src.key] has jumped to [target]")
// Jump to a distant target through a shout
mob/living/parasite/meme/verb/ObviousJump(mob/living/carbon/human/target as mob in world)
@@ -429,6 +430,7 @@ mob/living/parasite/meme/verb/ObviousJump(mob/living/carbon/human/target as mob
usr << "<b>You successfully jumped to [target]."
log_admin("[src.key] has jumped to [target]")
message_admins("[src.key] has jumped to [target]")
// Jump to an attuned mob for free
mob/living/parasite/meme/verb/AttunedJump(mob/living/carbon/human/target as mob in world)
@@ -452,6 +454,7 @@ mob/living/parasite/meme/verb/AttunedJump(mob/living/carbon/human/target as mob
usr << "<b>You successfully jumped to [target]."
log_admin("[src.key] has jumped to [target]")
message_admins("[src.key] has jumped to [target]")
// ATTUNE a mob, adding it to the indoctrinated list
mob/living/parasite/meme/verb/Attune()
@@ -472,6 +475,7 @@ mob/living/parasite/meme/verb/Attune()
host << "\red Your head feels a bit roomier.."
log_admin("[src.key] has attuned [host]")
message_admins("[src.key] has attuned [host]")
// Enables the mob to take a lot more damage
mob/living/parasite/meme/verb/Analgesic()
@@ -526,10 +530,12 @@ mob/living/parasite/meme/verb/Possession()
host.update_clothing()
log_admin("[meme_mind.key] has taken possession of [host]([host_mind.key])")
message_admins("[meme_mind.key] has taken possession of [host]([host_mind.key])")
sleep(600)
log_admin("[meme_mind.key] has lost possession of [host]([host_mind.key])")
message_admins("[meme_mind.key] has lost possession of [host]([host_mind.key])")
meme_mind.transfer_to(src)
host_mind.transfer_to(host)