diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 50f34a66b6f..4f836c4e222 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -80,8 +80,8 @@ revsafe = 1 break M.mind_initialize() //give them a mind datum if they don't have one. - if(M.mind.has_been_rev) - revsafe = 2 +// if(M.mind.has_been_rev) +// revsafe = 2 if(!revsafe) M.mind.has_been_rev = 1 ticker.mode.add_revolutionary(M.mind) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 8e6701f2440..50a68dc9fd7 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -223,6 +223,38 @@ M.take_organ_damage(15) M:eye_op_stage = 3.0 + if(user.zone_sel.selecting == "head") + if(M.brain_op_stage != 0.0 && M.brain_op_stage != 1.0) + for(var/obj/item/weapon/implant/I in M)//Checking that there is an implant in the contents + if(I.imp_in == M)//Checking that it's actually implanted + + if(M != user) + user.visible_message( \ + "\red [user] carefully destroys [I] implant embedded in [M]'s head with [src]!", \ + "\red You destroy [I] implant embedded in [M]'s head with [src]!" \ + ) + else + user.visible_message( \ + "\red [user] begins to remove [I] implant embedded in his head with [src]!", \ + "\red You destroy [I] implant embedded in your head with [src]!" \ + ) + if(M == user && prob(25)) + user << "\red You nick an artery!" + if(istype(M, /mob/living/carbon/human)) + var/datum/organ/external/affecting = M:get_organ("head") + if(affecting.take_damage(75)) + M:UpdateDamageIcon() + else + M.take_organ_damage(75) + + if(istype(I, /obj/item/weapon/implant/loyalty)) //Checking if the implant we found is a loyality implant. + M << " You feel a sense of liberation as Nanotrasen's grip on your mind fades away." + + del(I) + M.updatehealth() + break + return + else if(user.zone_sel.selecting == "chest") if(M:alien_op_stage == 2.0 || M:alien_op_stage == 3.0) var/mob/living/carbon/human/H = M diff --git a/html/changelog.html b/html/changelog.html index 0a84c9f69aa..b0b246e9841 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,14 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +