Base Life-addition()

This commit is contained in:
PsiOmega
2015-06-13 13:36:08 +02:00
parent 73977df371
commit ee88e7b8b4
21 changed files with 60 additions and 44 deletions
+2
View File
@@ -0,0 +1,2 @@
#define BACKGROUND_ENABLED 0 // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
// 1 will enable set background. 0 will disable set background.
+1 -1
View File
@@ -323,7 +323,7 @@ datum/mind
/*
else if (href_list["monkey"])
var/mob/living/L = current
if (L.monkeyizing)
if (L.transforming)
return
switch(href_list["monkey"])
if("healthy")
+4 -4
View File
@@ -399,7 +399,7 @@
if (isblockon(getblock(M.dna.struc_enzymes, MONKEYBLOCK,3),MONKEYBLOCK) && istype(M, /mob/living/carbon/human))
// human > monkey
var/mob/living/carbon/human/H = M
H.monkeyizing = 1
H.transforming = 1
var/list/implants = list() //Try to preserve implants.
for(var/obj/item/weapon/implant/W in H)
implants += W
@@ -410,7 +410,7 @@
if (W==H.w_uniform) // will be teared
continue
H.drop_from_inventory(W)
M.monkeyizing = 1
M.transforming = 1
M.canmove = 0
M.icon = null
M.invisibility = 101
@@ -475,7 +475,7 @@
if (!isblockon(getblock(M.dna.struc_enzymes, MONKEYBLOCK,3),MONKEYBLOCK) && !istype(M, /mob/living/carbon/human))
// monkey > human,
var/mob/living/carbon/monkey/Mo = M
Mo.monkeyizing = 1
Mo.transforming = 1
var/list/implants = list() //Still preserving implants
for(var/obj/item/weapon/implant/W in Mo)
implants += W
@@ -483,7 +483,7 @@
if(!connected)
for(var/obj/item/W in (Mo.contents-implants))
Mo.drop_from_inventory(W)
M.monkeyizing = 1
M.transforming = 1
M.canmove = 0
M.icon = null
M.invisibility = 101
+4 -4
View File
@@ -12,7 +12,7 @@
//testing("Cannot monkey-ify [M], type is [M.type].")
return
var/mob/living/carbon/human/H = M
H.monkeyizing = 1
H.transforming = 1
var/list/implants = list() //Try to preserve implants.
for(var/obj/item/weapon/implant/W in H)
implants += W
@@ -23,7 +23,7 @@
if (W==H.w_uniform) // will be teared
continue
H.drop_from_inventory(W)
M.monkeyizing = 1
M.transforming = 1
M.canmove = 0
M.icon = null
M.invisibility = 101
@@ -90,7 +90,7 @@
//testing("Cannot humanize [M], type is [M.type].")
return
var/mob/living/carbon/monkey/Mo = M
Mo.monkeyizing = 1
Mo.transforming = 1
var/list/implants = list() //Still preserving implants
for(var/obj/item/weapon/implant/W in Mo)
implants += W
@@ -98,7 +98,7 @@
if(!connected)
for(var/obj/item/W in (Mo.contents-implants))
Mo.drop_from_inventory(W)
M.monkeyizing = 1
M.transforming = 1
M.canmove = 0
M.icon = null
M.invisibility = 101
@@ -374,7 +374,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
for (var/obj/item/weapon/implant/I in C) //Still preserving implants
implants += I
C.monkeyizing = 1
C.transforming = 1
C.canmove = 0
C.icon = null
C.overlays.Cut()
+2 -2
View File
@@ -138,7 +138,7 @@
var/mob/living/M = A
if(M.stat != DEAD)
if(M.monkeyizing)
if(M.transforming)
return
if(M.has_brain_worms())
return //Borer stuff - RR
@@ -146,7 +146,7 @@
if(iscultist(M)) return
if(!ishuman(M) && !isrobot(M)) return
M.monkeyizing = 1
M.transforming = 1
M.canmove = 0
M.icon = null
M.overlays.len = 0
+1 -1
View File
@@ -306,7 +306,7 @@
occupant.client.perspective = MOB_PERSPECTIVE
occupant.loc = loc
eject_wait = 0 //If it's still set somehow.
domutcheck(occupant) //Waiting until they're out before possible monkeyizing.
domutcheck(occupant) //Waiting until they're out before possible transforming.
occupant = null
biomass -= CLONE_BIOMASS
+2 -2
View File
@@ -2,7 +2,7 @@
//added different sort of gibs and animations. N
/mob/proc/gib(anim="gibbed-m",do_gibs)
death(1)
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
@@ -28,7 +28,7 @@
/mob/proc/dust(anim="dust-m",remains=/obj/effect/decal/cleanable/ash)
death(1)
var/atom/movable/overlay/animation = null
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
+1 -1
View File
@@ -4,7 +4,7 @@
set invisibility = 0
set background = 1
if (monkeyizing) return
if (transforming) return
if(!loc) return
..()
+1 -1
View File
@@ -38,7 +38,7 @@
set invisibility = 0
set background = 1
if (monkeyizing) return
if (transforming) return
if(!loc) return // Fixing a null error that occurs when the mob isn't found in the world -- TLE
..()
@@ -426,7 +426,7 @@ var/global/list/damage_icon_parts = list()
//For legacy support.
/mob/living/carbon/human/regenerate_icons()
..()
if(monkeyizing) return
if(transforming) return
update_mutations(0)
update_body(0)
@@ -2,7 +2,7 @@
set invisibility = 0
set background = 1
if (src.monkeyizing)
if (src.transforming)
return
..()
+14
View File
@@ -0,0 +1,14 @@
/mob/living/Life()
set invisibility = 0
set background = BACKGROUND_ENABLED
if (transforming)
return
if(!loc)
return
var/datum/gas_mixture/environment = loc.return_air()
if(stat != DEAD)
. = 1
return .
@@ -2,7 +2,7 @@
set invisibility = 0
set background = 1
if (src.monkeyizing)
if (src.transforming)
return
src.blinded = null
+1 -1
View File
@@ -648,7 +648,7 @@
if(!canmove) return 0
if(stat) return 0
if(anchored) return 0
if(monkeyizing) return 0
if(transforming) return 0
return 1
//Updates canmove, lying and icons. Could perhaps do with a rename but I can't think of anything to describe it.
+1 -1
View File
@@ -57,7 +57,7 @@
var/disabilities = 0 //Carbon
var/atom/movable/pulling = null
var/next_move = null
var/monkeyizing = null //Carbon
var/transforming = null //Carbon
var/other = 0.0
var/hand = null
var/eye_blind = null //Carbon
+1 -1
View File
@@ -196,7 +196,7 @@
if(mob.eyeobj)
return mob.EyeMove(n,direct)
if(mob.monkeyizing) return//This is sota the goto stop mobs from moving var
if(mob.transforming) return//This is sota the goto stop mobs from moving var
if(isliving(mob))
var/mob/living/L = mob
+16 -16
View File
@@ -1,12 +1,12 @@
/mob/living/carbon/human/proc/monkeyize()
if (monkeyizing)
if (transforming)
return
for(var/obj/item/W in src)
if (W==w_uniform) // will be torn
continue
drop_from_inventory(W)
regenerate_icons()
monkeyizing = 1
transforming = 1
canmove = 0
stunned = 1
icon = null
@@ -21,7 +21,7 @@
sleep(48)
//animation = null
monkeyizing = 0
transforming = 0
stunned = 0
update_canmove()
invisibility = initial(invisibility)
@@ -46,7 +46,7 @@
return ..()
/mob/living/carbon/human/AIize(move=1) // 'move' argument needs defining here too because BYOND is dumb
if (monkeyizing)
if (transforming)
return
for(var/t in organs)
qdel(t)
@@ -54,11 +54,11 @@
return ..(move)
/mob/living/carbon/AIize()
if (monkeyizing)
if (transforming)
return
for(var/obj/item/W in src)
drop_from_inventory(W)
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
@@ -112,12 +112,12 @@
//human -> robot
/mob/living/carbon/human/proc/Robotize()
if (monkeyizing)
if (transforming)
return
for(var/obj/item/W in src)
drop_from_inventory(W)
regenerate_icons()
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
@@ -165,12 +165,12 @@
//human -> alien
/mob/living/carbon/human/proc/Alienize()
if (monkeyizing)
if (transforming)
return
for(var/obj/item/W in src)
drop_from_inventory(W)
regenerate_icons()
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
@@ -188,12 +188,12 @@
return
/mob/living/carbon/human/proc/slimeize(adult as num, reproduce as num)
if (monkeyizing)
if (transforming)
return
for(var/obj/item/W in src)
drop_from_inventory(W)
regenerate_icons()
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
@@ -222,12 +222,12 @@
return
/mob/living/carbon/human/proc/corgize()
if (monkeyizing)
if (transforming)
return
for(var/obj/item/W in src)
drop_from_inventory(W)
regenerate_icons()
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
@@ -251,13 +251,13 @@
usr << "\red Sorry but this mob type is currently unavailable."
return
if(monkeyizing)
if(transforming)
return
for(var/obj/item/W in src)
drop_from_inventory(W)
regenerate_icons()
monkeyizing = 1
transforming = 1
canmove = 0
icon = null
invisibility = 101
@@ -11,7 +11,7 @@
/obj/item/projectile/change/proc/wabbajack(var/mob/M)
if(istype(M, /mob/living) && M.stat != DEAD)
if(M.monkeyizing)
if(M.transforming)
return
if(M.has_brain_worms())
return //Borer stuff - RR
@@ -467,10 +467,10 @@
color = "#13BC5E"
/datum/reagent/aslimetoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) // TODO: check if there's similar code anywhere else
if(M.monkeyizing)
if(M.transforming)
return
M << "<span class='danger'>Your flesh rapidly mutates!</span>"
M.monkeyizing = 1
M.transforming = 1
M.canmove = 0
M.icon = null
M.overlays.Cut()
@@ -16,7 +16,7 @@
/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
for(var/mob/living/target in targets)
target.monkeyizing = 1 //protects the mob from being transformed (replaced) midjaunt and getting stuck in bluespace
target.transforming = 1 //protects the mob from being transformed (replaced) midjaunt and getting stuck in bluespace
if(target.buckled) target.buckled = null
spawn(0)
var/mobloc = get_turf(target.loc)
@@ -33,7 +33,7 @@
target.buckled = null
jaunt_disappear(animation, target)
target.loc = holder
target.monkeyizing=0 //mob is safely inside holder now, no need for protection.
target.transforming=0 //mob is safely inside holder now, no need for protection.
jaunt_steam(mobloc)
sleep(duration)
mobloc = get_turf(target.loc)