cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 01:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating to new dev antagonist code.

Browse Source
This commit is contained in:
Zuhayr
2015-09-06 00:57:08 +09:30
parent bfe1d5a599
commit d37bf5fe2f
5 changed files with 6898 additions and 6895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
View File

@@ -248,14 +248,14 @@ mob/living/carbon/human/proc/xeno_infest(mob/living/carbon/human/M as mob in ovi
if(!do_after(src, 150))
return
if(!check_alien_ability(500,1,"egg sac"))
return
if(!M.Adjacent(src))
if(!M || !M.Adjacent(src))
src << "<span class='warning'>They are too far away.</span>"
return
if(!M || M.species.get_bodytype() == "Xenomorph" || !isnull(M.internal_organs_by_name["hive node"]) || !affecting || (affecting.status & ORGAN_ROBOT))
if(M.species.get_bodytype() == "Xenomorph" || !isnull(M.internal_organs_by_name["hive node"]) || !affecting || (affecting.status & ORGAN_ROBOT))
return
if(!check_alien_ability(500,1,"egg sac"))
return
src.visible_message("<span class='danger'>\The [src] regurgitates something into \the [M]'s torso!</span>")

6
code/modules/organs/subtypes/xenos.dm
View File

@@ -64,8 +64,6 @@
if(owner && ishuman(owner))
var/mob/living/carbon/human/H = owner
H.add_language("Hivemind")
if(H.mind)
if(H.mind && H.species.get_bodytype() != "Xenomorph")
H << "<span class='alium'>You feel a sense of pressure as a vast intelligence meshes with your thoughts...</span>"
if(H.species.get_bodytype() != "Xenomorph" && xenomorphs.add_antagonist_mind(H.mind,1))
H << "Your will is ripped away as your humanity merges with the xenomorph hive. You are now a thrall to the queen and her brood. \
Obey their instructions without question. Serve the hive."
xenomorphs.add_antagonist_mind(H.mind,1, xenomorphs.faction_role_text, xenomorphs.faction_welcome)