Skip to content

Вроде наконец-то пофиксил бореров. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Harold-Morgan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Вроде наконец-то пофиксил бореров. #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions code/modules/mob/living/simple_animal/borer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@

..()


if(host)

if(!stat && !host.stat)
Expand Down Expand Up @@ -218,8 +217,7 @@
src << "You cannot do that in your current state."
return

// � ������ � ��� � ����� ���. ��� �����, ��?
// if(host.internal_organs_by_name["brain"]) //this should only run in admin-weirdness situations, but it's here non the less - RR
// if(!host.internal_organs_by_name["brain"]) //this should only run in admin-weirdness situations, but it's here non the less - RR
// src << "<span class='warning'>There is no brain here for us to command!</span>"
// return

Expand Down Expand Up @@ -339,8 +337,14 @@ mob/living/simple_animal/borer/proc/detatch()
host_brain.name = "host brain"
host_brain.real_name = "host brain"

var/mob/living/H = host
host = null

// for(var/atom/A in H.contents)
// if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
// return
// H.status_flags &=~PASSEMOTES

/mob/living/simple_animal/borer/verb/infest()
set category = "Alien"
set name = "Infest"
Expand All @@ -355,9 +359,7 @@ mob/living/simple_animal/borer/proc/detatch()
return

var/list/choices = list()

// ������ ��������!
// for(var/mob/living/carbon/C in view(1,src))
for(var/mob/living/carbon/C in view(1,src))
// if(C.stat != 2 && src.Adjacent(C))
// choices += C

Expand All @@ -371,11 +373,8 @@ mob/living/simple_animal/borer/proc/detatch()
src << "You cannot infest someone who is already infested!"
return

// ������ ����� ����!
// if(istype(M,/mob/living/carbon/human))
// var/mob/living/carbon/human/H = M

// ��������, �� ��� ���� �� ����� � ����� ��������!
// if(H.check_head_coverage())
// src << "You cannot get through that host's protective gear."
// return
Expand Down Expand Up @@ -405,13 +404,14 @@ mob/living/simple_animal/borer/proc/detatch()
src.host = M
src.loc = M

if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
var/datum/organ/external/head = H.get_organ("head")
head.implants += src

host_brain.name = M.name
host_brain.real_name = M.real_name
// if(istype(M,/mob/living/carbon/human))
// var/mob/living/carbon/human/H = M
// var/datum/organ/external/head = H.get_organ("head")
// head.implants += src
//
// host_brain.name = M.name
// host_brain.real_name = M.real_name
// host.status_flags |= PASSEMOTES

return
else
Expand Down Expand Up @@ -504,4 +504,4 @@ mob/living/simple_animal/borer/proc/transfer_personality(var/client/candidate)
src.mind = candidate.mob.mind
src.ckey = candidate.ckey
if(src.mind)
src.mind.assigned_role = "Cortical Borer"
src.mind.assigned_role = "Cortical Borer"