cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into autism_fort_1

Browse Source
This commit is contained in:
kevinz000
2017-01-23 00:38:45 -08:00
committed by GitHub
parent f706dd90b5 5959ac32cc
commit d30dcb1f8c
253 changed files with 1147 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/advance/symptoms/heal.dm
+7 -7
View File
@@ -36,7 +36,7 @@ Bonus
/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A)
var/heal_amt = 0.5
if(M.toxloss > 0 && prob(20))
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#66FF99"))
new /obj/effect/overlay/temp/heal(get_turf(M), "#66FF99")
M.adjustToxLoss(-heal_amt)
return 1
@@ -67,7 +67,7 @@ Bonus
/datum/symptom/heal/plus/Heal(mob/living/M, datum/disease/advance/A)
var/heal_amt = 1
if(M.toxloss > 0 && prob(20))
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#00FF00"))
new /obj/effect/overlay/temp/heal(get_turf(M), "#00FF00")
M.adjustToxLoss(-heal_amt)
return 1
@@ -110,7 +110,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#FF3333"))
new /obj/effect/overlay/temp/heal(get_turf(M), "#FF3333")
return 1
@@ -148,7 +148,7 @@ Bonus
if(M.getCloneLoss() > 0)
M.adjustCloneLoss(-1)
M.take_bodypart_damage(0, 1) //Deals BURN damage, which is not cured by this symptom
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#33FFCC"))
new /obj/effect/overlay/temp/heal(get_turf(M), "#33FFCC")
if(!parts.len)
return
@@ -158,7 +158,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#CC1100"))
new /obj/effect/overlay/temp/heal(get_turf(M), "#CC1100")
return 1
@@ -201,7 +201,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#FF9933"))
new /obj/effect/overlay/temp/heal(get_turf(M), "#FF9933")
return 1
@@ -248,7 +248,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#CC6600"))
new /obj/effect/overlay/temp/heal(get_turf(M), "#CC6600")
return 1
code/datums/weather/weather_types.dm
+1 -1
View File
@@ -174,7 +174,7 @@
return
var/datum/signal/status_signal = new
var/atom/movable/virtualspeaker/virt = PoolOrNew(/atom/movable/virtualspeaker,null)
var/atom/movable/virtualspeaker/virt = new /atom/movable/virtualspeaker(null)
status_signal.source = virt
status_signal.transmission_method = 1
status_signal.data["command"] = "shuttle"