mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
This is a fix that addresses Issue 138.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1890 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
@@ -36,6 +36,9 @@
|
||||
//Disease Check
|
||||
handle_virus_updates()
|
||||
|
||||
//Update mind
|
||||
update_mind()
|
||||
|
||||
//Handle temperature/pressure differences between body and environment
|
||||
handle_environment()
|
||||
|
||||
@@ -109,6 +112,13 @@
|
||||
if (prob(10))
|
||||
src.stuttering = max(10, src.stuttering)
|
||||
|
||||
update_mind()
|
||||
if(!mind && client)
|
||||
mind = new
|
||||
mind.current = src
|
||||
mind.assigned_role = "Hunter"
|
||||
mind.key = key
|
||||
|
||||
handle_mutations_and_radiation()
|
||||
|
||||
if(src.fireloss)
|
||||
|
||||
@@ -33,6 +33,9 @@
|
||||
//to find it.
|
||||
blinded = null
|
||||
|
||||
//Mind update
|
||||
update_mind()
|
||||
|
||||
//Disease Check
|
||||
handle_virus_updates()
|
||||
|
||||
@@ -144,6 +147,12 @@
|
||||
toxloss += 3
|
||||
updatehealth()
|
||||
|
||||
update_mind()
|
||||
if(!mind && client)
|
||||
mind = new
|
||||
mind.current = src
|
||||
mind.assigned_role = "Larva"
|
||||
mind.key = key
|
||||
|
||||
breathe()
|
||||
|
||||
|
||||
@@ -400,69 +400,6 @@
|
||||
else
|
||||
eye_blurry += P.effects["eyeblur"]
|
||||
|
||||
|
||||
|
||||
/*
|
||||
// Bullet shots
|
||||
if(P.flag == "bullet")
|
||||
if (prob(50) && stat != 2)
|
||||
if(weakened <= 5) weakened = 5
|
||||
|
||||
// Taser shots
|
||||
if(P.flag == "taser" && d == P.damage)
|
||||
armor = getarmor(affecting, "taser")
|
||||
if (prob(armor["armor"]))
|
||||
show_message("\red Your [armor["clothes"]] absorbs the hit!", 4)
|
||||
return
|
||||
|
||||
if (prob(75) && stunned <= 10)
|
||||
stunned = 10
|
||||
else
|
||||
weakened = 10
|
||||
if (stuttering < 10)
|
||||
stuttering = 10
|
||||
|
||||
// Laser shots
|
||||
if(P.flag == "laser")
|
||||
if (!eye_blurry && prob(50)) eye_blurry = 4
|
||||
if (prob(25)) stunned++
|
||||
|
||||
// Shock shots
|
||||
if(istype(P, /obj/item/projectile/fireball))
|
||||
if (!eye_blurry && prob(50)) eye_blurry = 4
|
||||
if (prob(25))
|
||||
stunned = 10
|
||||
else
|
||||
weakened = 10
|
||||
|
||||
// Dart shots
|
||||
if(istype(P, /obj/item/projectile/dart) && d == P.damage)
|
||||
armor = getarmor(affecting, "bio")
|
||||
if (prob(armor["armor"]))
|
||||
show_message("\red Your [armor["clothes"]] absorbs the hit!", 4)
|
||||
return
|
||||
if (istype(l_hand, /obj/item/weapon/shield/riot)||istype(r_hand, /obj/item/weapon/shield/riot))
|
||||
if (prob(50))
|
||||
show_message("\red Your shield absorbs the hit!", 4)
|
||||
else
|
||||
weakened += 5
|
||||
toxloss += 10
|
||||
|
||||
// Pulse shots
|
||||
if(istype(P, /obj/item/projectile/beam/pulse))
|
||||
if (prob(50))
|
||||
stunned = min(stunned, 5)
|
||||
|
||||
// Bolt shots
|
||||
if(istype(P, /obj/item/projectile/bolt) && d == P.damage)
|
||||
toxloss += 3
|
||||
radiation += 100
|
||||
updatehealth()
|
||||
stuttering += 5
|
||||
drowsyness += 5
|
||||
|
||||
*/
|
||||
|
||||
return
|
||||
|
||||
/mob/living/carbon/human/emp_act(severity)
|
||||
|
||||
@@ -38,6 +38,9 @@
|
||||
//to find it.
|
||||
blinded = null
|
||||
|
||||
//Update Mind
|
||||
update_mind()
|
||||
|
||||
//Disease Check
|
||||
handle_virus_updates()
|
||||
|
||||
@@ -133,6 +136,14 @@
|
||||
oxyloss = max(oxyloss, 0)
|
||||
fireloss = max(fireloss, 0)
|
||||
|
||||
update_mind()
|
||||
if(!mind && client)
|
||||
mind = new
|
||||
mind.current = src
|
||||
mind.assigned_role = job
|
||||
if(!mind.assigned_role)
|
||||
mind.assigned_role = "Assistant"
|
||||
mind.key = key
|
||||
|
||||
handle_disabilities()
|
||||
if (disabilities & 2)
|
||||
|
||||
@@ -268,7 +268,12 @@
|
||||
AIproc = 0
|
||||
|
||||
|
||||
|
||||
update_mind()
|
||||
if(!mind && client)
|
||||
mind = new
|
||||
mind.current = src
|
||||
mind.assigned_role = "Metroid"
|
||||
mind.key = key
|
||||
|
||||
handle_environment(datum/gas_mixture/environment)
|
||||
if(!environment)
|
||||
|
||||
@@ -115,6 +115,12 @@
|
||||
if (prob(10))
|
||||
src.stuttering = max(10, src.stuttering)
|
||||
|
||||
update_mind()
|
||||
if(!mind && client)
|
||||
mind = new
|
||||
mind.current = src
|
||||
mind.key = key
|
||||
|
||||
handle_mutations_and_radiation()
|
||||
|
||||
if(src.fireloss)
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
|
||||
src.updatehealth()
|
||||
|
||||
src.update_mind()
|
||||
|
||||
/*if (istype(T, /turf))
|
||||
var/ficheck = src.firecheck(T)
|
||||
if (ficheck)
|
||||
@@ -242,4 +244,11 @@
|
||||
src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
|
||||
else
|
||||
src.health = 100
|
||||
src.stat = 0
|
||||
src.stat = 0
|
||||
|
||||
/mob/living/silicon/ai/proc/update_mind()
|
||||
if(!mind && client)
|
||||
mind = new
|
||||
mind.current = src
|
||||
mind.assigned_role = "AI"
|
||||
mind.key = key
|
||||
@@ -21,6 +21,8 @@
|
||||
process_locks()
|
||||
update_canmove()
|
||||
|
||||
update_mind()
|
||||
|
||||
|
||||
|
||||
/mob/living/silicon/robot
|
||||
@@ -73,6 +75,14 @@
|
||||
else canmove = 1
|
||||
|
||||
|
||||
update_mind()
|
||||
if(!mind && client)
|
||||
mind = new
|
||||
mind.current = src
|
||||
mind.assigned_role = "Hunter"
|
||||
mind.key = key
|
||||
|
||||
|
||||
handle_regular_status_updates()
|
||||
|
||||
//Stop AI using us as a camera
|
||||
|
||||
Reference in New Issue
Block a user