Added alien organs

This commit is contained in:
c0
2015-08-09 01:12:32 +03:00
parent f57fe6785c
commit 2e5cedef74
28 changed files with 368 additions and 227 deletions
@@ -15,9 +15,15 @@
nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2)
return ..()
/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user)
/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/living/user)
if(buckled_mob && buckled_mob.buckled == src)
var/mob/living/M = buckled_mob
if(user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
unbuckle_mob()
add_fingerprint(user)
return
if(M != user)
M.visible_message(\
"[user.name] pulls [M.name] free from the sticky nest!",\
@@ -42,13 +48,13 @@
unbuckle_mob()
add_fingerprint(user)
/obj/structure/stool/bed/nest/user_buckle_mob(mob/M, mob/user)
/obj/structure/stool/bed/nest/user_buckle_mob(mob/living/M, mob/living/user)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
return
if(istype(M,/mob/living/carbon/alien))
if(M.getorgan(/obj/item/organ/internal/alien/plasmavessel))
return
if(!istype(user,/mob/living/carbon/alien/humanoid))
if(!user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
return
unbuckle_mob()