xeno organ abiltys not working on insert (on non xeno mob)
Limb attachment for robot parts being stupid
This commit is contained in:
Aurorablade
2016-01-21 20:42:32 -05:00
parent 51013b97c0
commit cc8f402a4d
15 changed files with 266 additions and 177 deletions
+4 -4
View File
@@ -74,7 +74,7 @@
/obj/item/organ/internal/cyberimp/eyes/xray
name = "X-ray implant"
desc = "These cybernetic eye implants will give you X-ray vision. Blinking is futile."
eye_colour = rgb(0, 0, 0)
eye_colour = list(0, 0, 0)
implant_color = "#000000"
origin_tech = "materials=6;programming=4;biotech=6;magnets=5"
vision_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
@@ -82,7 +82,7 @@
/obj/item/organ/internal/cyberimp/eyes/thermals
name = "Thermals implant"
desc = "These cybernetic eye implants will give you Thermal vision. Vertical slit pupil included."
eye_colour = rgb(255, 204, 0)
eye_colour = list(255, 204, 0)
implant_color = "#FFCC00"
vision_flags = SEE_MOBS
flash_protect = -1
@@ -113,7 +113,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/medical
name = "Medical HUD implant"
desc = "These cybernetic eye implants will display a medical HUD over everything you see."
eye_colour = rgb(15,15,0)
eye_colour = list(15,15,0)
implant_color = "#00FFFF"
origin_tech = "materials=4;programming=3;biotech=4"
aug_message = "You suddenly see health bars floating above people's heads..."
@@ -122,7 +122,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/security
name = "Security HUD implant"
desc = "These cybernetic eye implants will display a security HUD over everything you see."
eye_colour = rgb(208,0,0)
eye_colour = list(208,0,0)
implant_color = "#CC0000"
origin_tech = "materials=4;programming=4;biotech=3;combat=1"
aug_message = "Job indicator icons pop up in your vision. That is not a certified surgeon..."
+34 -4
View File
@@ -132,6 +132,8 @@
//Insert something neat here.
///obj/item/organ/internal/lungs/remove(mob/living/carbon/M, special = 0)
// owner.losebreath += 10
//insert oxy damage extream here.
// ..()
@@ -140,7 +142,6 @@
if(!owner)
return
if (germ_level > INFECTION_LEVEL_ONE)
if(prob(5))
owner.emote("cough") //respitory tract infection
@@ -320,8 +321,7 @@
/obj/item/organ/internal/shadowtumor/process()
if(isturf(loc))
var/turf/T = loc
var/light_count = T.get_lumcount()
world << "[light_count]"
var/light_count = T.get_lumcount()*10
if(light_count > 4 && health > 0) //Die in the light
health--
else if(light_count < 2 && health < 3) //Heal in the dark
@@ -341,6 +341,7 @@
parent_organ = "head"
slot = "brain_tumor"
health = 3
var/lasthonk = 0
/obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
@@ -351,4 +352,33 @@
/obj/item/organ/internal/honktumor/remove(mob/living/carbon/M, special = 0)
M.mutations.Remove(CLUMSY)
M.mutations.Remove(COMICBLOCK)
//genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED)
//genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED)
/obj/item/organ/internal/honktumor/process()
if(!owner)
return
if(lasthonk > world.time + 60|| lasthonk == 0)
lasthonk = world.time
owner << "<font color='red' size='7'>HONK</font>"
owner.sleeping = 0
owner.stuttering = 20
owner.ear_deaf = 30
owner.Weaken(3)
owner << 'sound/items/AirHorn.ogg'
if(prob(30))
owner.Stun(10)
owner.Paralyse(4)
else
owner.Jitter(500)
if(istype(owner, /mob/living/carbon/human))
var/mob/living/carbon/human/H = owner
if(isobj(H.shoes))
var/thingy = H.shoes
H.unEquip(H.shoes)
walk_away(thingy,H,15,2)
spawn(20)
if(thingy)
walk(thingy,0)
@@ -16,11 +16,11 @@
/obj/item/organ/internal/xenos/insert(mob/living/carbon/M, special = 0)
..()
for(var/mob/living/carbon/alien/humanoid/verb/P in alien_powers)
verbs += P
M.verbs += P //at least until xeno powers are vamped to TG
/obj/item/organ/internal/xenos/remove(mob/living/carbon/M, special = 0)
for(var/mob/living/carbon/alien/humanoid/verb/P in alien_powers)
verbs -= P
M.verbs -= P
..()
@@ -144,8 +144,8 @@
/obj/item/organ/internal/xenos/resinspinner
name = "xeno resin organ"//...there tiger....
parent_organ = "head"
icon_state = "stomach-x"
parent_organ = "mouth"
icon_state = "liver-x"
slot = "resinspinner"
origin_tech = "biotech=5;materials=4"
alien_powers = list(/mob/living/carbon/alien/humanoid/proc/resin)