cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shitton of bugfixes related to bryteloss/fireloss.

Browse Source 
Note for coders: in order to help with seaching of health-related bugs I have moved many procs from /mob/ under /mob/living/.
Also, done some clean up and rearranging.
Results:
-admin rejuvenating now works again;
-people screams if getting creamated while still alive;
-diseases actually loose your health;
-monkeys wearing masks receive protection from acids as humans did;
-and other minor fixes and improvements.
Bugfix for imbuing a talisman.
RD now spawns with only 2 pens instead of 3.
Audible emotions can be heard by people outside of locker/other container.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1446 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-04-15 07:41:19 +00:00
parent 2a1818cc93
commit b58e465bbe
73 changed files with 1266 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/disease.dm
+1 -1
View File
@@ -25,7 +25,7 @@ to null does not delete the object itself. Thank you.
var/spread_type = AIRBORNE
var/contagious_period = 0//the disease stage when it can be spread
var/list/affected_species = list()
var/mob/affected_mob = null //the mob which is affected by disease.
var/mob/living/carbon/affected_mob = null //the mob which is affected by disease.
var/holder = null //the atom containing the disease (mob or obj)
var/carrier = 0.0 //there will be a small chance that the person will be a carrier
var/curable = 1 //can this disease be cured? (By itself...)
code/datums/diseases/alien_embryo.dm
+1 -2
View File
@@ -47,8 +47,7 @@
if(prob(2))
affected_mob << "\red Your muscles ache."
if(prob(20))
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
if(prob(2))
affected_mob << "\red Your stomach hurts."
if(prob(20))
code/datums/diseases/dna_spread.dm
+1 -2
View File
@@ -25,8 +25,7 @@
if(prob(1))
affected_mob << "\red Your muscles ache."
if(prob(20))
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
if(prob(1))
affected_mob << "\red Your stomach hurts."
if(prob(20))
code/datums/diseases/flu.dm
+2 -4
View File
@@ -26,8 +26,7 @@
if(prob(1))
affected_mob << "\red Your muscles ache."
if(prob(20))
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
if(prob(1))
affected_mob << "\red Your stomach hurts."
if(prob(20))
@@ -46,8 +45,7 @@
if(prob(1))
affected_mob << "\red Your muscles ache."
if(prob(20))
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
if(prob(1))
affected_mob << "\red Your stomach hurts."
if(prob(20))
code/datums/diseases/robotic_transformation.dm
+4 -8
View File
@@ -20,8 +20,7 @@
if(2)
if (prob(8))
affected_mob << "Your joints feel stiff."
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
if (prob(9))
affected_mob << "\red Beep...boop.."
if (prob(9))
@@ -29,14 +28,12 @@
if(3)
if (prob(8))
affected_mob << "\red Your joints feel very stiff."
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
if (prob(8))
affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
if (prob(10))
affected_mob << "Your skin feels loose."
affected_mob.bruteloss += 5
affected_mob.updatehealth()
affected_mob.take_organ_damage(5)
if (prob(4))
affected_mob << "\red You feel a stabbing pain in your head."
affected_mob.paralysis += 2
@@ -45,8 +42,7 @@
if(4)
if (prob(10))
affected_mob << "\red Your skin feels very loose."
affected_mob.bruteloss += 8
affected_mob.updatehealth()
affected_mob.take_organ_damage(8)
if (prob(20))
affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee..."))
if (prob(8))
code/datums/diseases/xeno_transformation.dm
+4 -8
View File
@@ -18,8 +18,7 @@
if(2)
if (prob(8))
affected_mob << "Your throat feels scratchy."
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
if (prob(9))
affected_mob << "\red Kill..."
if (prob(9))
@@ -27,16 +26,14 @@
if(3)
if (prob(8))
affected_mob << "\red Your throat feels very scratchy."
affected_mob.bruteloss += 1
affected_mob.updatehealth()
affected_mob.take_organ_damage(1)
/*
if (prob(8))
affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
*/
if (prob(10))
affected_mob << "Your skin feels tight."
affected_mob.bruteloss += 5
affected_mob.updatehealth()
affected_mob.take_organ_damage(5)
if (prob(4))
affected_mob << "\red You feel a stabbing pain in your head."
affected_mob.paralysis += 2
@@ -45,8 +42,7 @@
if(4)
if (prob(10))
affected_mob << pick("\red Your skin feels very tight.", "\red Your blood boils!")
affected_mob.bruteloss += 8
affected_mob.updatehealth()
affected_mob.take_organ_damage(8)
if (prob(20))
affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"))
if (prob(8))
code/datums/mind.dm
+2 -2
View File
@@ -1,7 +1,7 @@
datum/mind
var/key
var/mob/current
var/mob/original
var/mob/living/current
var/mob/living/original
var/memory
code/datums/spells/disintegrate.dm
+2 -2
View File
@@ -19,9 +19,9 @@
if(!cast_check())
return
var/mob/M = input("Choose whom to [kill_type]", "ABRAKADABRA") as mob in oview(usr,range)
var/mob/living/M = input("Choose whom to [kill_type]", "ABRAKADABRA") as mob in oview(usr,range)
if(!M)
if(!istype(M))
return
invocation()
code/datums/spells/fireball.dm
+2 -3
View File
@@ -38,9 +38,8 @@
for(i=0, i<lifetime, i++)
step_to(A,M,0)
if(get_dist(A,M) <= 1)
if(istype(M,/mob))
M:bruteloss += bruteloss
M:fireloss += fireloss
if(istype(M,/mob/living))
M:take_organ_damage(bruteloss,fireloss)
explosion(M.loc, radius_devastation, radius_heavy, radius_light, radius_flash)
del(A)
return
code/datums/spells/magic_missile.dm
+2 -2
View File
@@ -23,7 +23,7 @@
invocation()
var/targets = 0
for (var/mob/M as mob in oview(usr,range))
for (var/mob/living/M as mob in oview(usr,range))
if(max_targets)
if(targets >= max_targets)
break
@@ -49,7 +49,7 @@
step_to(A,M,0)
if (get_dist(A,M) == 0)
M.weakened += missile_weaken_amt
M.fireloss += missile_damage
M.take_organ_damage(0, missile_damage)
del(A)
return
sleep(missile_step_delay)