cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10231 from GinjaNinja32/spanclassbalance

Browse Source 
Fixes <span class='class>, makes Travis check it
This commit is contained in:
Chinsky
2015-07-18 23:55:15 +03:00
parent 6f5c27f6e1 e1a750344e
commit f7871e6d08
15 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/ghosttrap/trap.dm
View File

@@ -107,7 +107,7 @@ proc/populate_ghost_traps()
ghost_trap_role = "Plant"
/datum/ghosttrap/plant/welcome_candidate(var/mob/target)
target << "<span class='alium><B>You awaken slowly, stirring into sluggish motion as the air caresses you.</B></span>"
target << "<span class='alium'><B>You awaken slowly, stirring into sluggish motion as the air caresses you.</B></span>"
// This is a hack, replace with some kind of species blurb proc.
if(istype(target,/mob/living/carbon/alien/diona))
target << "<B>You are \a [target], one of a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders.</B>"

4
code/modules/mob/living/carbon/human/life.dm
View File

@@ -445,7 +445,7 @@
else if(exhaled_pp > safe_exhaled_max * 0.7)
if (!co2_alert || prob(1))
var/word = pick("dizzy","short of breath","faint","momentarily confused")
src << "<span class='warning>You feel [word].</span>"
src << "<span class='warning'>You feel [word].</span>"
//scale linearly from 0 to 1 between safe_exhaled_max and safe_exhaled_max*0.7
var/ratio = 1.0 - (safe_exhaled_max - exhaled_pp)/(safe_exhaled_max*0.3)
@@ -459,7 +459,7 @@
else if(exhaled_pp > safe_exhaled_max * 0.6)
if (prob(0.3))
var/word = pick("a little dizzy","short of breath")
src << "<span class='warning>You feel [word].</span>"
src << "<span class='warning'>You feel [word].</span>"
else
co2_alert = 0

2
code/modules/mob/living/living.dm
View File

@@ -787,7 +787,7 @@ default behaviour is:
inertia_dir = 1
else if(y >= world.maxy -TRANSITIONEDGE)
inertia_dir = 2
src << "<span class='warning>Something you are carrying is preventing you from leaving.</span>"
src << "<span class='warning'>Something you are carrying is preventing you from leaving.</span>"
return
..()

2
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -305,7 +305,7 @@
purge = 3
adjustBruteLoss(damage)
else
usr << "<span class='danger>This weapon is ineffective, it does no damage.</span>"
usr << "<span class='danger'>This weapon is ineffective, it does no damage.</span>"
visible_message("<span class='danger'>\The [src] has been attacked with \the [O] by [user].</span>")
user.do_attack_animation(src)

2
code/modules/spells/aoe_turf/conjure/conjure.dm
View File

@@ -45,7 +45,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below
var/atom/summoned_object
if(ispath(summoned_object_type,/turf))
if(istype(get_turf(user),/turf/simulated/shuttle) || istype(spawn_place, /turf/simulated/shuttle))
user << "<span class='warning>You can't build things on shuttles!</span>"
user << "<span class='warning'>You can't build things on shuttles!</span>"
continue
spawn_place.ChangeTurf(summoned_object_type)
summoned_object = spawn_place