cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-30 16:47:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts a number of simple_animals into their simple_mob variants (#5510)

Browse Source 
* 125 commits merged from master

* Converts a number of simple_animal mobs to the new format

* Grammar fixes
This commit is contained in:
Anewbe
2018-08-21 18:38:18 -07:00
committed by Atermonera
parent a2950e5c35
commit 6a40982a48
573 changed files with 10011 additions and 6582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/_modifiers/traits.dm
+26 -8
View File
@@ -84,20 +84,38 @@
icon_scale_percent = 0.9
/datum/modifier/trait/colorblind_protanopia
name = "Protanopia"
desc = "You have a form of red-green colorblindness. You cannot see reds, and have trouble distinguishing them from yellows and greens."
client_color = MATRIX_Protanopia
/datum/modifier/trait/colorblind_deuteranopia
name = "Deuteranopia"
desc = "You have a form of red-green colorblindness. You cannot see greens, and have trouble distinguishing them from yellows and reds."
client_color = MATRIX_Deuteranopia
/datum/modifier/trait/colorblind_tritanopia
name = "Tritanopia"
desc = "You have a form of blue-yellow colorblindness. You have trouble distinguishing between blues, greens, and yellows, and see blues and violets as dim."
client_color = MATRIX_Tritanopia
/datum/modifier/trait/colorblind_taj
name = "Colorblind - B+R"
name = "Colorblind - Blue-red"
desc = "You are colorblind. You have a minor issue with blue colors and have difficulty recognizing them from red colors."
client_color = MATRIX_Taj_Colorblind
/datum/modifier/trait/colorblind_vulp
name = "Colorblind - G+R"
name = "Colorblind - Red-green"
desc = "You are colorblind. You have a severe issue with green colors and have difficulty recognizing them from red colors."
client_color = MATRIX_Vulp_Colorblind
/datum/modifier/trait/colorblind_mono
name = "Colorblind - Mono"
desc = "You are colorblind. Your condition is rare, but you can see no colors at all."
/datum/modifier/trait/colorblind_monochrome
name = "Monochromacy"
desc = "You are fully colorblind. Your condition is rare, but you can see no colors at all."
client_color = MATRIX_Monochromia
code/modules/mob/_modifiers/traits_phobias.dm
+2 -2
View File
@@ -207,8 +207,8 @@
if(istype(thing, /obj/structure/snowman/spider)) //Snow spiders are also spooky so people can be assholes with those too.
fear_amount += 1
if(istype(thing, /mob/living/simple_animal/hostile/giant_spider)) // Actual giant spiders are the scariest of them all.
var/mob/living/simple_animal/hostile/giant_spider/S = thing
if(istype(thing, /mob/living/simple_mob/animal/giant_spider)) // Actual giant spiders are the scariest of them all.
var/mob/living/simple_mob/animal/giant_spider/S = thing
if(S.stat == DEAD) // Dead giant spiders are less scary than alive ones.
fear_amount += 4
else