cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added alien organs

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/aliens.dm
+7 -9
View File
@@ -324,8 +324,11 @@
Grow()
/obj/structure/alien/egg/attack_paw(mob/user)
if(isalien(user))
/obj/structure/alien/egg/attack_paw(mob/living/user)
return attack_hand(user)
/obj/structure/alien/egg/attack_hand(mob/living/user)
if(user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
switch(status)
if(BURST)
user << "<span class='notice'>You clear the hatched egg.</span>"
@@ -340,18 +343,13 @@
Burst(0)
return
else
return attack_hand(user)
/obj/structure/alien/egg/attack_hand(mob/user)
user << "<span class='notice'>It feels slimy.</span>"
user.changeNext_move(CLICK_CD_MELEE)
user << "<span class='notice'>It feels slimy.</span>"
user.changeNext_move(CLICK_CD_MELEE)
/obj/structure/alien/egg/proc/GetFacehugger()
return locate(/obj/item/clothing/mask/facehugger) in contents
/obj/structure/alien/egg/proc/Grow()
icon_state = "egg"
status = GROWN
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+10 -4
View File
@@ -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()