meanwhile as i driver tiger INSANE

This commit is contained in:
Aurorablade
2016-02-25 16:17:39 -05:00
parent 71ebef0338
commit 5f98feb0bc
32 changed files with 40 additions and 116 deletions
@@ -1,5 +1,3 @@
datumvars//note i am putting External in robolimbs.
#define STUN_SET_AMOUNT 2
/obj/item/organ/internal/cyberimp
+1 -1
View File
@@ -12,7 +12,7 @@
/obj/item/organ/internal/body_egg/New(loc)
if(iscarbon(loc))
src.insert(loc)
insert(loc)
return ..()
/obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0)
+2 -34
View File
@@ -5,7 +5,7 @@ var/list/organ_cache = list()
icon = 'icons/obj/surgery.dmi'
var/dead_icon
var/mob/living/carbon/human/owner = null
var/status = ORGAN_ORGANIC
var/status = 0
var/vital //Lose a vital limb, die immediately.
var/damage = 0 // amount of damage to the organ
@@ -32,31 +32,6 @@ var/list/organ_cache = list()
var/sterile = 0 //can the organ be infected by germs?
var/tough = 0 //can organ be easily damaged?
/*/obj/item/organ/Destroy()
if(!owner)
return ..()
if(istype(owner, /mob/living/carbon))
if((owner.internal_organs) && (src in owner.internal_organs))
var/obj/item/organ/internal/O = src
O.remove(owner)
if(istype(owner, /mob/living/carbon/human))
var/obj/item/organ/internal/O = src
O.remove(owner)
if((owner.organs) && (src in owner.organs))
owner.organs -= src
if((owner.organs_by_name) && (src in owner.organs_by_name))
owner.organs_by_name -= src
if(src in owner.contents)
owner.contents -= src
return ..()*/
/obj/item/organ/proc/update_health()
return
@@ -97,8 +72,6 @@ var/list/organ_cache = list()
owner.death()
/obj/item/organ/process()
//if(loc != owner)
// owner = null
//dead already, no need for more processing
if(status & ORGAN_DEAD)
@@ -287,11 +260,6 @@ var/list/organ_cache = list()
if(!istype(owner))
return
//if(is_primary_organ())//Toddo from fethas:Do i need to move ths?
// owner.internal_organs_by_name[organ_tag] = null
// owner.internal_organs_by_name -= organ_tag
// owner.internal_organs_by_name -= null // uh what does this line even do this seems silly
owner.internal_organs -= src
var/obj/item/organ/external/affected = owner.get_organ(parent_organ)
@@ -320,7 +288,7 @@ var/list/organ_cache = list()
processing_objects -= src
affected.internal_organs |= src
if (!target.get_int_organ(src))
target.internal_organs |= src
target.internal_organs += src
src.loc = target
if(robotic)
status |= ORGAN_ROBOT
@@ -69,7 +69,6 @@
for(var/obj/item/organ/internal/O in internal_organs)
internal_organs -= O
O.remove(owner,special = 1)
//qdel(O)
if(children)
for(var/obj/item/organ/external/C in children)
@@ -389,6 +389,12 @@
M.mutations.Remove(CLUMSY)
M.mutations.Remove(COMICBLOCK)
genemutcheck(M,COMICBLOCK,null,MUTCHK_FORCED)
if(isturf(loc))
visible_message("<span class='warning'>[src] honks in on itself!</span>")
playsound(src, 'sound/items/AirHorn.ogg', 100, 1)
new /obj/item/weapon/bananapeel(get_turf(src.loc))
qdel(src)
/obj/item/organ/internal/honktumor/on_life()
@@ -396,7 +402,7 @@
return
if(organhonked < world.time)
organhonked = world.time+600
organhonked = world.time+900
owner << "<font color='red' size='7'>HONK</font>"
owner.sleeping = 0
owner.stuttering = 20