From 2cc290e31ca14db79fc62835e63fca2fa53b06a6 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Tue, 25 Apr 2017 21:07:41 +0100 Subject: [PATCH] Uses WJohnston's new fantastic icons --- code/modules/language/common.dm | 3 +-- code/modules/language/drone.dm | 3 +-- code/modules/language/language.dm | 5 +++-- code/modules/language/machine.dm | 3 +-- code/modules/language/monkey.dm | 3 +-- code/modules/language/ratvar.dm | 3 +-- code/modules/language/slime.dm | 3 +-- code/modules/language/swarmer.dm | 1 - code/modules/language/xenocommon.dm | 3 +-- icons/misc/language.dmi | Bin 0 -> 1366 bytes 10 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 icons/misc/language.dmi diff --git a/code/modules/language/common.dm b/code/modules/language/common.dm index a54bab618dd..c00ab328ec1 100644 --- a/code/modules/language/common.dm +++ b/code/modules/language/common.dm @@ -8,8 +8,7 @@ flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_UNDERSTOOD default_priority = 100 - icon = 'icons/obj/cardboard_cutout.dmi' - icon_state = "cutout_greytide" + icon_state = "galcom" //Syllable Lists /* diff --git a/code/modules/language/drone.dm b/code/modules/language/drone.dm index 841307489c4..253682d7e49 100644 --- a/code/modules/language/drone.dm +++ b/code/modules/language/drone.dm @@ -13,5 +13,4 @@ sentence_chance = 0 default_priority = 20 - icon = 'icons/mob/drone.dmi' - icon_state = "drone_repair" + icon_state = "drone" \ No newline at end of file diff --git a/code/modules/language/language.dm b/code/modules/language/language.dm index cf56a85b7ff..01bf268e01e 100644 --- a/code/modules/language/language.dm +++ b/code/modules/language/language.dm @@ -21,8 +21,9 @@ var/static/list/scramble_cache = list() var/default_priority = 0 // the language that an atom knows with the highest "default_priority" is selected by default. - var/icon - var/icon_state + // if you are seeing someone speak popcorn language, then something is wrong. + var/icon = 'icons/misc/language.dmi' + var/icon_state = "popcorn" /datum/language/proc/display_icon(atom/movable/hearer) if(isobserver(hearer)) diff --git a/code/modules/language/machine.dm b/code/modules/language/machine.dm index bfbbe6bb8e9..1241ce02510 100644 --- a/code/modules/language/machine.dm +++ b/code/modules/language/machine.dm @@ -11,8 +11,7 @@ space_chance = 10 default_priority = 90 - icon = 'icons/mob/robots.dmi' - icon_state = "robot_old" + icon_state = "eal" /datum/language/machine/get_random_name() if(prob(70)) diff --git a/code/modules/language/monkey.dm b/code/modules/language/monkey.dm index 0817689074c..bc1ff6a8e7b 100644 --- a/code/modules/language/monkey.dm +++ b/code/modules/language/monkey.dm @@ -10,5 +10,4 @@ syllables = list("oop", "aak", "chee", "eek") default_priority = 80 - icon = 'icons/obj/hydroponics/harvest.dmi' - icon_state = "banana" + icon_state = "animal" diff --git a/code/modules/language/ratvar.dm b/code/modules/language/ratvar.dm index bd0280d1bb0..51fc57f045e 100644 --- a/code/modules/language/ratvar.dm +++ b/code/modules/language/ratvar.dm @@ -8,8 +8,7 @@ default_priority = 10 spans = list(SPAN_ROBOT, "brass") - icon = 'icons/obj/clockwork_objects.dmi' - icon_state = "wall_gear" + icon_state = "ratvar" /datum/language/ratvar/scramble(var/input) . = text2ratvar(input) diff --git a/code/modules/language/slime.dm b/code/modules/language/slime.dm index c70902c14c8..f1398ef1ba2 100644 --- a/code/modules/language/slime.dm +++ b/code/modules/language/slime.dm @@ -9,5 +9,4 @@ syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!") default_priority = 70 - icon = 'icons/mob/slimes.dmi' - icon_state = "grey adult slime" + icon_state = "slime" diff --git a/code/modules/language/swarmer.dm b/code/modules/language/swarmer.dm index a1145a123d6..318c3f48f75 100644 --- a/code/modules/language/swarmer.dm +++ b/code/modules/language/swarmer.dm @@ -11,7 +11,6 @@ sentence_chance = 0 default_priority = 60 - icon = 'icons/mob/swarmer.dmi' icon_state = "swarmer" // since various flats and sharps are the same, diff --git a/code/modules/language/xenocommon.dm b/code/modules/language/xenocommon.dm index fd53405d477..790c56fd4e6 100644 --- a/code/modules/language/xenocommon.dm +++ b/code/modules/language/xenocommon.dm @@ -9,5 +9,4 @@ syllables = list("sss","sSs","SSS") default_priority = 50 - icon = 'icons/mob/alien.dmi' - icon_state = "alienq" + icon_state = "xeno" diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e3ad574d676bb7387788df1744c52f5cf4f8b26d GIT binary patch literal 1366 zcmV-c1*!UpP);OQk06Camm-z-hn*chQM~U?XJeX&l`v5nS zHFVoekNZi9^;?qiTa)unkNZP|?LdI(07kk1M797ztpGlz06d=-<^{$80004WQchC< zK<3zH0001{dQ@0+L}hbha%pgMX>V=-0C=2@(Xk4`Fc1ddIeCiE?xG-WF47_$>^mII z*#?tbxP;cnw_0$MbNhep<6o{em-gEArnz-`M$V3+Ih*5duhrsgnbvYRX*Ho6r?Qn? zpx_#-5&S@*(#kr{@0(V4hJaiCG6XN0Cq@zxL>K@MNS_h!DCjb;6xsKDS+g}I^aW?{qN z`YP3J$eo4b&`U(ER>P?!;M%T8K?oH9#B~QQO^>1Up51`)CjeD9Asmfh6#=&E+rDda z3#gPk0Gg<$2rX&NMWy040MKwN=t3_b1GJjWmgCUPQ69t!@`msG6&SwX0EAvZv_N0q zau~?bN}ycW5I&fIu!{aAfW6tly;f5MCU3Z|3mL%L0L1TrdcA%yz>*n&f1B39<~5K7 z#3pP8n>xVKG7ycREdUR)jZ$1iog?%ut%$|5q@4r3fYqva03b>)8=y{t4Q(tPBvA_v zz)o5vfEMaoI2a&(NJ3Fx_?T1ytIES)BMglnJwOasyB*?>f6{v)1JEBlA_#MR+k=S< zCqz*P;!s4a6OuOQfzVF4zSB93h8%61KB+C*6jbZ3}&$93_2D2r>H*Ytg2qjHDa_0Pya?P8y^;1IU9B z`o{>2e#~p=DS+pNQKzT$kV2M%fdOOydW#WaavX4wH`0UXapCX z@}IFa9tVdg%K8#vJPCqHFf~PtMw}o3lj+InBmm0flqtZ{0h80yGiQTy!FW18zYYL@ z(e=W`OP8-)y*8s^Y(c-je&gn?+j*YfxqI)v5r7pz-9C7j=W`hOY+;sxEF+Ici`~7w z-Nj<@_=zc?h?v34A?8nKYXEc~vpiqs%OzOIpBYLOf&rFGNMbpk<o=x=QPBcsFyCLjT^R#LS{r8X-hcSG|LOCWm6={6@cXadzW?~STAAs8 Y0sks&qdBeTF#rGn07*qoM6N<$f(e^{*#H0l literal 0 HcmV?d00001