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

Merge pull request #10252 from Baystation12/dev-freeze

Browse Source 
Dev freeze -> Dev
This commit is contained in:
PsiOmegaDelta
2015-07-21 14:42:16 +02:00
parent 7d552f63fa 5b96d6c630
commit d276d4b8f0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/silicon/robot/custom_sprites.dm
View File

@@ -19,6 +19,7 @@ var/list/robot_custom_icons
var/real_name = copytext(line, split_idx+1)
robot_custom_icons[ckey] = real_name
return 1
/mob/living/silicon/robot/proc/set_custom_sprite()
var/rname = robot_custom_icons[ckey]

3
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
View File

@@ -61,7 +61,8 @@
/mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
..()
src.visible_message("\red [src] gets an evil-looking gleam in their eye.")
if(stat == CONSCIOUS)
visible_message("<span class='warning'>[src] gets an evil-looking gleam in their eye.</span>")
/mob/living/simple_animal/hostile/retaliate/goat/Move()
..()