diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d4ba398e9c6..c9960deb975 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -98,7 +98,8 @@ var/global/floorIsLava = 0 body += "Make AI | " body += "Make Robot | " body += "Make Alien | " - body += "Make slime " + body += "Make Blob Fragment | " + body += "Make Slime " //Simple Animals if(isanimal(M)) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index fabeb78fe13..655acd1799a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -972,6 +972,19 @@ message_admins("\blue [key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1) H.corgize() + else if(href_list["makeblob"]) + if(!check_rights(R_SPAWN)) return + + var/mob/living/carbon/human/H = locate(href_list["makeblob"]) + if(!istype(H)) + usr << "This can only be used on instances of type /mob/living/carbon/human" + return + + log_admin("[key_name(usr)] attempting to blobize [key_name(H)]") + message_admins("\blue [key_name_admin(usr)] attempting to blobize [key_name_admin(H)]", 1) + H.blobize() + + else if(href_list["forcespeech"]) if(!check_rights(R_FUN)) return diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm index 2e8f86282f9..52edf14bdba 100644 --- a/code/modules/mob/living/blob/blob.dm +++ b/code/modules/mob/living/blob/blob.dm @@ -185,7 +185,7 @@ return -///mob/proc/Blobize() +/mob/proc/Blobize() /client/proc/Blobcount() set category = "Debug" set name = "blobreport" diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 087422810c3..ae4ba793470 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -36,7 +36,7 @@ if (!muzzled) message = "The [src.name] roars." m_type = 2 - if("hiss") + if("his") if(!muzzled) message = "The [src.name] hisses." m_type = 2 diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 8f996a3791e..d5f6be74cda 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -265,6 +265,28 @@ del(src) return +/mob/living/carbon/human/proc/blobize() // Oh boy, this is for you Int - Summoner + if (monkeyizing) + return + for(var/obj/item/W in src) + drop_from_inventory(W) + regenerate_icons() + monkeyizing = 1 + canmove = 0 + icon = null + invisibility = 101 + for(var/t in organs) + del(t) + + var/mob/living/blob/new_blob = new /mob/living/blob (loc) + new_blob.a_intent = "hurt" + new_blob.key = key + + new_blob << "You are now a Blob Fragment. You can now sacrifice yourself to spawn blobs!" + spawn(0)//To prevent the proc from returning null. + del(src) + return + /mob/living/carbon/human/Animalize() var/list/mobtypes = typesof(/mob/living/simple_animal)